moved test cases for specific RDATA-type classes to separate files to keep

each test unit concise and more focused.


git-svn-id: svn://bind10.isc.org/svn/bind10/branches/jinmei-dnsrdata2@758 e5f2f494-b856-4b98-b285-d166d9295462

src/lib/dns/cpp/tests/Makefile.am

@@ -0,0 +1,33 @@
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/ext
+AM_CPPFLAGS += -I$(top_builddir)/include/dns/cpp
+
+CLEANFILES = *.gcno *.gcda
+
+TESTS =
+if HAVE_GTEST
+TESTS += run_unittests
+run_unittests_SOURCES = unittest_util.h unittest_util.cc
+run_unittests_SOURCES += buffer_unittest.cc name_unittest.cc
+run_unittests_SOURCES += messagerenderer_unittest.cc
+run_unittests_SOURCES += rrclass_unittest.cc rrtype_unittest.cc
+run_unittests_SOURCES += rrttl_unittest.cc
+run_unittests_SOURCES += rdata_unittest.h rdata_unittest.cc
+run_unittests_SOURCES += rdata_in_a_unittest.cc rdata_in_aaaa_unittest.cc
+run_unittests_SOURCES += rdata_ns_unittest.cc rdata_soa_unittest.cc
+run_unittests_SOURCES += rdata_txt_unittest.cc rdata_mx_unittest.cc
+run_unittests_SOURCES += rdata_cname_unittest.cc
+run_unittests_SOURCES += rdata_rrsig_unittest.cc
+run_unittests_SOURCES += rrset_unittest.cc
+run_unittests_SOURCES += question_unittest.cc
+run_unittests_SOURCES += rrparamregistry_unittest.cc
+run_unittests_SOURCES += message_unittest.cc
+run_unittests_SOURCES += base64_unittest.cc
+run_unittests_SOURCES += run_unittests.cc
+run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
+run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
+run_unittests_LDADD = $(GTEST_LDADD)
+run_unittests_LDADD += $(top_builddir)/src/lib/dns/cpp/.libs/libdns.a
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/cpp/.libs/libexceptions.a
+endif
+
+noinst_PROGRAMS = $(TESTS)

src/lib/dns/cpp/tests/rdata_cname_unittest.cc

@@ -0,0 +1,121 @@
+// Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+// PERFORMANCE OF THIS SOFTWARE.
+
+// $Id$
+
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+
+#include <gtest/gtest.h>
+
+#include "unittest_util.h"
+#include "rdata_unittest.h"
+
+using isc::UnitTestUtil;
+using namespace std;
+using namespace isc::dns;
+using namespace isc::dns::rdata;
+
+namespace {
+class Rdata_CNAME_Test : public RdataTest {
+    // there's nothing to specialize
+};
+
+const generic::CNAME rdata_cname("cn.example.com");
+const generic::CNAME rdata_cname2("cn2.example.com");
+const uint8_t wiredata_cname[] = {
+    0x02, 0x63, 0x6e, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x03,
+    0x63, 0x6f, 0x6d, 0x00 };
+const uint8_t wiredata_cname2[] = {
+    // first name: cn.example.com.
+    0x02, 0x63, 0x6e, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x03,
+    0x63, 0x6f, 0x6d, 0x00,
+    // second name: cn2.example.com.  all labels except the first should be
+    // compressed.
+    0x03, 0x63, 0x6e, 0x32, 0xc0, 0x03 };
+
+TEST_F(Rdata_CNAME_Test, createFromText)
+{
+    EXPECT_EQ(0, rdata_cname.compare(generic::CNAME("cn.example.com")));
+    // explicitly add a trailing dot.  should be the same RDATA.
+    EXPECT_EQ(0, rdata_cname.compare(generic::CNAME("cn.example.com.")));
+    // should be case sensitive.
+    EXPECT_EQ(0, rdata_cname.compare(generic::CNAME("CN.EXAMPLE.COM")));
+    // RDATA of a class-independent type should be recognized for any
+    // "unknown" class.
+    EXPECT_EQ(0, rdata_cname.compare(*createRdata(RRType("CNAME"),
+                                                  RRClass(65000),
+                                                  "cn.example.com")));
+}
+
+TEST_F(Rdata_CNAME_Test, createFromWire)
+{
+    EXPECT_EQ(0, rdata_cname.compare(
+                  *rdataFactoryFromFile(RRType("CNAME"), RRClass("IN"),
+                                        "testdata/rdata_cname_fromWire")));
+    // RDLENGTH is too short
+    EXPECT_THROW(rdataFactoryFromFile(RRType("CNAME"), RRClass("IN"),
+                                      "testdata/rdata_cname_fromWire", 18),
+                 InvalidRdataLength);
+    // RDLENGTH is too long
+    EXPECT_THROW(rdataFactoryFromFile(RRType("CNAME"), RRClass("IN"),
+                                      "testdata/rdata_cname_fromWire", 36),
+                 InvalidRdataLength);
+    // incomplete name.  the error should be detected in the name constructor
+    EXPECT_THROW(rdataFactoryFromFile(RRType("CNAME"), RRClass("IN"),
+                                      "testdata/rdata_cname_fromWire", 71),
+                 IncompleteName);
+
+    EXPECT_EQ(0, generic::CNAME("cn2.example.com").compare(
+                  *rdataFactoryFromFile(RRType("CNAME"), RRClass("IN"),
+                                        "testdata/rdata_cname_fromWire", 55)));
+    EXPECT_THROW(*rdataFactoryFromFile(RRType("CNAME"), RRClass("IN"),
+                                       "testdata/rdata_cname_fromWire", 63),
+                 InvalidRdataLength);
+}
+
+TEST_F(Rdata_CNAME_Test, toWireBuffer)
+{
+    rdata_cname.toWire(obuffer);
+    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
+                        obuffer.getData(), obuffer.getLength(),
+                        wiredata_cname, sizeof(wiredata_cname));
+}
+
+TEST_F(Rdata_CNAME_Test, toWireRenderer)
+{
+    rdata_cname.toWire(renderer);
+    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
+                        obuffer.getData(), obuffer.getLength(),
+                        wiredata_cname, sizeof(wiredata_cname));
+    rdata_cname2.toWire(renderer);
+    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
+                        obuffer.getData(), obuffer.getLength(),
+                        wiredata_cname2, sizeof(wiredata_cname2));
+}
+
+TEST_F(Rdata_CNAME_Test, toText)
+{
+    EXPECT_EQ("cn.example.com.", rdata_cname.toText());
+}
+
+TEST_F(Rdata_CNAME_Test, getCname)
+{
+    EXPECT_EQ(Name("cn.example.com."), rdata_cname.getCname());
+}
+}

src/lib/dns/cpp/tests/rdata_in_a_unittest.cc

@@ -0,0 +1,118 @@
+// Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+// PERFORMANCE OF THIS SOFTWARE.
+
+// $Id$
+
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+
+#include <gtest/gtest.h>
+
+#include "unittest_util.h"
+#include "rdata_unittest.h"
+
+using isc::UnitTestUtil;
+using namespace std;
+using namespace isc::dns;
+using namespace isc::dns::rdata;
+
+namespace {
+class Rdata_IN_A_Test : public RdataTest {
+    // there's nothing to specialize
+};
+
+const in::A rdata_in_a("192.0.2.1");
+const uint8_t wiredata_in_a[] = { 192, 0, 2, 1 };
+
+TEST_F(Rdata_IN_A_Test, createFromText)
+{
+    rdata_in_a.compare(in::A(string("192.0.2.1")));
+    //EXPECT_EQ(0, rdata_in_a.compare(in::A("192.0.2.1")));
+    // should reject an abbreviated form of IPv4 address
+    EXPECT_THROW(in::A("10.1"), InvalidRdataText);
+    // or an IPv6 address
+    EXPECT_THROW(in::A("2001:db8::1234"), InvalidRdataText);
+    // or any meaningless text as an IP address
+    EXPECT_THROW(in::A("xxx"), InvalidRdataText);
+}
+
+TEST_F(RdataTest, createFromWire)
+{
+    // Valid data
+    EXPECT_EQ(0, rdata_in_a.compare(
+                  *rdataFactoryFromFile(RRType("A"), RRClass("IN"),
+                                        "testdata/rdata_in_a_fromWire")));
+    // RDLENGTH is too short
+    EXPECT_THROW(rdataFactoryFromFile(RRType("A"), RRClass("IN"),
+                                      "testdata/rdata_in_a_fromWire", 6),
+                 InvalidRdataLength);
+    // RDLENGTH is too long
+    EXPECT_THROW(rdataFactoryFromFile(RRType("A"), RRClass("IN"),
+                                      "testdata/rdata_in_a_fromWire", 12),
+                 InvalidRdataLength);
+    // buffer too short.  the error should be detected in buffer read
+    EXPECT_THROW(rdataFactoryFromFile(RRType("A"), RRClass("IN"),
+                                      "testdata/rdata_in_a_fromWire", 19),
+                 InvalidBufferPosition);
+}
+
+TEST_F(RdataTest, toWireBuffer)
+{
+    rdata_in_a.toWire(obuffer);
+    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
+                        obuffer.getData(), obuffer.getLength(),
+                        wiredata_in_a, sizeof(wiredata_in_a));
+}
+
+TEST_F(RdataTest, toWireRenderer)
+{
+    rdata_in_a.toWire(renderer);
+    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
+                        obuffer.getData(), obuffer.getLength(),
+                        wiredata_in_a, sizeof(wiredata_in_a));
+}
+
+TEST_F(RdataTest, toText)
+{
+    EXPECT_EQ("192.0.2.1", rdata_in_a.toText());
+    string longaddr("255.255.255.255"); // this shouldn't make the code crash
+    EXPECT_EQ(longaddr, in::A(longaddr).toText());
+}
+
+TEST_F(RdataTest, compare)
+{
+    in::A small1("1.1.1.1");
+    in::A small2("1.2.3.4");
+    in::A large1("255.255.255.255");
+    in::A large2("4.3.2.1");
+
+    // trivial case: self equivalence
+    EXPECT_EQ(0, small1.compare(small1));
+
+    // confirm these are compared as unsigned values
+    EXPECT_GT(0, small1.compare(large1));
+    EXPECT_LT(0, large1.compare(small1));
+
+    // confirm these are compared in network byte order
+    EXPECT_GT(0, small2.compare(large2));
+    EXPECT_LT(0, large2.compare(small2));
+
+    // comparison attempt between incompatible RR types should be rejected
+    EXPECT_THROW(rdata_in_a.compare(*RdataTest::rdata_nomatch), bad_cast); 
+}
+}

src/lib/dns/cpp/tests/rdata_in_aaaa_unittest.cc

@@ -0,0 +1,102 @@
+// Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+// PERFORMANCE OF THIS SOFTWARE.
+
+// $Id$
+
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+
+#include <gtest/gtest.h>
+
+#include "unittest_util.h"
+#include "rdata_unittest.h"
+
+using isc::UnitTestUtil;
+using namespace std;
+using namespace isc::dns;
+using namespace isc::dns::rdata;
+
+namespace {
+class Rdata_IN_AAAA_Test : public RdataTest {
+    // there's nothing to specialize
+};
+
+const in::AAAA rdata_in_aaaa("2001:db8::1234");
+const uint8_t wiredata_in_aaaa[] = {
+    0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x12, 0x34 };
+
+TEST_F(Rdata_IN_AAAA_Test, createFromText)
+{
+    rdata_in_aaaa.compare(in::AAAA(string("2001:db8::1234")));
+    EXPECT_THROW(in::AAAA("192.0.2.1"), InvalidRdataText);
+    EXPECT_THROW(in::AAAA("xxx"), InvalidRdataText);
+}
+
+TEST_F(Rdata_IN_AAAA_Test, createFromWire)
+{
+    // Valid data
+    EXPECT_EQ(0, rdata_in_aaaa.compare(
+                  *rdataFactoryFromFile(RRType("AAAA"), RRClass("IN"),
+                                        "testdata/rdata_in_aaaa_fromWire")));
+    //TBD: more tests
+}
+
+TEST_F(Rdata_IN_AAAA_Test, toWireBuffer)
+{
+    rdata_in_aaaa.toWire(obuffer);
+    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
+                        obuffer.getData(), obuffer.getLength(),
+                        wiredata_in_aaaa, sizeof(wiredata_in_aaaa));
+}
+
+TEST_F(Rdata_IN_AAAA_Test, toWireRenderer)
+{
+    rdata_in_aaaa.toWire(renderer);
+    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
+                        obuffer.getData(), obuffer.getLength(),
+                        wiredata_in_aaaa, sizeof(wiredata_in_aaaa));
+}
+
+TEST_F(Rdata_IN_AAAA_Test, toText)
+{
+    EXPECT_EQ("2001:db8::1234", rdata_in_aaaa.toText());
+}
+
+TEST_F(Rdata_IN_AAAA_Test, compare)
+{
+    in::AAAA small1("::1");
+    in::AAAA small2("1:2:3:4:5:6:7:8");
+    in::AAAA large1("ffff::");
+    in::AAAA large2("8:7:6:5:4:3:2:1");
+
+    // trivial case: self equivalence
+    EXPECT_EQ(0, small1.compare(small1));
+
+    // confirm these are compared as unsigned values
+    EXPECT_GT(0, small1.compare(large1));
+    EXPECT_LT(0, large1.compare(small1));
+
+    // confirm these are compared in network byte order
+    EXPECT_GT(0, small2.compare(large2));
+    EXPECT_LT(0, large2.compare(small2));
+
+    // comparison attempt between incompatible RR types should be rejected
+    EXPECT_THROW(rdata_in_aaaa.compare(*RdataTest::rdata_nomatch), bad_cast); 
+}
+}

src/lib/dns/cpp/tests/rdata_mx_unittest.cc

@@ -0,0 +1,91 @@
+// Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+// PERFORMANCE OF THIS SOFTWARE.
+
+// $Id$
+
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+
+#include <gtest/gtest.h>
+
+#include "unittest_util.h"
+#include "rdata_unittest.h"
+
+using isc::UnitTestUtil;
+using namespace std;
+using namespace isc::dns;
+using namespace isc::dns::rdata;
+
+namespace {
+class Rdata_MX_Test : public RdataTest {
+    // there's nothing to specialize
+};
+
+const generic::MX rdata_mx(10, Name("mx.example.com"));
+
+TEST_F(Rdata_MX_Test, createFromText)
+{
+    //TBD
+}
+
+TEST_F(Rdata_MX_Test, createFromWire)
+{
+    EXPECT_EQ(0, rdata_mx.compare(
+                  *rdataFactoryFromFile(RRType("MX"), RRClass("IN"),
+                                        "testdata/rdata_mx_fromWire")));
+    // TBD: more tests
+}
+
+TEST_F(Rdata_MX_Test, toWireRenderer)
+{
+    renderer.writeName(Name("example.com"));
+    rdata_mx.toWire(renderer);
+
+    vector<unsigned char> data;
+    UnitTestUtil::readWireData("testdata/rdata_mx_toWire1", data);
+    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData, obuffer.getData(),
+                        obuffer.getLength(), &data[0], data.size());
+}
+
+TEST_F(Rdata_MX_Test, toText)
+{
+    EXPECT_EQ("10 mx.example.com.", rdata_mx.toText());
+}
+
+TEST_F(Rdata_MX_Test, compare)
+{
+    generic::MX small1(1, Name("mx.example.com"));
+    generic::MX small2(10, Name("mx.example.com"));
+    generic::MX large1(65535, Name("mx.example.com"));
+    generic::MX large2(256, Name("mx.example.com"));
+
+    // trivial case: self equivalence
+    EXPECT_EQ(0, small1.compare(small1));
+
+    // confirm these are compared as unsigned values
+    EXPECT_GT(0, small1.compare(large1));
+    EXPECT_LT(0, large1.compare(small1));
+
+    // confirm these are compared in network byte order
+    EXPECT_GT(0, small2.compare(large2));
+    EXPECT_LT(0, large2.compare(small2));
+
+    // comparison attempt between incompatible RR types should be rejected
+    EXPECT_THROW(rdata_mx.compare(*rdata_nomatch), bad_cast); 
+}
+}

src/lib/dns/cpp/tests/rdata_ns_unittest.cc

@@ -0,0 +1,128 @@
+// Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+// PERFORMANCE OF THIS SOFTWARE.
+
+// $Id$
+
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+
+#include <gtest/gtest.h>
+
+#include "unittest_util.h"
+#include "rdata_unittest.h"
+
+using isc::UnitTestUtil;
+using namespace std;
+using namespace isc::dns;
+using namespace isc::dns::rdata;
+
+namespace {
+class Rdata_NS_Test : public RdataTest {
+    // there's nothing to specialize
+};
+
+const generic::NS rdata_ns("ns.example.com");
+const generic::NS rdata_ns2("ns2.example.com");
+const uint8_t wiredata_ns[] = {
+    0x02, 0x6e, 0x73, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x03,
+    0x63, 0x6f, 0x6d, 0x00 };
+const uint8_t wiredata_ns2[] = {
+    // first name: ns.example.com.
+    0x02, 0x6e, 0x73, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x03,
+    0x63, 0x6f, 0x6d, 0x00,
+    // second name: ns2.example.com.  all labels except the first should be
+    // compressed.
+    0x03, 0x6e, 0x73, 0x32, 0xc0, 0x03 };
+
+TEST_F(Rdata_NS_Test, createFromText)
+{
+    EXPECT_EQ(0, rdata_ns.compare(generic::NS("ns.example.com")));
+    // explicitly add a trailing dot.  should be the same RDATA.
+    EXPECT_EQ(0, rdata_ns.compare(generic::NS("ns.example.com.")));
+    // should be case sensitive.
+    EXPECT_EQ(0, rdata_ns.compare(generic::NS("NS.EXAMPLE.COM")));
+    // RDATA of a class-independent type should be recognized for any
+    // "unknown" class.
+    EXPECT_EQ(0, rdata_ns.compare(*createRdata(RRType("NS"), RRClass(65000),
+                                               "ns.example.com")));
+}
+
+TEST_F(Rdata_NS_Test, createFromWire)
+{
+    EXPECT_EQ(0, rdata_ns.compare(
+                  *rdataFactoryFromFile(RRType("NS"), RRClass("IN"),
+                                        "testdata/rdata_ns_fromWire")));
+    // RDLENGTH is too short
+    EXPECT_THROW(rdataFactoryFromFile(RRType("NS"), RRClass("IN"),
+                                      "testdata/rdata_ns_fromWire", 18),
+                 InvalidRdataLength);
+    // RDLENGTH is too long
+    EXPECT_THROW(rdataFactoryFromFile(RRType("NS"), RRClass("IN"),
+                                      "testdata/rdata_ns_fromWire", 36),
+                 InvalidRdataLength);
+    // incomplete name.  the error should be detected in the name constructor
+    EXPECT_THROW(rdataFactoryFromFile(RRType("NS"), RRClass("IN"),
+                                      "testdata/rdata_ns_fromWire", 71),
+                 IncompleteName);
+
+    EXPECT_EQ(0, generic::NS("ns2.example.com").compare(
+                  *rdataFactoryFromFile(RRType("NS"), RRClass("IN"),
+                                        "testdata/rdata_ns_fromWire", 55)));
+    EXPECT_THROW(*rdataFactoryFromFile(RRType("NS"), RRClass("IN"),
+                                       "testdata/rdata_ns_fromWire", 63),
+                 InvalidRdataLength);
+}
+
+TEST_F(Rdata_NS_Test, toWireBuffer)
+{
+    rdata_ns.toWire(obuffer);
+    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
+                        obuffer.getData(), obuffer.getLength(),
+                        wiredata_ns, sizeof(wiredata_ns));
+}
+
+TEST_F(Rdata_NS_Test, toWireRenderer)
+{
+    rdata_ns.toWire(renderer);
+    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
+                        obuffer.getData(), obuffer.getLength(),
+                        wiredata_ns, sizeof(wiredata_ns));
+    rdata_ns2.toWire(renderer);
+    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
+                        obuffer.getData(), obuffer.getLength(),
+                        wiredata_ns2, sizeof(wiredata_ns2));
+}
+
+TEST_F(Rdata_NS_Test, toText)
+{
+    EXPECT_EQ("ns.example.com.", rdata_ns.toText());
+}
+
+TEST_F(Rdata_NS_Test, compare)
+{
+    generic::NS small("a.example");
+    generic::NS large("example");
+    EXPECT_EQ(true, Name("a.example") > Name("example"));
+    EXPECT_GT(0, small.compare(large));
+}
+
+TEST_F(Rdata_NS_Test, getNSName)
+{
+    EXPECT_EQ(Name("ns.example.com"), rdata_ns.getNSName());
+}
+}

src/lib/dns/cpp/tests/rdata_rrsig_unittest.cc

@@ -0,0 +1,60 @@
+// Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+// PERFORMANCE OF THIS SOFTWARE.
+
+// $Id$
+
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+
+#include <gtest/gtest.h>
+
+#include "unittest_util.h"
+#include "rdata_unittest.h"
+
+using isc::UnitTestUtil;
+using namespace std;
+using namespace isc::dns;
+using namespace isc::dns::rdata;
+
+namespace {
+class Rdata_RRSIG_Test : public RdataTest {
+    // there's nothing to specialize
+};
+
+TEST_F(Rdata_RRSIG_Test, fromText)
+{
+    string rrsig_txt("A 5 4 43200 1264801134 191145710 8496 isc.org. "
+                     "evxhlGx13mpKLVkKsjpGzycS5twtIoxOmlN14w9t5AgzGBmz"
+                     "diGdLIrFabqr72af2rUq+UDBKMWXujwZTZUTws32sVldDPk/"
+                     "NbuacJM25fQXfv5mO3Af7TOoow3AjMaVG9icjCW0V55WcWQU"
+                     "f49t+sXKPzbipN9g+s1ZPiIyofc=");
+    generic::RRSIG rdata_rrsig(rrsig_txt);
+    EXPECT_EQ(rrsig_txt, rdata_rrsig.toText());
+}
+
+TEST_F(Rdata_RRSIG_Test, toWireRenderer)
+{
+    string rrsig_txt("A 5 4 43200 1264801134 191145710 8496 isc.org. "
+                     "evxhlGx13mpKLVkKsjpGzycS5twtIoxOmlN14w9t5AgzGBmz"
+                     "diGdLIrFabqr72af2rUq+UDBKMWXujwZTZUTws32sVldDPk/"
+                     "NbuacJM25fQXfv5mO3Af7TOoow3AjMaVG9icjCW0V55WcWQU"
+                     "f49t+sXKPzbipN9g+s1ZPiIyofc=");
+    generic::RRSIG rdata_rrsig(rrsig_txt);
+    rdata_rrsig.toWire(renderer);
+}
+}

src/lib/dns/cpp/tests/rdata_soa_unittest.cc

@@ -0,0 +1,73 @@
+// Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+// PERFORMANCE OF THIS SOFTWARE.
+
+// $Id$
+
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+
+#include <gtest/gtest.h>
+
+#include "unittest_util.h"
+#include "rdata_unittest.h"
+
+using isc::UnitTestUtil;
+using namespace std;
+using namespace isc::dns;
+using namespace isc::dns::rdata;
+
+namespace {
+class Rdata_SOA_Test : public RdataTest {
+    // there's nothing to specialize
+};
+
+const generic::SOA rdata_soa(Name("ns.example.com"),
+                                        Name("root.example.com"),
+                                        2010012601, 3600, 300, 3600000, 1200);
+
+TEST_F(Rdata_SOA_Test, createFromText)
+{
+    //TBD
+}
+
+TEST_F(Rdata_SOA_Test, createFromWire)
+{
+    EXPECT_EQ(0, rdata_soa.compare(
+                  *rdataFactoryFromFile(RRType("SOA"), RRClass("IN"),
+                                        "testdata/rdata_soa_fromWire")));
+    // TBD: more tests
+}
+
+TEST_F(Rdata_SOA_Test, toWireRenderer)
+{
+    renderer.skip(2);
+    rdata_soa.toWire(renderer);
+
+    vector<unsigned char> data;
+    UnitTestUtil::readWireData("testdata/rdata_soa_fromWire", data);
+    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
+                        static_cast<const uint8_t *>(obuffer.getData()) + 2,
+                        obuffer.getLength() - 2, &data[0] + 2, data.size() - 2);
+}
+
+TEST_F(Rdata_SOA_Test, toText)
+{
+    EXPECT_EQ("ns.example.com. root.example.com. "
+              "2010012601 3600 300 3600000 1200", rdata_soa.toText());
+}
+}

src/lib/dns/cpp/tests/rdata_txt_unittest.cc

@@ -0,0 +1,70 @@
+// Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+// PERFORMANCE OF THIS SOFTWARE.
+
+// $Id$
+
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+
+#include <gtest/gtest.h>
+
+#include "unittest_util.h"
+#include "rdata_unittest.h"
+
+using isc::UnitTestUtil;
+using namespace std;
+using namespace isc::dns;
+using namespace isc::dns::rdata;
+
+namespace {
+class Rdata_TXT_Test : public RdataTest {
+    // there's nothing to specialize
+};
+
+const generic::TXT rdata_txt("Test String");
+const generic::TXT rdata_txt_quoated("\"Test String\"");
+const uint8_t wiredata_txt[] = {
+    sizeof("Test String") - 1,
+    'T', 'e', 's', 't', ' ', 'S', 't', 'r', 'i', 'n', 'g'
+};
+
+TEST_F(RdataTest, createFromText)
+{
+    EXPECT_EQ(0, rdata_txt.compare(rdata_txt_quoated));
+}
+
+TEST_F(Rdata_TXT_Test, createFromWire)
+{
+    EXPECT_EQ(0, rdata_txt.compare(
+                  *rdataFactoryFromFile(RRType("TXT"), RRClass("IN"),
+                                        "testdata/rdata_txt_fromWire")));
+}
+
+TEST_F(Rdata_TXT_Test, toWireBuffer)
+{
+    rdata_txt.toWire(obuffer);
+    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
+                        obuffer.getData(), obuffer.getLength(),
+                        wiredata_txt, sizeof(wiredata_txt));
+}
+
+TEST_F(Rdata_TXT_Test, toText)
+{
+    EXPECT_EQ("\"Test String\"", rdata_txt.toText());
+}
+}

src/lib/dns/cpp/tests/rdata_unittest.cc

@@ -26,80 +26,20 @@
 #include <gtest/gtest.h>
 
 #include "unittest_util.h"
+#include "rdata_unittest.h"
 
 using isc::UnitTestUtil;
 using namespace std;
 using namespace isc::dns;
 using namespace isc::dns::rdata;
 
-namespace {
-class RdataTest : public ::testing::Test {
-protected:
-    RdataTest() : obuffer(0), renderer(obuffer) {}
-    static RdataPtr rdataFactoryFromFile(const RRType& rrtype,
-                                         const RRClass& rrclass,
-                                         const char* datafile,
-                                         size_t position = 0);
-    OutputBuffer obuffer;
-    MessageRenderer renderer;
-    static const in::A rdata_in_a;
-    static const in::AAAA rdata_in_aaaa;
-    static const uint8_t wiredata_in_a[];
-    static const uint8_t wiredata_in_aaaa[];
-    static const uint8_t wiredata_ns[];
-    static const uint8_t wiredata_ns2[];
-    static const uint8_t wiredata_cname[];
-    static const uint8_t wiredata_cname2[];
-    static const uint8_t wiredata_txt[];
-    static const generic::NS rdata_ns, rdata_ns2;
-    static const generic::SOA rdata_soa;
-    static const generic::CNAME rdata_cname, rdata_cname2;
-    static const generic::MX rdata_mx;
-    static const generic::TXT rdata_txt;
-    static const generic::TXT rdata_txt_quoated;
-};
-
-const in::A RdataTest::rdata_in_a("192.0.2.1");
-const in::AAAA RdataTest::rdata_in_aaaa("2001:db8::1234");
-const generic::NS RdataTest::rdata_ns("ns.example.com");
-const generic::NS RdataTest::rdata_ns2("ns2.example.com");
-const generic::SOA RdataTest::rdata_soa(Name("ns.example.com"),
-                                        Name("root.example.com"),
-                                        2010012601, 3600, 300, 3600000, 1200);
-const generic::CNAME RdataTest::rdata_cname("cn.example.com");
-const generic::CNAME RdataTest::rdata_cname2("cn2.example.com");
-const generic::MX RdataTest::rdata_mx(10, Name("mx.example.com"));
-const generic::TXT RdataTest::rdata_txt("Test String");
-const generic::TXT RdataTest::rdata_txt_quoated("\"Test String\"");
-
-const uint8_t RdataTest::wiredata_in_a[] = { 192, 0, 2, 1 };
-const uint8_t RdataTest::wiredata_in_aaaa[] = {
-    0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x12, 0x34 };
-const uint8_t RdataTest::wiredata_ns[] = {
-    0x02, 0x6e, 0x73, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x03,
-    0x63, 0x6f, 0x6d, 0x00 };
-const uint8_t RdataTest::wiredata_ns2[] = {
-    // first name: ns.example.com.
-    0x02, 0x6e, 0x73, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x03,
-    0x63, 0x6f, 0x6d, 0x00,
-    // second name: ns2.example.com.  all labels except the first should be
-    // compressed.
-    0x03, 0x6e, 0x73, 0x32, 0xc0, 0x03 };
-const uint8_t RdataTest::wiredata_cname[] = {
-    0x02, 0x63, 0x6e, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x03,
-    0x63, 0x6f, 0x6d, 0x00 };
-const uint8_t RdataTest::wiredata_cname2[] = {
-    // first name: cn.example.com.
-    0x02, 0x63, 0x6e, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x03,
-    0x63, 0x6f, 0x6d, 0x00,
-    // second name: cn2.example.com.  all labels except the first should be
-    // compressed.
-    0x03, 0x63, 0x6e, 0x32, 0xc0, 0x03 };
-const uint8_t RdataTest::wiredata_txt[] = {
-    sizeof("Test String") - 1,
-    'T', 'e', 's', 't', ' ', 'S', 't', 'r', 'i', 'n', 'g'
-};
+namespace isc {
+namespace dns {
+namespace rdata {
+RdataTest::RdataTest() :
+    obuffer(0), renderer(obuffer),
+    rdata_nomatch(createRdata(RRType(0), RRClass(1), "\\# 0"))
+{}
 
 RdataPtr
 RdataTest::rdataFactoryFromFile(const RRType& rrtype, const RRClass& rrclass,
@@ -114,417 +54,6 @@ RdataTest::rdataFactoryFromFile(const RRType& rrtype, const RRClass& rrclass,
     uint16_t rdlen = buffer.readUint16();
     return (createRdata(rrtype, rrclass, buffer, rdlen));
 }
-
-TEST_F(RdataTest, createFromText_IN_A)
-{
-    rdata_in_a.compare(in::A(string("192.0.2.1")));
-    //EXPECT_EQ(0, rdata_in_a.compare(in::A("192.0.2.1")));
-    // should reject an abbreviated form of IPv4 address
-    EXPECT_THROW(in::A("10.1"), InvalidRdataText);
-    // or an IPv6 address
-    EXPECT_THROW(in::A("2001:db8::1234"), InvalidRdataText);
-    // or any meaningless text as an IP address
-    EXPECT_THROW(in::A("xxx"), InvalidRdataText);
-}
-
-TEST_F(RdataTest, createFromWire_IN_A)
-{
-    // Valid data
-    EXPECT_EQ(0, rdata_in_a.compare(
-                  *rdataFactoryFromFile(RRType("A"), RRClass("IN"),
-                                        "testdata/rdata_in_a_fromWire")));
-    // RDLENGTH is too short
-    EXPECT_THROW(rdataFactoryFromFile(RRType("A"), RRClass("IN"),
-                                      "testdata/rdata_in_a_fromWire", 6),
-                 InvalidRdataLength);
-    // RDLENGTH is too long
-    EXPECT_THROW(rdataFactoryFromFile(RRType("A"), RRClass("IN"),
-                                      "testdata/rdata_in_a_fromWire", 12),
-                 InvalidRdataLength);
-    // buffer too short.  the error should be detected in buffer read
-    EXPECT_THROW(rdataFactoryFromFile(RRType("A"), RRClass("IN"),
-                                      "testdata/rdata_in_a_fromWire", 19),
-                 InvalidBufferPosition);
-}
-
-TEST_F(RdataTest, toWireBuffer_IN_A)
-{
-    rdata_in_a.toWire(obuffer);
-    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
-                        obuffer.getData(), obuffer.getLength(),
-                        wiredata_in_a, sizeof(wiredata_in_a));
-}
-
-TEST_F(RdataTest, toWireRenderer_IN_A)
-{
-    rdata_in_a.toWire(renderer);
-    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
-                        obuffer.getData(), obuffer.getLength(),
-                        wiredata_in_a, sizeof(wiredata_in_a));
-}
-
-TEST_F(RdataTest, toText_IN_A)
-{
-    EXPECT_EQ("192.0.2.1", rdata_in_a.toText());
-    string longaddr("255.255.255.255"); // this shouldn't make the code crash
-    EXPECT_EQ(longaddr, in::A(longaddr).toText());
-}
-
-TEST_F(RdataTest, compare_IN_A)
-{
-    in::A small1("1.1.1.1");
-    in::A small2("1.2.3.4");
-    in::A large1("255.255.255.255");
-    in::A large2("4.3.2.1");
-
-    // trivial case: self equivalence
-    EXPECT_EQ(0, small1.compare(small1));
-
-    // confirm these are compared as unsigned values
-    EXPECT_GT(0, small1.compare(large1));
-    EXPECT_LT(0, large1.compare(small1));
-
-    // confirm these are compared in network byte order
-    EXPECT_GT(0, small2.compare(large2));
-    EXPECT_LT(0, large2.compare(small2));
-
-    // comparison attempt between incompatible RR types should be rejected
-    EXPECT_THROW(rdata_in_a.compare(rdata_ns), bad_cast); 
-}
-
-TEST_F(RdataTest, createFromText_IN_AAAA)
-{
-    rdata_in_aaaa.compare(in::AAAA(string("2001:db8::1234")));
-    EXPECT_THROW(in::AAAA("192.0.2.1"), InvalidRdataText);
-    EXPECT_THROW(in::AAAA("xxx"), InvalidRdataText);
-}
-
-TEST_F(RdataTest, createFromWire_IN_AAAA)
-{
-    // Valid data
-    EXPECT_EQ(0, rdata_in_aaaa.compare(
-                  *rdataFactoryFromFile(RRType("AAAA"), RRClass("IN"),
-                                        "testdata/rdata_in_aaaa_fromWire")));
-    //TBD: more tests
-}
-
-TEST_F(RdataTest, toWireBuffer_IN_AAAA)
-{
-    rdata_in_aaaa.toWire(obuffer);
-    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
-                        obuffer.getData(), obuffer.getLength(),
-                        wiredata_in_aaaa, sizeof(wiredata_in_aaaa));
-}
-
-TEST_F(RdataTest, toWireRenderer_IN_AAAA)
-{
-    rdata_in_aaaa.toWire(renderer);
-    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
-                        obuffer.getData(), obuffer.getLength(),
-                        wiredata_in_aaaa, sizeof(wiredata_in_aaaa));
 }
-
-TEST_F(RdataTest, toText_IN_AAAA)
-{
-    EXPECT_EQ("2001:db8::1234", rdata_in_aaaa.toText());
-}
-
-TEST_F(RdataTest, compare_IN_AAAA)
-{
-    in::AAAA small1("::1");
-    in::AAAA small2("1:2:3:4:5:6:7:8");
-    in::AAAA large1("ffff::");
-    in::AAAA large2("8:7:6:5:4:3:2:1");
-
-    // trivial case: self equivalence
-    EXPECT_EQ(0, small1.compare(small1));
-
-    // confirm these are compared as unsigned values
-    EXPECT_GT(0, small1.compare(large1));
-    EXPECT_LT(0, large1.compare(small1));
-
-    // confirm these are compared in network byte order
-    EXPECT_GT(0, small2.compare(large2));
-    EXPECT_LT(0, large2.compare(small2));
-
-    // comparison attempt between incompatible RR types should be rejected
-    EXPECT_THROW(rdata_in_aaaa.compare(rdata_ns), bad_cast); 
-}
-
-TEST_F(RdataTest, createFromText_NS)
-{
-    EXPECT_EQ(0, rdata_ns.compare(generic::NS("ns.example.com")));
-    // explicitly add a trailing dot.  should be the same RDATA.
-    EXPECT_EQ(0, rdata_ns.compare(generic::NS("ns.example.com.")));
-    // should be case sensitive.
-    EXPECT_EQ(0, rdata_ns.compare(generic::NS("NS.EXAMPLE.COM")));
-    // RDATA of a class-independent type should be recognized for any
-    // "unknown" class.
-    EXPECT_EQ(0, rdata_ns.compare(*createRdata(RRType("NS"), RRClass(65000),
-                                               "ns.example.com")));
-}
-
-TEST_F(RdataTest, createFromWire_NS)
-{
-    EXPECT_EQ(0, rdata_ns.compare(
-                  *rdataFactoryFromFile(RRType("NS"), RRClass("IN"),
-                                        "testdata/rdata_ns_fromWire")));
-    // RDLENGTH is too short
-    EXPECT_THROW(rdataFactoryFromFile(RRType("NS"), RRClass("IN"),
-                                      "testdata/rdata_ns_fromWire", 18),
-                 InvalidRdataLength);
-    // RDLENGTH is too long
-    EXPECT_THROW(rdataFactoryFromFile(RRType("NS"), RRClass("IN"),
-                                      "testdata/rdata_ns_fromWire", 36),
-                 InvalidRdataLength);
-    // incomplete name.  the error should be detected in the name constructor
-    EXPECT_THROW(rdataFactoryFromFile(RRType("NS"), RRClass("IN"),
-                                      "testdata/rdata_ns_fromWire", 71),
-                 IncompleteName);
-
-    EXPECT_EQ(0, generic::NS("ns2.example.com").compare(
-                  *rdataFactoryFromFile(RRType("NS"), RRClass("IN"),
-                                        "testdata/rdata_ns_fromWire", 55)));
-    EXPECT_THROW(*rdataFactoryFromFile(RRType("NS"), RRClass("IN"),
-                                       "testdata/rdata_ns_fromWire", 63),
-                 InvalidRdataLength);
-}
-
-TEST_F(RdataTest, toWireBuffer_NS)
-{
-    rdata_ns.toWire(obuffer);
-    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
-                        obuffer.getData(), obuffer.getLength(),
-                        wiredata_ns, sizeof(wiredata_ns));
-}
-
-TEST_F(RdataTest, toWireRenderer_NS)
-{
-    rdata_ns.toWire(renderer);
-    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
-                        obuffer.getData(), obuffer.getLength(),
-                        wiredata_ns, sizeof(wiredata_ns));
-    rdata_ns2.toWire(renderer);
-    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
-                        obuffer.getData(), obuffer.getLength(),
-                        wiredata_ns2, sizeof(wiredata_ns2));
-}
-
-TEST_F(RdataTest, toText_NS)
-{
-    EXPECT_EQ("ns.example.com.", rdata_ns.toText());
-}
-
-TEST_F(RdataTest, compare_NS)
-{
-    generic::NS small("a.example");
-    generic::NS large("example");
-    EXPECT_EQ(true, Name("a.example") > Name("example"));
-    EXPECT_GT(0, small.compare(large));
-}
-
-TEST_F(RdataTest, getNSName)
-{
-    EXPECT_EQ(Name("ns.example.com"), rdata_ns.getNSName());
-}
-
-TEST_F(RdataTest, createFromText_SOA)
-{
-    //TBD
 }
-
-TEST_F(RdataTest, createFromWire_SOA)
-{
-    EXPECT_EQ(0, rdata_soa.compare(
-                  *rdataFactoryFromFile(RRType("SOA"), RRClass("IN"),
-                                        "testdata/rdata_soa_fromWire")));
-    // TBD: more tests
-}
-
-TEST_F(RdataTest, toWireRenderer_SOA)
-{
-    renderer.skip(2);
-    rdata_soa.toWire(renderer);
-
-    vector<unsigned char> data;
-    UnitTestUtil::readWireData("testdata/rdata_soa_fromWire", data);
-    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
-                        static_cast<const uint8_t *>(obuffer.getData()) + 2,
-                        obuffer.getLength() - 2, &data[0] + 2, data.size() - 2);
-}
-
-TEST_F(RdataTest, toText_SOA)
-{
-    EXPECT_EQ("ns.example.com. root.example.com. "
-              "2010012601 3600 300 3600000 1200", rdata_soa.toText());
-}
-
-TEST_F(RdataTest, createFromText_MX)
-{
-    //TBD
-}
-
-TEST_F(RdataTest, createFromWire_MX)
-{
-    EXPECT_EQ(0, rdata_mx.compare(
-                  *rdataFactoryFromFile(RRType("MX"), RRClass("IN"),
-                                        "testdata/rdata_mx_fromWire")));
-    // TBD: more tests
-}
-
-TEST_F(RdataTest, toWireRenderer_MX)
-{
-    renderer.writeName(Name("example.com"));
-    rdata_mx.toWire(renderer);
-
-    vector<unsigned char> data;
-    UnitTestUtil::readWireData("testdata/rdata_mx_toWire1", data);
-    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData, obuffer.getData(),
-                        obuffer.getLength(), &data[0], data.size());
-}
-
-TEST_F(RdataTest, toText_MX)
-{
-    EXPECT_EQ("10 mx.example.com.", rdata_mx.toText());
-}
-
-TEST_F(RdataTest, compare_IN_MX)
-{
-    generic::MX small1(1, Name("mx.example.com"));
-    generic::MX small2(10, Name("mx.example.com"));
-    generic::MX large1(65535, Name("mx.example.com"));
-    generic::MX large2(256, Name("mx.example.com"));
-
-    // trivial case: self equivalence
-    EXPECT_EQ(0, small1.compare(small1));
-
-    // confirm these are compared as unsigned values
-    EXPECT_GT(0, small1.compare(large1));
-    EXPECT_LT(0, large1.compare(small1));
-
-    // confirm these are compared in network byte order
-    EXPECT_GT(0, small2.compare(large2));
-    EXPECT_LT(0, large2.compare(small2));
-
-    // comparison attempt between incompatible RR types should be rejected
-    EXPECT_THROW(rdata_mx.compare(rdata_ns), bad_cast); 
-}
-
-TEST_F(RdataTest, createFromText_TXT)
-{
-    EXPECT_EQ(0, rdata_txt.compare(rdata_txt_quoated));
-}
-
-TEST_F(RdataTest, createFromWire_TXT)
-{
-    EXPECT_EQ(0, rdata_txt.compare(
-                  *rdataFactoryFromFile(RRType("TXT"), RRClass("IN"),
-                                        "testdata/rdata_txt_fromWire")));
-}
-
-TEST_F(RdataTest, toWireBuffer_TXT)
-{
-    rdata_txt.toWire(obuffer);
-    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
-                        obuffer.getData(), obuffer.getLength(),
-                        wiredata_txt, sizeof(wiredata_txt));
-}
-
-TEST_F(RdataTest, toText_TXT)
-{
-    EXPECT_EQ("\"Test String\"", rdata_txt.toText());
-}
-
-TEST_F(RdataTest, createFromText_CNAME)
-{
-    EXPECT_EQ(0, rdata_cname.compare(generic::CNAME("cn.example.com")));
-    // explicitly add a trailing dot.  should be the same RDATA.
-    EXPECT_EQ(0, rdata_cname.compare(generic::CNAME("cn.example.com.")));
-    // should be case sensitive.
-    EXPECT_EQ(0, rdata_cname.compare(generic::CNAME("CN.EXAMPLE.COM")));
-    // RDATA of a class-independent type should be recognized for any
-    // "unknown" class.
-    EXPECT_EQ(0, rdata_cname.compare(*createRdata(RRType("CNAME"),
-                                                  RRClass(65000),
-                                                  "cn.example.com")));
-}
-
-TEST_F(RdataTest, createFromWire_CNAME)
-{
-    EXPECT_EQ(0, rdata_cname.compare(
-                  *rdataFactoryFromFile(RRType("CNAME"), RRClass("IN"),
-                                        "testdata/rdata_cname_fromWire")));
-    // RDLENGTH is too short
-    EXPECT_THROW(rdataFactoryFromFile(RRType("CNAME"), RRClass("IN"),
-                                      "testdata/rdata_cname_fromWire", 18),
-                 InvalidRdataLength);
-    // RDLENGTH is too long
-    EXPECT_THROW(rdataFactoryFromFile(RRType("CNAME"), RRClass("IN"),
-                                      "testdata/rdata_cname_fromWire", 36),
-                 InvalidRdataLength);
-    // incomplete name.  the error should be detected in the name constructor
-    EXPECT_THROW(rdataFactoryFromFile(RRType("CNAME"), RRClass("IN"),
-                                      "testdata/rdata_cname_fromWire", 71),
-                 IncompleteName);
-
-    EXPECT_EQ(0, generic::CNAME("cn2.example.com").compare(
-                  *rdataFactoryFromFile(RRType("CNAME"), RRClass("IN"),
-                                        "testdata/rdata_cname_fromWire", 55)));
-    EXPECT_THROW(*rdataFactoryFromFile(RRType("CNAME"), RRClass("IN"),
-                                       "testdata/rdata_cname_fromWire", 63),
-                 InvalidRdataLength);
-}
-
-TEST_F(RdataTest, toWireBuffer_CNAME)
-{
-    rdata_cname.toWire(obuffer);
-    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
-                        obuffer.getData(), obuffer.getLength(),
-                        wiredata_cname, sizeof(wiredata_cname));
-}
-
-TEST_F(RdataTest, toWireRenderer_CNAME)
-{
-    rdata_cname.toWire(renderer);
-    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
-                        obuffer.getData(), obuffer.getLength(),
-                        wiredata_cname, sizeof(wiredata_cname));
-    rdata_cname2.toWire(renderer);
-    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
-                        obuffer.getData(), obuffer.getLength(),
-                        wiredata_cname2, sizeof(wiredata_cname2));
-}
-
-TEST_F(RdataTest, toText_CNAME)
-{
-    EXPECT_EQ("cn.example.com.", rdata_cname.toText());
-}
-
-TEST_F(RdataTest, getCname_CNAME)
-{
-    EXPECT_EQ(Name("cn.example.com."), rdata_cname.getCname());
-}
-
-TEST_F(RdataTest, fromText_RRSIG)
-{
-    string rrsig_txt("A 5 4 43200 1264801134 191145710 8496 isc.org. "
-                     "evxhlGx13mpKLVkKsjpGzycS5twtIoxOmlN14w9t5AgzGBmz"
-                     "diGdLIrFabqr72af2rUq+UDBKMWXujwZTZUTws32sVldDPk/"
-                     "NbuacJM25fQXfv5mO3Af7TOoow3AjMaVG9icjCW0V55WcWQU"
-                     "f49t+sXKPzbipN9g+s1ZPiIyofc=");
-    generic::RRSIG rdata_rrsig(rrsig_txt);
-    EXPECT_EQ(rrsig_txt, rdata_rrsig.toText());
-}
-
-TEST_F(RdataTest, toWireRenderer_RRSIG)
-{
-    string rrsig_txt("A 5 4 43200 1264801134 191145710 8496 isc.org. "
-                     "evxhlGx13mpKLVkKsjpGzycS5twtIoxOmlN14w9t5AgzGBmz"
-                     "diGdLIrFabqr72af2rUq+UDBKMWXujwZTZUTws32sVldDPk/"
-                     "NbuacJM25fQXfv5mO3Af7TOoow3AjMaVG9icjCW0V55WcWQU"
-                     "f49t+sXKPzbipN9g+s1ZPiIyofc=");
-    generic::RRSIG rdata_rrsig(rrsig_txt);
-    rdata_rrsig.toWire(renderer);
-}
-
 }

src/lib/dns/cpp/tests/rdata_unittest.h

@@ -0,0 +1,51 @@
+// Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+// PERFORMANCE OF THIS SOFTWARE.
+
+// $Id$
+
+#ifndef __RDATA_UNITTEST_H
+#define __RDATA_UNITTEST_H 1
+
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+#include <dns/rdata.h>
+
+#include <gtest/gtest.h>
+
+namespace isc {
+namespace dns {
+namespace rdata {
+class RdataTest : public ::testing::Test {
+protected:
+    RdataTest();
+    static RdataPtr rdataFactoryFromFile(const RRType& rrtype,
+                                         const RRClass& rrclass,
+                                         const char* datafile,
+                                         size_t position = 0);
+    OutputBuffer obuffer;
+    MessageRenderer renderer;
+    /// This is an RDATA object of some "unknown" RR type so that it can be
+    /// used to test the compare() method against a well-known RR type.
+    RdataPtr rdata_nomatch;
+};
+}
+}
+}
+#endif // __RDATA_UNITTEST_H
+
+// Local Variables: 
+// mode: c++
+// End: 

src/lib/dns/cpp/tests/testdata/rdata_unknown_fromWire

@@ -0,0 +1,5 @@
+#
+# various kinds of "unknown" RDATA stored in an input buffer
+#
+# 0  1  2  3  4  5 (bytes)
+ 00 04 a1 b2 c3 0d