From 93883953b54973a0c7c67ba51786d4f96d9b4cc4 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Fri, 1 Jul 2011 13:02:00 -0700 Subject: [PATCH] upgraded .fwb files in all unit tests; fixed GroupObjectDialogTest --- .../GroupObjectDialogTest.cpp | 129 ++++++++++-------- src/unit_tests/ImporterTest/test_data/ios.fwb | 2 +- .../ImporterTest/test_data/ipt-no-nat.fwb | 2 +- src/unit_tests/ImporterTest/test_data/ipt.fwb | 2 +- src/unit_tests/ObjectManipulatorTest/test.fwb | 2 +- .../ObjectMatcherTest/test_data.fwb | 2 +- .../test_data/pf-block-return-actions.fwb | 2 +- .../test_data/pf-hosts-matches.fwb | 2 +- .../test_data/pf-icmp-matches.fwb | 2 +- .../test_data/pf-interface-matches.fwb | 2 +- .../PFImporterTest/test_data/pf-nat-rules.fwb | 2 +- .../test_data/pf-port-matches.fwb | 2 +- .../PFImporterTest/test_data/pf-rdr-rules.fwb | 2 +- .../test_data/pf-state-matches.fwb | 2 +- .../PFImporterTest/test_data/pf-tables.fwb | 2 +- .../test_data/pf-tcp-flags-matches.fwb | 2 +- .../test_data/pf-user-group-matches.fwb | 2 +- .../test_data/asa8.0-names.fwb | 2 +- .../PIXImporterTest/test_data/asa8.0.fwb | 2 +- .../test_data/asa8.3-acl-object-groups.fwb | 2 +- .../PIXImporterTest/test_data/asa8.3-acl.fwb | 2 +- .../test_data/asa8.3-objects-and-groups.fwb | 2 +- .../PIXImporterTest/test_data/asa8.3.fwb | 2 +- .../PIXImporterTest/test_data/fwsm1.fwb | 2 +- .../PIXImporterTest/test_data/pix6.fwb | 2 +- .../PIXImporterTest/test_data/pix7-nat.fwb | 2 +- .../PIXImporterTest/test_data/pix7.fwb | 2 +- src/unit_tests/RCS/zu.fwb | 2 +- .../commandLinePrintingTest/test.fwb | 2 +- src/unit_tests/compilerLibTest/test.fwb | 2 +- .../generatedScriptTestsIpfilter/test1.fwb | 2 +- .../generatedScriptTestsIpfw/test1.fwb | 2 +- .../generatedScriptTestsLinux/test1.fwb | 2 +- .../generatedScriptTestsPF/test1.fwb | 2 +- .../generatedScriptTestsSecuwall/test1.fwb | 2 +- src/unit_tests/instDialogClusterTest/test.fwb | 2 +- src/unit_tests/instDialogCompileTest/test.fwb | 2 +- src/unit_tests/instDialogInspectTest/test.fwb | 2 +- src/unit_tests/instDialogInstallTest/test.fwb | 2 +- .../instDialogObjectListTest/test.fwb | 2 +- src/unit_tests/newClusterDialogTest/test.fwb | 2 +- test/ipt/rc.firewall.local | 4 +- 42 files changed, 115 insertions(+), 98 deletions(-) diff --git a/src/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.cpp b/src/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.cpp index 70e824bcf..5f2092c06 100644 --- a/src/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.cpp +++ b/src/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.cpp @@ -89,6 +89,10 @@ void GroupObjectDialogTest::initTestCase() tcpservice = createObject("tcpservice"); tagservice = createObject("tagservice"); userservice = createObject("userservice"); + + FWObject *object_group = createObject("Object Group"); + FWObject *service_group = createObject("Service Group"); + } QPoint findItemPos(ObjectTreeViewItem *item, ObjectTreeView *tree) @@ -162,23 +166,16 @@ template FWTYPE* GroupObjectDialogTest::createObject(QString name bool checkObjectInsertion(GroupObjectDialog *dlg, Group *grp, FWObject *obj) { + qDebug() << "Trying to add object" + << obj->getName().c_str() << "(" << obj->getTypeName().c_str() << ")" + << "to group" << grp->getPath().c_str(); + dlg->insertObject(obj); + dlg->applyChanges(); + for (Group::iterator i = grp->begin(); i!= grp->end(); i++) { - if (FWObjectReference::cast(*i)->getPointer() == obj) - return true; - } - - //object was not inserted into group - return false; -} - -bool checkObjectInsertion2(GroupObjectDialog *dlg, ServiceGroup *grp, FWObject *obj) -{ - dlg->insertObject(obj); - for (ServiceGroup::iterator i = grp->begin(); i!= grp->end(); i++) - { - if (FWServiceReference::cast(*i)->getPointer() == obj) + if (FWReference::cast(*i)->getPointer() == obj) return true; } @@ -186,19 +183,30 @@ bool checkObjectInsertion2(GroupObjectDialog *dlg, ServiceGroup *grp, FWObject * return false; } +/* + * Test insertion of objects of different types into an object group + */ void GroupObjectDialogTest::testObjectGroup() { - mw->findChild("om")->findChild(QString("newObject_") + ObjectGroup::TYPENAME)->trigger(); - ObjectTreeViewItem *groupItem = dynamic_cast(mw->getCurrentObjectTree()->findItems("Object Group", Qt::MatchRecursive, 0).first()); - mw->getCurrentObjectTree()->setCurrentItem(groupItem, 0, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Clear); + ObjectTreeViewItem *groupItem = dynamic_cast( + mw->getCurrentObjectTree()->findItems( + "Object Group", Qt::MatchRecursive, 0).first()); + QVERIFY(groupItem != NULL); + + mw->getCurrentObjectTree()->setCurrentItem( + groupItem, 0, + QItemSelectionModel::SelectCurrent | QItemSelectionModel::Clear); + ObjectGroup *group = ObjectGroup::cast(groupItem->getFWObject()); QVERIFY(group != NULL); om->editObject(group); QTest::qWait(50); - GroupObjectDialog *groupdialog = mw->findChild("w_ObjectGroupDialog"); - QVERIFY(groupdialog != NULL); + GroupObjectDialog *groupdialog = mw->findChild( + "w_ObjectGroupDialog"); + + QVERIFY(groupdialog != NULL); QVERIFY(checkObjectInsertion(groupdialog, group, address)); QVERIFY(checkObjectInsertion(groupdialog, group, address6)); @@ -217,9 +225,10 @@ void GroupObjectDialogTest::testObjectGroup() QVERIFY(!checkObjectInsertion(groupdialog, group, tagservice)); QVERIFY(!checkObjectInsertion(groupdialog, group, userservice)); - - QPushButton *newButton = mw->findChild("w_ObjectGroupDialog")->findChild("newButton"); + QPushButton *newButton = mw->findChild( + "w_ObjectGroupDialog")->findChild("newButton"); QVERIFY(newButton != NULL); + QTimer::singleShot(50, this, SLOT(checkObjectGroupMenu())); QTest::mouseClick(newButton, Qt::LeftButton); } @@ -227,17 +236,18 @@ void GroupObjectDialogTest::testObjectGroup() void GroupObjectDialogTest::checkObjectGroupMenu() { QMenu *menu = mw->findChild("w_ObjectGroupDialog")->findChild("GroupObjectDialog_newObjectMenu"); + QList names; names << (QString("newObject_") + Host::TYPENAME) - << (QString("newObject_") + Firewall::TYPENAME) - << (QString("newObject_") + Cluster::TYPENAME) - << (QString("newObject_") + Network::TYPENAME) - << (QString("newObject_") + NetworkIPv6::TYPENAME) - << (QString("newObject_") + IPv4::TYPENAME) - << (QString("newObject_") + IPv6::TYPENAME) - << (QString("newObject_") + DNSName::TYPENAME) - << (QString("newObject_") + AddressRange::TYPENAME) - << (QString("newObject_") + AddressTable::TYPENAME); + << (QString("newObject_") + Firewall::TYPENAME) + << (QString("newObject_") + Cluster::TYPENAME) + << (QString("newObject_") + Network::TYPENAME) + << (QString("newObject_") + NetworkIPv6::TYPENAME) + << (QString("newObject_") + IPv4::TYPENAME) + << (QString("newObject_") + IPv6::TYPENAME) + << (QString("newObject_") + DNSName::TYPENAME) + << (QString("newObject_") + AddressRange::TYPENAME) + << (QString("newObject_") + AddressTable::TYPENAME); QList menuNames; foreach(QAction *act, menu->actions()) @@ -252,15 +262,16 @@ void GroupObjectDialogTest::checkObjectGroupMenu() void GroupObjectDialogTest::checkObjectServiceGroupMenu() { QMenu *menu = mw->findChild("w_ServiceGroupDialog")->findChild("GroupObjectDialog_newObjectMenu"); + QList names; names << (QString("newObject_") + IPService::TYPENAME) - << (QString("newObject_") + ICMPService::TYPENAME) - << (QString("newObject_") + ICMP6Service::TYPENAME) - << (QString("newObject_") + TCPService::TYPENAME) - << (QString("newObject_") + UDPService::TYPENAME) - << (QString("newObject_") + CustomService::TYPENAME) - << (QString("newObject_") + TagService::TYPENAME) - << (QString("newObject_") + UserService::TYPENAME); + << (QString("newObject_") + ICMPService::TYPENAME) + << (QString("newObject_") + ICMP6Service::TYPENAME) + << (QString("newObject_") + TCPService::TYPENAME) + << (QString("newObject_") + UDPService::TYPENAME) + << (QString("newObject_") + CustomService::TYPENAME) + << (QString("newObject_") + TagService::TYPENAME) + << (QString("newObject_") + UserService::TYPENAME); QList menuNames; foreach(QAction *act, menu->actions()) @@ -275,35 +286,41 @@ void GroupObjectDialogTest::checkObjectServiceGroupMenu() void GroupObjectDialogTest::testServiceGroup() { + ObjectTreeViewItem *groupItem = dynamic_cast( + mw->getCurrentObjectTree()->findItems( + "Service Group", Qt::MatchRecursive, 0).first()); + + mw->getCurrentObjectTree()->setCurrentItem( + groupItem, 0, + QItemSelectionModel::SelectCurrent | QItemSelectionModel::Clear); - mw->findChild("om")->findChild(QString("newObject_") + ServiceGroup::TYPENAME)->trigger(); - ObjectTreeViewItem *groupItem = dynamic_cast(mw->getCurrentObjectTree()->findItems("Service Group", Qt::MatchRecursive, 0).first()); - mw->getCurrentObjectTree()->setCurrentItem(groupItem, 0, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Clear); QVERIFY(groupItem != NULL); ServiceGroup *group = ServiceGroup::cast(groupItem->getFWObject()); QVERIFY(group != NULL); om->editObject(group); QTest::qWait(50); - GroupObjectDialog *groupdialog = mw->findChild("w_ServiceGroupDialog"); + + GroupObjectDialog *groupdialog = mw->findChild( + "w_ServiceGroupDialog"); QVERIFY(groupdialog != NULL); - QVERIFY(!checkObjectInsertion2(groupdialog, group, address)); - QVERIFY(!checkObjectInsertion2(groupdialog, group, address6)); - QVERIFY(!checkObjectInsertion2(groupdialog, group, network)); - QVERIFY(!checkObjectInsertion2(groupdialog, group, network6)); - QVERIFY(!checkObjectInsertion2(groupdialog, group, range)); - QVERIFY(!checkObjectInsertion2(groupdialog, group, table)); - QVERIFY(!checkObjectInsertion2(groupdialog, group, dns)); + QVERIFY(!checkObjectInsertion(groupdialog, group, address)); + QVERIFY(!checkObjectInsertion(groupdialog, group, address6)); + QVERIFY(!checkObjectInsertion(groupdialog, group, network)); + QVERIFY(!checkObjectInsertion(groupdialog, group, network6)); + QVERIFY(!checkObjectInsertion(groupdialog, group, range)); + QVERIFY(!checkObjectInsertion(groupdialog, group, table)); + QVERIFY(!checkObjectInsertion(groupdialog, group, dns)); - QVERIFY(checkObjectInsertion2(groupdialog, group, group)); + QVERIFY(checkObjectInsertion(groupdialog, group, group)); FWObject *objGroup = dynamic_cast(mw->getCurrentObjectTree()->findItems("Object Group", Qt::MatchRecursive, 0).first())->getFWObject(); - QVERIFY(!checkObjectInsertion2(groupdialog, group, objGroup)); - QVERIFY(checkObjectInsertion2(groupdialog, group, ipservice)); - QVERIFY(checkObjectInsertion2(groupdialog, group, icmpservice)); - QVERIFY(checkObjectInsertion2(groupdialog, group, udpservice)); - QVERIFY(checkObjectInsertion2(groupdialog, group, tcpservice)); - QVERIFY(checkObjectInsertion2(groupdialog, group, tagservice)); - QVERIFY(checkObjectInsertion2(groupdialog, group, userservice)); + QVERIFY(!checkObjectInsertion(groupdialog, group, objGroup)); + QVERIFY(checkObjectInsertion(groupdialog, group, ipservice)); + QVERIFY(checkObjectInsertion(groupdialog, group, icmpservice)); + QVERIFY(checkObjectInsertion(groupdialog, group, udpservice)); + QVERIFY(checkObjectInsertion(groupdialog, group, tcpservice)); + QVERIFY(checkObjectInsertion(groupdialog, group, tagservice)); + QVERIFY(checkObjectInsertion(groupdialog, group, userservice)); QPushButton *newButton = mw->findChild("w_ServiceGroupDialog")->findChild("newButton"); diff --git a/src/unit_tests/ImporterTest/test_data/ios.fwb b/src/unit_tests/ImporterTest/test_data/ios.fwb index ccea22bab..337e25494 100644 --- a/src/unit_tests/ImporterTest/test_data/ios.fwb +++ b/src/unit_tests/ImporterTest/test_data/ios.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/ImporterTest/test_data/ipt-no-nat.fwb b/src/unit_tests/ImporterTest/test_data/ipt-no-nat.fwb index e6e7f384a..20f4383c3 100644 --- a/src/unit_tests/ImporterTest/test_data/ipt-no-nat.fwb +++ b/src/unit_tests/ImporterTest/test_data/ipt-no-nat.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/ImporterTest/test_data/ipt.fwb b/src/unit_tests/ImporterTest/test_data/ipt.fwb index fa8949f2e..4abad8d67 100644 --- a/src/unit_tests/ImporterTest/test_data/ipt.fwb +++ b/src/unit_tests/ImporterTest/test_data/ipt.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/ObjectManipulatorTest/test.fwb b/src/unit_tests/ObjectManipulatorTest/test.fwb index 20ec89b84..c4ef7e331 100644 --- a/src/unit_tests/ObjectManipulatorTest/test.fwb +++ b/src/unit_tests/ObjectManipulatorTest/test.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/ObjectMatcherTest/test_data.fwb b/src/unit_tests/ObjectMatcherTest/test_data.fwb index aac059408..5185726a1 100644 --- a/src/unit_tests/ObjectMatcherTest/test_data.fwb +++ b/src/unit_tests/ObjectMatcherTest/test_data.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PFImporterTest/test_data/pf-block-return-actions.fwb b/src/unit_tests/PFImporterTest/test_data/pf-block-return-actions.fwb index 3ebc3a03f..debc5b42e 100644 --- a/src/unit_tests/PFImporterTest/test_data/pf-block-return-actions.fwb +++ b/src/unit_tests/PFImporterTest/test_data/pf-block-return-actions.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PFImporterTest/test_data/pf-hosts-matches.fwb b/src/unit_tests/PFImporterTest/test_data/pf-hosts-matches.fwb index 3a2398653..42da5e99a 100644 --- a/src/unit_tests/PFImporterTest/test_data/pf-hosts-matches.fwb +++ b/src/unit_tests/PFImporterTest/test_data/pf-hosts-matches.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PFImporterTest/test_data/pf-icmp-matches.fwb b/src/unit_tests/PFImporterTest/test_data/pf-icmp-matches.fwb index 7132fc205..512155ce7 100644 --- a/src/unit_tests/PFImporterTest/test_data/pf-icmp-matches.fwb +++ b/src/unit_tests/PFImporterTest/test_data/pf-icmp-matches.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PFImporterTest/test_data/pf-interface-matches.fwb b/src/unit_tests/PFImporterTest/test_data/pf-interface-matches.fwb index c3c78c57f..5d229b88c 100644 --- a/src/unit_tests/PFImporterTest/test_data/pf-interface-matches.fwb +++ b/src/unit_tests/PFImporterTest/test_data/pf-interface-matches.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PFImporterTest/test_data/pf-nat-rules.fwb b/src/unit_tests/PFImporterTest/test_data/pf-nat-rules.fwb index 9f9a0e804..4a70f3d31 100644 --- a/src/unit_tests/PFImporterTest/test_data/pf-nat-rules.fwb +++ b/src/unit_tests/PFImporterTest/test_data/pf-nat-rules.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PFImporterTest/test_data/pf-port-matches.fwb b/src/unit_tests/PFImporterTest/test_data/pf-port-matches.fwb index 82bc0ff1a..b2c0fd0ca 100644 --- a/src/unit_tests/PFImporterTest/test_data/pf-port-matches.fwb +++ b/src/unit_tests/PFImporterTest/test_data/pf-port-matches.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PFImporterTest/test_data/pf-rdr-rules.fwb b/src/unit_tests/PFImporterTest/test_data/pf-rdr-rules.fwb index d707d4293..6793af8f0 100644 --- a/src/unit_tests/PFImporterTest/test_data/pf-rdr-rules.fwb +++ b/src/unit_tests/PFImporterTest/test_data/pf-rdr-rules.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PFImporterTest/test_data/pf-state-matches.fwb b/src/unit_tests/PFImporterTest/test_data/pf-state-matches.fwb index 87a8a8253..8ebe9c020 100644 --- a/src/unit_tests/PFImporterTest/test_data/pf-state-matches.fwb +++ b/src/unit_tests/PFImporterTest/test_data/pf-state-matches.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PFImporterTest/test_data/pf-tables.fwb b/src/unit_tests/PFImporterTest/test_data/pf-tables.fwb index 6acd22f5b..34418c699 100644 --- a/src/unit_tests/PFImporterTest/test_data/pf-tables.fwb +++ b/src/unit_tests/PFImporterTest/test_data/pf-tables.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PFImporterTest/test_data/pf-tcp-flags-matches.fwb b/src/unit_tests/PFImporterTest/test_data/pf-tcp-flags-matches.fwb index 93142ad5d..2074f43a0 100644 --- a/src/unit_tests/PFImporterTest/test_data/pf-tcp-flags-matches.fwb +++ b/src/unit_tests/PFImporterTest/test_data/pf-tcp-flags-matches.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PFImporterTest/test_data/pf-user-group-matches.fwb b/src/unit_tests/PFImporterTest/test_data/pf-user-group-matches.fwb index 48197f802..48033d7bd 100644 --- a/src/unit_tests/PFImporterTest/test_data/pf-user-group-matches.fwb +++ b/src/unit_tests/PFImporterTest/test_data/pf-user-group-matches.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.0-names.fwb b/src/unit_tests/PIXImporterTest/test_data/asa8.0-names.fwb index bdc844160..84d8177b1 100644 --- a/src/unit_tests/PIXImporterTest/test_data/asa8.0-names.fwb +++ b/src/unit_tests/PIXImporterTest/test_data/asa8.0-names.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.0.fwb b/src/unit_tests/PIXImporterTest/test_data/asa8.0.fwb index 750503323..3a58522fa 100644 --- a/src/unit_tests/PIXImporterTest/test_data/asa8.0.fwb +++ b/src/unit_tests/PIXImporterTest/test_data/asa8.0.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl-object-groups.fwb b/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl-object-groups.fwb index 882225e9a..197de6e0e 100644 --- a/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl-object-groups.fwb +++ b/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl-object-groups.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.fwb b/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.fwb index 0a0ee6ed7..9687cd757 100644 --- a/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.fwb +++ b/src/unit_tests/PIXImporterTest/test_data/asa8.3-acl.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.3-objects-and-groups.fwb b/src/unit_tests/PIXImporterTest/test_data/asa8.3-objects-and-groups.fwb index 5ddd30161..146cf84ca 100644 --- a/src/unit_tests/PIXImporterTest/test_data/asa8.3-objects-and-groups.fwb +++ b/src/unit_tests/PIXImporterTest/test_data/asa8.3-objects-and-groups.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PIXImporterTest/test_data/asa8.3.fwb b/src/unit_tests/PIXImporterTest/test_data/asa8.3.fwb index 8929dab81..351ec78ce 100644 --- a/src/unit_tests/PIXImporterTest/test_data/asa8.3.fwb +++ b/src/unit_tests/PIXImporterTest/test_data/asa8.3.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PIXImporterTest/test_data/fwsm1.fwb b/src/unit_tests/PIXImporterTest/test_data/fwsm1.fwb index bddd97892..6d111b9e5 100644 --- a/src/unit_tests/PIXImporterTest/test_data/fwsm1.fwb +++ b/src/unit_tests/PIXImporterTest/test_data/fwsm1.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PIXImporterTest/test_data/pix6.fwb b/src/unit_tests/PIXImporterTest/test_data/pix6.fwb index 39d04a632..b6b5c49ea 100644 --- a/src/unit_tests/PIXImporterTest/test_data/pix6.fwb +++ b/src/unit_tests/PIXImporterTest/test_data/pix6.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PIXImporterTest/test_data/pix7-nat.fwb b/src/unit_tests/PIXImporterTest/test_data/pix7-nat.fwb index 034ebf231..5d00c3d31 100644 --- a/src/unit_tests/PIXImporterTest/test_data/pix7-nat.fwb +++ b/src/unit_tests/PIXImporterTest/test_data/pix7-nat.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/PIXImporterTest/test_data/pix7.fwb b/src/unit_tests/PIXImporterTest/test_data/pix7.fwb index 5b939676b..6b546fee1 100644 --- a/src/unit_tests/PIXImporterTest/test_data/pix7.fwb +++ b/src/unit_tests/PIXImporterTest/test_data/pix7.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/RCS/zu.fwb b/src/unit_tests/RCS/zu.fwb index e9cca5b22..f144fbfe6 100644 --- a/src/unit_tests/RCS/zu.fwb +++ b/src/unit_tests/RCS/zu.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/commandLinePrintingTest/test.fwb b/src/unit_tests/commandLinePrintingTest/test.fwb index 0e9af9e3a..4d2cfc4d6 100644 --- a/src/unit_tests/commandLinePrintingTest/test.fwb +++ b/src/unit_tests/commandLinePrintingTest/test.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/compilerLibTest/test.fwb b/src/unit_tests/compilerLibTest/test.fwb index a531b0acc..ceb1d77d0 100644 --- a/src/unit_tests/compilerLibTest/test.fwb +++ b/src/unit_tests/compilerLibTest/test.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/generatedScriptTestsIpfilter/test1.fwb b/src/unit_tests/generatedScriptTestsIpfilter/test1.fwb index b72403adf..748179416 100644 --- a/src/unit_tests/generatedScriptTestsIpfilter/test1.fwb +++ b/src/unit_tests/generatedScriptTestsIpfilter/test1.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/generatedScriptTestsIpfw/test1.fwb b/src/unit_tests/generatedScriptTestsIpfw/test1.fwb index 8bb9fa025..b5ad59f3a 100644 --- a/src/unit_tests/generatedScriptTestsIpfw/test1.fwb +++ b/src/unit_tests/generatedScriptTestsIpfw/test1.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/generatedScriptTestsLinux/test1.fwb b/src/unit_tests/generatedScriptTestsLinux/test1.fwb index b7b879084..bfea75a56 100644 --- a/src/unit_tests/generatedScriptTestsLinux/test1.fwb +++ b/src/unit_tests/generatedScriptTestsLinux/test1.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/generatedScriptTestsPF/test1.fwb b/src/unit_tests/generatedScriptTestsPF/test1.fwb index 84146c719..79604751b 100644 --- a/src/unit_tests/generatedScriptTestsPF/test1.fwb +++ b/src/unit_tests/generatedScriptTestsPF/test1.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/generatedScriptTestsSecuwall/test1.fwb b/src/unit_tests/generatedScriptTestsSecuwall/test1.fwb index b7d14a6d1..15ced1aa3 100644 --- a/src/unit_tests/generatedScriptTestsSecuwall/test1.fwb +++ b/src/unit_tests/generatedScriptTestsSecuwall/test1.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/instDialogClusterTest/test.fwb b/src/unit_tests/instDialogClusterTest/test.fwb index d70978ce1..38bd8b8e9 100644 --- a/src/unit_tests/instDialogClusterTest/test.fwb +++ b/src/unit_tests/instDialogClusterTest/test.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/instDialogCompileTest/test.fwb b/src/unit_tests/instDialogCompileTest/test.fwb index 14d893604..c544f248a 100644 --- a/src/unit_tests/instDialogCompileTest/test.fwb +++ b/src/unit_tests/instDialogCompileTest/test.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/instDialogInspectTest/test.fwb b/src/unit_tests/instDialogInspectTest/test.fwb index 43f967040..47d637c73 100644 --- a/src/unit_tests/instDialogInspectTest/test.fwb +++ b/src/unit_tests/instDialogInspectTest/test.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/instDialogInstallTest/test.fwb b/src/unit_tests/instDialogInstallTest/test.fwb index d70978ce1..38bd8b8e9 100644 --- a/src/unit_tests/instDialogInstallTest/test.fwb +++ b/src/unit_tests/instDialogInstallTest/test.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/instDialogObjectListTest/test.fwb b/src/unit_tests/instDialogObjectListTest/test.fwb index 26a46c669..15bdd47c9 100644 --- a/src/unit_tests/instDialogObjectListTest/test.fwb +++ b/src/unit_tests/instDialogObjectListTest/test.fwb @@ -1,6 +1,6 @@ - + diff --git a/src/unit_tests/newClusterDialogTest/test.fwb b/src/unit_tests/newClusterDialogTest/test.fwb index ac230777d..c59e927d5 100644 --- a/src/unit_tests/newClusterDialogTest/test.fwb +++ b/src/unit_tests/newClusterDialogTest/test.fwb @@ -1,6 +1,6 @@ - + diff --git a/test/ipt/rc.firewall.local b/test/ipt/rc.firewall.local index b515af668..e16b11f9c 100755 --- a/test/ipt/rc.firewall.local +++ b/test/ipt/rc.firewall.local @@ -2,9 +2,9 @@ # # This is automatically generated file. DO NOT MODIFY ! # -# Firewall Builder fwb_ipt v5.0.0.3547 +# Firewall Builder fwb_ipt v5.0.0.3555 # -# Generated Sun Jun 5 20:10:11 2011 PDT by vadim +# Generated Wed Jun 29 22:49:14 2011 PDT by vadim # # files: * rc.firewall.local /etc/rc.d//rc.firewall.local #