mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up merge issues

Browse source 
Remove tests for removed properties.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-09-11 17:34:58 -07:00
parent 848d277951
commit d1060319d7
2 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/testqPrefCloudStorage.cpp
View file

@ -210,8 +210,6 @@ void TestQPrefCloudStorage::test_signals()
QSignalSpy spy6(qPrefCloudStorage::instance(), SIGNAL(cloud_timeoutChanged(int))); QSignalSpy spy6(qPrefCloudStorage::instance(), SIGNAL(cloud_timeoutChanged(int)));
QSignalSpy spy7(qPrefCloudStorage::instance(), SIGNAL(cloud_verification_statusChanged(int))); QSignalSpy spy7(qPrefCloudStorage::instance(), SIGNAL(cloud_verification_statusChanged(int)));
QSignalSpy spy9(qPrefCloudStorage::instance(), SIGNAL(save_password_localChanged(bool))); 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_base_url("signal url");
qPrefCloudStorage::set_cloud_storage_email("signal myEmail"); qPrefCloudStorage::set_cloud_storage_email("signal myEmail");
@ -221,8 +219,6 @@ void TestQPrefCloudStorage::test_signals()
qPrefCloudStorage::set_cloud_timeout(11); qPrefCloudStorage::set_cloud_timeout(11);
qPrefCloudStorage::set_cloud_verification_status(qPrefCloudStorage::CS_VERIFIED); qPrefCloudStorage::set_cloud_verification_status(qPrefCloudStorage::CS_VERIFIED);
qPrefCloudStorage::set_save_password_local(true); qPrefCloudStorage::set_save_password_local(true);
qPrefCloudStorage::set_save_userid_local(true);
qPrefCloudStorage::set_userid("signal my user");
QCOMPARE(spy1.count(), 1); QCOMPARE(spy1.count(), 1);
QCOMPARE(spy2.count(), 1); QCOMPARE(spy2.count(), 1);
@ -232,8 +228,6 @@ void TestQPrefCloudStorage::test_signals()
QCOMPARE(spy6.count(), 1); QCOMPARE(spy6.count(), 1);
QCOMPARE(spy7.count(), 1); QCOMPARE(spy7.count(), 1);
QCOMPARE(spy9.count(), 1); QCOMPARE(spy9.count(), 1);
QCOMPARE(spy10.count(), 1);
QCOMPARE(spy11.count(), 1);
QVERIFY(spy1.takeFirst().at(0).toString() == "signal url"); QVERIFY(spy1.takeFirst().at(0).toString() == "signal url");
QVERIFY(spy2.takeFirst().at(0).toString() == "signal myEmail"); QVERIFY(spy2.takeFirst().at(0).toString() == "signal myEmail");
@ -243,8 +237,6 @@ void TestQPrefCloudStorage::test_signals()
QVERIFY(spy6.takeFirst().at(0).toInt() == 11); QVERIFY(spy6.takeFirst().at(0).toInt() == 11);
QVERIFY(spy7.takeFirst().at(0).toInt() == qPrefCloudStorage::CS_VERIFIED); QVERIFY(spy7.takeFirst().at(0).toInt() == qPrefCloudStorage::CS_VERIFIED);
QVERIFY(spy9.takeFirst().at(0).toBool() == true); 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) QTEST_MAIN(TestQPrefCloudStorage)

16
tests/tst_qPrefCloudStorage.qml
View file

@ -42,14 +42,6 @@ TestCase {
var x9 = PrefCloudStorage.save_password_local var x9 = PrefCloudStorage.save_password_local
PrefCloudStorage.save_password_local = true PrefCloudStorage.save_password_local = true
compare(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 { Item {
@ -63,8 +55,6 @@ TestCase {
property bool spy7 : false property bool spy7 : false
property bool spy8 : false property bool spy8 : false
property bool spy9 : false property bool spy9 : false
property bool spy10 : false
property bool spy11 : false
Connections { Connections {
target: PrefCloudStorage target: PrefCloudStorage
@ -76,8 +66,6 @@ TestCase {
onCloud_timeoutChanged: {spyCatcher.spy7 = true } onCloud_timeoutChanged: {spyCatcher.spy7 = true }
onCloud_verification_statusChanged: {spyCatcher.spy8 = true } onCloud_verification_statusChanged: {spyCatcher.spy8 = true }
onSave_password_localChanged: {spyCatcher.spy9 = 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_timeout = 18
PrefCloudStorage.cloud_verification_status = 2 PrefCloudStorage.cloud_verification_status = 2
PrefCloudStorage.save_password_local = ! PrefCloudStorage.save_password_local 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.spy1, true)
compare(spyCatcher.spy3, true) compare(spyCatcher.spy3, true)
@ -101,7 +87,5 @@ TestCase {
compare(spyCatcher.spy7, true) compare(spyCatcher.spy7, true)
compare(spyCatcher.spy8, true) compare(spyCatcher.spy8, true)
compare(spyCatcher.spy9, true) compare(spyCatcher.spy9, true)
compare(spyCatcher.spy10, true)
compare(spyCatcher.spy11, true)
} }
} }