[svn] commit: r1706 - /trunk/src/lib/dns/tests/rdata_unittest.cc

BIND 10 source code commits bind10-changes at lists.isc.org
Tue Apr 13 21:33:29 UTC 2010


Author: jinmei
Date: Tue Apr 13 21:33:28 2010
New Revision: 1706

Log:
cleanup: use constants RRClasses rather than constructing them from text every time.

Modified:
    trunk/src/lib/dns/tests/rdata_unittest.cc

Modified: trunk/src/lib/dns/tests/rdata_unittest.cc
==============================================================================
--- trunk/src/lib/dns/tests/rdata_unittest.cc (original)
+++ trunk/src/lib/dns/tests/rdata_unittest.cc Tue Apr 13 21:33:28 2010
@@ -106,15 +106,15 @@
 {
     // valid construction.  This also tests a normal case of "FromWire".
     EXPECT_EQ(0, generic::Generic("\\# 4 a1b2c30d").compare(
-                  *rdataFactoryFromFile(unknown_rrtype, RRClass("IN"),
+                  *rdataFactoryFromFile(unknown_rrtype, RRClass::IN(),
                                         "testdata/rdata_unknown_fromWire")));
     // upper case hexadecimal digits should also be okay. 
     EXPECT_EQ(0, generic::Generic("\\# 4 A1B2C30D").compare(
-                  *rdataFactoryFromFile(unknown_rrtype, RRClass("IN"),
+                  *rdataFactoryFromFile(unknown_rrtype, RRClass::IN(),
                                         "testdata/rdata_unknown_fromWire")));
     // 0-length RDATA should be accepted
     EXPECT_EQ(0, generic::Generic("\\# 0").compare(
-                  *rdataFactoryFromFile(unknown_rrtype, RRClass("IN"),
+                  *rdataFactoryFromFile(unknown_rrtype, RRClass::IN(),
                                         "testdata/rdata_unknown_fromWire", 6)));
     // hex encoding can be space-separated
     EXPECT_EQ(0, generic::Generic("\\# 4 a1 b2c30d").compare(rdata_unknown));
@@ -153,7 +153,7 @@
     // normal case (including 0-length data) is covered in createFromText.
 
     // buffer too short.  the error should be detected in buffer read
-    EXPECT_THROW(rdataFactoryFromFile(unknown_rrtype, RRClass("IN"),
+    EXPECT_THROW(rdataFactoryFromFile(unknown_rrtype, RRClass::IN(),
                                       "testdata/rdata_unknown_fromWire", 8),
                  InvalidBufferPosition);
 
@@ -170,10 +170,10 @@
 TEST_F(Rdata_Unknown_Test, createRdataFromString)
 {
     EXPECT_EQ(0, rdata_unknown.compare(
-                  *createRdata(unknown_rrtype, RRClass("IN"),
+                  *createRdata(unknown_rrtype, RRClass::IN(),
                                rdata_unknowntxt)));
     EXPECT_EQ(0, rdata_unknown.compare(
-                  *createRdata(unknown_rrtype, RRClass("CH"),
+                  *createRdata(unknown_rrtype, RRClass::CH(),
                                rdata_unknowntxt)));
     EXPECT_EQ(0, rdata_unknown.compare(
                   *createRdata(unknown_rrtype, RRClass("CLASS65000"),
@@ -184,12 +184,12 @@
 {
     InputBuffer ibuffer(wiredata_unknown, sizeof(wiredata_unknown));
     EXPECT_EQ(0, rdata_unknown.compare(
-                  *createRdata(unknown_rrtype, RRClass("IN"),
+                  *createRdata(unknown_rrtype, RRClass::IN(),
                                ibuffer, sizeof(wiredata_unknown))));
 
     InputBuffer ibuffer2(wiredata_unknown, sizeof(wiredata_unknown));
     EXPECT_EQ(0, rdata_unknown.compare(
-                  *createRdata(unknown_rrtype, RRClass("CH"),
+                  *createRdata(unknown_rrtype, RRClass::CH(),
                                ibuffer2, sizeof(wiredata_unknown))));
 
     InputBuffer ibuffer3(wiredata_unknown, sizeof(wiredata_unknown));
@@ -201,9 +201,9 @@
 TEST_F(Rdata_Unknown_Test, createRdataByCopy)
 {
     EXPECT_EQ(0, rdata_unknown.compare(
-                  *createRdata(unknown_rrtype, RRClass("IN"), rdata_unknown)));
-    EXPECT_EQ(0, rdata_unknown.compare(
-                  *createRdata(unknown_rrtype, RRClass("CH"), rdata_unknown)));
+                  *createRdata(unknown_rrtype, RRClass::IN(), rdata_unknown)));
+    EXPECT_EQ(0, rdata_unknown.compare(
+                  *createRdata(unknown_rrtype, RRClass::CH(), rdata_unknown)));
     EXPECT_EQ(0, rdata_unknown.compare(
                   *createRdata(unknown_rrtype, RRClass("CLASS65000"),
                                rdata_unknown)));




More information about the bind10-changes mailing list