[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, develo
Brought to you by:
mikehorn
From: <gi...@ir...> - 2011-03-13 05:03:18
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Firewall Builder GUI and Policy Compilers Open Source Code". The branch, development has been updated via fcafb30adef55751d18307c39af05090a9808c5c (commit) from b7a018b2d750bfeac021adb1df91832b4fb3c419 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fcafb30adef55751d18307c39af05090a9808c5c Author: Vadim Kurland <va...@sl...> Date: Sat Mar 12 21:14:31 2011 -0800 see #2209 fixing another place where rule object was added to the second parent diff --git a/src/unit_tests/UsageResolverTest/UsageResolverTest.cpp b/src/unit_tests/UsageResolverTest/UsageResolverTest.cpp index 9ef6775..edeceaa 100644 --- a/src/unit_tests/UsageResolverTest/UsageResolverTest.cpp +++ b/src/unit_tests/UsageResolverTest/UsageResolverTest.cpp @@ -75,7 +75,6 @@ void UsageResolverTest::setUp() grp1->setName("Group 1"); grp2->setName("Group 2"); grp3->setName("Group 3"); - grp1->addRef(addr1); addToLib(grp1); addToLib(grp2); @@ -83,11 +82,11 @@ void UsageResolverTest::setUp() // addr1 belongs to grp1 // addr2 belongs to grp2 - // grp2 belongs to grp1 - grp1->add(addr1); - grp2->add(addr2); - grp2->add(grp1); - grp3->add(grp2); + // grp1 belongs to grp2 + grp1->addRef(addr1); + grp2->addRef(addr2); + grp2->addRef(grp1); + grp3->addRef(grp2); Policy *policy = fw1->getPolicy(); PolicyRule *rule; @@ -147,7 +146,12 @@ void UsageResolverTest::setUp() } - +/* + * addr1 is found in: + * - system group "Addresses" + * - group grp1 + * - rule 1 of firewall 1 + */ void UsageResolverTest::findWhereObjectIsUsed() { // db->dump(true, true); @@ -155,7 +159,7 @@ void UsageResolverTest::findWhereObjectIsUsed() set<FWObject*> res; db->findWhereObjectIsUsed(addr1, db, res); - CPPUNIT_ASSERT(res.size() == 4); + CPPUNIT_ASSERT(res.size() == 3); set<FWObject*>::iterator iter = res.begin(); while (iter!=res.end()) @@ -166,16 +170,27 @@ void UsageResolverTest::findWhereObjectIsUsed() if (FWReference::cast(obj)) { - // if we get reference, the parent must be rule element + // if we get reference, the parent must be rule element or user group obj = obj->getParent(); - CPPUNIT_ASSERT(obj->getTypeName() == RuleElementSrc::TYPENAME || obj->getTypeName() == ObjectGroup::TYPENAME); - CPPUNIT_ASSERT(obj->getParent()->getName() == "PolicyRule 1 of Firewall 1" || obj->getParent()->getName() == "Group 2"); + + CPPUNIT_ASSERT( + obj->getTypeName() == RuleElementSrc::TYPENAME || + obj->getTypeName() == ObjectGroup::TYPENAME); + + if (RuleElementSrc::isA(obj)) + { + CPPUNIT_ASSERT(obj->getParent()->getName() == "PolicyRule 1 of Firewall 1"); + } + + if (ObjectGroup::isA(obj)) + { + CPPUNIT_ASSERT(obj->getName() == "Group 1"); + } + } else { - // otherwise we should get the group grp1 or - // system folder "Addresses" - CPPUNIT_ASSERT(name == "Group 1" || - name == "Addresses" ); + // otherwise we should get system folder "Addresses" + CPPUNIT_ASSERT(name == "Addresses" ); } iter++; } ----------------------------------------------------------------------- Summary of changes: .../UsageResolverTest/UsageResolverTest.cpp | 45 +++++++++++++------- 1 files changed, 30 insertions(+), 15 deletions(-) hooks/post-receive -- Firewall Builder GUI and Policy Compilers Open Source Code |