From d19047e5802f89c540cf50b546adab675adca7fe Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com>
Date: Sun, 2 Sep 2018 11:59:25 +0200
Subject: [PATCH] Added unit test project

---
 DbMsgLib.pro                        |  4 +++-
 messagingclient/messagingclient.pro |  2 --
 messagingcorelib/dbmsgbase.h        | 17 +++++++-------
 messagingserver/messagingserver.pro |  2 --
 messagingtest/messagingtest.pro     | 25 +++++++++++++++++++++
 messagingtest/tst_messagingtest.cpp | 35 +++++++++++++++++++++++++++++
 project.pri                         |  6 ++++-
 7 files changed, 76 insertions(+), 15 deletions(-)
 create mode 100644 messagingtest/messagingtest.pro
 create mode 100644 messagingtest/tst_messagingtest.cpp

diff --git a/DbMsgLib.pro b/DbMsgLib.pro
index 61fcf67..8e3c639 100644
--- a/DbMsgLib.pro
+++ b/DbMsgLib.pro
@@ -2,7 +2,9 @@ TEMPLATE = subdirs
 
 SUBDIRS += messagingclient \
            messagingcorelib \
-           messagingserver
+           messagingserver \
+           messagingtest
 
 messagingclient.depends += messagingcorelib
 messagingserver.depends += messagingcorelib
+messagingtest.depends += messagingcorelib
diff --git a/messagingclient/messagingclient.pro b/messagingclient/messagingclient.pro
index 67f339a..526d055 100644
--- a/messagingclient/messagingclient.pro
+++ b/messagingclient/messagingclient.pro
@@ -3,8 +3,6 @@ QT += core network
 TARGET = messagingclient
 TEMPLATE = app
 
-CONFIG -= app_bundle
-
 PROJECT_ROOT = ..
 
 DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin
diff --git a/messagingcorelib/dbmsgbase.h b/messagingcorelib/dbmsgbase.h
index e27980b..2ce11b1 100644
--- a/messagingcorelib/dbmsgbase.h
+++ b/messagingcorelib/dbmsgbase.h
@@ -13,15 +13,15 @@ private: \
     DbMsgField<TYPE> m_##NAME;\
     \
 public: \
-    TYPE get##UPPER_NAME() const { return m_##NAME.getValue(); } \
-    void set##UPPER_NAME(const TYPE &NAME) { m_##NAME.setValue(NAME); } \
-    bool has##UPPER_NAME() const { return m_##NAME.hasValue(); } \
-    void clear##UPPER_NAME() { m_##NAME.clear(); } \
+    inline TYPE get##UPPER_NAME() const { return m_##NAME.getValue(); } \
+    inline void set##UPPER_NAME(const TYPE &NAME) { m_##NAME.setValue(NAME); } \
+    inline bool has##UPPER_NAME() const { return m_##NAME.hasValue(); } \
+    inline void clear##UPPER_NAME() { m_##NAME.clear(); } \
     \
-    DbMsgField<TYPE> &NAME##Field() { return m_##NAME; } \
-    const DbMsgField<TYPE> &NAME##Field() const { return m_##NAME; } \
-    DbMsgFieldBase &NAME##FieldBase() { return m_##NAME; } \
-    const DbMsgFieldBase &NAME##FieldBase() const { return m_##NAME; }
+    inline DbMsgField<TYPE> &NAME##Field() { return m_##NAME; } \
+    inline const DbMsgField<TYPE> &NAME##Field() const { return m_##NAME; } \
+    inline DbMsgFieldBase &NAME##FieldBase() { return m_##NAME; } \
+    inline const DbMsgFieldBase &NAME##FieldBase() const { return m_##NAME; }
 
 class MESSAGINGCORELIBSHARED_EXPORT DbMsgBase
 {
@@ -32,7 +32,6 @@ public:
     virtual ~DbMsgBase();
 
     bool touched() const;
-
     void setTouched(bool touched);
 
     void debug() const;
diff --git a/messagingserver/messagingserver.pro b/messagingserver/messagingserver.pro
index 5cc5584..4f5f0df 100644
--- a/messagingserver/messagingserver.pro
+++ b/messagingserver/messagingserver.pro
@@ -3,8 +3,6 @@ QT += core network
 TARGET = messagingserver
 TEMPLATE = app
 
-CONFIG -= app_bundle
-
 PROJECT_ROOT = ..
 
 DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin
diff --git a/messagingtest/messagingtest.pro b/messagingtest/messagingtest.pro
new file mode 100644
index 0000000..5730186
--- /dev/null
+++ b/messagingtest/messagingtest.pro
@@ -0,0 +1,25 @@
+QT += core testlib
+QT -= gui widgets
+
+TARGET = messagingserver
+TEMPLATE = app
+
+CONFIG += testcase
+
+PROJECT_ROOT = ..
+
+DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin
+
+DBLIBS += core
+
+SOURCES += tst_messagingtest.cpp
+
+HEADERS +=
+
+FORMS +=
+
+RESOURCES +=
+
+TRANSLATIONS +=
+
+include($${PROJECT_ROOT}/project.pri)
diff --git a/messagingtest/tst_messagingtest.cpp b/messagingtest/tst_messagingtest.cpp
new file mode 100644
index 0000000..e8fe5d8
--- /dev/null
+++ b/messagingtest/tst_messagingtest.cpp
@@ -0,0 +1,35 @@
+#include <QtTest>
+
+// add necessary includes here
+
+class MessagingTest : public QObject
+{
+    Q_OBJECT
+
+public:
+    MessagingTest();
+    ~MessagingTest();
+
+private slots:
+    void test_case1();
+
+};
+
+MessagingTest::MessagingTest()
+{
+
+}
+
+MessagingTest::~MessagingTest()
+{
+
+}
+
+void MessagingTest::test_case1()
+{
+
+}
+
+QTEST_APPLESS_MAIN(MessagingTest)
+
+#include "tst_messagingtest.moc"
diff --git a/project.pri b/project.pri
index aa366cf..fd48e71 100644
--- a/project.pri
+++ b/project.pri
@@ -1,9 +1,13 @@
-CONFIG += c++14
+CONFIG += qt console warn_on depend_includepath c++14
 
 DEFINES += QT_DEPRECATED_WARNINGS \
            QT_DISABLE_DEPRECATED_BEFORE=0x060000 \
            QT_MESSAGELOGCONTEXT
 
+equals(TEMPLATE, "app") {
+    CONFIG -= app_bundle
+}
+
 equals(TEMPLATE, "lib") {
     win32: DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin
     else: DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/lib