fix tests setup and a typo

diff --git a/CleaningService.pro b/CleaningService.pro
index b35ca2bf6e7c5b1480929ad0e626d09798fa2b5f..eeb56078eabfb587c2a0c30690b98502b92ab4c9 100644 (file)
--- a/CleaningService.pro
+++ b/CleaningService.pro
@@ -1,12 +1,11 @@
 TEMPLATE = app
 
-QT += qml quick sql testlib
-CONFIG += c++11 testcase
+QT += qml quick sql
+CONFIG += c++11
 
 SOURCES += main.cpp \
     dbconn.cpp \
-    logging.cpp \
-    Tests/tests.cpp
+    logging.cpp
 
 RESOURCES += qml.qrc
 
@@ -34,8 +33,19 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 
 HEADERS += \
     dbconn.h \
-    logging.h \
-    Tests/tests.h
+    logging.h
 
 DISTFILES += \
     style.astylerc
+
+test {
+    message(Tests)
+    QT += testlib
+    TARGET = UnitTests
+    SOURCES -= main.cpp
+    SOURCES += Tests/tests.cpp
+    HEADERS += Tests/tests.h
+    CONFIG += testcase
+} else {
+    message(NormalBuild)
+}

diff --git a/Tests/tests.cpp b/Tests/tests.cpp
index c493976cb7ceb8422744af9c9461f3cc1b0a0781..e771678628204abe8b7ca7a3eb762a0a62a3708c 100644 (file)
--- a/Tests/tests.cpp
+++ b/Tests/tests.cpp
@@ -1,6 +1,34 @@
 #include "tests.h"
 
-Tests::Tests(QObject *parent) : QObject(parent)
+Tests::Tests (QObject* parent) : QObject (parent)
 {
 
 }
+
+void Tests::initTestCase()
+{
+
+}
+
+void Tests::init()
+{
+
+}
+
+void Tests::cleanup()
+{
+
+}
+
+void Tests::cleanupTestCase()
+{
+
+}
+
+void Tests::dbTest()
+{
+  DbConn db;
+  QVERIFY (1 == 1);
+}
+
+QTEST_MAIN (Tests)

diff --git a/Tests/tests.h b/Tests/tests.h
index 53fe24dd29e1aecc84cf489fd5af759e58eb5926..a32e80073040f1685ba86f8a058ab51809d3bc3b 100644 (file)
--- a/Tests/tests.h
+++ b/Tests/tests.h
@@ -2,16 +2,26 @@
 #define TESTS_H
 
 #include <QObject>
+#include <QtTest/QtTest>
+#include "../dbconn.h"
 
 class Tests : public QObject
 {
   Q_OBJECT
+
 public:
-  explicit Tests(QObject *parent = nullptr);
+  explicit Tests (QObject* parent = nullptr);
 
 signals:
 
 public slots:
+private slots:
+  void initTestCase(); //run once before the tests
+  void init(); //run before every test
+  void cleanup(); //run after each test
+  void cleanupTestCase(); //run once after all tests
+
+  void dbTest();
 };
 
-#endif // TESTS_H
\ No newline at end of file
+#endif // TESTS_H

diff --git a/dbconn.h b/dbconn.h
index 241f3157980a4b662b915fdfaacf8be2d9311438..d562f6eea08ed9c3609d34add7efa59496786f33 100644 (file)
--- a/dbconn.h
+++ b/dbconn.h
@@ -37,7 +37,7 @@ class DbConn : public QObject
     "create table orders("
     "id integer primary key autoincrement,"
     "customerid integer not null,"
-    "date text"
+    "date text,"
     "foreign key(customerid) references customers(id)"
     ")"
   };