improve cistring/cipair tests, thanks ch

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3121 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/test-misc_hh.cc b/pdns/test-misc_hh.cc
index f8f0f29716c5ed6138eacaef193cfe7996de27e5..6952040144999d4778906c6728e0014c6abf86bf 100644 (file)
--- a/pdns/test-misc_hh.cc
+++ b/pdns/test-misc_hh.cc
@@ -15,14 +15,16 @@ BOOST_AUTO_TEST_CASE(test_CIStringCompare) {
        nsset.insert("abc");
        nsset.insert("ns.example.com");
        nsset.insert("");
+       nsset.insert("def");
+       nsset.insert("aBc");
        nsset.insert("ns.example.com");
-       BOOST_CHECK_EQUAL(nsset.size(), 3);
+       BOOST_CHECK_EQUAL(nsset.size(), 4);
 
        ostringstream s;
        for(set<std::string, CIStringCompare>::const_iterator i=nsset.begin();i!=nsset.end();++i) {
-               s<<"["<<*i<<"]";
+               s<<"("<<*i<<")";
        }
-       BOOST_CHECK_EQUAL(s.str(), "[][abc][ns.example.com]");
+       BOOST_CHECK_EQUAL(s.str(), "()(abc)(def)(ns.example.com)");
 }
 
 BOOST_AUTO_TEST_CASE(test_CIStringPairCompare) {
@@ -30,16 +32,20 @@ BOOST_AUTO_TEST_CASE(test_CIStringPairCompare) {
        nsset2.insert(make_pair("ns.example.com", 1));
        nsset2.insert(make_pair("abc", 1));
        nsset2.insert(make_pair("", 1));
+       nsset2.insert(make_pair("def", 1));
        nsset2.insert(make_pair("abc", 2));
        nsset2.insert(make_pair("abc", 1));
        nsset2.insert(make_pair("ns.example.com", 0));
-       BOOST_CHECK_EQUAL(nsset2.size(), 5);
+    nsset2.insert(make_pair("abc", 2));
+       nsset2.insert(make_pair("ABC", 2));
+
+       BOOST_CHECK_EQUAL(nsset2.size(), 6);
 
        ostringstream s;
        for(set<typedns_t, CIStringPairCompare>::const_iterator i=nsset2.begin();i!=nsset2.end();++i) {
-               s<<"["<<i->first<<"|"<<i->second<<"]";
+               s<<"("<<i->first<<"|"<<i->second<<")";
        }
-       BOOST_CHECK_EQUAL(s.str(), "[|1][abc|1][abc|2][ns.example.com|0][ns.example.com|1]");
+       BOOST_CHECK_EQUAL(s.str(), "(|1)(abc|1)(abc|2)(def|1)(ns.example.com|0)(ns.example.com|1)");
 }
 
 BOOST_AUTO_TEST_SUITE_END()