Browse Source

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

as a bonus we can make them const.
JINMEI Tatuya 12 years ago
parent
commit
103c817670
1 changed files with 12 additions and 15 deletions
  1. 12 15
      src/lib/dns/tests/rrcollator_unittest.cc

+ 12 - 15
src/lib/dns/tests/rrcollator_unittest.cc

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