diff options
Diffstat (limited to 'src/lib/dns/tests/rdata_soa_unittest.cc')
| -rw-r--r-- | src/lib/dns/tests/rdata_soa_unittest.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/lib/dns/tests/rdata_soa_unittest.cc b/src/lib/dns/tests/rdata_soa_unittest.cc index 11412e14d1..f74c66d956 100644 --- a/src/lib/dns/tests/rdata_soa_unittest.cc +++ b/src/lib/dns/tests/rdata_soa_unittest.cc @@ -23,12 +23,14 @@ #include <dns/tests/unittest_util.h> #include <dns/tests/rdata_unittest.h> +#include <util/unittests/wiredata.h> -using isc::UnitTestUtil; using namespace std; using namespace isc::dns; using namespace isc::util; using namespace isc::dns::rdata; +using isc::UnitTestUtil; +using isc::util::unittests::matchWireData; namespace { class Rdata_SOA_Test : public RdataTest { @@ -179,9 +181,9 @@ TEST_F(Rdata_SOA_Test, toWireRenderer) { vector<unsigned char> data; UnitTestUtil::readWireData("rdata_soa_fromWire", data); - EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData, - static_cast<const uint8_t *>(renderer.getData()) + 2, - renderer.getLength() - 2, &data[2], data.size() - 2); + matchWireData(&data[2], data.size() - 2, + static_cast<const uint8_t *>(renderer.getData()) + 2, + renderer.getLength() - 2); } TEST_F(Rdata_SOA_Test, toWireBuffer) { @@ -189,9 +191,9 @@ TEST_F(Rdata_SOA_Test, toWireBuffer) { rdata_soa.toWire(obuffer); vector<unsigned char> data; UnitTestUtil::readWireData("rdata_soa_toWireUncompressed.wire", data); - EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData, - static_cast<const uint8_t *>(obuffer.getData()) + 2, - obuffer.getLength() - 2, &data[2], data.size() - 2); + matchWireData(&data[2], data.size() - 2, + static_cast<const uint8_t *>(obuffer.getData()) + 2, + obuffer.getLength() - 2); } TEST_F(Rdata_SOA_Test, toText) { |