BIND 10 master, updated. 78f1d79b95b86d528a25827cf017c9f0186d18b9 Merge branch 'trac3344'

[BIND 10 source code commits]

The branch, master has been updated
       via  78f1d79b95b86d528a25827cf017c9f0186d18b9 (commit)
       via  4f3ed6aa0f1c5862652aabe91e300e95e4ca4cbd (commit)
       via  4ec8c2bf8c1c0eb385689973bfbd61c8420600e8 (commit)
      from  4d63c8c9b34dff6189d6b081ee4d2e0107926190 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 78f1d79b95b86d528a25827cf017c9f0186d18b9
Merge: 4d63c8c 4f3ed6a
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Feb 24 15:27:02 2014 +0530

    Merge branch 'trac3344'

-----------------------------------------------------------------------

Summary of changes:
 src/lib/dns/tests/rdata_unittest.cc |   31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dns/tests/rdata_unittest.cc b/src/lib/dns/tests/rdata_unittest.cc
index f29b61c..4c1c025 100644
--- a/src/lib/dns/tests/rdata_unittest.cc
+++ b/src/lib/dns/tests/rdata_unittest.cc
@@ -227,10 +227,28 @@ TEST_F(RdataTest, getLength) {
 }
 
 namespace {
+
+// Wire-format data correspond to rdata_unknown.  Note that it doesn't
+// include RDLENGTH.
+const uint8_t wiredata_unknown[] = { 0xa1, 0xb2, 0xc3, 0x0d };
+
 class Rdata_Unknown_Test : public RdataTest {
+public:
+    Rdata_Unknown_Test() :
+        // "Unknown" RR Type used for the test cases below.  If/when we
+        // use this type number as a "well-known" (probably
+        // experimental) type, we'll need to renumber it.
+        unknown_rrtype(RRType(65000)),
+        rdata_unknowntxt("\\# 4 a1b2c30d"),
+        rdata_unknown(rdata_unknowntxt)
+    {}
 protected:
     static string getLongestRdataTxt();
     static void getLongestRdataWire(vector<uint8_t>& v);
+
+    const RRType unknown_rrtype;
+    const std::string rdata_unknowntxt;
+    const generic::Generic rdata_unknown;
 };
 
 string
@@ -255,23 +273,12 @@ Rdata_Unknown_Test::getLongestRdataWire(vector<uint8_t>& v) {
     }
 }
 
-const string rdata_unknowntxt("\\# 4 a1b2c30d");
-const generic::Generic rdata_unknown(rdata_unknowntxt);
-// Wire-format data correspond to rdata_unknown.  Note that it doesn't include
-// RDLENGTH
-const uint8_t wiredata_unknown[] = { 0xa1, 0xb2, 0xc3, 0x0d };
-
-// "Unknown" RR Type used for the test cases below.  If/when we use this
-// type number as a "well-known" (probably experimental) type, we'll need to
-// renumber it.
-const RRType unknown_rrtype = RRType(65000);
-
 TEST_F(Rdata_Unknown_Test, createFromText) {
     // valid construction.  This also tests a normal case of "FromWire".
     EXPECT_EQ(0, generic::Generic("\\# 4 a1b2c30d").compare(
                   *rdataFactoryFromFile(unknown_rrtype, RRClass::IN(),
                                         "rdata_unknown_fromWire")));
-    // upper case hexadecimal digits should also be okay. 
+    // upper case hexadecimal digits should also be okay.
     EXPECT_EQ(0, generic::Generic("\\# 4 A1B2C30D").compare(
                   *rdataFactoryFromFile(unknown_rrtype, RRClass::IN(),
                                         "rdata_unknown_fromWire")));