onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-06-24 01:49:36 +02:00
Code Issues Releases Wiki Activity

fixing unit tests for removed modules and rearranged INCLUDEPATH

Browse Source
This commit is contained in:
Vadim Kurland
2012-03-22 22:17:10 -07:00
parent c086283bc5
commit a1af722d69
39 changed files with 61 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/unit_tests/AddressRangeDialogTest/main_AddressRangeDialogTest.cpp
View File

@@ -31,7 +31,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -41,14 +40,13 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -56,7 +54,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new AddressRangeDialogTest());

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

@@ -12,7 +12,7 @@ LIBS += $$CPPUNIT_LIBS
SOURCES += main.cpp AddressTableTest.cpp
HEADERS += AddressTableTest.h
INCLUDEPATH += ../../libfwbuilder/src
INCLUDEPATH += ../../.. ../../libfwbuilder/src
DEPENDPATH += ../../libfwbuilder/src
LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a
run_tests.commands = echo "Running tests..." && ./${TARGET}

7
src/unit_tests/CustomServiceDialogTest/main_CustomServiceDialogTest.cpp
View File

@@ -32,7 +32,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -42,14 +41,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -57,7 +54,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new CustomServiceDialogTest());

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

@@ -12,7 +12,7 @@ LIBS += $$CPPUNIT_LIBS
SOURCES += main.cpp DNSTest.cpp
HEADERS += DNSTest.h
INCLUDEPATH += ../../libfwbuilder/src
INCLUDEPATH += ../../.. ../../libfwbuilder/src
DEPENDPATH += ../../libfwbuilder/src
LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a
run_tests.commands = echo "Running tests..." && ./${TARGET}

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

@@ -11,7 +11,7 @@ LIBS += $$CPPUNIT_LIBS
SOURCES += main.cpp FWObjectTest.cpp
HEADERS += FWObjectTest.h
INCLUDEPATH += ../../libfwbuilder/src
INCLUDEPATH += ../../.. ../../libfwbuilder/src
DEPENDPATH += ../../libfwbuilder/src
LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a
run_tests.commands = echo "Running tests..." && ./${TARGET}

7
src/unit_tests/FWWindowTest/main_FWWindowTest.cpp
View File

@@ -32,7 +32,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -42,14 +41,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -57,7 +54,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new FWWindowTest());

7
src/unit_tests/FirewallDialogTest/main_FirewallDialogTest.cpp
View File

@@ -32,7 +32,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -42,14 +41,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -57,7 +54,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new FirewallDialogTest());

7
src/unit_tests/GroupObjectDialogTest/main_GroupObjectDialogTest.cpp
View File

@@ -32,7 +32,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -42,14 +41,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -57,7 +54,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new GroupObjectDialogTest());

7
src/unit_tests/ICMP6ServiceDialogTest/main_ICMP6ServiceDialogTest.cpp
View File

@@ -32,7 +32,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -42,14 +41,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -57,7 +54,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new ICMP6ServiceDialogTest());

7
src/unit_tests/ICMPServiceDialogTest/main_ICMPServiceDialogTest.cpp
View File

@@ -32,7 +32,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -42,14 +41,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -57,7 +54,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new ICMPServiceDialogTest());

7
src/unit_tests/IPDialogTest/main_IPDialogTest.cpp
View File

@@ -31,7 +31,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -41,14 +40,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -56,7 +53,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new IPDialogTest());

7
src/unit_tests/IPServiceDialogTest/main_IPServiceDialogTest.cpp
View File

@@ -31,7 +31,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -41,14 +40,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -56,7 +53,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new IPServiceDialogTest());

2
src/unit_tests/ImporterTest/main_ImporterTest.cpp
View File

@@ -31,7 +31,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
#include <QApplication>
#include <QString>
@@ -44,7 +43,6 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
std::string platform;

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

@@ -11,7 +11,7 @@ LIBS += $$CPPUNIT_LIBS
SOURCES += main.cpp Inet6AddrMaskTest.cpp
HEADERS += Inet6AddrMaskTest.h
INCLUDEPATH += ../../libfwbuilder/src
INCLUDEPATH += ../../.. ../../libfwbuilder/src
DEPENDPATH += ../../libfwbuilder/src
LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a
run_tests.commands = echo "Running tests..." && ./${TARGET}

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

@@ -11,7 +11,7 @@ LIBS += $$CPPUNIT_LIBS
SOURCES += main.cpp InetAddrMaskTest.cpp
HEADERS += InetAddrMaskTest.h
INCLUDEPATH += ../../libfwbuilder/src
INCLUDEPATH += ../../.. ../../libfwbuilder/src
DEPENDPATH += ../../libfwbuilder/src
LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a
run_tests.commands = echo "Running tests..." && ./${TARGET}

7
src/unit_tests/InterfaceDialogTest/main_InterfaceDialogTest.cpp
View File

@@ -31,7 +31,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -41,14 +40,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -56,7 +53,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new InterfaceDialogTest());

7
src/unit_tests/NetworkDialogTest/main_NetworkDialogTest.cpp
View File

@@ -31,7 +31,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -41,14 +40,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -56,7 +53,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new NetworkDialogTest());

7
src/unit_tests/ObjectManipulatorTest/main_ObjectManipulatorTest.cpp
View File

@@ -32,7 +32,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -42,14 +41,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -57,7 +54,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new ObjectManipulatorTest());

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

@@ -11,7 +11,7 @@ LIBS += $$CPPUNIT_LIBS
SOURCES += main.cpp ObjectMatcherTest.cpp
HEADERS += ObjectMatcherTest.h
INCLUDEPATH += ../../libfwbuilder/src
INCLUDEPATH += ../../.. ../../libfwbuilder/src
DEPENDPATH += ../../libfwbuilder/src
LIBS += ../../libfwbuilder/src/fwbuilder/libfwbuilder.a
run_tests.commands = echo "Running tests..." && ./${TARGET}

2
src/unit_tests/PFImporterTest/main_PFImporterTest.cpp
View File

@@ -29,7 +29,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
#include <QApplication>
#include <QString>
@@ -42,7 +41,6 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
std::string platform;

2
src/unit_tests/PIXImporterTest/main_PIXImporterTest.cpp
View File

@@ -29,7 +29,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
#include <QApplication>
#include <QString>
@@ -42,7 +41,6 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
std::string platform;

7
src/unit_tests/RuleSetViewContextMenuTest/main_RuleSetViewContextMenuTest.cpp
View File

@@ -32,7 +32,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -42,14 +41,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -57,7 +54,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new RuleSetViewContextMenuTest());

7
src/unit_tests/RuleSetViewTest/main_RuleSetViewTest.cpp
View File

@@ -32,7 +32,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -42,14 +41,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -57,7 +54,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new RuleSetViewTest());

7
src/unit_tests/TCPServiceDialogTest/main_TCPServiceDialogTest.cpp
View File

@@ -31,7 +31,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -41,14 +40,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -56,7 +53,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new TCPServiceDialogTest());

7
src/unit_tests/TagServiceDialogTest/main_TagServiceDialogTest.cpp
View File

@@ -32,7 +32,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -42,14 +41,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -57,7 +54,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new TagServiceDialogTest());

7
src/unit_tests/UDPServiceDialogTest/main_UDPServiceDialogTest.cpp
View File

@@ -31,7 +31,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -41,14 +40,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -56,7 +53,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new UDPServiceDialogTest());

7
src/unit_tests/UserSerivceDialogTest/main_UserServiceDialogTest.cpp
View File

@@ -31,7 +31,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -41,14 +40,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -56,7 +53,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new UserServiceDialogTest());

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

@@ -73,7 +73,6 @@
#include "RoutingRuleOptionsDialog.h"
#include "platforms.h"
#include "NATRuleOptionsDialog.h"
#include "UserWorkflow.h"
using namespace std;
using namespace libfwbuilder;
@@ -82,7 +81,6 @@ void genericDialogTest::initTestCase()
{
new FWObjectClipboard();
mw = new FWWindow();
wfl = new UserWorkflow();
mw->show();
mw->startupLoad();
mw->resize(1200, 600);

7
src/unit_tests/genericDialogTest/main_genericDialogTest.cpp
View File

@@ -32,7 +32,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -42,14 +41,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -57,7 +54,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new genericDialogTest());

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

@@ -69,7 +69,6 @@
#include <QCoreApplication>
#include "FWBApplication.h"
#include "UserWorkflow.h"
#include "FWObjectClipboard.h"
#include "StartTipDialog.h"
@@ -82,7 +81,6 @@ void instDialogClusterTest::initTestCase()
{
new FWObjectClipboard();
mw = new FWWindow();
wfl = new UserWorkflow();
mw->show();
mw->startupLoad();

7
src/unit_tests/instDialogClusterTest/main_instDialogClusterTest.cpp
View File

@@ -32,7 +32,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -42,14 +41,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -57,7 +54,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new instDialogClusterTest());

7
src/unit_tests/instDialogCompileTest/main_instDialogCompileTest.cpp
View File

@@ -32,7 +32,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -42,14 +41,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -57,7 +54,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new instDialogCompileTest());

7
src/unit_tests/instDialogInspectTest/main_instDialogInspectTest.cpp
View File

@@ -32,7 +32,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -42,14 +41,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -57,7 +54,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new instDialogInspectTest());

7
src/unit_tests/instDialogInstallTest/main_instDialogInstallTest.cpp
View File

@@ -32,7 +32,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -42,14 +41,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -57,7 +54,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new instDialogInstallTest());

7
src/unit_tests/instDialogObjectListTest/main_instDialogObjectListTest.cpp
View File

@@ -32,7 +32,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -42,14 +41,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -57,7 +54,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new instDialogObjectListTest());

6
src/unit_tests/main/main.cpp
View File

@@ -24,7 +24,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
#include "FWObjectClipboard.h"
#include "common/commoninit.h"
@@ -49,8 +48,7 @@ extern void init_platforms(); // defined in platforms.cpp
void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl)
FWBSettings** st)
{
Q_INIT_RESOURCE(MainRes);
@@ -65,8 +63,6 @@ void build_app(int argc, char** argv,
(*st)->setIntroDialogEnabled(false);
(*st)->suppressReminderAboutStandardLib(true);
*wfl = new UserWorkflow();
string full_res_path = Constants::getResourcesFilePath();
new Resources(full_res_path);

7
src/unit_tests/newClusterDialogTest/main_newClusterDialogTest.cpp
View File

@@ -32,7 +32,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -42,14 +41,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -57,7 +54,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new newClusterDialogTest());

7
src/unit_tests/startTipDialogTest/main_startTipDialogTest.cpp
View File

@@ -32,7 +32,6 @@
#include "FWWindow.h"
#include "FWBSettings.h"
#include "FWBApplication.h"
#include "UserWorkflow.h"
using namespace std;
@@ -42,14 +41,12 @@ int fwbdebug = 0;
FWWindow *mw = NULL;
FWBSettings *st = NULL;
FWBApplication *app = NULL;
UserWorkflow *wfl;
int sig = FWB_SIG;
extern void build_app(int argc, char** argv,
FWBApplication** app,
FWBSettings** st,
UserWorkflow** wfl);
FWBSettings** st);
int main(int argc, char** argv)
{
@@ -57,7 +54,7 @@ int main(int argc, char** argv)
app->setOrganizationName(QLatin1String("NetCitadel"));
app->setApplicationName(QLatin1String("Firewall Builder"));
build_app(argc, argv, &app, &st, &wfl);
build_app(argc, argv, &app, &st);
QTest::qExec(new startTipDialogTest());

4
src/unit_tests/unit_tests.sh
View File

@@ -9,9 +9,7 @@ build() {
local _d="$1"
shift
(
cd "$_d" &&
([ -f Makefile ] || $QMAKE $QMAKEPARAMS) &&
"$@"
cd "$_d" && $QMAKE $QMAKEPARAMS && "$@"
)
}