added export test

Author: Skycoder42

src/datasync/authenticator.cpp

@@ -9,21 +9,31 @@ Authenticator::Authenticator(QObject *parent) :
 	QObject(parent)
 {}
 
+void Authenticator::exportUserData(QIODevice *device) const
+{
+	exportUserDataImpl(device);
+}
+
 QByteArray Authenticator::exportUserData() const
 {
 	QBuffer buffer;
 	buffer.open(QIODevice::WriteOnly);
-	exportUserData(&buffer);
+	exportUserDataImpl(&buffer);
 	auto res = buffer.data();
 	buffer.close();
 	return res;
 }
 
+GenericTask<void> Authenticator::importUserData(QIODevice *device)
+{
+	return importUserDataImpl(device);
+}
+
 GenericTask<void> Authenticator::importUserData(QByteArray data)
 {
 	QBuffer buffer(&data);
 	buffer.open(QIODevice::ReadOnly);
-	auto res = importUserData(&buffer);
+	auto res = importUserDataImpl(&buffer);
 	buffer.close();
 	return res;
 }

src/datasync/authenticator.h

@@ -25,18 +25,21 @@ class Q_DATASYNC_EXPORT Authenticator : public QObject
 	explicit Authenticator(QObject *parent = nullptr);
 
 	//! Export all user-related remote data to the given device
-	virtual void exportUserData(QIODevice *device) const = 0;
+	void exportUserData(QIODevice *device) const;
 	//! Export all user-related remote data
 	QByteArray exportUserData() const;
 	//! Import user-related remote data from the given device
-	virtual GenericTask<void> importUserData(QIODevice *device) = 0;
+	GenericTask<void> importUserData(QIODevice *device);
 	//! Import user-related remote data
 	GenericTask<void> importUserData(QByteArray data);
 
 protected:
 	//! Call this method to reset the users identity.
 	GenericTask<void> resetIdentity(const QVariant &extraData = {}, bool resetLocalStore = true);
 
+	virtual void exportUserDataImpl(QIODevice *device) const = 0;
+	virtual GenericTask<void> importUserDataImpl(QIODevice *device) = 0;
+
 	//! Returns a reference to the connector this authenticator belongs to
 	virtual RemoteConnector *connector() = 0;
 };

src/datasync/wsauthenticator.cpp

@@ -20,7 +20,7 @@ WsAuthenticator::WsAuthenticator(WsRemoteConnector *connector, Defaults *default
 
 WsAuthenticator::~WsAuthenticator() {}
 
-void WsAuthenticator::exportUserData(QIODevice *device) const
+void WsAuthenticator::exportUserDataImpl(QIODevice *device) const
 {
 	QJsonObject data;
 	data[QStringLiteral("key")] = QString::fromUtf8(d->connector->cryptor()->key().toBase64());
@@ -29,7 +29,7 @@ void WsAuthenticator::exportUserData(QIODevice *device) const
 	device->write(QJsonDocument(data).toJson(QJsonDocument::Indented));
 }
 
-GenericTask<void> WsAuthenticator::importUserData(QIODevice *device)
+GenericTask<void> WsAuthenticator::importUserDataImpl(QIODevice *device)
 {
 	QJsonParseError error;
 	auto data = QJsonDocument::fromJson(device->readAll(), &error);

src/datasync/wsauthenticator.h

@@ -42,8 +42,8 @@ class Q_DATASYNC_EXPORT WsAuthenticator : public Authenticator
 	//! Destructor
 	~WsAuthenticator();
 
-	void exportUserData(QIODevice *device) const override;
-	GenericTask<void> importUserData(QIODevice *device) override;
+	void exportUserDataImpl(QIODevice *device) const override;
+	GenericTask<void> importUserDataImpl(QIODevice *device) override;
 
 	//! @readAcFn{WsAuthenticator::remoteEnabled}
 	bool isRemoteEnabled() const;

tests/auto/datasync/WsRemoteConnectorTest/tst_wsremoteconnector.cpp

@@ -22,6 +22,7 @@ private Q_SLOTS:
 	void testRemove();
 
 	void testSecondDevice();
+	void testExportImport();
 
 Q_SIGNALS:
 	void unlockSignal();
@@ -285,6 +286,65 @@ void WsRemoteConnectorTest::testSecondDevice()
 	store->mutex.unlock();
 }
 
+void WsRemoteConnectorTest::testExportImport()
+{
+	//IMPORTANT!!! clear pending notifies...
+	QCoreApplication::processEvents();
+
+	QSignalSpy syncSpy(controller, &SyncController::syncStateChanged);
+	QSignalSpy conSpy(auth, &WsAuthenticator::connectedChanged);
+
+	auto data = auth->exportUserData();
+
+	//after export: test with different user to reset
+	auth->resetUserIdentity();//reset device trick...
+	auth->reconnect();
+
+	QVERIFY(conSpy.wait());
+	QVERIFY(!auth->isConnected());
+	QVERIFY(conSpy.wait());
+	QVERIFY(auth->isConnected());
+	for(auto i = 0; i < 10 && syncSpy.count() < 4; i++)
+		syncSpy.wait(500);
+	QCOMPARE(syncSpy.count(), 4);
+	QCOMPARE(syncSpy[0][0], QVariant::fromValue(SyncController::Disconnected));
+	QCOMPARE(syncSpy[1][0], QVariant::fromValue(SyncController::Loading));
+	QCOMPARE(syncSpy[2][0], QVariant::fromValue(SyncController::Syncing));
+	QCOMPARE(syncSpy[3][0], QVariant::fromValue(SyncController::Synced));
+	QCOMPARE(controller->syncState(), SyncController::Synced);
+
+	store->mutex.lock();
+	[&](){
+		QVERIFY(store->pseudoStore.keys().isEmpty());
+	}();
+	store->mutex.unlock();
+
+	//now reimport
+	syncSpy.clear();
+	conSpy.clear();
+
+	auth->importUserData(data);
+
+	QVERIFY(conSpy.wait());
+	QVERIFY(!auth->isConnected());
+	QVERIFY(conSpy.wait());
+	QVERIFY(auth->isConnected());
+	for(auto i = 0; i < 10 && syncSpy.count() < 4; i++)
+		syncSpy.wait(500);
+	QCOMPARE(syncSpy.count(), 4);
+	QCOMPARE(syncSpy[0][0], QVariant::fromValue(SyncController::Disconnected));
+	QCOMPARE(syncSpy[1][0], QVariant::fromValue(SyncController::Loading));
+	QCOMPARE(syncSpy[2][0], QVariant::fromValue(SyncController::Syncing));
+	QCOMPARE(syncSpy[3][0], QVariant::fromValue(SyncController::Synced));
+	QCOMPARE(controller->syncState(), SyncController::Synced);
+
+	store->mutex.lock();
+	[&](){
+		QLISTCOMPARE(store->pseudoStore.keys(), generateDataJson(313, 318).keys());
+	}();
+	store->mutex.unlock();
+}
+
 QTEST_MAIN(WsRemoteConnectorTest)
 
 #include "tst_wsremoteconnector.moc"