BIND 10 trac3200, updated. e135eb799810f5671b622a2e5d5e4bedf545c049 [3200] Pass error message as a parameter of AssertionFailure.

[BIND 10 source code commits]

The branch, trac3200 has been updated
       via  e135eb799810f5671b622a2e5d5e4bedf545c049 (commit)
      from  1bbab8c3c1d12e1a7aaa2e2fc36ab4fc5653c92e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e135eb799810f5671b622a2e5d5e4bedf545c049
Author: Marcin Siodelski <marcin at isc.org>
Date:   Tue Oct 22 17:09:22 2013 +0200

    [3200] Pass error message as a parameter of AssertionFailure.

-----------------------------------------------------------------------

Summary of changes:
 src/bin/dhcp4/tests/dhcp4_test_utils.cc |   42 ++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 14 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp4/tests/dhcp4_test_utils.cc b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
index 471e0be..ad1ae38 100644
--- a/src/bin/dhcp4/tests/dhcp4_test_utils.cc
+++ b/src/bin/dhcp4/tests/dhcp4_test_utils.cc
@@ -137,19 +137,24 @@ Dhcpv4SrvTest::basicOptionsPresent(const Pkt4Ptr& pkt) {
     std::ostringstream errmsg;
     errmsg << "option missing in the response";
     if (!pkt->getOption(DHO_DOMAIN_NAME)) {
-        return (::testing::AssertionFailure() << "domain-name " << errmsg);
+        return (::testing::AssertionFailure(::testing::Message()
+                                            << "domain-name " << errmsg));
 
     } else if (!pkt->getOption(DHO_DOMAIN_NAME_SERVERS)) {
-        return (::testing::AssertionFailure() << "dns-servers " << errmsg);
+        return (::testing::AssertionFailure(::testing::Message()
+                                            << "dns-servers " << errmsg));
 
     } else if (!pkt->getOption(DHO_SUBNET_MASK)) {
-        return (::testing::AssertionFailure() << "subnet-mask " << errmsg);
+        return (::testing::AssertionFailure(::testing::Message()
+                                            << "subnet-mask " << errmsg));
 
     } else if (!pkt->getOption(DHO_ROUTERS)) {
-        return (::testing::AssertionFailure() << "routers " << errmsg);
+        return (::testing::AssertionFailure(::testing::Message() << "routers "
+                                            << errmsg));
 
     } else if (!pkt->getOption(DHO_DHCP_LEASE_TIME)) {
-        return (::testing::AssertionFailure() << "dhcp-lease-time " << errmsg);
+        return (::testing::AssertionFailure(::testing::Message() <<
+                                            "dhcp-lease-time " << errmsg));
 
     }
     return (::testing::AssertionSuccess());
@@ -161,19 +166,24 @@ Dhcpv4SrvTest::noBasicOptions(const Pkt4Ptr& pkt) {
     std::ostringstream errmsg;
     errmsg << "option present in the response";
     if (pkt->getOption(DHO_DOMAIN_NAME)) {
-        return (::testing::AssertionFailure() << "domain-name " << errmsg);
+        return (::testing::AssertionFailure(::testing::Message()
+                                            << "domain-name " << errmsg));
 
     } else if (pkt->getOption(DHO_DOMAIN_NAME_SERVERS)) {
-        return (::testing::AssertionFailure() << "dns-servers " << errmsg);
+        return (::testing::AssertionFailure(::testing::Message()
+                                            << "dns-servers " << errmsg));
 
     } else if (pkt->getOption(DHO_SUBNET_MASK)) {
-        return (::testing::AssertionFailure() << "subnet-mask " << errmsg);
+        return (::testing::AssertionFailure(::testing::Message()
+                                            << "subnet-mask " << errmsg));
 
     } else if (pkt->getOption(DHO_ROUTERS)) {
-        return (::testing::AssertionFailure() << "routers " << errmsg);
+        return (::testing::AssertionFailure(::testing::Message() << "routers "
+                                            << errmsg));
 
     } else if (pkt->getOption(DHO_DHCP_LEASE_TIME)) {
-        return (::testing::AssertionFailure() << "dhcp-lease-time " << errmsg);
+        return (::testing::AssertionFailure(::testing::Message()
+                                            << "dhcp-lease-time " << errmsg));
 
     }
     return (::testing::AssertionSuccess());
@@ -184,10 +194,12 @@ Dhcpv4SrvTest::requestedOptionsPresent(const Pkt4Ptr& pkt) {
     std::ostringstream errmsg;
     errmsg << "option missing in the response";
     if (!pkt->getOption(DHO_LOG_SERVERS)) {
-        return (::testing::AssertionFailure() << "log-servers " << errmsg);
+        return (::testing::AssertionFailure(::testing::Message()
+                                            << "log-servers " << errmsg));
 
     } else if (!pkt->getOption(DHO_COOKIE_SERVERS)) {
-        return (::testing::AssertionFailure() << "cookie-servers " << errmsg);
+        return (::testing::AssertionFailure(::testing::Message()
+                                            << "cookie-servers " << errmsg));
 
     }
     return (::testing::AssertionSuccess());
@@ -198,10 +210,12 @@ Dhcpv4SrvTest::noRequestedOptions(const Pkt4Ptr& pkt) {
     std::ostringstream errmsg;
     errmsg << "option present in the response";
     if (pkt->getOption(DHO_LOG_SERVERS)) {
-        return (::testing::AssertionFailure() << "log-servers " << errmsg);
+        return (::testing::AssertionFailure(::testing::Message()
+                                            << "log-servers " << errmsg));
 
     } else if (pkt->getOption(DHO_COOKIE_SERVERS)) {
-        return (::testing::AssertionFailure() << "cookie-servers " << errmsg);
+        return (::testing::AssertionFailure(::testing::Message()
+                                            << "cookie-servers " << errmsg));
 
     }
     return (::testing::AssertionSuccess());