tested generic resolver exception

Author: Skycoder42

tests/auto/datasync/TestSyncController/testresolver.cpp

@@ -10,6 +10,8 @@ TestData TestResolver::resolveConflict(TestData data1, TestData data2, QObject *
 	Q_ASSERT_X(data1.id == data2.id, Q_FUNC_INFO, "resolveConflict called on different datasets");
 
 	TestData resData(data1.id);
+	if(shouldThrow)
+		throw NoConflictResultException{};
 	if(data1.text < data2.text)
 		resData.text = data1.text + QStringLiteral("+conflict");
 	else if(data2.text < data1.text)

tests/auto/datasync/TestSyncController/testresolver.h

@@ -14,6 +14,8 @@ class TestResolver : public QtDataSync::GenericConflictResolver<TestData>
 	explicit TestResolver(QObject *parent = nullptr);
 
 	TestData resolveConflict(TestData data1, TestData data2, QObject *parent) const override;
+
+	bool shouldThrow = false;
 };
 
 #endif // TESTRESOLVER_H

tests/auto/datasync/TestSyncController/tst_synccontroller.cpp

@@ -490,15 +490,23 @@ void TestSyncController::testResolver_data()
 	QTest::addColumn<QJsonObject>("localData");
 	QTest::addColumn<QJsonObject>("remoteData");
 	QTest::addColumn<QJsonObject>("resultData");
+	QTest::addColumn<bool>("testThrow");
 
 	QTest::newRow("conflict:local") << TestLib::generateKey(10)
 									<< TestLib::generateDataJson(10, QStringLiteral("dataA"))
 									<< TestLib::generateDataJson(10, QStringLiteral("dataB"))
-									<< TestLib::generateDataJson(10, QStringLiteral("dataA+conflict"));
+									<< TestLib::generateDataJson(10, QStringLiteral("dataA+conflict"))
+									<< false;
 	QTest::newRow("conflict:remote") << TestLib::generateKey(10)
 									 << TestLib::generateDataJson(10, QStringLiteral("dataB"))
 									 << TestLib::generateDataJson(10, QStringLiteral("dataA"))
-									 << TestLib::generateDataJson(10, QStringLiteral("dataA+conflict"));
+									 << TestLib::generateDataJson(10, QStringLiteral("dataA+conflict"))
+									 << false;
+	QTest::newRow("conflict:throw") << TestLib::generateKey(10)
+									<< TestLib::generateDataJson(10, QStringLiteral("dataA"))
+									<< TestLib::generateDataJson(10, QStringLiteral("dataB"))
+									<< TestLib::generateDataJson(10, QStringLiteral("dataB"))
+									<< true;
 }
 
 void TestSyncController::testResolver()
@@ -507,6 +515,7 @@ void TestSyncController::testResolver()
 	QFETCH(QJsonObject, localData);
 	QFETCH(QJsonObject, remoteData);
 	QFETCH(QJsonObject, resultData);
+	QFETCH(bool, testThrow);
 	QSignalSpy doneSpy(controller, &SyncController::syncDone);
 	QSignalSpy errorSpy(controller, &SyncController::controllerError);
 
@@ -517,7 +526,9 @@ void TestSyncController::testResolver()
 
 		auto dPriv = DefaultsPrivate::obtainDefaults(DefaultSetup);
 		auto oldRes = dPriv->resolver;
-		dPriv->resolver = new TestResolver(controller);
+		auto testRes = new TestResolver(controller);
+		testRes->shouldThrow = testThrow;
+		dPriv->resolver = testRes;
 		dPriv->resolver->setDefaults(dPriv);
 
 		//step 1: setup the local store