diff --git a/src/unit_tests/ImporterTest/test_data/ios.fwb b/src/unit_tests/ImporterTest/test_data/ios.fwb index 13fea14b4..ccea22bab 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 74b3180c0..e6e7f384a 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 @@ - + @@ -487,7 +487,6 @@ - @@ -509,7 +508,6 @@ - diff --git a/src/unit_tests/ImporterTest/test_data/ipt.fwb b/src/unit_tests/ImporterTest/test_data/ipt.fwb index c73daa1e8..82b07f57d 100644 --- a/src/unit_tests/ImporterTest/test_data/ipt.fwb +++ b/src/unit_tests/ImporterTest/test_data/ipt.fwb @@ -1,6 +1,6 @@ - + @@ -1310,7 +1310,6 @@ - @@ -1332,7 +1331,6 @@ - @@ -1354,7 +1352,6 @@ - @@ -1376,7 +1373,6 @@ - @@ -1418,7 +1414,6 @@ - @@ -1440,7 +1435,6 @@ - @@ -1462,7 +1456,6 @@ - @@ -1841,7 +1834,6 @@ - @@ -3104,7 +3096,6 @@ - @@ -3126,7 +3117,6 @@ - @@ -3148,7 +3138,6 @@ - @@ -3170,7 +3159,6 @@ - @@ -3192,7 +3180,8 @@ - + + @@ -3214,7 +3203,8 @@ - + + @@ -3237,7 +3227,6 @@ - @@ -3260,7 +3249,6 @@ - @@ -3888,7 +3876,7 @@ - + @@ -3905,15 +3893,15 @@ - + - + @@ -3930,8 +3918,8 @@ - + @@ -3984,7 +3972,7 @@ - + @@ -4001,13 +3989,13 @@ - + - + @@ -4024,13 +4012,13 @@ - + - + @@ -4047,13 +4035,13 @@ - + - + @@ -4070,12 +4058,12 @@ - + - + @@ -4092,14 +4080,14 @@ - + - + @@ -4122,10 +4110,11 @@ + - + @@ -4148,6 +4137,7 @@ + diff --git a/src/unit_tests/ObjectManipulatorTest/test.fwb b/src/unit_tests/ObjectManipulatorTest/test.fwb index 88b28d5a4..20ec89b84 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 28623b210..aac059408 100644 --- a/src/unit_tests/ObjectMatcherTest/test_data.fwb +++ b/src/unit_tests/ObjectMatcherTest/test_data.fwb @@ -1,6 +1,6 @@ - + @@ -28,9 +28,9 @@ - + + @@ -46,9 +46,9 @@ - + + 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 f724c0023..bdc844160 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 6a333f3d0..750503323 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 2dc8c7dcd..882225e9a 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 c672ff8d6..0a0ee6ed7 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 702f79a95..5ddd30161 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 31759d22b..8929dab81 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 5705ef02e..bddd97892 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 74dffe476..39d04a632 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 9cfe9fd3d..034ebf231 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 6679103c7..5b939676b 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 8c29f051f..e9cca5b22 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/RuleSetViewContextMenuTest/RuleSetViewContextMenuTest.cpp b/src/unit_tests/RuleSetViewContextMenuTest/RuleSetViewContextMenuTest.cpp index b8480316b..ebfd826c5 100644 --- a/src/unit_tests/RuleSetViewContextMenuTest/RuleSetViewContextMenuTest.cpp +++ b/src/unit_tests/RuleSetViewContextMenuTest/RuleSetViewContextMenuTest.cpp @@ -243,7 +243,7 @@ void RuleSetViewContextMenuTest::verifyMenu(int column) << "Disable Rule" << "Compile rule"; } - if (column > 0 && column < 5 || column == 7) + if (column > 0 && (column < 5 || column == 7)) { names << "Edit" << "Copy" << "Cut" << "Paste" << "Delete"<< "Where used" @@ -264,11 +264,8 @@ void RuleSetViewContextMenuTest::verifyMenu(int column) possibleItems["Reject"] = getActionNameForPlatform(firewall, PolicyRule::getActionAsString(PolicyRule::Reject)); possibleItems["Accounting"] = getActionNameForPlatform(firewall, PolicyRule::getActionAsString(PolicyRule::Accounting)); possibleItems["Pipe"] = getActionNameForPlatform(firewall, PolicyRule::getActionAsString(PolicyRule::Pipe)); - possibleItems["Tag"] = getActionNameForPlatform(firewall, PolicyRule::getActionAsString(PolicyRule::Tag)); - possibleItems["Classify"] = getActionNameForPlatform(firewall, PolicyRule::getActionAsString(PolicyRule::Classify)); possibleItems["Custom"] = getActionNameForPlatform(firewall, PolicyRule::getActionAsString(PolicyRule::Custom)); possibleItems["Branch"] = getActionNameForPlatform(firewall, PolicyRule::getActionAsString(PolicyRule::Branch)); - possibleItems["Route"] = getActionNameForPlatform(firewall, PolicyRule::getActionAsString(PolicyRule::Route)); possibleItems["Continue"] = getActionNameForPlatform(firewall, PolicyRule::getActionAsString(PolicyRule::Continue)); string currentPlatform = firewall->getStr("platform"); foreach(QString item, order) diff --git a/src/unit_tests/commandLinePrintingTest/test.fwb b/src/unit_tests/commandLinePrintingTest/test.fwb index 482e57edb..0e9af9e3a 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 a1c282eea..a531b0acc 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 f8d251d0c..b72403adf 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 032850839..8bb9fa025 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 4a2df0cc0..b7b879084 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 5600d446a..84146c719 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 6203be92e..b7d14a6d1 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 05f97f664..d70978ce1 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 24f327ca4..14d893604 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 e884b9ca2..43f967040 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 05f97f664..d70978ce1 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 51607535b..26a46c669 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 eec1e65e1..ac230777d 100644 --- a/src/unit_tests/newClusterDialogTest/test.fwb +++ b/src/unit_tests/newClusterDialogTest/test.fwb @@ -1,6 +1,6 @@ - + @@ -410,7 +410,7 @@ - + @@ -427,8 +427,11 @@ + + +