From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 12 Dec 2012 19:00:11 +0000 (-0800)
Subject: [2470] initialize test Rdata for RRCollatorTest in member init list.
X-Git-Tag: bind10-1.0.0-beta-release~15^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=103c817670b1d4f839e8e82ae01fea0fe3aa1298;p=thirdparty%2Fkea.git

[2470] initialize test Rdata for RRCollatorTest in member init list.

as a bonus we can make them const.
---

diff --git a/src/lib/dns/tests/rrcollator_unittest.cc b/src/lib/dns/tests/rrcollator_unittest.cc
index 11e442e97c..e66f87c03a 100644
--- a/src/lib/dns/tests/rrcollator_unittest.cc
+++ b/src/lib/dns/tests/rrcollator_unittest.cc
@@ -53,20 +53,17 @@ protected:
         origin_("example.com"), rrclass_(RRClass::IN()), rrttl_(3600),
         throw_from_callback_(false),
         collator_(boost::bind(addRRset, _1, &rrsets_, &throw_from_callback_)),
-        rr_callback_(collator_.getCallback())
-    {
-        a_rdata1_ = createRdata(RRType::A(), rrclass_, "192.0.2.1");
-        a_rdata2_ = createRdata(RRType::A(), rrclass_, "192.0.2.2");
-
-        txt_rdata_ = createRdata(RRType::TXT(), rrclass_, "test");
-
-        sig_rdata1_ = createRdata(RRType::RRSIG(), rrclass_,
-                                  "A 5 3 3600 20000101000000 20000201000000 "
-                                  "12345 example.com. FAKE\n");
-        sig_rdata2_ = createRdata(RRType::RRSIG(), rrclass_,
-                                  "NS 5 3 3600 20000101000000 20000201000000 "
-                                  "12345 example.com. FAKE\n");
-    }
+        rr_callback_(collator_.getCallback()),
+        a_rdata1_(createRdata(RRType::A(), rrclass_, "192.0.2.1")),
+        a_rdata2_(createRdata(RRType::A(), rrclass_, "192.0.2.2")),
+        txt_rdata_(createRdata(RRType::TXT(), rrclass_, "test")),
+        sig_rdata1_(createRdata(RRType::RRSIG(), rrclass_,
+                                "A 5 3 3600 20000101000000 20000201000000 "
+                                "12345 example.com. FAKE\n")),
+        sig_rdata2_(createRdata(RRType::RRSIG(), rrclass_,
+                                "NS 5 3 3600 20000101000000 20000201000000 "
+                                "12345 example.com. FAKE\n"))
+    {}
 
     void checkRRset(const Name& expected_name, const RRClass& expected_class,
                     const RRType& expected_type, const RRTTL& expected_ttl,
@@ -99,10 +96,10 @@ protected:
     const RRClass rrclass_;
     const RRTTL rrttl_;
     vector<ConstRRsetPtr> rrsets_;
-    RdataPtr a_rdata1_, a_rdata2_, txt_rdata_, sig_rdata1_, sig_rdata2_;
     bool throw_from_callback_;
     RRCollator collator_;
     AddRRCallback rr_callback_;
+    const RdataPtr a_rdata1_, a_rdata2_, txt_rdata_, sig_rdata1_, sig_rdata2_;
     vector<ConstRdataPtr> rdatas_; // placeholder for expected data
 };