onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-05-10 19:14:57 +02:00
Code Issues Releases Wiki Activity

test: Make unit tests compile

Browse Source 
However, not all tests run.
This commit is contained in:
Sirius Bakke
2018-04-19 17:42:28 +02:00
parent d31619a572
commit 1b6e8ce7cc
66 changed files with 122 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libgui/ObjectManipulator.h
View File

@@ -32,9 +32,9 @@
#include "global.h" #include "global.h"
#include "utils.h" #include "utils.h"
#include <qdialog.h> #include <QDialog>
#include <qtreewidget.h> #include <QTreeWidget>
#include <qtooltip.h> #include <QToolTip>
#include <QMenu> #include <QMenu>
#include <ui_objectmanipulator_q.h> #include <ui_objectmanipulator_q.h>

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

@@ -25,12 +25,12 @@
#include "AddressRangeDialogTest.h" #include "AddressRangeDialogTest.h"
#include "../../../../config.h" #include "../../../config.h"
//#include "../../global.h" //#include "../../global.h"
#include <qapplication.h> #include <QApplication>
#include <qfile.h> #include <QFile>
#include <qtextstream.h> #include <QTextStream>
#include <QTest> #include <QTest>
#include <iostream> #include <iostream>

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = AddressRangeDialogTest TARGET = AddressRangeDialogTest
CONFIG += console CONFIG += console
CONFIG -= app_bundle CONFIG -= app_bundle

8
src/unit_tests/CustomServiceDialogTest/CustomServiceDialogTest.cpp
View File

@@ -25,12 +25,12 @@
#include "CustomServiceDialogTest.h" #include "CustomServiceDialogTest.h"
#include "../../../../config.h" #include "../../../config.h"
//#include "../../global.h" //#include "../../global.h"
#include <qapplication.h> #include <QApplication>
#include <qfile.h> #include <QFile>
#include <qtextstream.h> #include <QTextStream>
#include <QTest> #include <QTest>
#include <iostream> #include <iostream>

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = CustomServiceDialogTest TARGET = CustomServiceDialogTest
CONFIG += console CONFIG += console
CONFIG -= app_bundle CONFIG -= app_bundle

2
src/unit_tests/FWWindowTest/FWWindowTest.h
View File

@@ -26,7 +26,7 @@
#ifndef FWWINDOWTEST_H #ifndef FWWINDOWTEST_H
#define FWWINDOWTEST_H #define FWWINDOWTEST_H
#include <QtGui/QMainWindow> #include <QMainWindow>
#include <QTest> #include <QTest>
#include <QMessageBox> #include <QMessageBox>

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = FWWindowTest TARGET = FWWindowTest
HEADERS += FWWindowTest.h HEADERS += FWWindowTest.h

8
src/unit_tests/FirewallDialogTest/FirewallDialogTest.cpp
View File

@@ -25,12 +25,12 @@
#include "FirewallDialogTest.h" #include "FirewallDialogTest.h"
#include "../../../../config.h" #include "../../../config.h"
//#include "../../global.h" //#include "../../global.h"
#include <qapplication.h> #include <QApplication>
#include <qfile.h> #include <QFile>
#include <qtextstream.h> #include <QTextStream>
#include <QTest> #include <QTest>
#include <iostream> #include <iostream>

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = FirewallDialogTest TARGET = FirewallDialogTest
SOURCES += main_FirewallDialogTest.cpp \ SOURCES += main_FirewallDialogTest.cpp \
FirewallDialogTest.cpp FirewallDialogTest.cpp

8
src/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.cpp
View File

@@ -25,12 +25,12 @@
#include "GroupObjectDialogTest.h" #include "GroupObjectDialogTest.h"
#include "../../../../config.h" #include "../../../config.h"
//#include "../../global.h" //#include "../../global.h"
#include <qapplication.h> #include <QApplication>
#include <qfile.h> #include <QFile>
#include <qtextstream.h> #include <QTextStream>
#include <QTest> #include <QTest>
#include <iostream> #include <iostream>

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = GroupObjectDialogTest TARGET = GroupObjectDialogTest
SOURCES += main_GroupObjectDialogTest.cpp \ SOURCES += main_GroupObjectDialogTest.cpp \
GroupObjectDialogTest.cpp GroupObjectDialogTest.cpp

8
src/unit_tests/ICMP6ServiceDialogTest/ICMP6ServiceDialogTest.cpp
View File

@@ -25,12 +25,12 @@
#include "ICMP6ServiceDialogTest.h" #include "ICMP6ServiceDialogTest.h"
#include "../../../../config.h" #include "../../../config.h"
//#include "../../global.h" //#include "../../global.h"
#include <qapplication.h> #include <QApplication>
#include <qfile.h> #include <QFile>
#include <qtextstream.h> #include <QTextStream>
#include <QTest> #include <QTest>
#include <iostream> #include <iostream>

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = ICMP6ServiceDialogTest TARGET = ICMP6ServiceDialogTest
SOURCES += main_ICMP6ServiceDialogTest.cpp \ SOURCES += main_ICMP6ServiceDialogTest.cpp \
ICMP6ServiceDialogTest.cpp ICMP6ServiceDialogTest.cpp

8
src/unit_tests/ICMPServiceDialogTest/ICMPServiceDialogTest.cpp
View File

@@ -25,12 +25,12 @@
#include "ICMPServiceDialogTest.h" #include "ICMPServiceDialogTest.h"
#include "../../../../config.h" #include "../../../config.h"
//#include "../../global.h" //#include "../../global.h"
#include <qapplication.h> #include <QApplication>
#include <qfile.h> #include <QFile>
#include <qtextstream.h> #include <QTextStream>
#include <QTest> #include <QTest>
#include <iostream> #include <iostream>

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = ICMPServiceDialogTest TARGET = ICMPServiceDialogTest
SOURCES += main_ICMPServiceDialogTest.cpp \ SOURCES += main_ICMPServiceDialogTest.cpp \
ICMPServiceDialogTest.cpp ICMPServiceDialogTest.cpp

8
src/unit_tests/IPDialogTest/IPDialogTest.cpp
View File

@@ -25,12 +25,12 @@
#include "IPDialogTest.h" #include "IPDialogTest.h"
#include "../../../../config.h" #include "../../../config.h"
//#include "../../global.h" //#include "../../global.h"
#include <qapplication.h> #include <QApplication>
#include <qfile.h> #include <QFile>
#include <qtextstream.h> #include <QTextStream>
#include <QTest> #include <QTest>
#include <iostream> #include <iostream>

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = IPDialogTest TARGET = IPDialogTest
SOURCES += main_IPDialogTest.cpp \ SOURCES += main_IPDialogTest.cpp \
IPDialogTest.cpp IPDialogTest.cpp

8
src/unit_tests/IPServiceDialogTest/IPServiceDialogTest.cpp
View File

@@ -25,12 +25,12 @@
#include "IPServiceDialogTest.h" #include "IPServiceDialogTest.h"
#include "../../../../config.h" #include "../../../config.h"
//#include "../../global.h" //#include "../../global.h"
#include <qapplication.h> #include <QApplication>
#include <qfile.h> #include <QFile>
#include <qtextstream.h> #include <QTextStream>
#include <QTest> #include <QTest>
#include <iostream> #include <iostream>

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = IPServiceDialogTest TARGET = IPServiceDialogTest
SOURCES += main_IPServiceDialogTest.cpp \ SOURCES += main_IPServiceDialogTest.cpp \
IPServiceDialogTest.cpp IPServiceDialogTest.cpp

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

@@ -131,7 +131,7 @@ void ImporterTest::compareResults(QueueLogger* logger,
QFile rw(obtained_result_file_name); QFile rw(obtained_result_file_name);
rw.open(QFile::WriteOnly); rw.open(QFile::WriteOnly);
rw.write(result.toAscii()); rw.write(result.toLocal8Bit());
rw.close(); rw.close();
QFile rr(expected_result_file_name); QFile rr(expected_result_file_name);

1
src/unit_tests/ImporterTest/ImporterTest.pro
View File

@@ -1,5 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += widgets printsupport
TARGET = ImporterTest TARGET = ImporterTest
HEADERS += ImporterTest.h HEADERS += ImporterTest.h
SOURCES += main_ImporterTest.cpp \ SOURCES += main_ImporterTest.cpp \

8
src/unit_tests/InterfaceDialogTest/InterfaceDialogTest.cpp
View File

@@ -25,12 +25,12 @@
#include "InterfaceDialogTest.h" #include "InterfaceDialogTest.h"
#include "../../../../config.h" #include "../../../config.h"
//#include "../../global.h" //#include "../../global.h"
#include <qapplication.h> #include <QApplication>
#include <qfile.h> #include <QFile>
#include <qtextstream.h> #include <QTextStream>
#include <QTest> #include <QTest>
#include <iostream> #include <iostream>

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = InterfaceDialogTest TARGET = InterfaceDialogTest
SOURCES += main_InterfaceDialogTest.cpp \ SOURCES += main_InterfaceDialogTest.cpp \
InterfaceDialogTest.cpp InterfaceDialogTest.cpp

8
src/unit_tests/NetworkDialogTest/NetworkDialogTest.cpp
View File

@@ -25,12 +25,12 @@
#include "NetworkDialogTest.h" #include "NetworkDialogTest.h"
#include "../../../../config.h" #include "../../../config.h"
//#include "../../global.h" //#include "../../global.h"
#include <qapplication.h> #include <QApplication>
#include <qfile.h> #include <QFile>
#include <qtextstream.h> #include <QTextStream>
#include <QTest> #include <QTest>
#include <iostream> #include <iostream>

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = NetworkDialogTests TARGET = NetworkDialogTests
SOURCES += main_NetworkDialogTest.cpp \ SOURCES += main_NetworkDialogTest.cpp \
NetworkDialogTest.cpp NetworkDialogTest.cpp

8
src/unit_tests/ObjectManipulatorTest/ObjectManipulatorTest.cpp
View File

@@ -25,12 +25,12 @@
#include "ObjectManipulatorTest.h" #include "ObjectManipulatorTest.h"
#include "../../../../config.h" #include "../../../config.h"
//#include "../../global.h" //#include "../../global.h"
#include <qapplication.h> #include <QApplication>
#include <qfile.h> #include <QFile>
#include <qtextstream.h> #include <QTextStream>
#include <QTest> #include <QTest>
#include <iostream> #include <iostream>

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = ObjectManipulatorTest TARGET = ObjectManipulatorTest
SOURCES += main_ObjectManipulatorTest.cpp \ SOURCES += main_ObjectManipulatorTest.cpp \
ObjectManipulatorTest.cpp ObjectManipulatorTest.cpp

1
src/unit_tests/PFImporterTest/PFImporterTest.pro
View File

@@ -1,5 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += widgets printsupport
TARGET = PFImporterTest TARGET = PFImporterTest
HEADERS += PFImporterTest.h HEADERS += PFImporterTest.h
SOURCES += main_PFImporterTest.cpp \ SOURCES += main_PFImporterTest.cpp \

1
src/unit_tests/PIXImporterTest/PIXImporterTest.pro
View File

@@ -1,5 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += widgets printsupport
TARGET = PIXImporterTest TARGET = PIXImporterTest
HEADERS += PIXImporterTest.h HEADERS += PIXImporterTest.h
SOURCES += main_PIXImporterTest.cpp \ SOURCES += main_PIXImporterTest.cpp \

8
src/unit_tests/RCS/RCSTest.cpp
View File

@@ -25,13 +25,13 @@
#include "RCSTest.h" #include "RCSTest.h"
#include "../../../../config.h" #include "../../../config.h"
//#include "../../global.h" //#include "../../global.h"
#include "../../libgui/RCS.h" #include "../../libgui/RCS.h"
#include <qapplication.h> #include <QApplication>
#include <qfile.h> #include <QFile>
#include <qtextstream.h> #include <QTextStream>
#include <iostream> #include <iostream>

2
src/unit_tests/RCS/RCSTest.pro
View File

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += gui network QT += gui widgets printsupport network
HEADERS += RCSTest.h HEADERS += RCSTest.h
SOURCES += main_RCS.cpp \ SOURCES += main_RCS.cpp \

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = RuleSetViewContextMenuTest TARGET = RuleSetViewContextMenuTest
SOURCES += main_RuleSetViewContextMenuTest.cpp \ SOURCES += main_RuleSetViewContextMenuTest.cpp \
RuleSetViewContextMenuTest.cpp RuleSetViewContextMenuTest.cpp

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = RuleSetViewTest TARGET = RuleSetViewTest
SOURCES += main_RuleSetViewTest.cpp \ SOURCES += main_RuleSetViewTest.cpp \
RuleSetViewTest.cpp RuleSetViewTest.cpp

8
src/unit_tests/TCPServiceDialogTest/TCPServiceDialogTest.cpp
View File

@@ -25,12 +25,12 @@
#include "TCPServiceDialogTest.h" #include "TCPServiceDialogTest.h"
#include "../../../../config.h" #include "../../../config.h"
//#include "../../global.h" //#include "../../global.h"
#include <qapplication.h> #include <QApplication>
#include <qfile.h> #include <QFile>
#include <qtextstream.h> #include <QTextStream>
#include <QTest> #include <QTest>
#include <iostream> #include <iostream>

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = TCPServiceDialogTest TARGET = TCPServiceDialogTest
SOURCES += main_TCPServiceDialogTest.cpp \ SOURCES += main_TCPServiceDialogTest.cpp \
TCPServiceDialogTest.cpp TCPServiceDialogTest.cpp

8
src/unit_tests/TagServiceDialogTest/TagServiceDialogTest.cpp
View File

@@ -25,12 +25,12 @@
#include "TagServiceDialogTest.h" #include "TagServiceDialogTest.h"
#include "../../../../config.h" #include "../../../config.h"
//#include "../../global.h" //#include "../../global.h"
#include <qapplication.h> #include <QApplication>
#include <qfile.h> #include <QFile>
#include <qtextstream.h> #include <QTextStream>
#include <QTest> #include <QTest>
#include <iostream> #include <iostream>

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = TagServiceDialogTest TARGET = TagServiceDialogTest
SOURCES += main_TagServiceDialogTest.cpp \ SOURCES += main_TagServiceDialogTest.cpp \
TagServiceDialogTest.cpp TagServiceDialogTest.cpp

8
src/unit_tests/UDPServiceDialogTest/UDPServiceDialogTest.cpp
View File

@@ -25,12 +25,12 @@
#include "UDPServiceDialogTest.h" #include "UDPServiceDialogTest.h"
#include "../../../../config.h" #include "../../../config.h"
//#include "../../global.h" //#include "../../global.h"
#include <qapplication.h> #include <QApplication>
#include <qfile.h> #include <QFile>
#include <qtextstream.h> #include <QTextStream>
#include <QTest> #include <QTest>
#include <iostream> #include <iostream>

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = UDPServiceDialogTest TARGET = UDPServiceDialogTest
SOURCES += main_UDPServiceDialogTest.cpp \ SOURCES += main_UDPServiceDialogTest.cpp \
UDPServiceDialogTest.cpp UDPServiceDialogTest.cpp

8
src/unit_tests/UserSerivceDialogTest/UserServiceDialogTest.cpp
View File

@@ -25,12 +25,12 @@
#include "UserServiceDialogTest.h" #include "UserServiceDialogTest.h"
#include "../../../../config.h" #include "../../../config.h"
//#include "../../global.h" //#include "../../global.h"
#include <qapplication.h> #include <QApplication>
#include <qfile.h> #include <QFile>
#include <qtextstream.h> #include <QTextStream>
#include <QTest> #include <QTest>
#include <iostream> #include <iostream>

2
src/unit_tests/UserSerivceDialogTest/UserServiceDialogTest.pro
View File

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = UserServiceDialogTest TARGET = UserServiceDialogTest
SOURCES += main_UserServiceDialogTest.cpp \ SOURCES += main_UserServiceDialogTest.cpp \
UserServiceDialogTest.cpp UserServiceDialogTest.cpp

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

@@ -1,5 +1,5 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += gui network QT += gui widgets printsupport network
HEADERS = generatedScriptTestsIpfilter.h HEADERS = generatedScriptTestsIpfilter.h

1
src/unit_tests/generatedScriptTestsIpfilter/main_generatedScriptTestsIpfilter.cpp
View File

@@ -47,7 +47,6 @@ int main(int argc, char **argv)
QApplication app(argc, argv, false); QApplication app(argc, argv, false);
// compilers always write file names into manifest in Utf8 // compilers always write file names into manifest in Utf8
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("Utf8"));
QTextCodec::setCodecForLocale(QTextCodec::codecForName("Utf8")); QTextCodec::setCodecForLocale(QTextCodec::codecForName("Utf8"));
init(argv); init(argv);

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

@@ -1,5 +1,5 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += gui network QT += gui widgets printsupport network
HEADERS = generatedScriptTestsIpfw.h HEADERS = generatedScriptTestsIpfw.h

1
src/unit_tests/generatedScriptTestsIpfw/main_generatedScriptTestsIpfw.cpp
View File

@@ -47,7 +47,6 @@ int main(int argc, char **argv)
QApplication app(argc, argv, false); QApplication app(argc, argv, false);
// compilers always write file names into manifest in Utf8 // compilers always write file names into manifest in Utf8
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("Utf8"));
QTextCodec::setCodecForLocale(QTextCodec::codecForName("Utf8")); QTextCodec::setCodecForLocale(QTextCodec::codecForName("Utf8"));
init(argv); init(argv);

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

@@ -1,5 +1,5 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += gui network QT += gui widgets printsupport network
HEADERS = generatedScriptTestsLinux.h HEADERS = generatedScriptTestsLinux.h
SOURCES = main_generatedScriptTestsLinux.cpp \ SOURCES = main_generatedScriptTestsLinux.cpp \

1
src/unit_tests/generatedScriptTestsLinux/main_generatedScriptTestsLinux.cpp
View File

@@ -47,7 +47,6 @@ int main(int argc, char **argv)
QApplication app(argc, argv, false); QApplication app(argc, argv, false);
// compilers always write file names into manifest in Utf8 // compilers always write file names into manifest in Utf8
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("Utf8"));
QTextCodec::setCodecForLocale(QTextCodec::codecForName("Utf8")); QTextCodec::setCodecForLocale(QTextCodec::codecForName("Utf8"));
init(argv); init(argv);

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

@@ -1,5 +1,5 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += gui network QT += gui widgets printsupport network
HEADERS = generatedScriptTestsPF.h HEADERS = generatedScriptTestsPF.h
SOURCES = main_generatedScriptTestsPF.cpp \ SOURCES = main_generatedScriptTestsPF.cpp \
generatedScriptTestsPF.cpp generatedScriptTestsPF.cpp

1
src/unit_tests/generatedScriptTestsPF/main_generatedScriptTestsPF.cpp
View File

@@ -47,7 +47,6 @@ int main(int argc, char **argv)
QApplication app(argc, argv, false); QApplication app(argc, argv, false);
// compilers always write file names into manifest in Utf8 // compilers always write file names into manifest in Utf8
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("Utf8"));
QTextCodec::setCodecForLocale(QTextCodec::codecForName("Utf8")); QTextCodec::setCodecForLocale(QTextCodec::codecForName("Utf8"));
init(argv); init(argv);

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

@@ -1,5 +1,5 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += gui network QT += gui widgets printsupport network
HEADERS = generatedScriptTestsSecuwall.h HEADERS = generatedScriptTestsSecuwall.h
SOURCES = main_generatedScriptTestsSecuwall.cpp \ SOURCES = main_generatedScriptTestsSecuwall.cpp \
generatedScriptTestsSecuwall.cpp generatedScriptTestsSecuwall.cpp

1
src/unit_tests/generatedScriptTestsSecuwall/main_generatedScriptTestsSecuwall.cpp
View File

@@ -37,7 +37,6 @@ int main(int argc, char **argv)
QApplication app(argc, argv, false); QApplication app(argc, argv, false);
// compilers always write file names into manifest in Utf8 // compilers always write file names into manifest in Utf8
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("Utf8"));
QTextCodec::setCodecForLocale(QTextCodec::codecForName("Utf8")); QTextCodec::setCodecForLocale(QTextCodec::codecForName("Utf8"));
init(argv); init(argv);

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

@@ -25,12 +25,12 @@
#include "genericDialogTest.h" #include "genericDialogTest.h"
#include "../../../../config.h" #include "../../../config.h"
//#include "../../global.h" //#include "../../global.h"
#include <qapplication.h> #include <QApplication>
#include <qfile.h> #include <QFile>
#include <qtextstream.h> #include <QTextStream>
#include <QTest> #include <QTest>
#include <iostream> #include <iostream>

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = genericDialogTest TARGET = genericDialogTest
SOURCES += main_genericDialogTest.cpp \ SOURCES += main_genericDialogTest.cpp \
genericDialogTest.cpp genericDialogTest.cpp

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = instDialogClusterTest TARGET = instDialogClusterTest
SOURCES += main_instDialogClusterTest.cpp \ SOURCES += main_instDialogClusterTest.cpp \
instDialogClusterTest.cpp instDialogClusterTest.cpp

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = instDialogCompileTest TARGET = instDialogCompileTest
SOURCES += main_instDialogCompileTest.cpp \ SOURCES += main_instDialogCompileTest.cpp \
instDialogCompileTest.cpp instDialogCompileTest.cpp

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = instDialogInspectTest TARGET = instDialogInspectTest
SOURCES += main_instDialogInspectTest.cpp \ SOURCES += main_instDialogInspectTest.cpp \
instDialogInspectTest.cpp instDialogInspectTest.cpp

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = instDialogInstallTest TARGET = instDialogInstallTest
SOURCES += main_instDialogInstallTest.cpp \ SOURCES += main_instDialogInstallTest.cpp \
instDialogInstallTest.cpp instDialogInstallTest.cpp

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = instDialogObjectListTest TARGET = instDialogObjectListTest
SOURCES += main_instDialogObjectListTest.cpp \ SOURCES += main_instDialogObjectListTest.cpp \
instDialogObjectListTest.cpp instDialogObjectListTest.cpp

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

@@ -26,7 +26,7 @@ DEPENDPATH += ../../.. \
../../compiler_lib \ ../../compiler_lib \
../../common ../../common
QT += testlib network gui QT += testlib network gui widgets printsupport
TEMPLATE = lib TEMPLATE = lib

4
src/unit_tests/newClusterDialogTest/newClusterDialogTest.cpp
View File

@@ -132,7 +132,7 @@ void newClusterDialogTest::test1()
for (int i=1; i<dialog->getUi()->interfaceEditor->count(); i++) for (int i=1; i<dialog->getUi()->interfaceEditor->count(); i++)
dynamic_cast<InterfaceEditorWidget*>(dialog->getUi()->interfaceEditor->widget(i))->setProtocolIndex(2); dynamic_cast<InterfaceEditorWidget*>(dialog->getUi()->interfaceEditor->widget(i))->setProtocolIndex(2);
InterfaceEditorWidget* eth0 = qFindChild<InterfaceEditorWidget*>(dialog->getUi()->interfaceEditor, "eth0_widget"); InterfaceEditorWidget* eth0 = dialog->getUi()->interfaceEditor->findChild<InterfaceEditorWidget*>("eth0_widget");
eth0->setProtocolIndex(0); eth0->setProtocolIndex(0);
eth0->addNewAddress("123.45.67.89", "24", true); eth0->addNewAddress("123.45.67.89", "24", true);
@@ -168,7 +168,7 @@ void newClusterDialogTest::test1()
} }
dialog->getUi()->interfaceEditor->setCurrentIndex(1); dialog->getUi()->interfaceEditor->setCurrentIndex(1);
InterfaceEditorWidget* eth1 = qFindChild<InterfaceEditorWidget*>(dialog->getUi()->interfaceEditor, "eth1_widget"); InterfaceEditorWidget* eth1 = dialog->getUi()->interfaceEditor->findChild<InterfaceEditorWidget*>("eth1_widget");
eth1->setProtocolIndex(0); eth1->setProtocolIndex(0);
QTableWidget *addrs = eth1->findChild<QTableWidget*>("addresses"); QTableWidget *addrs = eth1->findChild<QTableWidget*>("addresses");
QVERIFY(addrs != NULL); QVERIFY(addrs != NULL);

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = newClusterDialogTest TARGET = newClusterDialogTest
SOURCES += main_newClusterDialogTest.cpp \ SOURCES += main_newClusterDialogTest.cpp \
newClusterDialogTest.cpp newClusterDialogTest.cpp

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

@@ -28,9 +28,9 @@
#include "config.h" #include "config.h"
#include "utils.h" #include "utils.h"
#include <qapplication.h> #include <QApplication>
#include <qfile.h> #include <QFile>
#include <qtextstream.h> #include <QTextStream>
#include <iostream> #include <iostream>

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += gui network QT += gui widgets printsupport network
HEADERS += parseCommandLineTest.h HEADERS += parseCommandLineTest.h
SOURCES += main_parseCommandLineTest.cpp parseCommandLineTest.cpp SOURCES += main_parseCommandLineTest.cpp parseCommandLineTest.cpp

2
src/unit_tests/startTipDialogTest/startTipDialogTest.h
View File

@@ -26,7 +26,7 @@
#ifndef FWWINDOWTEST_H #ifndef FWWINDOWTEST_H
#define FWWINDOWTEST_H #define FWWINDOWTEST_H
#include <QtGui/QMainWindow> #include <QMainWindow>
#include <QTest> #include <QTest>
#include <QMessageBox> #include <QMessageBox>

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

@@ -1,6 +1,6 @@
include(../tests_common.pri) include(../tests_common.pri)
QT += testlib network gui QT += testlib network gui widgets printsupport
TARGET = startTipDialogTest TARGET = startTipDialogTest
HEADERS += startTipDialogTest.h HEADERS += startTipDialogTest.h
SOURCES += main_startTipDialogTest.cpp \ SOURCES += main_startTipDialogTest.cpp \

5
src/unit_tests/tests_common.pri
View File

@@ -23,6 +23,7 @@ INCLUDEPATH += ../../.. \
../../iptlib \ ../../iptlib \
../../pflib \ ../../pflib \
../../cisco_lib \ ../../cisco_lib \
../../juniper_lib \
../../libfwbuilder/src ../../libfwbuilder/src
DEPENDPATH += ../../.. \ DEPENDPATH += ../../.. \
@@ -36,6 +37,7 @@ DEPENDPATH += ../../.. \
../../iptlib \ ../../iptlib \
../../pflib \ ../../pflib \
../../cisco_lib \ ../../cisco_lib \
../../juniper_lib \
../../libfwbuilder/src ../../libfwbuilder/src
run_tests.commands = echo "Running tests..."; ./${TARGET} run_tests.commands = echo "Running tests..."; ./${TARGET}
@@ -52,6 +54,7 @@ DEPENDPATH = ../../common \
../../iptlib \ ../../iptlib \
../../pflib \ ../../pflib \
../../cisco_lib/ \ ../../cisco_lib/ \
../../juniper_lib/ \
../../compiler_lib \ ../../compiler_lib \
../../libgui \ ../../libgui \
../../libfwbuilder/src/fwbuilder \ ../../libfwbuilder/src/fwbuilder \
@@ -65,6 +68,7 @@ STATIC_LIBS += \
../../iptlib/libiptlib.a \ ../../iptlib/libiptlib.a \
../../pflib/libfwbpf.a \ ../../pflib/libfwbpf.a \
../../cisco_lib/libfwbcisco.a \ ../../cisco_lib/libfwbcisco.a \
../../juniper_lib/libfwbjuniper.a \
../../compiler_lib/libcompilerdriver.a \ ../../compiler_lib/libcompilerdriver.a \
../../libfwbuilder/src/fwcompiler/libfwcompiler.a \ ../../libfwbuilder/src/fwcompiler/libfwcompiler.a \
../../libfwbuilder/src/fwbuilder/libfwbuilder.a \ ../../libfwbuilder/src/fwbuilder/libfwbuilder.a \
@@ -77,6 +81,7 @@ PRE_TARGETDEPS += ../../common/libcommon.a \
../../iptlib/libiptlib.a \ ../../iptlib/libiptlib.a \
../../pflib/libfwbpf.a \ ../../pflib/libfwbpf.a \
../../cisco_lib/libfwbcisco.a \ ../../cisco_lib/libfwbcisco.a \
../../juniper_lib/libfwbjuniper.a \
../../compiler_lib/libcompilerdriver.a \ ../../compiler_lib/libcompilerdriver.a \
../../parsers/libfwbparser.a \ ../../parsers/libfwbparser.a \
../../import/libimport.a \ ../../import/libimport.a \