From: Thomas Markwalder <tmark@isc.org>
Date: Wed, 23 Oct 2013 23:22:19 +0000 (-0400)
Subject: [master] Fixed unit test build issue in user check library
X-Git-Tag: bind10-1.2.0beta1-release~102^2~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea8ba75f55dceb13773d98a5836d075e231b2b6f;p=thirdparty%2Fkea.git

[master] Fixed unit test build issue in user check library

trac3186 added the user_chk hook library which had a couple of
uses of EXPECT_EQ on stl containers. Gtest 1.5 does not like this.
---

diff --git a/src/hooks/dhcp/user_chk/tests/user_unittests.cc b/src/hooks/dhcp/user_chk/tests/user_unittests.cc
index 70497113d6..2ca156cbc1 100644
--- a/src/hooks/dhcp/user_chk/tests/user_unittests.cc
+++ b/src/hooks/dhcp/user_chk/tests/user_unittests.cc
@@ -90,7 +90,7 @@ TEST(UserTest, properties) {
     EXPECT_EQ("2.0", value);
 
     const PropertyMap& map2 = user->getProperties();
-    EXPECT_EQ(map2, map);
+    EXPECT_TRUE(map2 == map);
 }
 
 } // end of anonymous namespace
diff --git a/src/hooks/dhcp/user_chk/tests/userid_unittests.cc b/src/hooks/dhcp/user_chk/tests/userid_unittests.cc
index 817e0113a2..c31c4ae876 100644
--- a/src/hooks/dhcp/user_chk/tests/userid_unittests.cc
+++ b/src/hooks/dhcp/user_chk/tests/userid_unittests.cc
@@ -55,7 +55,7 @@ TEST(UserIdTest, hwAddress_type) {
     ASSERT_NO_THROW(id.reset(new UserId(UserId::HW_ADDRESS, bytes)));
     // Verify that the id can be fetched.
     EXPECT_EQ(id->getType(), UserId::HW_ADDRESS);
-    EXPECT_EQ(bytes, id->getId());
+    EXPECT_TRUE(bytes == id->getId());
 
     // Check relational oeprators when a == b.
     UserIdPtr id2;
@@ -98,7 +98,7 @@ TEST(UserIdTest, duid_type) {
     ASSERT_NO_THROW(id.reset(new UserId(UserId::DUID, bytes)));
     // Verify that the id can be fetched.
     EXPECT_EQ(id->getType(), UserId::DUID);
-    EXPECT_EQ(bytes, id->getId());
+    EXPECT_TRUE(bytes == id->getId());
 
     // Check relational oeprators when a == b.
     UserIdPtr id2;