Clean up merge issues

Remove tests for removed properties.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

2 files changed, 0 insertions, 24 deletions

diff --git a/tests/testqPrefCloudStorage.cpp b/tests/testqPrefCloudStorage.cpp
index 84beda8db..f8f0fe00f 100644
--- a/tests/testqPrefCloudStorage.cpp
+++ b/tests/testqPrefCloudStorage.cpp
@@ -210,8 +210,6 @@ void TestQPrefCloudStorage::test_signals()
 	QSignalSpy spy6(qPrefCloudStorage::instance(), SIGNAL(cloud_timeoutChanged(int)));
 	QSignalSpy spy7(qPrefCloudStorage::instance(), SIGNAL(cloud_verification_statusChanged(int)));
 	QSignalSpy spy9(qPrefCloudStorage::instance(), SIGNAL(save_password_localChanged(bool)));
-	QSignalSpy spy10(qPrefCloudStorage::instance(), SIGNAL(save_userid_localChanged(bool)));
-	QSignalSpy spy11(qPrefCloudStorage::instance(), SIGNAL(useridChanged(QString)));
 
 	qPrefCloudStorage::set_cloud_base_url("signal url");
 	qPrefCloudStorage::set_cloud_storage_email("signal myEmail");
@@ -221,8 +219,6 @@ void TestQPrefCloudStorage::test_signals()
 	qPrefCloudStorage::set_cloud_timeout(11);
 	qPrefCloudStorage::set_cloud_verification_status(qPrefCloudStorage::CS_VERIFIED);
 	qPrefCloudStorage::set_save_password_local(true);
-	qPrefCloudStorage::set_save_userid_local(true);
-	qPrefCloudStorage::set_userid("signal my user");
 
 	QCOMPARE(spy1.count(), 1);
 	QCOMPARE(spy2.count(), 1);
@@ -232,8 +228,6 @@ void TestQPrefCloudStorage::test_signals()
 	QCOMPARE(spy6.count(), 1);
 	QCOMPARE(spy7.count(), 1);
 	QCOMPARE(spy9.count(), 1);
-	QCOMPARE(spy10.count(), 1);
-	QCOMPARE(spy11.count(), 1);
 
 	QVERIFY(spy1.takeFirst().at(0).toString() == "signal url");
 	QVERIFY(spy2.takeFirst().at(0).toString() == "signal myEmail");
@@ -243,8 +237,6 @@ void TestQPrefCloudStorage::test_signals()
 	QVERIFY(spy6.takeFirst().at(0).toInt() == 11);
 	QVERIFY(spy7.takeFirst().at(0).toInt() == qPrefCloudStorage::CS_VERIFIED);
 	QVERIFY(spy9.takeFirst().at(0).toBool() == true);
-	QVERIFY(spy10.takeFirst().at(0).toBool() == true);
-	QVERIFY(spy11.takeFirst().at(0).toString() == "signal my user");
 }
 
 QTEST_MAIN(TestQPrefCloudStorage)
diff --git a/tests/tst_qPrefCloudStorage.qml b/tests/tst_qPrefCloudStorage.qml
index f2341218d..7bc137d20 100644
--- a/tests/tst_qPrefCloudStorage.qml
+++ b/tests/tst_qPrefCloudStorage.qml
@@ -42,14 +42,6 @@ TestCase {
 		var x9 = PrefCloudStorage.save_password_local
 		PrefCloudStorage.save_password_local = true
 		compare(PrefCloudStorage.save_password_local, true)
-
-		var x10 = PrefCloudStorage.save_userid_local
-		PrefCloudStorage.save_userid_local = true
-		compare(PrefCloudStorage.save_userid_local, true)
-
-		var x11 = PrefCloudStorage.userid
-		PrefCloudStorage.userid = "my user"
-		compare(PrefCloudStorage.userid, "my user")
 	}
 
 	Item {
@@ -63,8 +55,6 @@ TestCase {
 		property bool spy7 : false
 		property bool spy8 : false
 		property bool spy9 : false
-		property bool spy10 : false
-		property bool spy11 : false
 
 		Connections {
 			target: PrefCloudStorage
@@ -76,8 +66,6 @@ TestCase {
 			onCloud_timeoutChanged: {spyCatcher.spy7 = true }
 			onCloud_verification_statusChanged: {spyCatcher.spy8 = true }
 			onSave_password_localChanged: {spyCatcher.spy9 = true }
-			onSave_userid_localChanged: {spyCatcher.spy10 = true }
-			onUseridChanged: {spyCatcher.spy11 = true }
 		}
 	}
 
@@ -90,8 +78,6 @@ TestCase {
 		PrefCloudStorage.cloud_timeout = 18
 		PrefCloudStorage.cloud_verification_status = 2
 		PrefCloudStorage.save_password_local = ! PrefCloudStorage.save_password_local
-		PrefCloudStorage.save_userid_local = ! PrefCloudStorage.save_userid_local
-		PrefCloudStorage.userid = "qml"
 
 		compare(spyCatcher.spy1, true)
 		compare(spyCatcher.spy3, true)
@@ -101,7 +87,5 @@ TestCase {
 		compare(spyCatcher.spy7, true)
 		compare(spyCatcher.spy8, true)
 		compare(spyCatcher.spy9, true)
-		compare(spyCatcher.spy10, true)
-		compare(spyCatcher.spy11, true)
 	}
 }