Merge branch 'ci-test'

Skycoder42 · Skycoder42 · commit 36997ee3d340 · 2017-08-02T11:48:24.000+02:00
diff --git a/.qmake.conf b/.qmake.conf
@@ -2,4 +2,4 @@ load(qt_build_config)
 
 CONFIG += warning_clean exceptions
 
-MODULE_VERSION = 3.0.1
+MODULE_VERSION = 3.0.2
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,62 @@
+language: cpp
+
+services:
+  - docker
+
+sudo: required
+dist: trusty
+osx_image: xcode8.3
+
+env:
+  global:
+    - QT_VER=5.9.1
+    - EXTRA_MODULES=".skycoder42.jsonserializer .skycoder42.backgroundprocess"
+
+matrix:
+  include:
+    - os: linux
+      env:
+        - PLATFORM=gcc_64
+        - BUILD_DOC=true
+    - os: linux
+      env:
+        - PLATFORM=android_armv7
+    - os: linux
+      env:
+        - PLATFORM=android_x86
+    - os: osx
+      env:
+        - PLATFORM=clang_64
+    - os: osx
+      env:
+        - PLATFORM=ios
+
+before_install:
+  - git clone https://github.com/Skycoder42/QtModules.git ./qtmodules-travis
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then travis_wait 40 ./qtmodules-travis/ci/$TRAVIS_OS_NAME/setup.sh; else ./qtmodules-travis/ci/$TRAVIS_OS_NAME/setup.sh; fi
+  - ./tests/ci/setup.sh
+
+script:
+  - ./qtmodules-travis/ci/$TRAVIS_OS_NAME/build.sh
+
+before_deploy:
+  - ./qtmodules-travis/ci/$TRAVIS_OS_NAME/upload-prepare.sh
+deploy:
+  provider: releases
+  skip_cleanup: true
+  api_key:
+    secure: rlbQDrfTPXKyOBgnixuvnXwl/0G9O89rHe+IEGJuLWc7hfkEYKhDCcjjfONM6dQ/qp3NDYKJYO1FsYgfkjN50IywpHO2Hgmr/2Gg/Bin37kbT7ZPzKqYT2TD1IqTerdNmL7n60YjJtvIDLd/k+9k5xU2TDd1jawiz1pEKkvUKHkBImKhNUk3NX6Ba8d4xbWwAvg3IIg63TI42f0srapZY+jvzbQjiuIqfL+pbByfcPi77NIKtrSJNF0UsLFeeqEYrvd1TsmeObyp566xPH7OZzJ0llomDqmD1leSYUM7bwBMscQai/3BcucygQbX+wx/Z9Ghq4HhXQ+E9nQvhEHwAXgvGB+Rxd/IvtzBRS8VQoDpCyFqEN1xhEE38vvkkTGfxWLDCeTSNsKrZYj6iqPOrOkF6/DFC/L1jSy0BumedhK4+Zi2InvniGSPIk9Gk3PWgJp1MWTzdJ+E3L5WEch4iV+TY3E8ukPCuvTyIQiitm9O+Dfz2FVmT+aMwvL/tHr7w7dG/05fDZj7psXjEGTPdKIfzjf1fUp++AKmg0hjPYXkQRvMg7jHS9R4AYvwVagDleXLZwq7lhmREq1gJL32D806sdN8+9scNKrA6D/ZhHr6j03i6eLoLzL1n17IOfjB6taantmsOeSEV4TKyznMXOY2/Wdm8gIpk0GTn1h7O8Y=
+  file_glob: true
+  file: install/opt/build_*_$QT_VER.tar.xz
+  on:
+    repo: Skycoder42/QtDataSync
+    tags: true
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+    - $HOME/.android/build-cache
diff --git a/appveyor.yml b/appveyor.yml
@@ -0,0 +1,58 @@
+image:
+  - Visual Studio 2017
+  - Visual Studio 2015
+
+version: build-{build}
+
+environment:
+  QT_VER: 5.9.1
+  EXTRA_MODULES: .skycoder42.jsonserializer;.skycoder42.backgroundprocess
+
+  matrix:
+    - PLATFORM: msvc2017_64
+    - PLATFORM: winrt_x64_msvc2017
+    - PLATFORM: winrt_x86_msvc2017
+    - PLATFORM: winrt_armv7_msvc2017
+    - PLATFORM: msvc2015_64
+    - PLATFORM: msvc2015
+    - PLATFORM: mingw53_32
+
+matrix:
+  exclude:
+    - PLATFORM: msvc2017_64
+      image: Visual Studio 2015
+    - PLATFORM: winrt_x64_msvc2017
+      image: Visual Studio 2015
+    - PLATFORM: winrt_x86_msvc2017
+      image: Visual Studio 2015
+    - PLATFORM: winrt_armv7_msvc2017
+      image: Visual Studio 2015
+    - PLATFORM: mingw53_32
+      image: Visual Studio 2015
+    - PLATFORM: msvc2015_64
+      image: Visual Studio 2017
+    - PLATFORM: msvc2015
+      image: Visual Studio 2017
+
+install:
+  - git clone https://github.com/Skycoder42/QtModules.git .\qtmodules-travis
+  - .\qtmodules-travis\ci\win\setup.bat
+  - .\tests\ci\setup.bat
+
+build_script:
+  - .\qtmodules-travis\ci\win\build.bat
+
+after_build:
+  - .\qtmodules-travis\ci\win\upload-prepare.bat
+
+artifacts:
+  - path: install\build_*_%QT_VER%.zip
+
+deploy:
+  provider: GitHub
+  auth_token:
+    secure: Cp5GRQku2ZWnKPE12NB5q11ZO0Fr5mlzdUTjnLpYJr/dki4LPVqm231edFggogy8
+  artifact: /.*\.zip/
+  force_update: false
+  on:
+    appveyor_repo_tag: true
diff --git a/doc/makedoc.sh b/doc/makedoc.sh
@@ -19,7 +19,7 @@ doxyTemplate="$srcDir/Doxyfile"
 readme="$destDir/README.md"
 doxme="$scriptDir/doxme.py"
 
-python "$doxme" "$srcDir/../README.md"
+python3 "$doxme" "$srcDir/../README.md"
 
 cat "$doxyTemplate" > Doxyfile
 echo "PROJECT_NUMBER = \"$version\"" >> Doxyfile
diff --git a/repogen.sh b/repogen.sh
@@ -3,5 +3,10 @@
 # $1 path to module binaries
 # $2 Version
 
+
 myDir=$(dirname "$0")
-"$myDir/../QtModules/repogen.py" "$1" DataSync "qt.59.skycoder42.jsonserializer,qt.59.skycoder42.backgroundprocess" "qdatasyncserver" "A simple offline-first synchronisation framework, to synchronize data of Qt applications between devices." "$2" "$myDir/LICENSE" BSD-3-Clause
+qtDir=${1?First parameter must be set to the dir to install}
+version=${2?Set the version as second parameter}
+qtvid=$(echo $qtDir | sed -e "s/\\.//g")
+
+"$myDir/../QtModules/deploy/repogen.py"  "$qtDir" DataSync "qt.$qtvid.skycoder42.jsonserializer,qt.$qtvid.skycoder42.backgroundprocess" "qdatasyncserver" "A simple offline-first synchronisation framework, to synchronize data of Qt applications between devices." "$version" "$myDir/LICENSE" BSD-3-Clause
diff --git a/src/3rdparty/qpm.json b/src/3rdparty/qpm.json
@@ -2,9 +2,9 @@
   "name": "",
   "description": "",
   "dependencies": [
-    "de.skycoder42.qtinyaes@1.0.4",
-    "de.skycoder42.kokke.tiny-aes128-c@1.0.1",
-    "de.skycoder42.qrng@1.0.0"
+    "de.skycoder42.qtinyaes@2.0.1",
+    "de.skycoder42.kokke.tiny-aes128-c@2.0.1",
+    "de.skycoder42.qrng@1.0.1"
   ],
   "license": "NONE",
   "pri_filename": "",
diff --git a/src/datasync/datasync.pro b/src/datasync/datasync.pro
@@ -1,6 +1,7 @@
 TARGET = QtDataSync
 
 QT = core jsonserializer sql websockets
+QTAES_KEYSIZE = 128 #TODO make 256 with next major release
 
 include(../3rdparty/vendor/vendor.pri)
 
diff --git a/src/datasync/qtinyaesencryptor.cpp b/src/datasync/qtinyaesencryptor.cpp
@@ -44,6 +44,7 @@ void QTinyAesEncryptor::setKey(const QByteArray &key)
 
 QJsonValue QTinyAesEncryptor::encrypt(const ObjectKey &key, const QJsonObject &object, const QByteArray &keyProperty) const
 {
+	//TODO adjust to AES256
 	auto salt = QRng().generateRandom(28);//224 bits
 	auto iv = QCryptographicHash::hash(salt + key.first + key.second.toUtf8() + keyProperty, QCryptographicHash::Sha3_224);
 	iv.resize(QTinyAes::BLOCKSIZE);
diff --git a/tests/auto/datasync/ChangeControllerTest/tst_changecontroller.cpp b/tests/auto/datasync/ChangeControllerTest/tst_changecontroller.cpp
@@ -365,10 +365,13 @@ void ChangeControllerTest::testLiveChanges()
 	remote->mutex.unlock();
 
 	if(localChange.id != -1) {//not default constructed
+		holder->mutex.lock();//block holder to prevent early changes
+
 		try {
 			auto task = async->save<TestData>(localChange);
 			task.waitForFinished();
 		} catch(QException &e) {
+			holder->mutex.unlock();
 			QFAIL(e.what());
 		}
 
@@ -377,6 +380,8 @@ void ChangeControllerTest::testLiveChanges()
 			store->failCount = 1;
 			store->mutex.unlock();
 		}
+
+		holder->mutex.unlock();
 	}
 	if(remoteChange.size() == 1) {
 		remote->mutex.lock();
diff --git a/tests/auto/datasync/WsRemoteConnectorTest/WsRemoteConnectorTest.pro b/tests/auto/datasync/WsRemoteConnectorTest/WsRemoteConnectorTest.pro
@@ -20,6 +20,13 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 
 SOURCES += tst_wsremoteconnector.cpp
+
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
+DEFINES += BUILDDIR=\\\"$$OUT_PWD/\\\"
 
 HEADERS +=
+
+DISTFILES += server-setup.conf
+
+include(setup.pri)
+DEFINES += SETUP_CONF=\\\"$$SETUP_FILE\\\"
diff --git a/tests/auto/datasync/WsRemoteConnectorTest/server-setup.conf b/tests/auto/datasync/WsRemoteConnectorTest/server-setup.conf
@@ -0,0 +1,14 @@
+[general]
+name=QtDataSync-TestServer
+
+[server]
+host=localhost
+port=4242
+secret=baum42
+
+[database]
+name=QtDataSync
+host=localhost
+port=15432
+username=qtdatasync
+password=baum42
diff --git a/tests/auto/datasync/WsRemoteConnectorTest/setup.pri b/tests/auto/datasync/WsRemoteConnectorTest/setup.pri
@@ -0,0 +1 @@
+SETUP_FILE=$$PWD/server-setup.conf
diff --git a/tests/auto/datasync/WsRemoteConnectorTest/tst_wsremoteconnector.cpp b/tests/auto/datasync/WsRemoteConnectorTest/tst_wsremoteconnector.cpp
@@ -58,11 +58,10 @@ void WsRemoteConnectorTest::initTestCase()
 	auth = Setup::authenticatorForSetup<WsAuthenticator>(this);
 
 	//now start the server!
-	QProcess p;
-	p.start(QStringLiteral("../../../../bin/qdatasyncserver start -c %1/../../../../tools/qdatasyncserver/docker_setup.conf")
-			.arg(SRCDIR));
-	QVERIFY(p.waitForFinished());
-	QCOMPARE(p.exitCode(), EXIT_SUCCESS);
+	auto res = QProcess::execute(QStringLiteral("%1/../../../../bin/qdatasyncserver start -c %2")
+								 .arg(BUILDDIR)
+								 .arg(SETUP_CONF));
+	QCOMPARE(res, EXIT_SUCCESS);
 }
 
 void WsRemoteConnectorTest::cleanupTestCase()
@@ -73,10 +72,9 @@ void WsRemoteConnectorTest::cleanupTestCase()
 	Setup::removeSetup(Setup::DefaultSetup);
 
 	//and stop the server!
-	QProcess p;
-	p.start(QStringLiteral("../../../../bin/qdatasyncserver stop"));
-	QVERIFY(p.waitForFinished());
-	QCOMPARE(p.exitCode(), EXIT_SUCCESS);
+	auto res = QProcess::execute(QStringLiteral("%1/../../../../bin/qdatasyncserver stop")
+								 .arg(BUILDDIR));
+	QCOMPARE(res, EXIT_SUCCESS);
 }
 
 void WsRemoteConnectorTest::testServerConnecting()
diff --git a/tests/ci/server-setup.conf b/tests/ci/server-setup.conf
@@ -0,0 +1,13 @@
+[general]
+name=QtDataSync-TestServer
+
+[server]
+host=localhost
+port=4242
+secret=baum42
+
+[database]
+name=postgres
+port=5432
+username=postgres
+password=baum42
diff --git a/tests/ci/setup.bat b/tests/ci/setup.bat
@@ -0,0 +1,2 @@
+:: disable ws test
+echo SUBDIRS -= WsRemoteConnectorTest >> .\tests\auto\datasync\datasync.pro
diff --git a/tests/ci/setup.sh b/tests/ci/setup.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+
+# get postgres running for ws test
+if [[ $PLATFORM == "gcc_64" ]]; then
+	sudo curl -o /usr/local/bin/docker-compose -L "https://github.com/docker/compose/releases/download/1.14.0/docker-compose-$(uname -s)-$(uname -m)"
+	sudo chmod +x /usr/local/bin/docker-compose
+
+	sudo docker run -d --name datasync_postgres -e "POSTGRES_PASSWORD=baum42" postgres:latest
+	
+	postgresIp=$(sudo docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datasync_postgres)
+	echo host=$postgresIp >> ./tests/ci/server-setup.conf
+	echo 'SETUP_FILE=$$PWD/../../../ci/server-setup.conf' > ./tests/auto/datasync/WsRemoteConnectorTest/setup.pri
+fi
+
+# disable test on osx as workaround (build fail and no docker support)
+if [[ $PLATFORM == "clang_64" ]]; then
+	echo "SUBDIRS -= CachingDataStoreTest WsRemoteConnectorTest" >> ./tests/auto/datasync/datasync.pro
+fi
diff --git a/tools/qdatasyncserver/docker-compose.yaml b/tools/qdatasyncserver/docker-compose.yaml
@@ -1,26 +1,28 @@
-version: '2'
+version: '2.2'
 services:
-  datasync_server:
-    container_name: datasync_example_server
+  datasync_postgres:
+    container_name: datasync_example_postgres
     image: postgres:latest
     ports:
-      - "15432/tcp:5432/tcp"
+      - "15432:5432/tcp"
     environment:
       POSTGRES_USER: qtdatasync
       POSTGRES_PASSWORD: baum42
       POSTGRES_DB: QtDataSync
       PGDATA: /var/lib/postgresql/data/pgdata
     volumes:
-      - datasync_example_server_data:/var/lib/postgresql/data/pgdata
+      - datasync_example_postgres_data:/var/lib/postgresql/data/pgdata
+    network_mode: "bridge"
   datasync_pgAdmin:
     container_name: datasync_example_pgAdmin
     image: thajeztah/pgadmin4:latest
     depends_on:
-      - datasync_server
+      - datasync_postgres
     ports:
-      - "5050/tcp:5050/tcp"
+      - "5050:5050/tcp"
     volumes:
       - datasync_example_pgAdmin_data:/pgadmin
+    network_mode: "bridge"
 volumes:
-  datasync_example_server_data:
+  datasync_example_postgres_data:
   datasync_example_pgAdmin_data:

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ load(qt_build_config)`
`2`	`2`
`3`	`3`	`CONFIG += warning_clean exceptions`
`4`	`4`
`5`		`-MODULE_VERSION = 3.0.1`
	`5`	`+MODULE_VERSION = 3.0.2`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ void QTinyAesEncryptor::setKey(const QByteArray &key)`
`44`	`44`
`45`	`45`	`QJsonValue QTinyAesEncryptor::encrypt(const ObjectKey &key, const QJsonObject &object, const QByteArray &keyProperty) const`
`46`	`46`	`{`
	`47`	`+ //TODO adjust to AES256`
`47`	`48`	`auto salt = QRng().generateRandom(28);//224 bits`
`48`	`49`	`auto iv = QCryptographicHash::hash(salt + key.first + key.second.toUtf8() + keyProperty, QCryptographicHash::Sha3_224);`
`49`	`50`	`iv.resize(QTinyAes::BLOCKSIZE);`