From 6d52b312e556356030edd6ec5904faa63f5b9778 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 31 Oct 2014 22:09:34 +0000 Subject: Whitespace, comment and readability fixes --- test/backupstorefix/testbackupstorefix.cpp | 87 ++++++++++++++++++------------ 1 file changed, 52 insertions(+), 35 deletions(-) (limited to 'test/backupstorefix') diff --git a/test/backupstorefix/testbackupstorefix.cpp b/test/backupstorefix/testbackupstorefix.cpp index 4c66b079..31cffc78 100644 --- a/test/backupstorefix/testbackupstorefix.cpp +++ b/test/backupstorefix/testbackupstorefix.cpp @@ -103,7 +103,7 @@ int32_t getID(const char *name) std::map::iterator i(nameToID.find(std::string(name))); TEST_THAT(i != nameToID.end()); if(i == nameToID.end()) return -1; - + return i->second; } @@ -167,11 +167,12 @@ typedef struct int flags; } dir_en_check; -void check_dir(BackupStoreDirectory &dir, dir_en_check *ck) +bool check_dir(BackupStoreDirectory &dir, dir_en_check *ck) { BackupStoreDirectory::Iterator i(dir); BackupStoreDirectory::Entry *en; - + bool ok = true; + while((en = i.Next()) != 0) { BackupStoreFilenameClear clear(en->GetName()); @@ -186,9 +187,10 @@ void check_dir(BackupStoreDirectory &dir, dir_en_check *ck) TEST_THAT(en->GetFlags() == ck->flags); ++ck; } - - TEST_THAT(en == 0); - TEST_THAT(ck->name == -1); + + TEST_EQUAL_OR(en, 0, ok = false); + TEST_EQUAL_OR(ck->name, -1, ok = false); + return ok; } typedef struct @@ -200,7 +202,7 @@ void check_dir_dep(BackupStoreDirectory &dir, checkdepinfoen *ck) { BackupStoreDirectory::Iterator i(dir); BackupStoreDirectory::Entry *en; - + while((en = i.Next()) != 0) { TEST_THAT(ck->id != -1); @@ -216,7 +218,7 @@ void check_dir_dep(BackupStoreDirectory &dir, checkdepinfoen *ck) "Wrong Older dependency for " << BOX_FORMAT_OBJECTID(ck->id)); ++ck; } - + TEST_THAT(en == 0); TEST_THAT(ck->id == -1); } @@ -230,19 +232,25 @@ void test_dir_fixing() 2 /* id */, 1, BackupStoreDirectory::Entry::Flags_File | BackupStoreDirectory::Entry::Flags_OldVersion, 2); e->SetDependsNewer(3); - + TEST_THAT(dir.CheckAndFix() == true); TEST_THAT(dir.CheckAndFix() == false); dir_en_check ck[] = { {-1, 0, 0} }; - - check_dir(dir, ck); + + TEST_THAT(check_dir(dir, ck)); } { BackupStoreDirectory dir; + /* + Entry *AddEntry(const BackupStoreFilename &rName, + box_time_t ModificationTime, int64_t ObjectID, + int64_t SizeInBlocks, int16_t Flags, + uint64_t AttributesHash); + */ dir.AddEntry(fnames[0], 12, 2 /* id */, 1, BackupStoreDirectory::Entry::Flags_File, 2); dir.AddEntry(fnames[1], 12, 2 /* id */, 1, @@ -252,14 +260,23 @@ void test_dir_fixing() dir.AddEntry(fnames[0], 12, 5 /* id */, 1, BackupStoreDirectory::Entry::Flags_File | BackupStoreDirectory::Entry::Flags_OldVersion, 2); - + + /* + typedef struct + { + int name; + int64_t id; + int flags; + } dir_en_check; + */ + dir_en_check ck[] = { {1, 2, BackupStoreDirectory::Entry::Flags_File}, {0, 3, BackupStoreDirectory::Entry::Flags_File | BackupStoreDirectory::Entry::Flags_OldVersion}, {0, 5, BackupStoreDirectory::Entry::Flags_File}, {-1, 0, 0} }; - + TEST_THAT(dir.CheckAndFix() == true); TEST_THAT(dir.CheckAndFix() == false); check_dir(dir, ck); @@ -271,7 +288,7 @@ void test_dir_fixing() dir.AddEntry(fnames[1], 12, 10 /* id */, 1, BackupStoreDirectory::Entry::Flags_File | BackupStoreDirectory::Entry::Flags_Dir | BackupStoreDirectory::Entry::Flags_OldVersion, 2); dir.AddEntry(fnames[0], 12, 3 /* id */, 1, BackupStoreDirectory::Entry::Flags_File | BackupStoreDirectory::Entry::Flags_OldVersion, 2); dir.AddEntry(fnames[0], 12, 5 /* id */, 1, BackupStoreDirectory::Entry::Flags_File | BackupStoreDirectory::Entry::Flags_OldVersion, 2); - + dir_en_check ck[] = { {0, 2, BackupStoreDirectory::Entry::Flags_File | BackupStoreDirectory::Entry::Flags_OldVersion}, {1, 10, BackupStoreDirectory::Entry::Flags_Dir}, @@ -279,7 +296,7 @@ void test_dir_fixing() {0, 5, BackupStoreDirectory::Entry::Flags_File}, {-1, 0, 0} }; - + TEST_THAT(dir.CheckAndFix() == true); TEST_THAT(dir.CheckAndFix() == false); check_dir(dir, ck); @@ -310,7 +327,7 @@ void test_dir_fixing() 5 /* id */, 1, BackupStoreDirectory::Entry::Flags_File, 2); TEST_THAT(e5 != 0); e5->SetDependsOlder(4); - + // This should all be nice and valid TEST_THAT(dir.CheckAndFix() == false); static checkdepinfoen c1[] = {{2, 3, 0}, {3, 4, 2}, {4, 5, 3}, {5, 0, 4}, {-1, 0, 0}}; @@ -399,7 +416,7 @@ void login_client_and_check_empty(BackupProtocolCallable& client) check_dir_dep(dir, start_deps); read_bb_dir(1 /* root */, dir); - + // Everything should be OK at the moment TEST_THAT(dir.CheckAndFix() == false); @@ -419,7 +436,7 @@ void check_root_dir_ok(dir_en_check after_entries[], // Check the store, check that the error is detected and // repaired, by removing x1 from the directory. RUN_CHECK_INTERNAL(0); - + // Read the directory back in, check that it's empty BackupStoreDirectory dir; read_bb_dir(1 /* root */, dir); @@ -555,10 +572,10 @@ int test(int argc, const char *argv[]) { BackupStoreDirectory dir; read_bb_dir(1 /* root */, dir); - + dir.AddEntry(fnames[0], 12, 0x1234567890123456LL /* id */, 1, BackupStoreDirectory::Entry::Flags_File, 2); - + std::string fn; StoreStructure::MakeObjectFilename(1 /* root */, accountRootDir, discSetNum, fn, true /* EnsureDirectoryExists */); @@ -590,7 +607,7 @@ int test(int argc, const char *argv[]) } if (failures > 0) return 1; - + // Generate a list of all the object IDs TEST_THAT_ABORTONFAIL(::system(BBACKUPQUERY " -Wwarning " "-c testfiles/bbackupd.conf \"list -R\" quit " @@ -617,7 +634,7 @@ int test(int argc, const char *argv[]) ::fclose(f); } - // ------------------------------------------------------------------------------------------------ + // ------------------------------------------------------------------------------------------------ BOX_INFO(" === Delete store info, add random file"); { // Delete store info @@ -645,7 +662,7 @@ int test(int argc, const char *argv[]) accountRootDir + "01/randomfile")); } - // ------------------------------------------------------------------------------------------------ + // ------------------------------------------------------------------------------------------------ BOX_INFO(" === Delete an entry for an object from dir, change that " "object to be a patch, check it's deleted"); { @@ -662,7 +679,7 @@ int test(int argc, const char *argv[]) dir.DeleteEntry(delID); SaveDirectory("Test1/cannes/ict/metegoguered", dir); } - + // Adjust that entry // // IMPORTANT NOTE: There's a special hack in testbackupstorefix.pl to make sure that @@ -784,8 +801,8 @@ int test(int argc, const char *argv[]) TEST_EQUAL(RaidFileUtil::AsRaid, RaidFileUtil::RaidFileExists( rdiscSet, "backup/01234567/02/01/01/o03")); } - - // ------------------------------------------------------------------------------------------------ + + // ------------------------------------------------------------------------------------------------ BOX_INFO(" === Delete directory, change container ID of another, " "duplicate entry in dir, spurious file size, delete file"); { @@ -824,8 +841,8 @@ int test(int argc, const char *argv[]) // Delete a file DeleteObject("Test1/cannes/ict/scely"); - // We don't know quite how good the checker is (or will become) at - // spotting errors! But asserting an exact number will help us catch + // We don't know quite how good the checker is (or will become) at + // spotting errors! But asserting an exact number will help us catch // changes in checker behaviour, so it's not a bad thing to test. // The 11 errors are: @@ -875,7 +892,7 @@ int test(int argc, const char *argv[]) } } - // ------------------------------------------------------------------------------------------------ + // ------------------------------------------------------------------------------------------------ BOX_INFO(" === Modify the obj ID of dir, delete dir with no members, " "add extra reference to a file"); // Set bad object ID @@ -909,18 +926,18 @@ int test(int argc, const char *argv[]) LoadDirectory("Test1/foreomizes/stemptinevidate/ict", dir); TEST_THAT(dir.GetObjectID() == getID("Test1/foreomizes/stemptinevidate/ict")); } - - // ------------------------------------------------------------------------------------------------ + + // ------------------------------------------------------------------------------------------------ BOX_INFO(" === Orphan files and dirs without being recoverable"); - DeleteObject("Test1/dir1"); - DeleteObject("Test1/dir1/dir2"); + DeleteObject("Test1/dir1"); + DeleteObject("Test1/dir1/dir2"); // Fix it RUN_CHECK // Check everything is where it is predicted to be TEST_THAT(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl check 4") == 0); - // ------------------------------------------------------------------------------------------------ + // ------------------------------------------------------------------------------------------------ BOX_INFO(" === Corrupt file and dir"); // File CorruptObject("Test1/foreomizes/stemptinevidate/algoughtnerge", @@ -934,7 +951,7 @@ int test(int argc, const char *argv[]) TEST_THAT(::system(PERL_EXECUTABLE " testfiles/testbackupstorefix.pl check 5") == 0); - // ------------------------------------------------------------------------------------------------ + // ------------------------------------------------------------------------------------------------ BOX_INFO(" === Overwrite root with a file"); { std::auto_ptr r(RaidFileRead::Open(discSetNum, getObjectName(getID("Test1/pass/shuted/brightinats/milamptimaskates")))); -- cgit v1.2.3