From: Tomek Mrugalski <tomasz@isc.org>
Date: Mon, 1 Oct 2012 16:05:44 +0000 (+0200)
Subject: [master] Test fix for ambiguous IPv6 notation (ending with :0 vs ::)
X-Git-Tag: trac2402_base~5^2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5811cdff640338babcf1ca0b4cfc7a06580a4f5;p=thirdparty%2Fkea.git

[master] Test fix for ambiguous IPv6 notation (ending with :0 vs ::)
---

diff --git a/src/lib/dhcp/tests/addr_utilities_unittest.cc b/src/lib/dhcp/tests/addr_utilities_unittest.cc
index 46207b29db..838282739f 100644
--- a/src/lib/dhcp/tests/addr_utilities_unittest.cc
+++ b/src/lib/dhcp/tests/addr_utilities_unittest.cc
@@ -64,15 +64,15 @@ TEST(Pool6Test, lastAddrInPrefix) {
 }
 
 TEST(Pool6Test, firstAddrInPrefix) {
-    IOAddress addr1("2001:db8:1:1234:5678:abcd:1234:beef");
+    IOAddress addr1("2001:db8:1:1234:5678:1234:abcd:beef");
 
     // Prefixes rounded to nibbles are easy...
-    EXPECT_EQ("2001:db8:1:1234:5678:abcd:1234:0",
-              firstAddrInPrefix(addr1, 112).toText());
-    EXPECT_EQ("2001:db8:1:1234:5678:abcd:1230:0",
-              firstAddrInPrefix(addr1, 108).toText());
-    EXPECT_EQ("2001:db8:1:1234:5678:abcd:1200:0",
-              firstAddrInPrefix(addr1, 104).toText());
+    EXPECT_EQ("2001:db8:1:1234:5678:1234::",
+              firstAddrInPrefix(addr1, 96).toText());
+    EXPECT_EQ("2001:db8:1:1234:5678:1230::",
+              firstAddrInPrefix(addr1, 92).toText());
+    EXPECT_EQ("2001:db8:1:1234:5678:1200::",
+              firstAddrInPrefix(addr1, 88).toText());
     EXPECT_EQ("2001:db8:1:1234::",
               firstAddrInPrefix(addr1, 64).toText());