onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-18 17:27:20 +01:00
Code Issues Releases Wiki Activity

fixed unit test; new build number 3465

Browse Source
This commit is contained in:
Vadim Kurland 2011-02-08 12:00:11 -08:00
parent 78bb5a5ba7
commit 8d7fb06891
6 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0
# build number is like "nano" version number. I am incrementing build # build number is like "nano" version number. I am incrementing build
# number during development cycle # number during development cycle
# #
BUILD_NUM="3464" BUILD_NUM="3465"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"

2
VERSION.h
View File

@ -1,2 +1,2 @@
#define VERSION "4.2.0.3464" #define VERSION "4.2.0.3465"
#define GENERATION "4.2" #define GENERATION "4.2"

2
packaging/fwbuilder-static-qt.spec
View File

@ -3,7 +3,7 @@
%define name fwbuilder %define name fwbuilder
%define version 4.2.0.3464 %define version 4.2.0.3465
%define release 1 %define release 1
%if "%_vendor" == "MandrakeSoft" %if "%_vendor" == "MandrakeSoft"

2
packaging/fwbuilder.control
View File

@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
Priority: extra Priority: extra
Section: checkinstall Section: checkinstall
Maintainer: vadim@fwbuilder.org Maintainer: vadim@fwbuilder.org
Version: 4.2.0.3464-1 Version: 4.2.0.3465-1
Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15 Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Description: Firewall Builder GUI and policy compilers Description: Firewall Builder GUI and policy compilers

2
packaging/fwbuilder.spec
View File

@ -1,6 +1,6 @@
%define name fwbuilder %define name fwbuilder
%define version 4.2.0.3464 %define version 4.2.0.3465
%define release 1 %define release 1
%if "%_vendor" == "MandrakeSoft" %if "%_vendor" == "MandrakeSoft"

31
src/unit_tests/generatedScriptTestsPF/generatedScriptTestsPF.cpp
View File

@ -326,7 +326,7 @@ void GeneratedScriptTest::ActivationCommandsTest_1()
objdb = new FWObjectDatabase(); objdb = new FWObjectDatabase();
QString res = Configlet::findConfigletInFile("activation", "pf1.fw") QString res = Configlet::findConfigletInFile("activation", "pf1.fw")
.split(QRegExp("\\s+")).join(" "); .split(QRegExp("\\s+")).join(" ");
CPPUNIT_ASSERT(res.indexOf("$PFCTL \\ -f \\ /etc/pf1.conf") != -1); CPPUNIT_ASSERT(res.indexOf("$PFCTL -f /etc/pf1.conf") != -1);
delete objdb; delete objdb;
} }
@ -335,7 +335,7 @@ void GeneratedScriptTest::ActivationCommandsTest_2()
objdb = new FWObjectDatabase(); objdb = new FWObjectDatabase();
QString res = Configlet::findConfigletInFile("activation", "ipf2-1.fw") QString res = Configlet::findConfigletInFile("activation", "ipf2-1.fw")
.split(QRegExp("\\s+")).join(" "); .split(QRegExp("\\s+")).join(" ");
CPPUNIT_ASSERT(res.indexOf("$PFCTL \\ -f \\ /etc/ipf2-1.conf") != -1); CPPUNIT_ASSERT(res.indexOf("$PFCTL -f /etc/ipf2-1.conf") != -1);
delete objdb; delete objdb;
} }
@ -344,7 +344,7 @@ void GeneratedScriptTest::ActivationCommandsTest_3()
objdb = new FWObjectDatabase(); objdb = new FWObjectDatabase();
QString res = Configlet::findConfigletInFile("activation", "ipf2-1.fw") QString res = Configlet::findConfigletInFile("activation", "ipf2-1.fw")
.split(QRegExp("\\s+")).join(" "); .split(QRegExp("\\s+")).join(" ");
CPPUNIT_ASSERT(res.indexOf("$PFCTL \\ -f \\ /etc/ipf2-1.conf") != -1); CPPUNIT_ASSERT(res.indexOf("$PFCTL -f /etc/ipf2-1.conf") != -1);
delete objdb; delete objdb;
} }
@ -353,7 +353,7 @@ void GeneratedScriptTest::ActivationCommandsTest_4()
objdb = new FWObjectDatabase(); objdb = new FWObjectDatabase();
QString res = Configlet::findConfigletInFile("activation", "pf2-1.fw") QString res = Configlet::findConfigletInFile("activation", "pf2-1.fw")
.split(QRegExp("\\s+")).join(" "); .split(QRegExp("\\s+")).join(" ");
CPPUNIT_ASSERT(res.indexOf("$PFCTL \\ -f \\ /etc/ipf2-1.conf") != -1); CPPUNIT_ASSERT(res.indexOf("$PFCTL -f /etc/ipf2-1.conf") != -1);
delete objdb; delete objdb;
} }
@ -362,7 +362,7 @@ void GeneratedScriptTest::ActivationCommandsTest_6()
objdb = new FWObjectDatabase(); objdb = new FWObjectDatabase();
QString res = Configlet::findConfigletInFile("activation", "pf3.fw") QString res = Configlet::findConfigletInFile("activation", "pf3.fw")
.split(QRegExp("\\s+")).join(" "); .split(QRegExp("\\s+")).join(" ");
CPPUNIT_ASSERT(res.indexOf("$PFCTL \\ -f \\ /etc/fw/pf3.conf") != -1); CPPUNIT_ASSERT(res.indexOf("$PFCTL -f /etc/fw/pf3.conf") != -1);
delete objdb; delete objdb;
} }
@ -377,7 +377,7 @@ void GeneratedScriptTest::ActivationCommandsTest_7()
objdb = new FWObjectDatabase(); objdb = new FWObjectDatabase();
QString res = Configlet::findConfigletInFile("activation", "pf4.fw") QString res = Configlet::findConfigletInFile("activation", "pf4.fw")
.split(QRegExp("\\s+")).join(" "); .split(QRegExp("\\s+")).join(" ");
CPPUNIT_ASSERT(res.indexOf("$PFCTL \\ -f \\ /etc/pf4.conf") != -1); CPPUNIT_ASSERT(res.indexOf("$PFCTL -f /etc/pf4.conf") != -1);
delete objdb; delete objdb;
} }
@ -386,7 +386,7 @@ void GeneratedScriptTest::ActivationCommandsTest_8()
objdb = new FWObjectDatabase(); objdb = new FWObjectDatabase();
QString res = Configlet::findConfigletInFile("activation", "pf5.fw") QString res = Configlet::findConfigletInFile("activation", "pf5.fw")
.split(QRegExp("\\s+")).join(" "); .split(QRegExp("\\s+")).join(" ");
CPPUNIT_ASSERT(res.indexOf("$PFCTL \\ -f \\ /etc/pf5.conf") != -1); CPPUNIT_ASSERT(res.indexOf("$PFCTL -f /etc/pf5.conf") != -1);
delete objdb; delete objdb;
} }
@ -395,7 +395,7 @@ void GeneratedScriptTest::ActivationCommandsTest_9()
objdb = new FWObjectDatabase(); objdb = new FWObjectDatabase();
QString res = Configlet::findConfigletInFile("activation", "/tmp/pf6.fw") QString res = Configlet::findConfigletInFile("activation", "/tmp/pf6.fw")
.split(QRegExp("\\s+")).join(" "); .split(QRegExp("\\s+")).join(" ");
CPPUNIT_ASSERT(res.indexOf("$PFCTL \\ -f \\ /etc/pf.conf") != -1); CPPUNIT_ASSERT(res.indexOf("$PFCTL -f /etc/pf.conf") != -1);
delete objdb; delete objdb;
} }
@ -404,7 +404,7 @@ void GeneratedScriptTest::ActivationCommandsTest_10()
objdb = new FWObjectDatabase(); objdb = new FWObjectDatabase();
QString res = Configlet::findConfigletInFile("activation", "tmp/pf7.fw") QString res = Configlet::findConfigletInFile("activation", "tmp/pf7.fw")
.split(QRegExp("\\s+")).join(" "); .split(QRegExp("\\s+")).join(" ");
CPPUNIT_ASSERT(res.indexOf("$PFCTL \\ -f \\ /etc/pf.conf") != -1); CPPUNIT_ASSERT(res.indexOf("$PFCTL -f /etc/pf.conf") != -1);
delete objdb; delete objdb;
} }
@ -414,13 +414,8 @@ void GeneratedScriptTest::ActivationCommandsTest_11()
QString res = Configlet::findConfigletInFile("activation", "tmp/pf8.fw", 1) QString res = Configlet::findConfigletInFile("activation", "tmp/pf8.fw", 1)
.split(QRegExp("\\s+")).join(" "); .split(QRegExp("\\s+")).join(" ");
CPPUNIT_ASSERT(res.indexOf("$PFCTL \\ -f \\ /etc/pf.conf") != -1); CPPUNIT_ASSERT(res.indexOf("$PFCTL -f /etc/pf.conf") != -1);
// find occurence #2
res = Configlet::findConfigletInFile("activation", "tmp/pf8.fw", 2)
.split(QRegExp("\\s+")).join(" ");
CPPUNIT_ASSERT(res.indexOf("$PFCTL -a anchor_1 \\ -f \\ /etc/pf-anchor_1.conf") != -1);
delete objdb; delete objdb;
} }
@ -429,12 +424,8 @@ void GeneratedScriptTest::ActivationCommandsTest_12()
objdb = new FWObjectDatabase(); objdb = new FWObjectDatabase();
QString res = Configlet::findConfigletInFile("activation", "pf9.fw", 1) QString res = Configlet::findConfigletInFile("activation", "pf9.fw", 1)
.split(QRegExp("\\s+")).join(" "); .split(QRegExp("\\s+")).join(" ");
CPPUNIT_ASSERT(res.indexOf("$PFCTL \\ -f \\ /etc/pf9.conf") != -1); CPPUNIT_ASSERT(res.indexOf("$PFCTL -f /etc/pf9.conf") != -1);
res = Configlet::findConfigletInFile("activation", "pf9.fw", 2)
.split(QRegExp("\\s+")).join(" ");
CPPUNIT_ASSERT(res.indexOf("$PFCTL -a anchor_1 \\ -f \\ /etc/pf9-anchor_1.conf") != -1);
delete objdb; delete objdb;
} }