git.iko.soy/unity8
on xenial help sign in
Revert wizard test (for now)
21fa1e8Marius Gripsgard
tests/plugins/Wizard/tst_system.cpp+7−39
compare with xenial
unifiedsplit
@@ -33,59 +33,41 @@ private Q_SLOTS:
33 void testEnable();
33 void testEnable();
34 void testDisable();
34 void testDisable();
35 void testNoticeChanges();
35 void testNoticeChanges();
36− void testUpdate();
37
36
38private:
37private:
39 void enable();
38 void enable();
40− void enableUpdateOnly();
41 void disable();
39 void disable();
42 bool isEnabled();
40 bool isEnabled();
43− bool updateIsEnabled();
44
41
45 QTemporaryDir dir;
42 QTemporaryDir dir;
46 QDir enableDir;
43 QDir enableDir;
47− QFile enableUpdateWizardFile;
44+ QFile enableFile;
48};
45};
49
46
50SystemTest::SystemTest()
47SystemTest::SystemTest()
51{
48{
52− System system;
53 qputenv("HOME", dir.path().toUtf8());
49 qputenv("HOME", dir.path().toUtf8());
54− enableDir.setPath(dir.path() + "/.config/ubuntu-system-settings/wizard-has-run/");
50+ enableDir.setPath(dir.path() + "/.config/ubuntu-system-settings");
55− QString updateFileName = enableDir.filePath(QString::number(system.CURRENT_VERSION));
51+ enableFile.setFileName(enableDir.filePath("wizard-has-run"));
56− enableUpdateWizardFile.setFileName(updateFileName);
57}
52}
58
53
59void SystemTest::enable()
54void SystemTest::enable()
60{
55{
61− enableDir.removeRecursively();
56+ enableFile.remove();
62 QCOMPARE(isEnabled(), true);
57 QCOMPARE(isEnabled(), true);
63}
58}
64
59
65void SystemTest::disable()
60void SystemTest::disable()
66{
61{
67 enableDir.mkpath(".");
62 enableDir.mkpath(".");
68− enableUpdateWizardFile.open(QIODevice::WriteOnly);
63+ enableFile.open(QIODevice::WriteOnly);
69− enableUpdateWizardFile.close();
64+ enableFile.close();
70 QCOMPARE(isEnabled(), false);
65 QCOMPARE(isEnabled(), false);
71− QCOMPARE(updateIsEnabled(), false);
72}
66}
73
67
74bool SystemTest::isEnabled()
68bool SystemTest::isEnabled()
75{
69{
76− return !enableDir.exists();
70+ return !enableFile.exists();
77−}
78−
79−void SystemTest::enableUpdateOnly()
80−{
81− disable();
82− enableUpdateWizardFile.remove();
83− QCOMPARE(updateIsEnabled(), true);
84−}
85−
86−bool SystemTest::updateIsEnabled()
87−{
88− return !enableUpdateWizardFile.exists();
89}
71}
90
72
91void SystemTest::testEnable()
73void SystemTest::testEnable()
@@ -112,20 +94,6 @@ void SystemTest::testDisable()
112 QVERIFY(!isEnabled());
94 QVERIFY(!isEnabled());
113}
95}
114
96
115−void SystemTest::testUpdate()
116−{
117− enableUpdateOnly();
118−
119− System system;
120− QVERIFY(system.wizardEnabled());
121− QVERIFY(system.versionToShow() == system.CURRENT_VERSION);
122−
123− system.setWizardEnabled(false);
124− QVERIFY(!system.wizardEnabled());
125− QVERIFY(!isEnabled());
126− QVERIFY(!updateIsEnabled());
127−}
128−
129void SystemTest::testNoticeChanges()
97void SystemTest::testNoticeChanges()
130{
98{
131 enable();
99 enable();