From: Mukund Sivaraman <muks@isc.org>
Date: Thu, 6 Feb 2014 09:01:17 +0000 (+0530)
Subject: Merge branch 'master' into trac2168
X-Git-Tag: bind10-1.2.0beta1-release~47^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b413f0b6f0325a124af6e170e9c96016d032007;p=thirdparty%2Fkea.git

Merge branch 'master' into trac2168

Conflicts:
	src/lib/dns/tests/rrset_unittest.cc
---

8b413f0b6f0325a124af6e170e9c96016d032007
diff --cc src/lib/dns/tests/message_unittest.cc
index 637357eae4,46927ddbbf..00b8a5bd5f
--- a/src/lib/dns/tests/message_unittest.cc
+++ b/src/lib/dns/tests/message_unittest.cc
@@@ -865,11 -893,12 +894,11 @@@ commonTSIGToWireCheck(Message& message
          message.addRRset(Message::SECTION_ANSWER, ans_rrset);
      }
  
-     message.toWire(renderer, tsig_ctx);
+     message.toWire(renderer, &tsig_ctx);
      vector<unsigned char> expected_data;
      UnitTestUtil::readWireData(expected_file, expected_data);
 -    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData, renderer.getData(),
 -                        renderer.getLength(),
 -                        &expected_data[0], expected_data.size());
 +    matchWireData(&expected_data[0], expected_data.size(),
 +                  renderer.getData(), renderer.getLength());
  }
  
  TEST_F(MessageTest, toWireWithTSIG) {
diff --cc src/lib/dns/tests/rdata_sshfp_unittest.cc
index 99ce810ab5,a3275572d4..cb8640af1a
--- a/src/lib/dns/tests/rdata_sshfp_unittest.cc
+++ b/src/lib/dns/tests/rdata_sshfp_unittest.cc
@@@ -235,10 -227,13 +230,11 @@@ TEST_F(Rdata_SSHFP_Test, toWire) 
      this->obuffer.clear();
      rdata_sshfp.toWire(this->obuffer);
  
-     EXPECT_EQ(22, this->obuffer.getLength());
+     EXPECT_EQ(sizeof (rdata_sshfp_wiredata),
+               this->obuffer.getLength());
  
 -    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
 -                        this->obuffer.getData(),
 -                        this->obuffer.getLength(),
 -                        rdata_sshfp_wiredata, sizeof(rdata_sshfp_wiredata));
 +    matchWireData(rdata_sshfp_wiredata, sizeof(rdata_sshfp_wiredata),
 +                  obuffer.getData(), obuffer.getLength());
  }
  
  TEST_F(Rdata_SSHFP_Test, compare) {
diff --cc src/lib/dns/tests/rrset_unittest.cc
index 66621b9a15,a91f97903b..fc75b7731c
--- a/src/lib/dns/tests/rrset_unittest.cc
+++ b/src/lib/dns/tests/rrset_unittest.cc
@@@ -209,10 -252,11 +253,11 @@@ TEST_F(RRsetTest, toWireBuffer) 
      rrset_a.toWire(buffer);
  
      UnitTestUtil::readWireData("rrset_toWire1", wiredata);
 -    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData, buffer.getData(),
 -                        buffer.getLength(), &wiredata[0], wiredata.size());
 +    matchWireData(&wiredata[0], wiredata.size(),
 +                  buffer.getData(), buffer.getLength());
  
-     // toWire() cannot be performed for an empty RRset.
+     // toWire() cannot be performed for an empty RRset except when
+     // class=ANY or class=NONE.
      buffer.clear();
      EXPECT_THROW(rrset_a_empty.toWire(buffer), EmptyRRset);
  
@@@ -239,28 -283,29 +285,29 @@@ TEST_F(RRsetTest, toWireRenderer) 
      rrset_ns.toWire(renderer);
  
      UnitTestUtil::readWireData("rrset_toWire2", wiredata);
 -    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData, renderer.getData(),
 -                        renderer.getLength(), &wiredata[0], wiredata.size());
 +    matchWireData(&wiredata[0], wiredata.size(),
 +                  renderer.getData(), renderer.getLength());
  
-     // toWire() cannot be performed for an empty RRset.
-     buffer.clear();
-     EXPECT_THROW(rrset_a_empty.toWire(buffer), EmptyRRset);
+     // toWire() cannot be performed for an empty RRset except when
+     // class=ANY or class=NONE.
+     renderer.clear();
+     EXPECT_THROW(rrset_a_empty.toWire(renderer), EmptyRRset);
  
-     // Unless it is type ANY or None
-     // toWire() can also be performed for an empty RRset.
-     buffer.clear();
-     rrset_any_a_empty.toWire(buffer);
+     // When class=ANY or class=NONE, toWire() can also be performed for
+     // an empty RRset.
+     renderer.clear();
+     rrset_any_a_empty.toWire(renderer);
      wiredata.clear();
      UnitTestUtil::readWireData("rrset_toWire3", wiredata);
 -    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData, renderer.getData(),
 -                        renderer.getLength(), &wiredata[0], wiredata.size());
 +    matchWireData(&wiredata[0], wiredata.size(),
-                   buffer.getData(), buffer.getLength());
++                  renderer.getData(), renderer.getLength());
  
-     buffer.clear();
-     rrset_none_a_empty.toWire(buffer);
+     renderer.clear();
+     rrset_none_a_empty.toWire(renderer);
      wiredata.clear();
      UnitTestUtil::readWireData("rrset_toWire4", wiredata);
 -    EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData, renderer.getData(),
 -                        renderer.getLength(), &wiredata[0], wiredata.size());
 +    matchWireData(&wiredata[0], wiredata.size(),
-                   buffer.getData(), buffer.getLength());
++                  renderer.getData(), renderer.getLength());
  }
  
  // test operator<<.  We simply confirm it appends the result of toText().