Removed fancy records, fixed DLV test

diff --git a/pdns/test-dnsrecords_cc.cc b/pdns/test-dnsrecords_cc.cc
index 4ba90dc08e35c42f10eb1c7917b03450d4d38b01..9b5ab3c92ec49a637f1507ee924005a417f5f9c3 100644 (file)
--- a/pdns/test-dnsrecords_cc.cc
+++ b/pdns/test-dnsrecords_cc.cc
@@ -130,11 +130,11 @@ BOOST_AUTO_TEST_CASE(test_record_types) {
      (CASE_S(QType::EUI48, "00-11-22-33-44-55", "\x00\x11\x22\x33\x44\x55"))
      (CASE_S(QType::EUI64, "00-11-22-33-44-55-66-77", "\x00\x11\x22\x33\x44\x55\x66\x77"))
      (CASE_S(QType::TSIG, "HMAC-MD5.SIG-ALG.REG.INT 1368386956 60 16 4e46e90faebf32d828f0650415923086 12345 0 0", "\x08HMAC-MD5\x07SIG-ALG\x03REG\x03INT\x00\x00\x00\x51\x8f\xed\x8c\x00\x3c\x00\x0a\x4e\x46\xe9\x0f\xae\xbf\x32\xd8\x28\xf0\x65\x04\x15\x92\x30\x86\x30\x39\x00\x00\x00\x00"))
-     (CASE_S(QType::URL, "http://server.rec.test/", "\x17http://server.rec.test/"))
-     (CASE_S(QType::MBOXFW, "you@yourcompany.com", "line format"))
-     (CASE_S(QType::CURL, "http://server.rec.test/", "\x17http://server.rec.test/"))
-//     (CASE_S(QType::ADDR, "zone format", "line format")) <-- FIXME: What is this?
-     (CASE_L(QType::DLV, "20642 8 2 04443ABE7E94C3985196BEAE5D548C727B044DDA5151E60D7CD76A9F D931D00E", "20642 8 2 04443abe7e94c3985196beae5d548c727b044dda5151e60d7cd76a9fd931d00e", "\x50\xa2\x08\x02\x04\x44\x3a\xbe\x7e\x94\xc3\x98\x51\x96\xbe\xae\x5d\x54\x8c\x72\x7b\x04\x4d\xda\x51\x51\xe6\x0d\x7c\xd7\x6a\x9f\xd9\x31\xd0\x0e"))
+/*     (CASE_S(QType::URL, "http://server.rec.test/", "\x17http://server.rec.test/"))
+       (CASE_S(QType::MBOXFW, "you@yourcompany.com", "line format"))
+       (CASE_S(QType::CURL, "http://server.rec.test/", "\x17http://server.rec.test/")) 
+       (CASE_S(QType::ADDR, "zone format", "line format")) */
+     (CASE_S(QType::DLV, "20642 8 2 04443abe7e94c3985196beae5d548c727b044dda5151e60d7cd76a9fd931d00e", "\x50\xa2\x08\x02\x04\x44\x3a\xbe\x7e\x94\xc3\x98\x51\x96\xbe\xae\x5d\x54\x8c\x72\x7b\x04\x4d\xda\x51\x51\xe6\x0d\x7c\xd7\x6a\x9f\xd9\x31\xd0\x0e"))
 ;
 
   int n=0;
@@ -154,6 +154,7 @@ BOOST_AUTO_TEST_CASE(test_record_types) {
       switch(q.getCode()) {
          case QType::LOC:
          case QType::DS:
+         case QType::DLV:
             BOOST_CHECK_EQUAL(rec->getZoneRepresentation(), val.get<2>());
          break;
          default: