1
=== modified file 'tests/autopilot/ubuntu_rssreader_app/emulators.py'
2
--- tests/autopilot/ubuntu_rssreader_app/emulators.py	2013-08-13 20:21:58 +0000
3
+++ tests/autopilot/ubuntu_rssreader_app/emulators.py	2013-09-05 05:27:18 +0000
4
@@ -127,3 +127,12 @@
5
127
127
6
128
    def get_add_a_topic(self):
128
    def get_add_a_topic(self):
7
129
        return self.select_single("QQuickItem", objectName = "addTopic")
129
        return self.select_single("QQuickItem", objectName = "addTopic")
8
130
9
131
    def get_refresh_feed_dialog(self):
10
132
        return self.select_single("Dialog", objectName = "refreshWaitDialog")
11
133
12
134
    def get_refresh_dialog_cancel_button(self):
13
135
        return self.select_single("Button", objectName = "refreshCancel")
14
136
15
137
    def get_network_activity(self):
16
138
        return self.select_single("ActivityIndicator", running = "True")
17
130
139
18
=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/__init__.py'
19
--- tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	2013-08-13 02:52:16 +0000
20
+++ tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	2013-09-05 05:27:18 +0000
21
@@ -21,12 +21,13 @@
22
21
21
23
22
import os.path
22
import os.path
24
23
import os
23
import os
25
24
import shutil
26
24
25
27
25
from autopilot.input import Mouse, Touch, Pointer
26
from autopilot.input import Mouse, Touch, Pointer
28
26
from autopilot.platform import model
27
from autopilot.platform import model
29
27
from autopilot.testcase import AutopilotTestCase
28
from autopilot.testcase import AutopilotTestCase
30
28
from autopilot.matchers import Eventually
29
from autopilot.matchers import Eventually
32
29
from testtools.matchers import GreaterThan
30
from testtools.matchers import GreaterThan, Equals
33
30
31
34
31
from ubuntuuitoolkit import emulators as toolkit_emulators
32
from ubuntuuitoolkit import emulators as toolkit_emulators
35
32
from ubuntu_rssreader_app import emulators
33
from ubuntu_rssreader_app import emulators
36
@@ -43,10 +44,16 @@
37
43
        scenarios = [('with touch', dict(input_device_class=Touch))]
44
        scenarios = [('with touch', dict(input_device_class=Touch))]
38
44
45
39
45
    local_location = "../../ubuntu-rssreader-app.qml"
46
    local_location = "../../ubuntu-rssreader-app.qml"
40
47
    sqlite_dir = os.path.expanduser(
41
48
        "~/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/Databases")
42
49
    backup_dir = sqlite_dir + ".backup"
43
46
50
44
47
    def setUp(self):
51
    def setUp(self):
45
48
        self.pointing_device = Pointer(self.input_device_class.create())
52
        self.pointing_device = Pointer(self.input_device_class.create())
46
49
        super(RssReaderAppTestCase, self).setUp()
53
        super(RssReaderAppTestCase, self).setUp()
47
54
        self.temp_move_sqlite_db()
48
55
        self.addCleanup(self.restore_sqlite_db)
49
56
50
50
        if os.path.exists(self.local_location):
57
        if os.path.exists(self.local_location):
51
51
            self.launch_test_local()
58
            self.launch_test_local()
52
52
        else:
59
        else:
53
@@ -68,6 +75,31 @@
54
68
            app_type='qt',
75
            app_type='qt',
55
69
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
76
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
56
70
77
57
78
    def temp_move_sqlite_db(self):
58
79
        if os.path.exists(self.sqlite_dir):
59
80
            shutil.move(self.sqlite_dir, self.backup_dir)
60
81
            self.assertThat(
61
82
                lambda: os.path.exists(self.backup_dir),
62
83
                Eventually(Equals(True)))
63
84
64
85
    def restore_sqlite_db(self):
65
86
        if os.path.exists(self.backup_dir) and os.path.exists(self.sqlite_dir):
66
87
            shutil.rmtree(self.sqlite_dir)
67
88
            self.assertThat(
68
89
                lambda: os.path.exists(self.sqlite_dir),
69
90
                Eventually(Equals(False)))
70
91
            shutil.move(self.backup_dir, self.sqlite_dir)
71
92
            self.assertTrue(
72
93
                lambda: os.path.exists(self.sqlite_dir),
73
94
                Eventually(Equals(True)))
74
95
        elif os.path.exists(self.backup_dir):
75
96
            shutil.move(self.backup_dir, self.sqlite_dir)
76
97
            self.assertTrue(
77
98
                lambda: os.path.exists(self.sqlite_dir),
78
99
                Eventually(Equals(True)))
79
100
        else:
80
101
            pass
81
102
82
71
    @property
103
    @property
83
72
    def main_view(self):
104
    def main_view(self):
84
73
        return self.app.select_single(emulators.MainView)
105
        return self.app.select_single(emulators.MainView)
85
74
106
86
=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
87
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-08-30 14:58:01 +0000
88
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-09-05 05:27:18 +0000
89
@@ -26,6 +26,11 @@
90
26
        super(TestMainWindow, self).setUp()
26
        super(TestMainWindow, self).setUp()
91
27
        self.assertThat(self.main_view.visible, Eventually(Equals(True)))
27
        self.assertThat(self.main_view.visible, Eventually(Equals(True)))
92
28
28
93
29
        #wait for any updates to finish before beginning tests
94
30
        self.assertThat(self.main_view.get_network_activity, Eventually(Not(Is(None))))
95
31
        self.assertThat(self.main_view.get_network_activity, Eventually(Is(None)))
96
32
97
33
98
29
    def _add_feed_and_topic(self):
34
    def _add_feed_and_topic(self):
99
30
        """test add feed and topic"""
35
        """test add feed and topic"""
100
31
        #open toolbar
36
        #open toolbar
101
@@ -65,15 +70,28 @@
102
65
        self.assertThat(chossetopicpage, Eventually(Equals(True)))
70
        self.assertThat(chossetopicpage, Eventually(Equals(True)))
103
66
71
104
67
        #add a new topic
72
        #add a new topic
106
68
        self._input_new_topic("CanonicalTopic")
73
        topicName = "CanonicalTopic"
107
74
        self._input_new_topic(topicName)
108
69
75
109
70
        #select canonical topic
76
        #select canonical topic
110
71
        self.assertThat(self.main_view.get_canonical_topic_labelvisual, Eventually(Not(Is(None))))
77
        self.assertThat(self.main_view.get_canonical_topic_labelvisual, Eventually(Not(Is(None))))
111
78
112
79
        #make sure topic is selected
113
80
        timeout = 0
114
72
        canonicalTopic = self.main_view.get_canonical_topic_labelvisual()
81
        canonicalTopic = self.main_view.get_canonical_topic_labelvisual()
115
73
        self.pointing_device.click_object(canonicalTopic)
82
        self.pointing_device.click_object(canonicalTopic)
116
74
83
119
75
        #just for timing purposes
84
        #loop to ensure we clicked the topic
120
76
        self.assertThat(canonicalTopic.text, Eventually(Equals("CanonicalTopic")))
85
        #while canonicalTopic.Text != topicName and timeout < 10:
121
86
        while not self.main_view.get_network_activity and timeout < 10:
122
87
            canonicalTopic = self.main_view.get_canonical_topic_labelvisual()
123
88
            self.pointing_device.click_object(canonicalTopic)
124
89
            sleep(1)
125
90
            timeout += 1
126
91
127
92
        #wait for any updates to finish
128
93
        #self.assertThat(self.main_view.get_network_activity, Eventually(Not(Is(None))))
129
94
        self.assertThat(self.main_view.get_network_activity, Eventually(Is(None)))
130
77
95
131
78
    def _remove_feed(self):
96
    def _remove_feed(self):
132
79
        #open toolbar
97
        #open toolbar
133
@@ -197,7 +215,7 @@
134
197
        #remove added Canonical topic
215
        #remove added Canonical topic
135
198
        #12 Aug 2013, removing topic broken for now
216
        #12 Aug 2013, removing topic broken for now
136
199
        #test commented until fixed, see https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1211631
217
        #test commented until fixed, see https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1211631
138
200
        ##        self._remove_topic()
218
        #self._remove_topic()
139
201
219
140
202
        #remove added Canonical feed
220
        #remove added Canonical feed
141
203
        self._remove_feed()
221
        self._remove_feed()
142
204
222
143
=== modified file 'ubuntu-rssreader-app.qml'
144
--- ubuntu-rssreader-app.qml	2013-09-01 21:45:40 +0000
145
+++ ubuntu-rssreader-app.qml	2013-09-05 05:27:18 +0000
146
@@ -273,6 +273,7 @@
147
273
273
148
274
        Dialog {
274
        Dialog {
149
275
            id: refreshWaitDialog
275
            id: refreshWaitDialog
150
276
            objectName: refreshWaitDialog
151
276
277
152
277
            title: i18n.tr("Checking for new articles")
278
            title: i18n.tr("Checking for new articles")
153
278
279
154
@@ -282,6 +283,7 @@
155
282
283
156
283
            Button {
284
            Button {
157
284
                text: i18n.tr("Cancel")
285
                text: i18n.tr("Cancel")
158
286
                objectName: refreshCancel
159
285
                color: UbuntuColors.orange
287
                color: UbuntuColors.orange
160
286
                onClicked: {
288
                onClicked: {
161
287
                    xmlnetwork.cancelDownload()
289
                    xmlnetwork.cancelDownload()
Status:	Merged
Approved by:	Nicholas Skaggs on 2013-09-05
Approved revision:	62
Merged at revision:	59
Proposed branch:	lp:~nskaggs/ubuntu-rssreader-app/expand-setup
Merge into:	lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target:	161 lines (+66/-5) 4 files modified tests/autopilot/ubuntu_rssreader_app/emulators.py (+9/-0) tests/autopilot/ubuntu_rssreader_app/tests/__init__.py (+33/-1) tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py (+22/-4) ubuntu-rssreader-app.qml (+2/-0)
To merge this branch:	bzr merge lp:~nskaggs/ubuntu-rssreader-app/expand-setup
Related bugs:	Link a bug report
Reviewer	Review Type	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration	Approve on 2013-09-05
Nicholas Skaggs (community)		Approve on 2013-09-05
Review via email: mp+183912@code.launchpad.net