From: Thomas Markwalder <tmark@isc.org>
Date: Mon, 2 Dec 2013 13:18:00 +0000 (-0500)
Subject: [3087] Minor corrections for D2 unit tests
X-Git-Tag: bind10-1.2.0beta1-release~102^2~9^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6782bcbb2c658aecf68902af6f50f07cf04cf2f2;p=thirdparty%2Fkea.git

[3087] Minor corrections for D2 unit tests

Addressed minor compilation issues in nc_trans_unittests.cc under
FreeBSD.
---

diff --git a/src/bin/d2/tests/nc_trans_unittests.cc b/src/bin/d2/tests/nc_trans_unittests.cc
index 5896eb46bf..d83b1ec4ef 100644
--- a/src/bin/d2/tests/nc_trans_unittests.cc
+++ b/src/bin/d2/tests/nc_trans_unittests.cc
@@ -261,6 +261,10 @@ public:
     using NameChangeTransaction::sendUpdate;
 };
 
+// Declare them so Gtest can see them.
+const int NameChangeStub::DOING_UPDATE_ST;
+const int NameChangeStub::SEND_UPDATE_EVT;
+
 typedef boost::shared_ptr<asio::ip::udp::socket> SocketPtr;
 
 /// @brief This class simulates a DNS server.  It is capable of performing
@@ -994,7 +998,7 @@ TEST_F(NameChangeTransactionTest, sendUpdateDoUpdateFailure) {
 
 /// @brief Tests sendUpdate method when underlying doUpdate times out.
 TEST_F(NameChangeTransactionTest, sendUpdateTimeout) {
-    log::initLogger();
+    isc::log::initLogger();
     NameChangeStubPtr name_change;
     ASSERT_NO_THROW(name_change = makeCannedTransaction());
     ASSERT_NO_THROW(name_change->initDictionaries());
@@ -1031,7 +1035,7 @@ TEST_F(NameChangeTransactionTest, sendUpdateTimeout) {
 /// @brief Tests sendUpdate method when it receives a corrupt respons from
 /// the server.
 TEST_F(NameChangeTransactionTest, sendUpdateCorruptResponse) {
-    log::initLogger();
+    isc::log::initLogger();
     NameChangeStubPtr name_change;
     ASSERT_NO_THROW(name_change = makeCannedTransaction());
     ASSERT_NO_THROW(name_change->initDictionaries());
@@ -1071,7 +1075,7 @@ TEST_F(NameChangeTransactionTest, sendUpdateCorruptResponse) {
 
 /// @brief Tests sendUpdate method when the exchange succeeds.
 TEST_F(NameChangeTransactionTest, sendUpdate) {
-    log::initLogger();
+    isc::log::initLogger();
     NameChangeStubPtr name_change;
     ASSERT_NO_THROW(name_change = makeCannedTransaction());
     ASSERT_NO_THROW(name_change->initDictionaries());