Tests: Minor refactoring.

src/tests/common/Test.pri

@@ -6,14 +6,17 @@ CONFIG -= app_bundle
 TARGET = test
 TEMPLATE = app
 
-UIPATH = ../../ui
+UIPATH = $$PWD/../../ui
 INCLUDEPATH += $$UIPATH
 
+INCLUDEPATH += $$PWD
+
 SOURCES += \
-    ../common/main.cpp \
+    $$PWD/main.cpp \
     test.cpp
 
 HEADERS += \
+    $$PWD/commontest.h \
     test.h
 
 # Windows

src/tests/common/commontest.h

@@ -0,0 +1,9 @@
+#ifndef TESTUTIL_H
+#define TESTUTIL_H
+
+#include <QtTest>
+
+#define _STR(x) #x
+#define STR(x)  _STR(x)
+
+#endif // TESTUTIL_H

src/tests/confutil/test.cpp

@@ -1,7 +1,6 @@
 #include "test.h"
 
-#include <QtTest>
-
+#include "commontest.h"
 #include "conf/addressgroup.h"
 #include "conf/appgroup.h"
 #include "conf/firewallconf.h"

src/tests/db/test.cpp

@@ -1,8 +1,8 @@
 #include "test.h"
 
-#include <QtTest>
 #include <QElapsedTimer>
 
+#include "commontest.h"
 #include "db/databasemanager.h"
 #include "db/quotamanager.h"
 #include "db/sqlite/sqlitedb.h"

src/tests/fileutil/test.cpp

@@ -1,7 +1,6 @@
 #include "test.h"
 
-#include <QtTest>
-
+#include "commontest.h"
 #include "util/fileutil.h"
 #include "util/processinfo.h"
 

src/tests/logbuffer/test.cpp

@@ -1,7 +1,6 @@
 #include "test.h"
 
-#include <QtTest>
-
+#include "commontest.h"
 #include "fortcommon.h"
 #include "log/logbuffer.h"
 #include "log/logentryblocked.h"

src/tests/logreader/test.cpp

@@ -1,9 +1,8 @@
 #include "test.h"
 
-#include <QtTest>
-#include <QDebug>
 #include <QFile>
 
+#include "commontest.h"
 #include "conf/addressgroup.h"
 #include "conf/appgroup.h"
 #include "conf/firewallconf.h"

src/tests/netutil/test.cpp

@@ -1,15 +1,11 @@
 #include "test.h"
 
-#include <QtTest>
-
+#include "commontest.h"
 #include "task/tasktasix.h"
 #include "util/fileutil.h"
 #include "util/net/ip4range.h"
 #include "util/net/netutil.h"
 
-#define _STR(x) #x
-#define STR(x)  _STR(x)
-
 void Test::ip4Text()
 {
     const QString ip4Str("172.16.0.1");