[svn] commit: r3565 - in /branches/trac327: ./ src/bin/auth/tests/ src/bin/auth/tests/testdata/ src/bin/bind10/ src/bin/recurse/tests/ src/bin/recurse/tests/testdata/ src/bin/stats/tests/isc/util/ src/lib/ src/lib/python/isc/util/ src/lib/testutils/
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Nov 19 17:03:21 UTC 2010
Author: vorner
Date: Fri Nov 19 17:03:20 2010
New Revision: 3565
Log:
Merge #402
Added:
branches/trac327/src/lib/testutils/
- copied from r3564, branches/trac402/src/lib/testutils/
Removed:
branches/trac327/src/bin/auth/tests/mockups.h
branches/trac327/src/bin/auth/tests/testdata/
branches/trac327/src/bin/recurse/tests/testdata/
Modified:
branches/trac327/ (props changed)
branches/trac327/configure.ac
branches/trac327/src/bin/auth/tests/Makefile.am
branches/trac327/src/bin/auth/tests/auth_srv_unittest.cc
branches/trac327/src/bin/bind10/bind10.py.in (props changed)
branches/trac327/src/bin/recurse/tests/Makefile.am
branches/trac327/src/bin/recurse/tests/recursor_unittest.cc
branches/trac327/src/bin/stats/tests/isc/util/ (props changed)
branches/trac327/src/lib/Makefile.am
branches/trac327/src/lib/python/isc/util/ (props changed)
Modified: branches/trac327/configure.ac
==============================================================================
--- branches/trac327/configure.ac (original)
+++ branches/trac327/configure.ac Fri Nov 19 17:03:20 2010
@@ -465,11 +465,9 @@
src/bin/msgq/tests/Makefile
src/bin/auth/Makefile
src/bin/auth/tests/Makefile
- src/bin/auth/tests/testdata/Makefile
src/bin/auth/benchmarks/Makefile
src/bin/recurse/Makefile
src/bin/recurse/tests/Makefile
- src/bin/recurse/tests/testdata/Makefile
src/bin/xfrin/Makefile
src/bin/xfrin/tests/Makefile
src/bin/xfrout/Makefile
@@ -521,6 +519,8 @@
src/lib/datasrc/Makefile
src/lib/datasrc/tests/Makefile
src/lib/xfr/Makefile
+ src/lib/testutils/Makefile
+ src/lib/testutils/testdata/Makefile
])
AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
src/bin/cfgmgr/tests/b10-cfgmgr_test.py
Modified: branches/trac327/src/bin/auth/tests/Makefile.am
==============================================================================
--- branches/trac327/src/bin/auth/tests/Makefile.am (original)
+++ branches/trac327/src/bin/auth/tests/Makefile.am Fri Nov 19 17:03:20 2010
@@ -1,11 +1,9 @@
-SUBDIRS = testdata .
-
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += -I$(top_builddir)/src/lib/dns -I$(top_srcdir)/src/bin
AM_CPPFLAGS += -I$(top_builddir)/src/lib/cc
AM_CPPFLAGS += $(BOOST_INCLUDES)
-AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(srcdir)/testdata\"
-AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/bin/auth/tests/testdata\"
+AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(top_srcdir)/src/lib/testutils/testdata\"
+AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/lib/testutils/testdata\"
AM_CXXFLAGS = $(B10_CXXFLAGS)
Modified: branches/trac327/src/bin/auth/tests/auth_srv_unittest.cc
==============================================================================
--- branches/trac327/src/bin/auth/tests/auth_srv_unittest.cc (original)
+++ branches/trac327/src/bin/auth/tests/auth_srv_unittest.cc Fri Nov 19 17:03:20 2010
@@ -15,28 +15,8 @@
// $Id$
#include <config.h>
-
-#include <gtest/gtest.h>
-
-#include <dns/buffer.h>
-#include <dns/name.h>
-#include <dns/message.h>
-#include <dns/messagerenderer.h>
-#include <dns/opcode.h>
-#include <dns/rcode.h>
-#include <dns/rrclass.h>
-#include <dns/rrtype.h>
-
-#include <cc/data.h>
-#include <cc/session.h>
-
-#include <xfr/xfrout_client.h>
-
#include <auth/auth_srv.h>
-#include <asiolink/asiolink.h>
-
-#include <dns/tests/unittest_util.h>
-#include <auth/tests/mockups.h>
+#include <testutils/srv_unittest.h>
using namespace std;
using namespace isc::cc;
@@ -53,265 +33,60 @@
// the sqlite3 test).
const char* const BADCONFIG_TESTDB =
"{ \"database_file\": \"" TEST_DATA_DIR "/nodir/notexist\"}";
-const char* const DEFAULT_REMOTE_ADDRESS = "192.0.2.1";
-
-class AuthSrvTest : public ::testing::Test {
+
+class AuthSrvTest : public SrvTestBase {
protected:
- AuthSrvTest() : server(true, xfrout),
- request_message(Message::RENDER),
- parse_message(new Message(Message::PARSE)),
- default_qid(0x1035), opcode(Opcode(Opcode::QUERY())),
- qname("www.example.com"), qclass(RRClass::IN()),
- qtype(RRType::A()), io_message(NULL), endpoint(NULL),
- request_obuffer(0), request_renderer(request_obuffer),
- response_obuffer(new OutputBuffer(0))
- {
+ AuthSrvTest() : server(true, xfrout) {
server.setXfrinSession(¬ify_session);
}
- ~AuthSrvTest() {
- delete io_message;
- delete endpoint;
- }
- MockSession notify_session;
MockXfroutClient xfrout;
- MockServer dnsserv;
AuthSrv server;
- Message request_message;
- MessagePtr parse_message;
- const qid_t default_qid;
- const Opcode opcode;
- const Name qname;
- const RRClass qclass;
- const RRType qtype;
- IOSocket* io_sock;
- IOMessage* io_message;
- const IOEndpoint* endpoint;
- OutputBuffer request_obuffer;
- MessageRenderer request_renderer;
- OutputBufferPtr response_obuffer;
- vector<uint8_t> data;
-
- void createDataFromFile(const char* const datafile, int protocol);
- void createRequestPacket(Message& message, const int protocol);
};
-
-// These are flags to indicate whether the corresponding flag bit of the
-// DNS header is to be set in the test cases. (Note that the flag values
-// is irrelevant to their wire-format values)
-const unsigned int QR_FLAG = 0x1;
-const unsigned int AA_FLAG = 0x2;
-const unsigned int TC_FLAG = 0x4;
-const unsigned int RD_FLAG = 0x8;
-const unsigned int RA_FLAG = 0x10;
-const unsigned int AD_FLAG = 0x20;
-const unsigned int CD_FLAG = 0x40;
-
-void
-AuthSrvTest::createDataFromFile(const char* const datafile,
- const int protocol = IPPROTO_UDP)
-{
- delete io_message;
- data.clear();
-
- delete endpoint;
-
- endpoint = IOEndpoint::create(protocol,
- IOAddress(DEFAULT_REMOTE_ADDRESS), 5300);
- UnitTestUtil::readWireData(datafile, data);
- io_sock = (protocol == IPPROTO_UDP) ? &IOSocket::getDummyUDPSocket() :
- &IOSocket::getDummyTCPSocket();
- io_message = new IOMessage(&data[0], data.size(), *io_sock, *endpoint);
-}
-
-void
-AuthSrvTest::createRequestPacket(Message& message,
- const int protocol = IPPROTO_UDP)
-{
- message.toWire(request_renderer);
-
- delete io_message;
-
- endpoint = IOEndpoint::create(protocol,
- IOAddress(DEFAULT_REMOTE_ADDRESS), 5300);
- io_sock = (protocol == IPPROTO_UDP) ? &IOSocket::getDummyUDPSocket() :
- &IOSocket::getDummyTCPSocket();
- io_message = new IOMessage(request_renderer.getData(),
- request_renderer.getLength(),
- *io_sock, *endpoint);
-}
-
-void
-headerCheck(const Message& message, const qid_t qid, const Rcode& rcode,
- const uint16_t opcodeval, const unsigned int flags,
- const unsigned int qdcount,
- const unsigned int ancount, const unsigned int nscount,
- const unsigned int arcount)
-{
- EXPECT_EQ(qid, message.getQid());
- EXPECT_EQ(rcode, message.getRcode());
- EXPECT_EQ(opcodeval, message.getOpcode().getCode());
- EXPECT_EQ((flags & QR_FLAG) != 0,
- message.getHeaderFlag(Message::HEADERFLAG_QR));
- EXPECT_EQ((flags & AA_FLAG) != 0,
- message.getHeaderFlag(Message::HEADERFLAG_AA));
- EXPECT_EQ((flags & TC_FLAG) != 0,
- message.getHeaderFlag(Message::HEADERFLAG_TC));
- EXPECT_EQ((flags & RA_FLAG) != 0,
- message.getHeaderFlag(Message::HEADERFLAG_RA));
- EXPECT_EQ((flags & RD_FLAG) != 0,
- message.getHeaderFlag(Message::HEADERFLAG_RD));
- EXPECT_EQ((flags & AD_FLAG) != 0,
- message.getHeaderFlag(Message::HEADERFLAG_AD));
- EXPECT_EQ((flags & CD_FLAG) != 0,
- message.getHeaderFlag(Message::HEADERFLAG_CD));
-
- EXPECT_EQ(qdcount, message.getRRCount(Message::SECTION_QUESTION));
- EXPECT_EQ(ancount, message.getRRCount(Message::SECTION_ANSWER));
- EXPECT_EQ(nscount, message.getRRCount(Message::SECTION_AUTHORITY));
- EXPECT_EQ(arcount, message.getRRCount(Message::SECTION_ADDITIONAL));
-}
// Unsupported requests. Should result in NOTIMP.
TEST_F(AuthSrvTest, unsupportedRequest) {
- for (unsigned int i = 0; i < 16; ++i) {
- // set Opcode to 'i', which iterators over all possible codes except
- // the standard query and notify
- if (i == Opcode::QUERY().getCode() ||
- i == Opcode::NOTIFY().getCode()) {
- continue;
- }
- createDataFromFile("simplequery_fromWire.wire");
- data[2] = ((i << 3) & 0xff);
-
- parse_message->clear(Message::PARSE);
- server.processMessage(*io_message, parse_message, response_obuffer,
- &dnsserv);
- EXPECT_TRUE(dnsserv.hasAnswer());
- headerCheck(*parse_message, default_qid, Rcode::NOTIMP(), i, QR_FLAG,
- 0, 0, 0, 0);
- }
+ UNSUPPORTED_REQUEST_TEST;
}
// Simple API check
TEST_F(AuthSrvTest, verbose) {
- EXPECT_FALSE(server.getVerbose());
- server.setVerbose(true);
- EXPECT_TRUE(server.getVerbose());
- server.setVerbose(false);
- EXPECT_FALSE(server.getVerbose());
+ VERBOSE_TEST;
}
// Multiple questions. Should result in FORMERR.
TEST_F(AuthSrvTest, multiQuestion) {
- createDataFromFile("multiquestion_fromWire.wire");
- server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
- EXPECT_TRUE(dnsserv.hasAnswer());
- headerCheck(*parse_message, default_qid, Rcode::FORMERR(), opcode.getCode(),
- QR_FLAG, 2, 0, 0, 0);
-
- QuestionIterator qit = parse_message->beginQuestion();
- EXPECT_EQ(Name("example.com"), (*qit)->getName());
- EXPECT_EQ(RRClass::IN(), (*qit)->getClass());
- EXPECT_EQ(RRType::A(), (*qit)->getType());
- ++qit;
- EXPECT_EQ(Name("example.com"), (*qit)->getName());
- EXPECT_EQ(RRClass::IN(), (*qit)->getClass());
- EXPECT_EQ(RRType::AAAA(), (*qit)->getType());
- ++qit;
- EXPECT_TRUE(qit == parse_message->endQuestion());
+ MULTI_QUESTION_TEST;
}
// Incoming data doesn't even contain the complete header. Must be silently
// dropped.
TEST_F(AuthSrvTest, shortMessage) {
- createDataFromFile("shortmessage_fromWire");
- server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
- EXPECT_FALSE(dnsserv.hasAnswer());
+ SHORT_MESSAGE_TEST;
}
// Response messages. Must be silently dropped, whether it's a valid response
// or malformed or could otherwise cause a protocol error.
TEST_F(AuthSrvTest, response) {
- // A valid (although unusual) response
- createDataFromFile("simpleresponse_fromWire.wire");
- server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
- EXPECT_FALSE(dnsserv.hasAnswer());
-
- // A response with a broken question section. must be dropped rather than
- // returning FORMERR.
- createDataFromFile("shortresponse_fromWire");
- server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
- EXPECT_FALSE(dnsserv.hasAnswer());
-
- // A response to iquery. must be dropped rather than returning NOTIMP.
- createDataFromFile("iqueryresponse_fromWire.wire");
- server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
- EXPECT_FALSE(dnsserv.hasAnswer());
+ RESPONSE_TEST;
}
// Query with a broken question
TEST_F(AuthSrvTest, shortQuestion) {
- createDataFromFile("shortquestion_fromWire");
- server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
- EXPECT_TRUE(dnsserv.hasAnswer());
- // Since the query's question is broken, the question section of the
- // response should be empty.
- headerCheck(*parse_message, default_qid, Rcode::FORMERR(), opcode.getCode(),
- QR_FLAG, 0, 0, 0, 0);
+ SHORT_QUESTION_TEST;
}
// Query with a broken answer section
TEST_F(AuthSrvTest, shortAnswer) {
- createDataFromFile("shortanswer_fromWire.wire");
- server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
- EXPECT_TRUE(dnsserv.hasAnswer());
-
- // This is a bogus query, but question section is valid. So the response
- // should copy the question section.
- headerCheck(*parse_message, default_qid, Rcode::FORMERR(), opcode.getCode(),
- QR_FLAG, 1, 0, 0, 0);
-
- QuestionIterator qit = parse_message->beginQuestion();
- EXPECT_EQ(Name("example.com"), (*qit)->getName());
- EXPECT_EQ(RRClass::IN(), (*qit)->getClass());
- EXPECT_EQ(RRType::A(), (*qit)->getType());
- ++qit;
- EXPECT_TRUE(qit == parse_message->endQuestion());
+ SHORT_ANSWER_TEST;
}
// Query with unsupported version of EDNS.
TEST_F(AuthSrvTest, ednsBadVers) {
- createDataFromFile("queryBadEDNS_fromWire.wire");
- server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
- EXPECT_TRUE(dnsserv.hasAnswer());
-
- // The response must have an EDNS OPT RR in the additional section, but
- // it will be added automatically at the render time.
- // Note that the DNSSEC DO bit is cleared even if this bit in the query
- // is set. This is a limitation of the current implementation.
- headerCheck(*parse_message, default_qid, Rcode::BADVERS(), opcode.getCode(),
- QR_FLAG, 1, 0, 0, 1);
- EXPECT_FALSE(parse_message->getEDNS()); // EDNS isn't added at this point
-
- InputBuffer ib(response_obuffer->getData(), response_obuffer->getLength());
- Message parsed(Message::PARSE);
- parsed.fromWire(ib);
- EXPECT_EQ(Rcode::BADVERS(), parsed.getRcode());
- ConstEDNSPtr edns(parsed.getEDNS());
- ASSERT_TRUE(edns);
- EXPECT_FALSE(edns->getDNSSECAwareness());
+ EDNS_BADVERS_TEST;
}
TEST_F(AuthSrvTest, AXFROverUDP) {
- // AXFR over UDP is invalid and should result in FORMERR.
- UnitTestUtil::createRequestMessage(request_message, opcode, default_qid,
- Name("example.com"), RRClass::IN(),
- RRType::AXFR());
- createRequestPacket(request_message, IPPROTO_UDP);
- server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
- EXPECT_TRUE(dnsserv.hasAnswer());
- headerCheck(*parse_message, default_qid, Rcode::FORMERR(), opcode.getCode(),
- QR_FLAG, 1, 0, 0, 0);
+ AXFR_OVER_UDP_TEST;
}
TEST_F(AuthSrvTest, AXFRSuccess) {
Modified: branches/trac327/src/bin/recurse/tests/Makefile.am
==============================================================================
--- branches/trac327/src/bin/recurse/tests/Makefile.am (original)
+++ branches/trac327/src/bin/recurse/tests/Makefile.am Fri Nov 19 17:03:20 2010
@@ -3,7 +3,9 @@
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += -I$(top_builddir)/src/lib/dns -I$(top_srcdir)/src/bin
AM_CPPFLAGS += -I$(top_builddir)/src/lib/cc
-AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(srcdir)/testdata\"
+AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(top_srcdir)/src/lib/testutils/testdata\"
+AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/lib/testutils/testdata\"
+AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CPPFLAGS += $(BOOST_INCLUDES)
AM_CXXFLAGS = $(B10_CXXFLAGS)
@@ -20,7 +22,6 @@
run_unittests_SOURCES = $(top_srcdir)/src/lib/dns/tests/unittest_util.h
run_unittests_SOURCES += $(top_srcdir)/src/lib/dns/tests/unittest_util.cc
run_unittests_SOURCES += ../recursor.h ../recursor.cc
-run_unittests_SOURCES += ../../auth/tests/mockups.h
run_unittests_SOURCES += recursor_unittest.cc
run_unittests_SOURCES += run_unittests.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
Modified: branches/trac327/src/bin/recurse/tests/recursor_unittest.cc
==============================================================================
--- branches/trac327/src/bin/recurse/tests/recursor_unittest.cc (original)
+++ branches/trac327/src/bin/recurse/tests/recursor_unittest.cc Fri Nov 19 17:03:20 2010
@@ -15,30 +15,8 @@
// $Id$
#include <config.h>
-
-#include <gtest/gtest.h>
-
-#include <asiolink/asiolink.h>
-
-#include <dns/opcode.h>
-#include <dns/rcode.h>
-#include <dns/buffer.h>
-#include <dns/name.h>
-#include <dns/message.h>
-#include <dns/messagerenderer.h>
-#include <dns/rrclass.h>
-#include <dns/rrtype.h>
-
-#include <cc/data.h>
-#include <cc/session.h>
-
-#include <auth/common.h>
-
#include <recurse/recursor.h>
-
-#include <dns/tests/unittest_util.h>
-
-#include <auth/tests/mockups.h>
+#include <testutils/srv_unittest.h>
using isc::UnitTestUtil;
using namespace std;
@@ -48,266 +26,58 @@
using namespace asiolink;
namespace {
-const char* const DEFAULT_REMOTE_ADDRESS = "192.0.2.1";
const char* const TEST_PORT = "53535";
-class RecursorTest : public ::testing::Test {
+class RecursorTest : public SrvTestBase{
protected:
- RecursorTest() : server(),
- request_message(Message::RENDER),
- parse_message(new Message(Message::PARSE)),
- default_qid(0x1035), opcode(Opcode(Opcode::QUERY())),
- qname("www.example.com"),
- qclass(RRClass::IN()), qtype(RRType::A()),
- io_message(NULL), endpoint(NULL), request_obuffer(0),
- request_renderer(request_obuffer),
- response_obuffer(new OutputBuffer(0))
- {
- vector<pair<string, uint16_t> > upstream;
- upstream.push_back(pair<string, uint16_t>(DEFAULT_REMOTE_ADDRESS, 53));
- server.setForwardAddresses(upstream);
- }
- ~RecursorTest() {
- delete io_message;
- delete endpoint;
- }
- MockSession notify_session;
- MockServer dnsserv;
+ RecursorTest() : server(){}
Recursor server;
- Message request_message;
- MessagePtr parse_message;
- const qid_t default_qid;
- const Opcode opcode;
- const Name qname;
- const RRClass qclass;
- const RRType qtype;
- IOMessage* io_message;
- IOSocket* io_sock;
- const IOEndpoint* endpoint;
- OutputBuffer request_obuffer;
- MessageRenderer request_renderer;
- OutputBufferPtr response_obuffer;
- vector<uint8_t> data;
-
- void createDataFromFile(const char* const datafile, int protocol);
- void createRequestPacket(Message& message, int protocol);
};
-
-void
-RecursorTest::createDataFromFile(const char* const datafile,
- const int protocol = IPPROTO_UDP)
-{
- delete io_message;
- data.clear();
-
- delete endpoint;
- endpoint = IOEndpoint::create(protocol,
- IOAddress(DEFAULT_REMOTE_ADDRESS), 5300);
- UnitTestUtil::readWireData(datafile, data);
- io_sock = (protocol == IPPROTO_UDP) ? &IOSocket::getDummyUDPSocket() :
- &IOSocket::getDummyTCPSocket();
- io_message = new IOMessage(&data[0], data.size(), *io_sock, *endpoint);
-}
-
-void
-RecursorTest::createRequestPacket(Message& message,
- const int protocol = IPPROTO_UDP)
-{
- message.toWire(request_renderer);
-
- delete io_message;
-
- endpoint = IOEndpoint::create(protocol,
- IOAddress(DEFAULT_REMOTE_ADDRESS), 5300);
- io_sock = (protocol == IPPROTO_UDP) ? &IOSocket::getDummyUDPSocket() :
- &IOSocket::getDummyTCPSocket();
- io_message = new IOMessage(request_renderer.getData(),
- request_renderer.getLength(),
- *io_sock, *endpoint);
-}
-
-// These are flags to indicate whether the corresponding flag bit of the
-// DNS header is to be set in the test cases. (Note that the flag values
-// is irrelevant to their wire-format values)
-const unsigned int QR_FLAG = 0x1;
-const unsigned int AA_FLAG = 0x2;
-const unsigned int TC_FLAG = 0x4;
-const unsigned int RD_FLAG = 0x8;
-const unsigned int RA_FLAG = 0x10;
-const unsigned int AD_FLAG = 0x20;
-const unsigned int CD_FLAG = 0x40;
-
-void
-headerCheck(const Message& message, const qid_t qid, const Rcode& rcode,
- const uint16_t opcodeval, const unsigned int flags,
- const unsigned int qdcount,
- const unsigned int ancount, const unsigned int nscount,
- const unsigned int arcount)
-{
- EXPECT_EQ(qid, message.getQid());
- EXPECT_EQ(rcode, message.getRcode());
- EXPECT_EQ(opcodeval, message.getOpcode().getCode());
- EXPECT_EQ((flags & QR_FLAG) != 0, message.getHeaderFlag(
- Message::HEADERFLAG_QR));
- EXPECT_EQ((flags & AA_FLAG) != 0, message.getHeaderFlag(
- Message::HEADERFLAG_AA));
- EXPECT_EQ((flags & TC_FLAG) != 0, message.getHeaderFlag(
- Message::HEADERFLAG_TC));
- EXPECT_EQ((flags & RA_FLAG) != 0, message.getHeaderFlag(
- Message::HEADERFLAG_RA));
- EXPECT_EQ((flags & RD_FLAG) != 0, message.getHeaderFlag(
- Message::HEADERFLAG_RD));
- EXPECT_EQ((flags & AD_FLAG) != 0, message.getHeaderFlag(
- Message::HEADERFLAG_AD));
- EXPECT_EQ((flags & CD_FLAG) != 0, message.getHeaderFlag(
- Message::HEADERFLAG_CD));
-
- EXPECT_EQ(qdcount, message.getRRCount(Message::SECTION_QUESTION));
- EXPECT_EQ(ancount, message.getRRCount(Message::SECTION_ANSWER));
- EXPECT_EQ(nscount, message.getRRCount(Message::SECTION_AUTHORITY));
- EXPECT_EQ(arcount, message.getRRCount(Message::SECTION_ADDITIONAL));
-}
// Unsupported requests. Should result in NOTIMP.
TEST_F(RecursorTest, unsupportedRequest) {
- for (unsigned int i = 0; i < 16; ++i) {
- // set Opcode to 'i', which iterators over all possible codes except
- // the standard query and notify
- if (i == Opcode::QUERY().getCode() ||
- i == Opcode::NOTIFY().getCode()) {
- continue;
- }
- createDataFromFile("simplequery_fromWire.wire");
- data[2] = ((i << 3) & 0xff);
-
- parse_message->clear(Message::PARSE);
- server.processMessage(*io_message, parse_message,
- response_obuffer, &dnsserv);
- EXPECT_TRUE(dnsserv.hasAnswer());
- headerCheck(*parse_message, default_qid, Rcode::NOTIMP(), i, QR_FLAG,
- 0, 0, 0, 0);
- }
+ UNSUPPORTED_REQUEST_TEST;
}
// Simple API check
TEST_F(RecursorTest, verbose) {
- EXPECT_FALSE(server.getVerbose());
- server.setVerbose(true);
- EXPECT_TRUE(server.getVerbose());
- server.setVerbose(false);
- EXPECT_FALSE(server.getVerbose());
+ VERBOSE_TEST;
}
// Multiple questions. Should result in FORMERR.
TEST_F(RecursorTest, multiQuestion) {
- createDataFromFile("multiquestion_fromWire.wire");
- server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
- EXPECT_TRUE(dnsserv.hasAnswer());
- headerCheck(*parse_message, default_qid, Rcode::FORMERR(), opcode.getCode(),
- QR_FLAG, 2, 0, 0, 0);
-
- QuestionIterator qit = parse_message->beginQuestion();
- EXPECT_EQ(Name("example.com"), (*qit)->getName());
- EXPECT_EQ(RRClass::IN(), (*qit)->getClass());
- EXPECT_EQ(RRType::A(), (*qit)->getType());
- ++qit;
- EXPECT_EQ(Name("example.com"), (*qit)->getName());
- EXPECT_EQ(RRClass::IN(), (*qit)->getClass());
- EXPECT_EQ(RRType::AAAA(), (*qit)->getType());
- ++qit;
- EXPECT_TRUE(qit == parse_message->endQuestion());
+ MULTI_QUESTION_TEST;
}
// Incoming data doesn't even contain the complete header. Must be silently
// dropped.
TEST_F(RecursorTest, shortMessage) {
- createDataFromFile("shortmessage_fromWire");
- server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
- EXPECT_FALSE(dnsserv.hasAnswer());
+ SHORT_MESSAGE_TEST;
}
// Response messages. Must be silently dropped, whether it's a valid response
// or malformed or could otherwise cause a protocol error.
TEST_F(RecursorTest, response) {
- // A valid (although unusual) response
- createDataFromFile("simpleresponse_fromWire.wire");
- server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
- EXPECT_FALSE(dnsserv.hasAnswer());
-
- // A response with a broken question section. must be dropped rather than
- // returning FORMERR.
- createDataFromFile("shortresponse_fromWire");
- server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
- EXPECT_FALSE(dnsserv.hasAnswer());
-
- // A response to iquery. must be dropped rather than returning NOTIMP.
- createDataFromFile("iqueryresponse_fromWire.wire");
- server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
- EXPECT_FALSE(dnsserv.hasAnswer());
+ RESPONSE_TEST;
}
// Query with a broken question
TEST_F(RecursorTest, shortQuestion) {
- createDataFromFile("shortquestion_fromWire");
- server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
- EXPECT_TRUE(dnsserv.hasAnswer());
- // Since the query's question is broken, the question section of the
- // response should be empty.
- headerCheck(*parse_message, default_qid, Rcode::FORMERR(), opcode.getCode(),
- QR_FLAG, 0, 0, 0, 0);
+ SHORT_QUESTION_TEST;
}
// Query with a broken answer section
TEST_F(RecursorTest, shortAnswer) {
- createDataFromFile("shortanswer_fromWire.wire");
- server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
- EXPECT_TRUE(dnsserv.hasAnswer());
-
- // This is a bogus query, but question section is valid. So the response
- // should copy the question section.
- headerCheck(*parse_message, default_qid, Rcode::FORMERR(), opcode.getCode(),
- QR_FLAG, 1, 0, 0, 0);
-
- QuestionIterator qit = parse_message->beginQuestion();
- EXPECT_EQ(Name("example.com"), (*qit)->getName());
- EXPECT_EQ(RRClass::IN(), (*qit)->getClass());
- EXPECT_EQ(RRType::A(), (*qit)->getType());
- ++qit;
- EXPECT_TRUE(qit == parse_message->endQuestion());
+ SHORT_ANSWER_TEST;
}
// Query with unsupported version of EDNS.
TEST_F(RecursorTest, ednsBadVers) {
- createDataFromFile("queryBadEDNS_fromWire.wire");
- server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
- EXPECT_TRUE(dnsserv.hasAnswer());
-
- // The response must have an EDNS OPT RR in the additional section, but
- // it will be added automatically at the render time.
- // Note that the DNSSEC DO bit is cleared even if this bit in the query
- // is set. This is a limitation of the current implementation.
- headerCheck(*parse_message, default_qid, Rcode::BADVERS(), opcode.getCode(),
- QR_FLAG, 1, 0, 0, 1);
- EXPECT_FALSE(parse_message->getEDNS()); // EDNS isn't added at this point
-
- InputBuffer ib(response_obuffer->getData(), response_obuffer->getLength());
- Message parsed(Message::PARSE);
- parsed.fromWire(ib);
- EXPECT_EQ(Rcode::BADVERS(), parsed.getRcode());
- ConstEDNSPtr edns(parsed.getEDNS());
- ASSERT_TRUE(edns);
- EXPECT_FALSE(edns->getDNSSECAwareness());
+ EDNS_BADVERS_TEST;
}
TEST_F(RecursorTest, AXFROverUDP) {
- // AXFR over UDP is invalid and should result in FORMERR.
- UnitTestUtil::createRequestMessage(request_message, opcode, default_qid,
- Name("example.com"), RRClass::IN(), RRType::AXFR());
- createRequestPacket(request_message, IPPROTO_UDP);
- server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
- EXPECT_TRUE(dnsserv.hasAnswer());
- headerCheck(*parse_message, default_qid, Rcode::FORMERR(), opcode.getCode(),
- QR_FLAG, 1, 0, 0, 0);
+ AXFR_OVER_UDP_TEST;
}
TEST_F(RecursorTest, AXFRFail) {
@@ -336,7 +106,6 @@
headerCheck(*parse_message, default_qid, Rcode::NOTAUTH(),
Opcode::NOTIFY().getCode(), QR_FLAG, 0, 0, 0, 0);
}
-
class RecursorConfig : public ::testing::Test {
public:
IOService ios;
Modified: branches/trac327/src/lib/Makefile.am
==============================================================================
--- branches/trac327/src/lib/Makefile.am (original)
+++ branches/trac327/src/lib/Makefile.am Fri Nov 19 17:03:20 2010
@@ -1,1 +1,1 @@
-SUBDIRS = exceptions dns asiolink cc config datasrc python xfr bench
+SUBDIRS = exceptions dns asiolink cc config datasrc python xfr bench testutils
More information about the bind10-changes
mailing list