Merge branch 'master' into trac2168

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

diff --cc src/lib/dns/tests/message_unittest.cc
index 637357eae44c0d6cdcab135648b3036113ae0fe6,46927ddbbfd259c2287c612d2ee6f6576ce4ffc8..00b8a5bd5fac7baea227fc29ce04e987513edaf1
--- 1/src/lib/dns/tests/message_unittest.cc
--- 2/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 99ce810ab5929666047ab5dff665e63eb5c1ecc5,a3275572d476bf9b75aee2b01e5671d4b473657f..cb8640af1a31855b812279df09e396dde507d341
--- 1/src/lib/dns/tests/rdata_sshfp_unittest.cc
--- 2/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/rdata_unittest.cc
Simple merge

diff --cc src/lib/dns/tests/rrset_unittest.cc
index 66621b9a1584ff53cfe503d5268ff96393b00c44,a91f97903ba2d4edb95f29137adf4c69b49b6fc2..fc75b7731cee830d4bbd384dde269671d252d0d4
--- 1/src/lib/dns/tests/rrset_unittest.cc
--- 2/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().

diff --cc src/lib/dns/tests/tsig_unittest.cc
Simple merge

diff --cc src/lib/resolve/tests/recursive_query_unittest.cc
Simple merge