onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-23 19:57:21 +01:00
Code Issues Releases Wiki Activity

making unit tests work in merged fwbuilder/libfwbuilder

Browse Source
This commit is contained in:
Vadim Kurland 2010-12-27 13:10:11 -08:00
parent 9a4e29aff4
commit 5fb3c6634d
14 changed files with 95 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/unit_tests/AddressTableTest/AddressTableTest.pro
View File

@ -1,21 +1,19 @@
include(../../../../qmake.inc)
include(../../../qmake.inc)
QT -= core \
gui
QMAKE_CXXFLAGS += $$CPPUNIT_CFLAGS
LIBS += $$CPPUNIT_LIBS
QT -= core gui
TARGET = AddressTableTest
CONFIG += console
CONFIG -= app_bundle
TEMPLATE = app
SOURCES += main.cpp \
AddressTableTest.cpp
QMAKE_CXXFLAGS += $$CPPUNIT_CFLAGS
LIBS += $$CPPUNIT_LIBS
SOURCES += main.cpp AddressTableTest.cpp
HEADERS += AddressTableTest.h
INCLUDEPATH += ../../..
LIBS += -L ../.. -lfwbuilder
INCLUDEPATH += ../../libfwbuilder/src
LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a
run_tests.commands = echo "Running tests..." && ./${TARGET}
run_tests.depends = all
clean_tests.depends = clean

3
src/unit_tests/AddressTableTest/main.cpp
View File

@ -26,8 +26,9 @@
#include <cppunit/ui/text/TestRunner.h>
#include <cppunit/CompilerOutputter.h>
#include "AddressTableTest.h"
#include "fwbuilder/FWObjectDatabase.h"
#include <string>
#include "FWObjectDatabase.h"
int fwbdebug = 0;
std::string platform;

6
src/unit_tests/DNSTest/DNSTest.h
View File

@ -29,8 +29,10 @@
#include <cppunit/TestCase.h>
#include <cppunit/TestSuite.h>
#include <cppunit/TestCaller.h>
#include "FWObjectDatabase.h"
#include "FWObject.h"
#include "fwbuilder/FWObjectDatabase.h"
#include "fwbuilder/FWObject.h"
class DNSTest : public CppUnit::TestCase
{

20
src/unit_tests/DNSTest/DNSTest.pro
View File

@ -1,23 +1,21 @@
include(../../../../qmake.inc)
include(../../../qmake.inc)
QT -= core \
gui
QMAKE_CXXFLAGS += $$CPPUNIT_CFLAGS
LIBS += $$CPPUNIT_LIBS
QT -= core gui
TARGET = DNSTest
CONFIG += console
CONFIG -= app_bundle
TEMPLATE = app
SOURCES += main.cpp \
DNSTest.cpp
QMAKE_CXXFLAGS += $$CPPUNIT_CFLAGS
LIBS += $$CPPUNIT_LIBS
SOURCES += main.cpp DNSTest.cpp
HEADERS += DNSTest.h
INCLUDEPATH += ../../..
LIBS += -L ../.. -lfwbuilder
INCLUDEPATH += ../../libfwbuilder/src
LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a
run_tests.commands = echo "Running tests..." && ./${TARGET}
run_tests.depends = all
clean_tests.depends = clean
build_tests.depends = all
QMAKE_EXTRA_TARGETS += run_tests clean_tests build_tests
QMAKE_EXTRA_TARGETS += run_tests clean_tests build_tests

3
src/unit_tests/DNSTest/main.cpp
View File

@ -26,8 +26,9 @@
#include <cppunit/ui/text/TestRunner.h>
#include <cppunit/CompilerOutputter.h>
#include "DNSTest.h"
#include "fwbuilder/FWObjectDatabase.h"
#include <string>
#include "FWObjectDatabase.h"
int fwbdebug = 0;
std::string platform;

2
src/unit_tests/FWObjectTest/FWObjectTest.cpp
View File

@ -38,7 +38,7 @@
#include "fwbuilder/AddressRange.h"
#include "fwbuilder/Host.h"
#include "fwbuilder/Firewall.h"
#include "Group.h"
#include "fwbuilder/Group.h"
using namespace libfwbuilder;
using namespace std;

6
src/unit_tests/FWObjectTest/FWObjectTest.pro
View File

@ -1,4 +1,4 @@
include(../../../../qmake.inc)
include(../../../qmake.inc)
QT -= core gui
@ -11,8 +11,8 @@ LIBS += $$CPPUNIT_LIBS
SOURCES += main.cpp FWObjectTest.cpp
HEADERS += FWObjectTest.h
INCLUDEPATH += ../../..
LIBS += -L../.. -lfwbuilder -lcppunit
INCLUDEPATH += ../../libfwbuilder/src
LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a
run_tests.commands = echo "Running tests..." && ./${TARGET}
run_tests.depends = all
clean_tests.depends = clean

3
src/unit_tests/FWObjectTest/main.cpp
View File

@ -26,7 +26,8 @@
#include <cppunit/ui/text/TestRunner.h>
#include <cppunit/CompilerOutputter.h>
#include "FWObjectTest.h"
#include "FWObjectDatabase.h"
#include "fwbuilder/FWObjectDatabase.h"
#include <string>
using namespace libfwbuilder;

20
src/unit_tests/Inet6AddrMaskTest/Inet6AddrMaskTest.pro
View File

@ -1,22 +1,20 @@
include(../../../../qmake.inc)
include(../../../qmake.inc)
QT -= core \
gui
QMAKE_CXXFLAGS += $$CPPUNIT_CFLAGS
LIBS += $$CPPUNIT_LIBS
QT -= core gui
TARGET = Inet6AddrMaskTest
CONFIG += console
CONFIG -= app_bundle
TEMPLATE = app
SOURCES += main.cpp \
Inet6AddrMaskTest.cpp
QMAKE_CXXFLAGS += $$CPPUNIT_CFLAGS
LIBS += $$CPPUNIT_LIBS
SOURCES += main.cpp Inet6AddrMaskTest.cpp
HEADERS += Inet6AddrMaskTest.h
INCLUDEPATH += ../../..
LIBS += -L ../.. -lfwbuilder
INCLUDEPATH += ../../libfwbuilder/src
LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a
run_tests.commands = echo "Running tests..." && ./${TARGET}
run_tests.depends = all
clean_tests.depends = clean
build_tests.depends = all
QMAKE_EXTRA_TARGETS += run_tests clean_tests build_tests
QMAKE_EXTRA_TARGETS += run_tests clean_tests build_tests

18
src/unit_tests/InetAddrMaskTest/InetAddrMaskTest.pro
View File

@ -1,20 +1,18 @@
include(../../../../qmake.inc)
include(../../../qmake.inc)
QT -= core \
gui
QMAKE_CXXFLAGS += $$CPPUNIT_CFLAGS
LIBS += $$CPPUNIT_LIBS
QT -= core gui
TARGET = InetAddrMaskTest
CONFIG += console
CONFIG -= app_bundle
TEMPLATE = app
SOURCES += main.cpp \
InetAddrMaskTest.cpp
QMAKE_CXXFLAGS += $$CPPUNIT_CFLAGS
LIBS += $$CPPUNIT_LIBS
SOURCES += main.cpp InetAddrMaskTest.cpp
HEADERS += InetAddrMaskTest.h
INCLUDEPATH += ../../..
LIBS += -L ../.. -lfwbuilder
INCLUDEPATH += ../../libfwbuilder/src
LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a
run_tests.commands = echo "Running tests..." && ./${TARGET}
run_tests.depends = all
clean_tests.depends = clean

2
src/unit_tests/ObjectMatcherTest/ObjectMatcherTest.cpp
View File

@ -63,7 +63,7 @@ void ObjectMatcherTest::matchTest()
FWObjectDatabase *db = new FWObjectDatabase();
XMLTools::UpgradePredicate up;
db->load(string("test_data.fwb"), &up, string(LIBFWBUILDER_TEMPLATE_DIR));
db->load(string("test_data.fwb"), &up, string(RES_DIR));
ObjectMatcher om;
om.setRecognizeBroadcasts(true);

6
src/unit_tests/ObjectMatcherTest/ObjectMatcherTest.pro
View File

@ -1,4 +1,4 @@
include(../../../../qmake.inc)
include(../../../qmake.inc)
QT -= core gui
@ -11,8 +11,8 @@ LIBS += $$CPPUNIT_LIBS
SOURCES += main.cpp ObjectMatcherTest.cpp
HEADERS += ObjectMatcherTest.h
INCLUDEPATH += ../../..
LIBS += -L../.. -lfwbuilder
INCLUDEPATH += ../../libfwbuilder/src
LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a
run_tests.commands = echo "Running tests..." && ./${TARGET}
run_tests.depends = all
clean_tests.depends = clean

2
src/unit_tests/ObjectMatcherTest/main.cpp
View File

@ -26,7 +26,7 @@
#include <cppunit/ui/text/TestRunner.h>
#include <cppunit/CompilerOutputter.h>
#include "ObjectMatcherTest.h"
#include "FWObjectDatabase.h"
#include "fwbuilder/FWObjectDatabase.h"
#include <string>
using namespace libfwbuilder;

88
src/unit_tests/tests_common.pri
View File

@ -1,52 +1,34 @@
include(../../qmake.inc)
macx:exists(../gui/qmake.inc):include(../gui/qmake.inc)
macx:SOURCES -= main_mac.cpp
OBJECTS_DIR = .obj
MOC_DIR = .moc
LIBS += ../../libgui/libgui.a
QMAKE_CXXFLAGS += $$CPPUNIT_CFLAGS
CONFIG -= release
CONFIG += debug
LIBS += $$LIBS_FWCOMPILER $$LIBS_FWBUILDER $$CPPUNIT_LIBS
INCLUDEPATH += ../../..
INCLUDEPATH += ../..
INCLUDEPATH += ../../libfwbuilder/src
INCLUDEPATH += ../../libgui
INCLUDEPATH += ../../libgui/.ui
INCLUDEPATH += ../../compiler_lib
INCLUDEPATH += ../../iptlib
INCLUDEPATH += ../../.. \
../../cisco_lib \
../../pflib \
../..
INCLUDEPATH += ../../cisco_lib
INCLUDEPATH += ../../pflib
DEPENDPATH = ../../common
!win32:LIBS += ../../common/libcommon.a
!win32:PRE_TARGETDEPS = ../../common/libcommon.a
win32:CONFIG += console
win32:LIBS += ../../common/release/common.lib
win32:PRE_TARGETDEPS = ../../common/release/common.lib
run_tests.commands = echo "Running tests..."; \
./${TARGET}
run_tests.commands = echo "Running tests..."; ./${TARGET}
run_tests.depends = build_tests
build_tests.depends = all
clean_tests.depends = clean
QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
INCLUDEPATH += $$ANTLR_INCLUDEPATH
LIBS += ../$$FWBPARSER_LIB
DEFINES += $$ANTLR_DEFINES
LIBS += $$LIBS_FWCOMPILER
LIBS += $$ANTLR_LIBS
# fwtransfer lib. Add this before adding -lQtDBus to LIBS below
LIBS += ../$$FWTRANSFER_LIB
#LIBS += ../$$FWTRANSFER_LIB
contains( HAVE_QTDBUS, 1 ):unix {
!macx:QT += network \
dbus
@ -56,32 +38,46 @@ contains( HAVE_QTDBUS, 1 ):unix {
# !macx:LIBS += -lQtDBus # workaround for QT += dbus not working with Qt < 4.4.0
INCLUDEPATH += ../../common \
../../iptlib \
../../iptlib \
../../pflib \
../../cisco_lib/ \
../../compiler_lib/
../../compiler_lib/ \
../../libgui \
../../libfwbuilder/src
DEPENDPATH = ../../common \
../../iptlib \
../../iptlib \
../../pflib \
../../cisco_lib/ \
../../compiler_lib
win32:LIBS += ../../common/release/common.lib \
../../iptlib/release/iptlib.lib \
../../pflib/release/fwbpf.lib \
../../cisco_lib/release/fwbcisco.lib \
../../compiler_lib/release/compilerdriver.lib
!win32:LIBS += ../../common/libcommon.a \
../../iptlib/libiptlib.a \
../../compiler_lib \
../../libgui \
../../fwtransfer \
../../libfwbuilder/src/fwbuilder \
../../libfwbuilder/src/fwcompiler
STATIC_LIBS += ../../libgui/libgui.a \
../../common/libcommon.a \
../../iptlib/libiptlib.a \
../../pflib/libfwbpf.a \
../../cisco_lib/libfwbcisco.a \
../../compiler_lib/libcompilerdriver.a
win32:PRE_TARGETDEPS = ../../common/release/common.lib \
../../iptlib/release/iptlib.lib \
../../pflib/release/fwbpf.lib \
../../cisco_lib/release/fwbcisco.lib \
../../compiler_lib/release/compilerdriver.lib
!win32:PRE_TARGETDEPS = ../../common/libcommon.a \
../../iptlib/libiptlib.a \
../../compiler_lib/libcompilerdriver.a \
../../fwtransfer/libfwtransfer.a \
../../parsers/libfwbparser.a \
../../libfwbuilder/src/fwcompiler/libfwcompiler.a \
../../libfwbuilder/src/fwbuilder/libfwbuilder.a \
$$ANTLR_LIBS \
$$CPPUNIT_LIBS
PRE_TARGETDEPS += ../../common/libcommon.a \
../../iptlib/libiptlib.a \
../../pflib/libfwbpf.a \
../../cisco_lib/libfwbcisco.a \
../../compiler_lib/libcompilerdriver.a
../../compiler_lib/libcompilerdriver.a \
../../fwtransfer/libfwtransfer.a \
../../parsers/libfwbparser.a \
../../libfwbuilder/src/fwcompiler/libfwcompiler.a \
../../libfwbuilder/src/fwbuilder/libfwbuilder.a \
$$ANTLR_LIBS
LIBS = $$STATIC_LIBS $$LIBS