added setup tests and improved integration test

Author: Skycoder42

src/datasync/defaults.cpp

@@ -42,6 +42,11 @@ bool Defaults::isValid() const
 	return d;
 }
 
+void Defaults::drop()
+{
+	d.clear();
+}
+
 Logger *Defaults::createLogger(const QByteArray &subCategory, QObject *parent) const
 {
 	return new Logger(subCategory, d->setupName, parent);
@@ -189,6 +194,11 @@ QSqlDatabase *DatabaseRef::operator->() const
 	return &(d->db());
 }
 
+void DatabaseRef::drop()
+{
+	d.reset();
+}
+
 // ------------- PRIVATE IMPLEMENTATION Defaults -------------
 
 #undef QTDATASYNC_LOG

src/datasync/defaults.h

@@ -49,6 +49,8 @@ class Q_DATASYNC_EXPORT DatabaseRef
 	//! Arrow operator to access the database
 	QSqlDatabase *operator->() const;
 
+	void drop();
+
 private:
 	QScopedPointer<DatabaseRefPrivate> d;
 };
@@ -94,6 +96,7 @@ class Q_DATASYNC_EXPORT Defaults
 	~Defaults();
 
 	bool isValid() const;
+	void drop();
 
 	//! Create a new logger instance
 	Logger *createLogger(const QByteArray &subCategory, QObject *parent = nullptr) const;

src/datasync/exchangeengine.cpp

@@ -389,6 +389,7 @@ void EngineThread::waitAndTerminate(unsigned long timeout)
 {
 	if(isFinished())
 		return;
+	qCDebug(qdssetup) << "Waiting for workerthread of setup" << _name << "to exit normally...";
 	if(!wait(timeout)) {
 		qCWarning(qdssetup) << "Workerthread of setup" << _name << "did not finish before the timout. Terminating...";
 		terminate();

src/datasync/qpmx.json

@@ -3,7 +3,7 @@
         {
             "package": "de.skycoder42.qpluginfactory",
             "provider": "qpm",
-            "version": "1.3.0"
+            "version": "1.3.1"
         },
         {
             "package": "de.skycoder42.cryptoqq",

src/datasync/remoteconfig.cpp

@@ -17,6 +17,25 @@ RemoteConfig &RemoteConfig::operator=(const RemoteConfig &other) = default;
 
 RemoteConfig &RemoteConfig::operator=(RemoteConfig &&other) noexcept = default;
 
+bool RemoteConfig::operator==(const RemoteConfig &other) const
+{
+	return d == other.d || (
+				d->url == other.d->url &&
+				d->accessKey == other.d->accessKey &&
+				d->headers == other.d->headers &&
+				d->keepaliveTimeout == other.d->keepaliveTimeout);
+}
+
+bool RemoteConfig::operator!=(const RemoteConfig &other) const
+{
+	return d != other.d && (
+				d->url != other.d->url ||
+				d->accessKey != other.d->accessKey ||
+				d->headers != other.d->headers ||
+				d->keepaliveTimeout != other.d->keepaliveTimeout);
+}
+
+
 QUrl RemoteConfig::url() const
 {
 	return d->url;

src/datasync/remoteconfig.h

@@ -48,6 +48,9 @@ class Q_DATASYNC_EXPORT RemoteConfig
 	//! Move-Assignment operator
 	RemoteConfig &operator=(RemoteConfig &&other) noexcept;
 
+	bool operator==(const RemoteConfig &other) const;
+	bool operator!=(const RemoteConfig &other) const;
+
 	//! @readAcFn{RemoteConfig::url}
 	QUrl url() const;
 	//! @readAcFn{RemoteConfig::accessKey}

src/datasync/setup.cpp

@@ -29,7 +29,7 @@ void Setup::setCleanupTimeout(unsigned long timeout)
 	SetupPrivate::timeout = timeout;
 }
 
-void Setup::removeSetup(const QString &name, bool waitForFinished) //TODO add awaitable version
+void Setup::removeSetup(const QString &name, bool waitForFinished)
 {
 	QMutexLocker _(&SetupPrivate::setupMutex);
 	if(!SetupPrivate::engines.contains(name))

src/datasync/setup.h

@@ -35,17 +35,17 @@ namespace literals {
 
 //! literal for kilobytes
 Q_DECL_CONSTEXPR inline int operator "" _kb(unsigned long long x) {
-	return KB(static_cast<int>(x));
+	return KB(static_cast<intmax_t>(x));
 }
 
 //! literal for megabytes
 Q_DECL_CONSTEXPR inline int operator "" _mb(unsigned long long x) {
-	return MB(static_cast<int>(x));
+	return MB(static_cast<intmax_t>(x));
 }
 
 //! literal for gigabytes
 Q_DECL_CONSTEXPR inline int operator "" _gb(unsigned long long x) {
-	return GB(static_cast<int>(x));
+	return GB(static_cast<intmax_t>(x));
 }
 
 }

tests/auto/datasync/IntegrationTest/IntegrationTest.pro

@@ -1,5 +1,7 @@
 include(../tests.pri)
 
+QT += service
+
 TARGET = tst_integration
 
 SOURCES += \

tests/auto/datasync/IntegrationTest/tst_integration.cpp

@@ -1,6 +1,7 @@
 #include <QString>
 #include <QtTest>
 #include <QCoreApplication>
+#include <QtService/ServiceControl>
 #include <testlib.h>
 #include <testdata.h>
 using namespace QtDataSync;
@@ -20,11 +21,13 @@ private Q_SLOTS:
 	void testRemoveAndResetAccount();
 	void testAddAccountTrusted();
 
+	void testAddAccountOnCreate();
+
 Q_SIGNALS:
 	void unlock();
 
 private:
-	QProcess *server;
+	QtService::ServiceControl *server;
 
 	AccountManager *acc1;
 	SyncManager *sync1;
@@ -45,21 +48,24 @@ void IntegrationTest::initTestCase()
 	QVERIFY(QFile::exists(QString::fromUtf8(confPath)));
 	qputenv("QDSAPP_CONFIG_FILE", confPath);
 
+	const QString launchPath { QStringLiteral(BUILD_BIN_DIR "qdsapp") };
 #ifdef Q_OS_UNIX
-	QString binPath { QStringLiteral(BUILD_BIN_DIR "qdsappd") };
+	const QString binPath { QStringLiteral(BUILD_BIN_DIR "qdsappd") };
 #elif Q_OS_WIN
-	QString binPath { QStringLiteral(BUILD_BIN_DIR "qdsappsvc") };
+	const QString binPath { QStringLiteral(BUILD_BIN_DIR "qdsappsvc") };
 #else
-	QString binPath { QStringLiteral(BUILD_BIN_DIR "qdsapp") };
+	const auto binPath = launchPath;
 #endif
 	QVERIFY(QFile::exists(binPath));
+	if(!QFile::exists(launchPath))
+		QVERIFY(QFile::link(binPath, launchPath));
+	QVERIFY(QFile::exists(launchPath));
 
-	server = new QProcess(this);
-	server->setProgram(binPath);
-	server->setProcessChannelMode(QProcess::ForwardedErrorChannel);
-	server->start();
-	QVERIFY(server->waitForStarted(5000));
-	QVERIFY(!server->waitForFinished(5000));
+	server = QtService::ServiceControl::create(QStringLiteral("debug"), launchPath, this);
+	QVERIFY(server);
+	QVERIFY(server->serviceExists());
+	server->setBlocking(true);
+	QVERIFY(server->start());
 
 	try {
 		TestLib::init();
@@ -117,16 +123,9 @@ void IntegrationTest::cleanupTestCase()
 	acc2 = nullptr;
 	Setup::removeSetup(QStringLiteral("setup2"), true);
 
-	//send a signal to stop
-#ifdef Q_OS_UNIX
-	server->terminate(); //same as kill(SIGTERM)
-#elif Q_OS_WIN
-	GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, server->processId());
-#endif
-	QVERIFY(server->waitForFinished(5000));
-	QCOMPARE(server->exitStatus(), QProcess::NormalExit);
-	QCOMPARE(server->exitCode(), 0);
-	server->close();
+	QVERIFY(server->stop());
+	QTRY_COMPARE(server->status(), QtService::ServiceControl::ServiceStopped);
+	server->deleteLater();
 }
 
 void IntegrationTest::testPrepareData()
@@ -241,12 +240,12 @@ void IntegrationTest::testAddAccount()
 				emit unlock();
 				QCOMPARE(s, SyncManager::Synchronized);
 			}, true);
-			unlockSpy.wait();
+			QVERIFY(unlockSpy.wait());
 			sync2->runOnSynchronized([this](SyncManager::SyncState s) {
 				emit unlock();
 				QCOMPARE(s, SyncManager::Synchronized);
 			});
-			unlockSpy.wait();
+			QVERIFY(unlockSpy.wait());
 		} while(oldCnt1 != store1->count() || oldCnt2 != store2->count());
 
 		QCOMPARE(store1->count(), 20);
@@ -598,12 +597,12 @@ void IntegrationTest::testAddAccountTrusted()
 			emit unlock();
 			QCOMPARE(s, SyncManager::Synchronized);
 		}, true);
-		unlockSpy.wait();
+		QVERIFY(unlockSpy.wait());
 		sync2->runOnSynchronized([this](SyncManager::SyncState s) {
 			emit unlock();
 			QCOMPARE(s, SyncManager::Synchronized);
 		});
-		unlockSpy.wait();
+		QVERIFY(unlockSpy.wait());
 
 		QCOMPARE(store1->count(), 0);
 		QCOMPARE(store2->count(), 0);
@@ -615,6 +614,89 @@ void IntegrationTest::testAddAccountTrusted()
 	}
 }
 
+void IntegrationTest::testAddAccountOnCreate()
+{
+	try {
+		QSignalSpy error1Spy(acc1, &AccountManager::lastErrorChanged);
+		QSignalSpy grantSpy(acc1, &AccountManager::accountAccessGranted);
+		QSignalSpy unlockSpy(this, &IntegrationTest::unlock);
+
+		//export from acc1
+		auto password = QStringLiteral("password");
+		QJsonObject exportData;
+		acc1->exportAccountTrusted(false, password, [&](QJsonObject exp) {
+			QVERIFY(AccountManager::isTrustedImport(exp));
+			exportData = exp;
+			emit unlock();
+		}, [](QString e) {
+			QFAIL(qUtf8Printable(e));
+		});
+		QVERIFY(unlockSpy.wait());
+		QVERIFY(!exportData.isEmpty());
+
+		// create acc3 with account from setup
+		AccountManager *acc3;
+		SyncManager *sync3;
+		DataTypeStore<TestData> *store3;
+		QString setupName3 = QStringLiteral("setup3");
+		{
+			Setup setup3;
+			TestLib::setup(setup3);
+			setup3.setLocalDir(setup3.localDir() + QLatin1Char('/') + setupName3)
+					.setRemoteConfiguration(QUrl(QStringLiteral("ws://localhost:14242")))
+					.setAccountTrusted(exportData, password, false, false);
+			setup3.create(setupName3);
+
+			acc3 = new AccountManager(setupName3, this);
+			QVERIFY(acc3->replica()->waitForSource(5000));
+			sync3 = new SyncManager(setupName3, this);
+			QVERIFY(sync3->replica()->waitForSource(5000));
+			store3 = new DataTypeStore<TestData>(setupName3, this);
+		}
+
+		QSignalSpy error3Spy(acc3, &AccountManager::lastErrorChanged);
+		QSignalSpy acceptSpy(acc3, &AccountManager::importAccepted);
+
+		//wait for accept
+		if(acceptSpy.isEmpty())
+			QVERIFY(acceptSpy.wait());
+		QCOMPARE(acceptSpy.size(), 1);
+
+		//wait for grant
+		if(grantSpy.isEmpty())
+			QVERIFY(grantSpy.wait());
+		QCOMPARE(grantSpy.size(), 1);
+
+		//wait for sync
+		sync1->runOnSynchronized([this](SyncManager::SyncState s) {
+			emit unlock();
+			QCOMPARE(s, SyncManager::Synchronized);
+		}, true);
+		QVERIFY(unlockSpy.wait());
+		sync3->runOnSynchronized([this](SyncManager::SyncState s) {
+			emit unlock();
+			QCOMPARE(s, SyncManager::Synchronized);
+		});
+		QVERIFY(unlockSpy.wait());
+
+		QCOMPARE(store1->count(), 0);
+		QCOMPARE(store3->count(), 0);
+
+		QVERIFY(error1Spy.isEmpty());
+		QVERIFY(error3Spy.isEmpty());
+
+		delete store3;
+		store3 = nullptr;
+		delete sync3;
+		sync3 = nullptr;
+		delete acc3;
+		acc3 = nullptr;
+		Setup::removeSetup(setupName3, true);
+	} catch(std::exception &e) {
+		QFAIL(e.what());
+	}
+}
+
 QTEST_MAIN(IntegrationTest)
 
 #include "tst_integration.moc"