Merge pull request #62 from QuasarApp/package_version_system

Added versions into packages.
QuasarApp · May 28, 2023 · 5c2657d · 5c2657d
2 parents 64cdc99 + 12e1165
commit 5c2657d
Show file tree

Hide file tree

Showing 49 changed files with 928 additions and 158 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,7 +24,7 @@ if (DEFINED TARGET_PLATFORM_TOOLCHAIN)
 endif()
 
 updateGitVars()
-set(HEART_VERSION 1.2.${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH})
+set(HEART_VERSION 1.3.${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH})
 
 if (ANDROID OR IOS)
     option(HEART_TESTS "Enable or disable tests of the heart library" OFF)

diff --git a/HeartTests/tst_testprotockol.cpp b/HeartTests/tst_testprotockol.cpp
@@ -13,6 +13,7 @@
 #include <bigdatatest.h>
 #include <ecdsaauthtest.h>
 #include <upgradedatabasetest.h>
+#include <multiversiontest.h>
 
 #define TestCase(name, testClass) \
     void name() { \
@@ -39,6 +40,8 @@ private slots:
 #endif
 
     TestCase(upgradeDataBaseTest, UpgradeDataBaseTest)
+    TestCase(multiVersionTest, MultiVersionTest)
+
 
     // END TEST CASES
 
@@ -67,7 +70,6 @@ testProtockol::testProtockol() {
 }
 
 testProtockol::~testProtockol() {
-    _app->exit(0);
     delete _app;
 }
 

diff --git a/HeartTests/units/bigdatatest.cpp b/HeartTests/units/bigdatatest.cpp
@@ -12,7 +12,7 @@
 #define LOCAL_TEST_PORT TEST_PORT + 4
 
 class BigPackage: public QH::PKG::AbstractData {
-    QH_PACKAGE(BigPackage, "BigPackage")
+    QH_PACKAGE("BigPackage")
 
 public:
     BigPackage(){
@@ -22,13 +22,15 @@ class BigPackage: public QH::PKG::AbstractData {
 
     // StreamBase interface
 protected:
-    QDataStream &fromStream(QDataStream &stream) override{
+    QDataStream &fromStream(QDataStream &stream) override {
+
         stream >> data;
 
         return stream;
     };
 
-    QDataStream &toStream(QDataStream &stream) const override{
+    QDataStream &toStream(QDataStream &stream) const override {
+
         stream << data;
 
         return stream;