[svn] commit: r960 - in /branches/each-ds/src/lib/auth/cpp: Makefile.am datasrc_unittest.cc testdata/q_spork unittest_ds.cc unittest_util.cc
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Feb 25 05:55:21 UTC 2010
Author: each
Date: Thu Feb 25 05:55:21 2010
New Revision: 960
Log:
checkpoint: data source unit tests now compile and run, but don't
actually check results yet
Modified:
branches/each-ds/src/lib/auth/cpp/Makefile.am
branches/each-ds/src/lib/auth/cpp/datasrc_unittest.cc
branches/each-ds/src/lib/auth/cpp/testdata/q_spork
branches/each-ds/src/lib/auth/cpp/unittest_ds.cc
branches/each-ds/src/lib/auth/cpp/unittest_util.cc
Modified: branches/each-ds/src/lib/auth/cpp/Makefile.am
==============================================================================
--- branches/each-ds/src/lib/auth/cpp/Makefile.am (original)
+++ branches/each-ds/src/lib/auth/cpp/Makefile.am Thu Feb 25 05:55:21 2010
@@ -11,11 +11,13 @@
TESTS =
if HAVE_GTEST
TESTS += run_unittests
-run_unittests_SOURCES = unittest_util.h unittest_util.cc
+run_unittests_SOURCES = run_unittests.cc
+run_unittests_SOURCES += unittest_util.h unittest_util.cc
run_unittests_SOURCES += unittest_ds.h unittest_ds.cc
run_unittests_SOURCES += datasrc_unittest.cc
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD)
+run_unittests_LDADD += .libs/libauth.a
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
Modified: branches/each-ds/src/lib/auth/cpp/datasrc_unittest.cc
==============================================================================
--- branches/each-ds/src/lib/auth/cpp/datasrc_unittest.cc (original)
+++ branches/each-ds/src/lib/auth/cpp/datasrc_unittest.cc Thu Feb 25 05:55:21 2010
@@ -16,13 +16,20 @@
#include <stdint.h>
+#include <iostream>
#include <vector>
#include <string>
#include <gtest/gtest.h>
#include <dns/buffer.h>
+#include <dns/message.h>
#include <dns/messagerenderer.h>
+#include <dns/question.h>
+#include <dns/rdataclass.h>
+#include <dns/rrclass.h>
+#include <dns/rrttl.h>
+#include <dns/rrtype.h>
#include "unittest_util.h"
#include "unittest_ds.h"
@@ -30,6 +37,7 @@
using isc::UnitTestUtil;
using namespace std;
using namespace isc::dns;
+using namespace isc::auth;
namespace {
class DataSrcTest : public ::testing::Test {
@@ -53,55 +61,81 @@
}
TEST_F(DataSrcTest, Query) {
- queryFromFile(query, "q_www");
+ queryFromFile(query, "testdata/q_www");
+ Query q = Query(query, false);
+ ds.doQuery(q);
}
TEST_F(DataSrcTest, NSQuery) {
- queryFromFile(query, "q_example_ns");
+ queryFromFile(query, "testdata/q_example_ns");
+ Query q = Query(query, false);
+ ds.doQuery(q);
}
TEST_F(DataSrcTest, NxRRset) {
- queryFromFile(query, "q_example_ptr");
+ queryFromFile(query, "testdata/q_example_ptr");
+ Query q = Query(query, false);
+ ds.doQuery(q);
}
TEST_F(DataSrcTest, Nxdomain) {
- queryFromFile(query, "q_glork");
+ queryFromFile(query, "testdata/q_glork");
+ Query q = Query(query, false);
+ ds.doQuery(q);
}
TEST_F(DataSrcTest, NxZone) {
- queryFromFile(query, "q_spork");
+ queryFromFile(query, "testdata/q_spork");
+ Query q = Query(query, false);
+ ds.doQuery(q);
}
TEST_F(DataSrcTest, Wildcard) {
- queryFromFile(query, "q_wild");
+ queryFromFile(query, "testdata/q_wild");
+ Query q = Query(query, false);
+ ds.doQuery(q);
}
TEST_F(DataSrcTest, AuthDelegation) {
- queryFromFile(query, "q_sql1");
+ queryFromFile(query, "testdata/q_sql1");
+ Query q = Query(query, false);
+ ds.doQuery(q);
}
TEST_F(DataSrcTest, Dname) {
- queryFromFile(query, "q_dname");
+ queryFromFile(query, "testdata/q_dname");
+ Query q = Query(query, false);
+ ds.doQuery(q);
}
TEST_F(DataSrcTest, Cname) {
- queryFromFile(query, "q_cname");
+ queryFromFile(query, "testdata/q_cname");
+ Query q = Query(query, false);
+ ds.doQuery(q);
}
TEST_F(DataSrcTest, CnameInt) {
- queryFromFile(query, "q_cname_int");
+ queryFromFile(query, "testdata/q_cname_int");
+ Query q = Query(query, false);
+ ds.doQuery(q);
}
TEST_F(DataSrcTest, CnameExt) {
- queryFromFile(query, "q_cname_ext");
+ queryFromFile(query, "testdata/q_cname_ext");
+ Query q = Query(query, false);
+ ds.doQuery(q);
}
TEST_F(DataSrcTest, Delegation) {
- queryFromFile(query, "q_subzone");
+ queryFromFile(query, "testdata/q_subzone");
+ Query q = Query(query, false);
+ ds.doQuery(q);
}
TEST_F(DataSrcTest, DS) {
- queryFromFile(query, "q_subzone_ds");
+ queryFromFile(query, "testdata/q_subzone_ds");
+ Query q = Query(query, false);
+ ds.doQuery(q);
}
}
Modified: branches/each-ds/src/lib/auth/cpp/testdata/q_spork
==============================================================================
--- branches/each-ds/src/lib/auth/cpp/testdata/q_spork (original)
+++ branches/each-ds/src/lib/auth/cpp/testdata/q_spork Thu Feb 25 05:55:21 2010
@@ -1,3 +1,3 @@
# spork.com/a (REFUSED)
- a8 8a 1 0 0 1 0 0 0 0 0 0 5 73 70 6f 72 6b 3 63
- 6f 6d 0 0 1 0 1
+ a8 8a 01 00 00 01 00 00 00 00 00 00 05 73 70 6f 72 6b 03 63
+ 6f 6d 00 00 01 00 01
Modified: branches/each-ds/src/lib/auth/cpp/unittest_ds.cc
==============================================================================
--- branches/each-ds/src/lib/auth/cpp/unittest_ds.cc (original)
+++ branches/each-ds/src/lib/auth/cpp/unittest_ds.cc Thu Feb 25 05:55:21 2010
@@ -15,14 +15,6 @@
// $Id$
#include "unittest_util.h"
-
-using isc::UnitTestUtil;
-using namespace std;
-using namespace isc::dns;
-using namespace isc::auth;
-
-namespace {
-
#include "unittest_ds.h"
#include "data_source.h"
@@ -38,8 +30,13 @@
#include <iostream>
+using isc::UnitTestUtil;
+using namespace std;
using namespace isc::dns;
using namespace isc::dns::rdata;
+
+namespace isc {
+namespace auth {
TestDataSrc::TestDataSrc() : example_name("example.com"),
sql1_name("sql1.example.com")
@@ -51,8 +48,8 @@
example_ns->addRdata(generic::NS(Name("dns03.example.com")));
example_rrsig = RRsetPtr(new RRset(example_name, RRClass::IN(),
- RRType::NS(), RRTTL(3600)));
- example_ns->addRdata(generic::RRSIG("NS 5 2 3600 20100322084538 20100220084538 33495 example.com. ClcrfjkQZUY5L6ZlCkU3cJHzcrEGrofKSVeeoeZ+w6yeEowFNVXs2YBo3tom53DiCrdD9rs3feVSLGW5rjsz/O6lDuomgQG+EVSnWa7GTIPBXj1BmDXXp3XxeldYmhf4UzaN5BA+RUA5E8NChNKuNNof76j2S9tilfN/kvpy4fw="));
+ RRType::RRSIG(), RRTTL(3600)));
+ example_rrsig->addRdata(generic::RRSIG("NS 5 2 3600 20100322084538 20100220084538 33495 example.com. ClcrfjkQZUY5L6ZlCkU3cJHzcrEGrofKSVeeoeZ+w6yeEowFNVXs2YBo3tom53DiCrdD9rs3feVSLGW5rjsz/O6lDuomgQG+EVSnWa7GTIPBXj1BmDXXp3XxeldYmhf4UzaN5BA+RUA5E8NChNKuNNof76j2S9tilfN/kvpy4fw="));
sql1_ns = RRsetPtr(new RRset(sql1_name, RRClass::IN(),
RRType::NS(), RRTTL(3600)));
@@ -61,13 +58,13 @@
sql1_ns->addRdata(generic::NS(Name("dns03.example.com")));
sql1_rrsig = RRsetPtr(new RRset(sql1_name, RRClass::IN(),
- RRType::NS(), RRTTL(3600)));
- example_ns->addRdata(generic::RRSIG("NS 5 3 3600 20100322084536 20100220084536 12447 sql1.example.com. 0CL8noy0NSgoWwuKd+Dc6vyIIw2BrAEBx0IJzcSB6GlB25x/zjEd6AJG0be13HN6jOaTX8iWTuCVrEYuXg76V+M4EvTZHjEScj0az74TrDv4Vdo459paGKCX9B8NLJW1mW4fzZrrXQ8jmBEZeS91Q5rJrO+UKJEuUz3LYdTPvao="));
+ RRType::RRSIG(), RRTTL(3600)));
+ sql1_rrsig->addRdata(generic::RRSIG("NS 5 3 3600 20100322084536 20100220084536 12447 sql1.example.com. 0CL8noy0NSgoWwuKd+Dc6vyIIw2BrAEBx0IJzcSB6GlB25x/zjEd6AJG0be13HN6jOaTX8iWTuCVrEYuXg76V+M4EvTZHjEScj0az74TrDv4Vdo459paGKCX9B8NLJW1mW4fzZrrXQ8jmBEZeS91Q5rJrO+UKJEuUz3LYdTPvao="));
www_sql1_a = RRsetPtr(new RRset(Name("www.sql1.example.com"),
RRClass::IN(), RRType::A(),
RRTTL(3600)));
- www_sql1_a->addRdata(generic::NS("192.168.2.2"));
+ www_sql1_a->addRdata(in::A("192.168.2.2"));
www_sql1_rrsig = RRsetPtr(new RRset(Name("www.sql1.example.com"),
RRClass::IN(), RRType::RRSIG(),
@@ -77,7 +74,7 @@
dns01_example_a = RRsetPtr(new RRset(Name("dns01.example.com"),
RRClass::IN(), RRType::A(),
RRTTL(3600)));
- dns01_example_a->addRdata(generic::NS("192.168.2.1"));
+ dns01_example_a->addRdata(in::A("192.168.2.1"));
dns01_example_rrsig = RRsetPtr(new RRset(Name("dns01.example.com"),
RRClass::IN(), RRType::RRSIG(),
@@ -85,19 +82,19 @@
dns01_example_rrsig->addRdata(generic::RRSIG("A 5 3 3600 20100322084538 20100220084538 33495 example.com. NIawlZLk8WZAjNux7oQM2mslfW52OZFFkWt++7FHu2SU98XqEeKfCMnpgtWe5T8Nr9cS8df901iEOJoWQzGTEaHYUBtEhsSjBVn7mKp3fz6473a2xxy75SUKZ0rxjNXSZ8Q5rnFmkX0HTH2Sg51mtjH6aC2pfheQnA2t193BnSg="));
dns02_example_a = RRsetPtr(new RRset(Name("dns02.example.com"),
+ RRClass::IN(), RRType::A(),
+ RRTTL(3600)));
+ dns02_example_a->addRdata(in::A("192.168.2.2"));
+
+ dns02_example_rrsig = RRsetPtr(new RRset(Name("dns02.example.com"),
RRClass::IN(), RRType::RRSIG(),
- RRTTL(3600)));
- dns02_example_a->addRdata(generic::NS("192.168.2.2"));
-
- dns02_example_rrsig = RRsetPtr(new RRset(Name("dns02.example.com"),
- RRClass::IN(), RRType::A(),
RRTTL(3600)));
dns02_example_rrsig->addRdata(generic::RRSIG("A 5 3 3600 20100322084538 20100220084538 33495 example.com. XJtVMbUIRE0mk6Hn/Nx6k36jaxaBDPK2/IYB6vCQjJETz6gW4T6q/H/eY9/Lsw5iYPFhoBRDxT4XFj575t98kELXnJe1WhuMbRPlOhyOjxkLECaUne/sbFPOtbGFx9ohuojI0RgxxZiCFaO8wJuv6nfPuzmlLajWS6z9NZeOMIk="));
dns03_example_a = RRsetPtr(new RRset(Name("dns03.example.com"),
RRClass::IN(), RRType::A(),
RRTTL(3600)));
- dns03_example_a->addRdata(generic::NS("192.168.2.3"));
+ dns03_example_a->addRdata(in::A("192.168.2.3"));
dns03_example_rrsig = RRsetPtr(new RRset(Name("dns03.example.com"),
RRClass::IN(), RRType::RRSIG(),
@@ -107,7 +104,7 @@
www_example_a = RRsetPtr(new RRset(Name("www.example.com"),
RRClass::IN(), RRType::A(),
RRTTL(3600)));
- www_example_a->addRdata(generic::NS("192.168.1.1"));
+ www_example_a->addRdata(in::A("192.168.1.1"));
www_example_rrsig = RRsetPtr(new RRset(Name("www.example.com"),
RRClass::IN(), RRType::RRSIG(),
@@ -117,7 +114,7 @@
wild_example_a = RRsetPtr(new RRset(Name("*.wild.example.com"),
RRClass::IN(), RRType::A(),
RRTTL(3600)));
- wild_example_a->addRdata(generic::NS("192.168.3.2"));
+ wild_example_a->addRdata(in::A("192.168.3.2"));
wild_example_rrsig = RRsetPtr(new RRset(Name("*.wild.example.com"),
RRClass::IN(), RRType::RRSIG(),
@@ -146,8 +143,7 @@
cnameint_example_rrsig->addRdata(generic::RRSIG("CNAME 5 3 3600 20100322084538 20100220084538 33495 example.com. U1wjt0XY9xjTwvUmWSUcfLGMhCjfX2ylWfHrycy50x2oxcK9z94E1ejen9wDTIEBSGYgi6wpZ8RK0+02N1DWTGpDqNXd7aFRfDrWQJ/q/XJHDx0vlcmhkWhrT82LBfKxkrptOzchuSo/c0mpK+mpiIMc1VOwY+yuQ2ALfcD6EHw="));
cnameext_example_cname = RRsetPtr(new RRset(Name("cname-ext.example.com"),
- RRClass::IN(),
- RRType::RRSIG(),
+ RRClass::IN(), RRType::CNAME(),
RRTTL(3600)));
cnameext_example_cname->addRdata(generic::CNAME("www.sql1.example.com"));
@@ -203,3 +199,4 @@
}
}
+}
Modified: branches/each-ds/src/lib/auth/cpp/unittest_util.cc
==============================================================================
--- branches/each-ds/src/lib/auth/cpp/unittest_util.cc (original)
+++ branches/each-ds/src/lib/auth/cpp/unittest_util.cc Thu Feb 25 05:55:21 2010
@@ -28,6 +28,8 @@
using isc::UnitTestUtil;
using isc::dns::NameComparisonResult;
+
+namespace isc {
void
UnitTestUtil::readWireData(const char* datafile,
@@ -122,3 +124,4 @@
}
return ::testing::AssertionSuccess();
}
+}
More information about the bind10-changes
mailing list