From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 8 Aug 2011 00:38:41 +0000 (+1200)
Subject: Revert rev.11620. Fix unit tests instead of dropping.
X-Git-Tag: take08~55^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27f1960077b4fd2ec8abae313080fb1d3ca52dfe;p=thirdparty%2Fsquid.git

Revert rev.11620. Fix unit tests instead of dropping.

Rather than dropping the unit tests if IPv4 state change them to match
the new assumptions that a fresh initialized address object is IPv6-only.
---

diff --git a/src/ip/testAddress.cc b/src/ip/testAddress.cc
index 8be2ceb06e..310d201ee8 100644
--- a/src/ip/testAddress.cc
+++ b/src/ip/testAddress.cc
@@ -41,6 +41,7 @@ testIpAddress::testDefaults()
     /* test stored values */
     CPPUNIT_ASSERT( anIPA.IsAnyAddr() );
     CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
+    CPPUNIT_ASSERT( !anIPA.IsIPv4() );
     CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
     CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );
     CPPUNIT_ASSERT( anIPA.IsIPv6() );
@@ -296,6 +297,7 @@ testIpAddress::testSetEmpty()
     /* test stored values after empty */
     CPPUNIT_ASSERT( anIPA.IsAnyAddr() );
     CPPUNIT_ASSERT( !anIPA.IsNoAddr() );
+    CPPUNIT_ASSERT( !anIPA.IsIPv4() );
     CPPUNIT_ASSERT( anIPA.IsIPv6() );
     CPPUNIT_ASSERT( !anIPA.IsSockAddr() );
     CPPUNIT_ASSERT_EQUAL( (u_short) 0 , anIPA.GetPort() );