[svn] commit: r1519 - in /trunk/src/lib/dns/tests: rdata_in_a_unittest.cc rdata_in_aaaa_unittest.cc
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Mar 18 16:20:05 UTC 2010
Author: jinmei
Date: Thu Mar 18 16:20:04 2010
New Revision: 1519
Log:
more test cases
Modified:
trunk/src/lib/dns/tests/rdata_in_a_unittest.cc
trunk/src/lib/dns/tests/rdata_in_aaaa_unittest.cc
Modified: trunk/src/lib/dns/tests/rdata_in_a_unittest.cc
==============================================================================
--- trunk/src/lib/dns/tests/rdata_in_a_unittest.cc (original)
+++ trunk/src/lib/dns/tests/rdata_in_a_unittest.cc Thu Mar 18 16:20:04 2010
@@ -15,6 +15,7 @@
// $Id$
#include <dns/buffer.h>
+#include <dns/exceptions.h>
#include <dns/messagerenderer.h>
#include <dns/rdata.h>
#include <dns/rdataclass.h>
@@ -39,8 +40,7 @@
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)
-{
+TEST_F(Rdata_IN_A_Test, createFromText) {
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);
@@ -50,51 +50,46 @@
EXPECT_THROW(in::A("xxx"), InvalidRdataText);
}
-TEST_F(Rdata_IN_A_Test, createFromWire)
-{
+TEST_F(Rdata_IN_A_Test, createFromWire) {
// Valid data
EXPECT_EQ(0, rdata_in_a.compare(
- *rdataFactoryFromFile(RRType("A"), RRClass("IN"),
+ *rdataFactoryFromFile(RRType::A(), RRClass::IN(),
"testdata/rdata_in_a_fromWire")));
// RDLENGTH is too short
- EXPECT_THROW(rdataFactoryFromFile(RRType("A"), RRClass("IN"),
+ EXPECT_THROW(rdataFactoryFromFile(RRType::A(), RRClass::IN(),
"testdata/rdata_in_a_fromWire", 6),
- InvalidRdataLength);
+ DNSMessageFORMERR);
// RDLENGTH is too long
- EXPECT_THROW(rdataFactoryFromFile(RRType("A"), RRClass("IN"),
+ 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"),
+ DNSMessageFORMERR);
+ // buffer too short.
+ EXPECT_THROW(rdataFactoryFromFile(RRType::A(), RRClass::IN(),
"testdata/rdata_in_a_fromWire", 19),
- InvalidBufferPosition);
+ DNSMessageFORMERR);
}
-TEST_F(Rdata_IN_A_Test, toWireBuffer)
-{
+TEST_F(Rdata_IN_A_Test, toWireBuffer) {
rdata_in_a.toWire(obuffer);
EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
obuffer.getData(), obuffer.getLength(),
wiredata_in_a, sizeof(wiredata_in_a));
}
-TEST_F(Rdata_IN_A_Test, toWireRenderer)
-{
+TEST_F(Rdata_IN_A_Test, toWireRenderer) {
rdata_in_a.toWire(renderer);
EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
obuffer.getData(), obuffer.getLength(),
wiredata_in_a, sizeof(wiredata_in_a));
}
-TEST_F(Rdata_IN_A_Test, toText)
-{
+TEST_F(Rdata_IN_A_Test, 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(Rdata_IN_A_Test, compare)
-{
+TEST_F(Rdata_IN_A_Test, compare) {
in::A small1("1.1.1.1");
in::A small2("1.2.3.4");
in::A large1("255.255.255.255");
Modified: trunk/src/lib/dns/tests/rdata_in_aaaa_unittest.cc
==============================================================================
--- trunk/src/lib/dns/tests/rdata_in_aaaa_unittest.cc (original)
+++ trunk/src/lib/dns/tests/rdata_in_aaaa_unittest.cc Thu Mar 18 16:20:04 2010
@@ -15,6 +15,7 @@
// $Id$
#include <dns/buffer.h>
+#include <dns/exceptions.h>
#include <dns/messagerenderer.h>
#include <dns/rdata.h>
#include <dns/rdataclass.h>
@@ -41,45 +42,50 @@
0x20, 0x01, 0x0d, 0xb8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x12, 0x34 };
-TEST_F(Rdata_IN_AAAA_Test, createFromText)
-{
+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)
-{
+TEST_F(Rdata_IN_AAAA_Test, createFromWire) {
// Valid data
EXPECT_EQ(0, rdata_in_aaaa.compare(
- *rdataFactoryFromFile(RRType("AAAA"), RRClass("IN"),
+ *rdataFactoryFromFile(RRType::AAAA(), RRClass::IN(),
"testdata/rdata_in_aaaa_fromWire")));
- //TBD: more tests
+ // RDLENGTH is too short
+ EXPECT_THROW(rdataFactoryFromFile(RRType::AAAA(), RRClass::IN(),
+ "testdata/rdata_in_aaaa_fromWire", 18),
+ DNSMessageFORMERR);
+ // RDLENGTH is too long
+ EXPECT_THROW(rdataFactoryFromFile(RRType::AAAA(), RRClass::IN(),
+ "testdata/rdata_in_aaaa_fromWire", 36),
+ DNSMessageFORMERR);
+ // buffer too short.
+ EXPECT_THROW(rdataFactoryFromFile(RRType::AAAA(), RRClass::IN(),
+ "testdata/rdata_in_aaaa_fromWire", 55),
+ DNSMessageFORMERR);
}
-TEST_F(Rdata_IN_AAAA_Test, toWireBuffer)
-{
+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)
-{
+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)
-{
+TEST_F(Rdata_IN_AAAA_Test, toText) {
EXPECT_EQ("2001:db8::1234", rdata_in_aaaa.toText());
}
-TEST_F(Rdata_IN_AAAA_Test, compare)
-{
+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::");
More information about the bind10-changes
mailing list