fix up testcases

diff --git a/pdns/test-misc_hh.cc b/pdns/test-misc_hh.cc
index f3fa17c5f4917a2b0faff700886163f63ccc17c9..d43693dd02fce65116a00c0595383a35f99956da 100644 (file)
--- a/pdns/test-misc_hh.cc
+++ b/pdns/test-misc_hh.cc
@@ -109,13 +109,9 @@ BOOST_AUTO_TEST_CASE(test_stripDot) {
 }
 
 BOOST_AUTO_TEST_CASE(test_labelReverse) {
-    BOOST_CHECK_EQUAL(labelReverse("www.powerdns.com"), "com powerdns www");
+  BOOST_CHECK_EQUAL(DNSName("www.powerdns.com").labelReverse().toString(" ", false), "com powerdns www");
 }
 
-BOOST_AUTO_TEST_CASE(test_makeRelative) {
-    BOOST_CHECK_EQUAL(makeRelative("www.powerdns.com", "powerdns.com"), "www");
-    BOOST_CHECK_EQUAL(makeRelative("PoWeRdNs.CoM", "powerdns.com"), "");
-}
 
 BOOST_AUTO_TEST_CASE(test_AtomicCounter) {
     AtomicCounter ac(0);

diff --git a/pdns/test-packetcache_cc.cc b/pdns/test-packetcache_cc.cc
index ad6353cb1651e148c83ccfbe37e7d41408ed2a17..e6ceb7ddcf06ccd107746fda654f7fa0ac2dfafb 100644 (file)
--- a/pdns/test-packetcache_cc.cc
+++ b/pdns/test-packetcache_cc.cc
@@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE(test_PacketCacheSimple) {
     BOOST_CHECK_EQUAL(PC.size(), counter-delcounter);
     
     int matches=0;
-    vector<DNSResourceRecord> entry;
+    vector<DNSZoneRecord> entry;
     int expected=counter-delcounter;
     for(; delcounter < counter; ++delcounter) {
       if(PC.getEntry(DNSName("hello ")+DNSName(std::to_string(delcounter)), QType(QType::A), PacketCache::QUERYCACHE, entry, 1)) {
@@ -97,7 +97,7 @@ static void *threadReader(void* a)
 try
 {
   unsigned int offset=(unsigned int)(unsigned long)a;
-  vector<DNSResourceRecord> entry;
+  vector<DNSZoneRecord> entry;
   for(unsigned int counter=0; counter < 100000; ++counter)
     if(!g_PC->getEntry(DNSName("hello ")+DNSName(std::to_string(counter+offset)), QType(QType::A), PacketCache::QUERYCACHE, entry, 1)) {
        g_missing++;