diff -r 65ce756bf3cc -r e322da4af2d2 sourcehook/test/testlist.cpp --- a/sourcehook/test/testlist.cpp Thu Sep 29 23:05:01 2005 +0000 +++ b/sourcehook/test/testlist.cpp Mon Oct 03 17:20:22 2005 +0000 @@ -33,50 +33,50 @@ return m_Int; } }; - + #define LIST_THIS_CHECK(lst, err) \ for (ListType::iterator iter = lst.begin(); iter != lst.end(); ++iter) \ CHECK_COND(&(*iter) == iter->m_This, err); - + bool DoTestList(std::string &error) { typedef SourceHook::List ListType; ListType lst; - + CHECK_COND(lst.empty(), "Part1"); - + for (int i = 1; i <= 100; ++i) lst.push_back(i); - + LIST_THIS_CHECK(lst, "PartA1"); - + CHECK_COND(!lst.empty(), "Part2"); - + lst.clear(); - + CHECK_COND(lst.empty(), "Part3"); - + for (int i = 1; i <= 100; ++i) lst.push_back(i); - + CHECK_COND(lst.back() == 100, "Part4"); LIST_THIS_CHECK(lst, "PartA2"); - + int ver = 1; for (ListType::iterator iter = lst.begin(); iter != lst.end(); ++iter) CHECK_COND(*iter == ver++, "Part5"); - + CHECK_COND(ver == 101, "Part 6"); - + ListType::iterator iter50 = lst.find(50); CHECK_COND(*iter50 == 50, "Part7"); - + iter50 = lst.erase(iter50); CHECK_COND(*iter50 == 51, "Part8"); CHECK_COND(*--iter50 == 49, "Part8.2"); - + lst.remove(80); - + ver = 1; for (ListType::iterator iter = lst.begin(); iter != lst.end(); ++iter) { @@ -86,68 +86,77 @@ } CHECK_COND(ver == 101, "Part10"); LIST_THIS_CHECK(lst, "PartA3"); - + ListType lst2; lst = lst2; CHECK_COND(lst.empty(), "Part11"); - + for (int i = 1; i <= 100; ++i) lst.push_back(i); lst2 = lst; CHECK_COND(lst2.size() == 100, "Part11.2"); - + LIST_THIS_CHECK(lst, "PartA4"); LIST_THIS_CHECK(lst2, "PartA5"); - + ver = 1; for (ListType::iterator iter = lst2.begin(); iter != lst2.end(); ++iter) CHECK_COND(*iter == ver++, "Part12"); - + lst.clear(); for (int i = 401; i <= 500; ++i) lst.push_back(i); lst = lst2; CHECK_COND(lst2.size() == 100, "Part13"); - + ver = 1; for (ListType::iterator iter = lst.begin(); iter != lst.end(); ++iter) CHECK_COND(*iter == ver++, "Part14"); LIST_THIS_CHECK(lst, "PartA6"); LIST_THIS_CHECK(lst2, "PartA7"); - + return true; } - + bool DoTestTinyHash(std::string &error) { const int mymax = 5000; - + typedef SourceHook::THash HashType; HashType hash; - + for (int i = 1; i <= mymax; ++i) hash[i] = i + 5000; - + for (int i = 1; i <= mymax; ++i) CHECK_COND(hash[i] == i + 5000, "Part1"); - + // Find int ver = 1; for (HashType::iterator iter = hash.begin(); iter != hash.end(); ++iter) CHECK_COND(iter->key == ver && iter->val == (ver++) + 5000, "Part2"); - + CHECK_COND(ver == mymax+1, "Part2.1"); - + HashType::iterator iter = hash.find(300); CHECK_COND(iter != hash.end() && iter->val == 300+5000, "Part3.1"); iter = hash.find(mymax+200); CHECK_COND(iter == hash.end(), "Part3.2"); - + HashType hash2; for (int i = 1; i <= mymax; ++i) hash2[i] = i + 5000; - + + hash2.erase(mymax - 100); + CHECK_COND(hash2.find(mymax - 101) != hash2.end(), "Part 4.1"); + CHECK_COND(hash2.find(mymax - 99) != hash2.end(), "Part 4.2"); + CHECK_COND(hash2.find(mymax - 100) == hash2.end(), "Part 4.3"); + hash2.erase(mymax - 99); + CHECK_COND(hash2.find(mymax - 101) != hash2.end(), "Part 4.4"); + CHECK_COND(hash2.find(mymax - 99) == hash2.end(), "Part 4.5"); + CHECK_COND(hash2.find(mymax - 100) == hash2.end(), "Part 4.6"); + return true; } } @@ -156,10 +165,10 @@ { if (!DoTestList(error)) return false; - + if (!DoTestTinyHash(error)) return false; - - + + return true; }