From 9a2a1d6e838fbe36f61be5dca94c5612e9c21c3c Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Mon, 1 Aug 2011 13:00:31 -0700 Subject: [PATCH] changelog update; fixed unit test ObjectMatcherTest --- doc/ChangeLog | 10 ++++++++++ src/unit_tests/ObjectMatcherTest/ObjectMatcherTest.cpp | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 59524a58f..b9d8731c5 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,13 @@ +2011-08-01 Vadim Kurland + + * unit_tests/ObjectMatcherTest/ObjectMatcherTest.cpp (matchTest): + fixed unit test (ObjectMatcher matches ipv6 only when internal + flag is set accordingly) + +2011-07-28 vadim + + * version 5.0.0. release + 2011-07-22 vadim * ObjectManipulator.h (QWidget): see #2622 "Remove Back and diff --git a/src/unit_tests/ObjectMatcherTest/ObjectMatcherTest.cpp b/src/unit_tests/ObjectMatcherTest/ObjectMatcherTest.cpp index 4735b1198..cbe7fdf59 100644 --- a/src/unit_tests/ObjectMatcherTest/ObjectMatcherTest.cpp +++ b/src/unit_tests/ObjectMatcherTest/ObjectMatcherTest.cpp @@ -121,7 +121,11 @@ void ObjectMatcherTest::matchTest() CPPUNIT_ASSERT(om.dispatch(fw1_eth1, fw1)); CPPUNIT_ASSERT(om.dispatch(fw1_eth0, fw1_eth0)); - CPPUNIT_ASSERT(om.dispatch(fw1_eth2_ipv6, fw1)); + CPPUNIT_ASSERT( ! om.dispatch(fw1_eth2_ipv6, fw1)); + om.setIPV6(true); + CPPUNIT_ASSERT( om.dispatch(fw1_eth2_ipv6, fw1)); + om.setIPV6(false); + CPPUNIT_ASSERT(om.dispatch(fw1_eth2_mac, fw1)); CPPUNIT_ASSERT(om.dispatch(host1_eth0, fw1));