From 6ef93f7fece55945290db71c86b0f626a4e92e30 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 9 Apr 2014 22:15:11 +0000 Subject: Replace magic numbers with named constants for readability. --- test/backupstore/testbackupstore.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'test') diff --git a/test/backupstore/testbackupstore.cpp b/test/backupstore/testbackupstore.cpp index 238d6652..0e1d7a7a 100644 --- a/test/backupstore/testbackupstore.cpp +++ b/test/backupstore/testbackupstore.cpp @@ -515,6 +515,9 @@ void create_file_in_dir(std::string name, std::string source, int64_t parentId, set_refcount(objectId, 1); } +const box_time_t FAKE_MODIFICATION_TIME = 0xfeedfacedeadbeefLL; +const box_time_t FAKE_ATTR_MODIFICATION_TIME = 0xdeadbeefcafebabeLL; + int64_t create_test_data_subdirs(BackupProtocolCallable &protocol, int64_t indir, const char *name, int depth, BackupStoreRefCountDatabase* pRefCount) @@ -527,7 +530,7 @@ int64_t create_test_data_subdirs(BackupProtocolCallable &protocol, int attrS = 0; std::auto_ptr attr(new MemBlockStream(&attrS, sizeof(attrS))); std::auto_ptr dirCreate(protocol.QueryCreateDirectory( - indir, 9837429842987984LL, dirname, attr)); + indir, FAKE_ATTR_MODIFICATION_TIME, dirname, attr)); subdirid = dirCreate->GetObjectID(); } @@ -1114,7 +1117,7 @@ int64_t create_directory(BackupProtocolCallable& protocol) std::auto_ptr dirCreate(protocol.QueryCreateDirectory( BACKUPSTORE_ROOT_DIRECTORY_ID, - 9837429842987984LL, dirname, attr)); + FAKE_ATTR_MODIFICATION_TIME, dirname, attr)); int64_t subdirid = dirCreate->GetObjectID(); set_refcount(subdirid, 1); @@ -1492,7 +1495,8 @@ bool test_multiple_uploads() // Attributes TEST_THAT(dir.HasAttributes()); - TEST_EQUAL(9837429842987984LL, dir.GetAttributesModTime()); + TEST_EQUAL(FAKE_ATTR_MODIFICATION_TIME, + dir.GetAttributesModTime()); StreamableMemBlock attr(attr1, sizeof(attr1)); TEST_THAT(dir.GetAttributes() == attr); } @@ -1640,10 +1644,8 @@ bool test_multiple_uploads() // Attributes std::auto_ptr attr(new MemBlockStream(attr1, sizeof(attr1))); - std::auto_ptr dirCreate(apProtocol->QueryCreateDirectory( - subdirid, - 9837429842987984LL, nd, attr)); - subsubdirid = dirCreate->GetObjectID(); + subsubdirid = apProtocol->QueryCreateDirectory(subdirid, + FAKE_ATTR_MODIFICATION_TIME, nd, attr)->GetObjectID(); BackupStoreFilenameClear file2("file2"); std::auto_ptr upload( @@ -2334,7 +2336,7 @@ bool test_account_limits_respected() BackupStoreFilenameClear fnxd("exceed-limit-dir"); TEST_CHECK_THROWS(protocol.QueryCreateDirectory( BackupProtocolListDirectory::RootDirectory, - 9837429842987984LL, fnxd, attr), + FAKE_ATTR_MODIFICATION_TIME, fnxd, attr), ConnectionException, Conn_Protocol_UnexpectedReply); // Finish the connection. TODO FIXME reinstate this. -- cgit v1.2.3