1
=== modified file 'FeedListPage.qml'
2
--- FeedListPage.qml	2013-06-16 07:43:59 +0000
3
+++ FeedListPage.qml	2013-07-12 20:14:27 +0000
4
@@ -145,6 +145,7 @@
5
145
        } // header
145
        } // header
6
146
146
7
147
        delegate: ListItems.Subtitled {
147
        delegate: ListItems.Subtitled {
8
148
            objectName: "feedItem"
9
148
            text: (model.title == "")? model.source /*+ "   " + model.status*/ : model.title /*+ "   " + model.status*/ // Debug - displaying status
149
            text: (model.title == "")? model.source /*+ "   " + model.status*/ : model.title /*+ "   " + model.status*/ // Debug - displaying status
10
149
            subText: (model.description != undefined)? model.description : "EMPTY"
150
            subText: (model.description != undefined)? model.description : "EMPTY"
11
150
            progression: true
151
            progression: true
12
@@ -333,6 +334,7 @@
13
333
            actions: ActionList {
334
            actions: ActionList {
14
334
                id: popoverActionsList
335
                id: popoverActionsList
15
335
                Action {
336
                Action {
16
337
                    objectName: "updateFeed"
17
336
                    id: nameActionUpdate
338
                    id: nameActionUpdate
18
337
                    text: i18n.tr("Update")
339
                    text: i18n.tr("Update")
19
338
                    onTriggered: {
340
                    onTriggered: {
20
@@ -369,6 +371,7 @@
21
369
                }
371
                }
22
370
372
23
371
                Action {
373
                Action {
24
374
                    objectName: "removeFeed"
25
372
                    text: i18n.tr("Remove")
375
                    text: i18n.tr("Remove")
26
373
                    onTriggered: {
376
                    onTriggered: {
27
374
                        PopupUtils.close(popover)
377
                        PopupUtils.close(popover)
28
@@ -480,6 +483,7 @@
29
480
                anchors.centerIn: parent
483
                anchors.centerIn: parent
30
481
484
31
482
                TextField {
485
                TextField {
32
486
                    objectName: "newFeedUrl"
33
483
                    id: tfFeedUrl
487
                    id: tfFeedUrl
34
484
                    anchors.horizontalCenter: parent.horizontalCenter
488
                    anchors.horizontalCenter: parent.horizontalCenter
35
485
                    width: parent.width
489
                    width: parent.width
36
486
490
37
=== modified file 'tests/autopilot/ubuntu_rssreader_app/emulators/main_window.py'
38
--- tests/autopilot/ubuntu_rssreader_app/emulators/main_window.py	2013-05-31 12:59:55 +0000
39
+++ tests/autopilot/ubuntu_rssreader_app/emulators/main_window.py	2013-07-12 20:14:27 +0000
40
@@ -15,10 +15,24 @@
41
15
    """
15
    """
42
16
    def __init__(self, app):
16
    def __init__(self, app):
43
17
        self.app = app
17
        self.app = app
51
18
18
        
52
19
    def get_qml_view(self):
19
    def get_new_event_name_input_box(self):
53
20
        """Get the main QML view"""
20
        return self.app.select_single("TextField", objectName="newFeedUrl")
54
21
        return self.app.select_single("QQuickView")
21
    
55
22
22
    def get_confirm_button(self):
56
23
    def get_toolbar(self):
23
        return self.app.select_single('Button', text='confirm')
57
24
        return self.app.select_single("Toolbar")
24
   
58
25
    def get_list_all_news(self):
59
26
        return self.app.select_single('Subtitled', text='All news')
60
27
   
61
28
    def get_individual_feed(self):
62
29
        return self.app.select_single('Subtitled', objectName='feedItem')
63
30
    
64
31
    def get_canonical_feed(self):
65
32
        return self.app.select_single('Subtitled', text='Canonical')
66
33
    
67
34
    def get_update_feed_context_menu_item(self):
68
35
        return self.app.select_single("Empty", text="Update")
69
36
70
37
    def get_remove_form_popOver(self):
71
38
        return self.app.select_single("Empty", text="Remove")
72
25
\ No newline at end of file
39
\ No newline at end of file
73
26
40
74
=== added file 'tests/autopilot/ubuntu_rssreader_app/emulators/ubuntusdk.py'
75
--- tests/autopilot/ubuntu_rssreader_app/emulators/ubuntusdk.py	1970-01-01 00:00:00 +0000
76
+++ tests/autopilot/ubuntu_rssreader_app/emulators/ubuntusdk.py	2013-07-12 20:14:27 +0000
77
@@ -0,0 +1,154 @@
78
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
79
2
#
80
3
# Copyright (C) 2013 Canonical Ltd
81
4
#
82
5
# This program is free software: you can redistribute it and/or modify
83
6
# it under the terms of the GNU General Public License version 3 as
84
7
# published by the Free Software Foundation.
85
8
#
86
9
# This program is distributed in the hope that it will be useful,
87
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
88
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
89
12
# GNU General Public License for more details.
90
13
#
91
14
# You should have received a copy of the GNU General Public License
92
15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
93
16
#
94
17
# Authored by: Nicholas Skaggs <nicholas.skaggs@canonical.com>
95
18
96
19
from testtools.matchers import Equals, NotEquals, Not, Is
97
20
from autopilot.matchers import Eventually
98
21
99
22
class ubuntusdk(object):
100
23
    """An emulator class that makes it easy to interact with the ubuntu sdk applications."""
101
24
102
25
    def __init__(self, autopilot, app):
103
26
        self.app = app
104
27
        self.autopilot = autopilot
105
28
106
29
    def get_qml_view(self):
107
30
        """Get the main QML view"""
108
31
        return self.app.select_single("QQuickView")
109
32
110
33
    def get_object(self, typeName, name):
111
34
        """Get a specific object"""
112
35
        return self.app.select_single(typeName, objectName=name)
113
36
114
37
    def get_objects(self, typeName, name):
115
38
        """Get more than one object"""
116
39
        return self.app.select_many(typeName, objectName=name)
117
40
118
41
    def switch_to_tab(self, tab):
119
42
        """Switch to the specified tab number"""
120
43
        tabs = self.get_tabs()
121
44
        currentTab = tabs.selectedTabIndex
122
45
123
46
        #perform operations until tab == currentTab
124
47
        while tab != currentTab:
125
48
            if tab > currentTab:
126
49
                self._previous_tab()
127
50
            if tab < currentTab:
128
51
                self._next_tab()
129
52
            currentTab = tabs.selectedTabIndex
130
53
131
54
    def toggle_toolbar(self):
132
55
        """Toggle the toolbar between revealed and hidden"""
133
56
        #check and see if the toolbar is open or not
134
57
        if self.get_toolbar().opened:
135
58
            self.hide_toolbar()
136
59
        else:
137
60
            self.open_toolbar()
138
61
139
62
    def get_toolbar(self):
140
63
        """Returns the toolbar in the main events view."""
141
64
        return self.app.select_single("Toolbar")
142
65
143
66
    def get_toolbar_button(self, buttonLabel):
144
67
        """Returns the toolbar button at position index"""
145
68
        toolbar = self.get_toolbar()
146
69
        if not toolbar.opened:
147
70
            self.open_toolbar()
148
71
        row = toolbar.select_single("QQuickRow")
149
72
        loaderList = row.select_many("QQuickLoader")
150
73
        for loader in loaderList:
151
74
            buttonList = loader.select_many("Button")
152
75
            for button in buttonList:
153
76
                if button.text == buttonLabel:
154
77
                    return button
155
78
156
79
    def click_toolbar_button(self, buttonLabel):
157
80
        """Clicks the toolbar button with buttonLabel"""
158
81
        #The toolbar button is assumed to be the following format
159
82
        #ToolbarActions {
160
83
        #           Action {
161
84
        #               objectName: "name"
162
85
        #                text: value
163
86
        button = self.get_toolbar_button(buttonLabel)
164
87
        self.autopilot.pointing_device.click_object(button)
165
88
166
89
    def open_toolbar(self):
167
90
        """Open the toolbar"""
168
91
        qmlView = self.get_qml_view()
169
92
170
93
        lineX = qmlView.x + qmlView.width * 0.50
171
94
        startY = qmlView.y + qmlView.height - 1
172
95
        stopY = qmlView.y + qmlView.height * 0.95
173
96
174
97
        self.autopilot.pointing_device.drag(lineX, startY, lineX, stopY)
175
98
176
99
    def hide_toolbar(self):
177
100
        """Hide the toolbar"""
178
101
        qmlView = self.get_qml_view()
179
102
180
103
        lineX = qmlView.x + qmlView.width * 0.50
181
104
        startY = qmlView.y + qmlView.height * 0.95
182
105
        stopY = qmlView.y + qmlView.height - 1
183
106
184
107
        self.autopilot.pointing_device.drag(lineX, startY, lineX, stopY)
185
108
186
109
    def set_popup_value(self, popover, button, value):
187
110
        """Changes the given popover selector to the request value
188
111
        At the moment this only works for values that are currently visible. To
189
112
        access the remaining items, a help method to drag and recheck is needed."""
190
113
        #The popover is assumed to be the following format
191
114
        #    Popover {
192
115
        #        Column {
193
116
        #            ListView {
194
117
        #                delegate: Standard {
195
118
        #                    objectName: "name"
196
119
        #                    text: value
197
120
198
121
        self.autopilot.pointing_device.click_object(button)
199
122
        #we'll get all matching objects, incase the popover is reused between buttons
200
123
        itemList = lambda: self.get_objects("Standard", popover)
201
124
202
125
        for item in itemList():
203
126
            if item.get_properties()['text'] == value:
204
127
                self.autopilot.pointing_device.click_object(item)
205
128
206
129
    def get_tabs(self):
207
130
        """Return all tabs"""
208
131
        return self.get_object("Tabs", "rootTabs")
209
132
210
133
    def _previous_tab(self):
211
134
        """Switch to the previous tab"""
212
135
        qmlView = self.get_qml_view()
213
136
214
137
        startX = qmlView.x + qmlView.width * 0.35
215
138
        stopX = qmlView.x + qmlView.width * 0.50
216
139
        lineY = qmlView.y + qmlView.height * 0.05
217
140
218
141
        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
219
142
        self.autopilot.pointing_device.click()
220
143
        self.autopilot.pointing_device.click()
221
144
222
145
    def _next_tab(self):
223
146
        """Switch to the next tab"""
224
147
        qmlView = self.get_qml_view()
225
148
226
149
        startX = qmlView.x + qmlView.width * 0.50
227
150
        stopX = qmlView.x + qmlView.width * 0.35
228
151
        lineY = qmlView.y + qmlView.height * 0.05
229
152
230
153
        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
231
154
        self.autopilot.pointing_device.click()
232
0
155
233
=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/__init__.py'
234
--- tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	2013-05-31 12:59:55 +0000
235
+++ tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	2013-07-12 20:14:27 +0000
236
@@ -12,8 +12,11 @@
237
12
from autopilot.input import Mouse, Touch, Pointer
12
from autopilot.input import Mouse, Touch, Pointer
238
13
from autopilot.platform import model
13
from autopilot.platform import model
239
14
from autopilot.testcase import AutopilotTestCase
14
from autopilot.testcase import AutopilotTestCase
240
15
from autopilot.matchers import Eventually
241
16
from testtools.matchers import Equals, NotEquals
242
15
17
243
16
from ubuntu_rssreader_app.emulators.main_window import MainWindow
18
from ubuntu_rssreader_app.emulators.main_window import MainWindow
244
19
from ubuntu_rssreader_app.emulators.ubuntusdk import ubuntusdk
245
17
20
246
18
21
247
19
class RssreaderTestCase(AutopilotTestCase):
22
class RssreaderTestCase(AutopilotTestCase):
248
@@ -53,3 +56,7 @@
249
53
    @property
56
    @property
250
54
    def main_window(self):
57
    def main_window(self):
251
55
        return MainWindow(self.app)
58
        return MainWindow(self.app)
252
59
253
60
    @property
254
61
    def ubuntusdk(self):
255
62
        return ubuntusdk(self, self.app)
256
56
63
257
=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
258
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-05-31 12:59:55 +0000
259
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-07-12 20:14:27 +0000
260
@@ -10,29 +10,114 @@
261
10
from __future__ import absolute_import
10
from __future__ import absolute_import
262
11
11
263
12
from autopilot.matchers import Eventually
12
from autopilot.matchers import Eventually
265
13
from testtools.matchers import Equals
13
from testtools.matchers import Equals, NotEquals
266
14
14
267
15
from ubuntu_rssreader_app.tests import RssreaderTestCase
15
from ubuntu_rssreader_app.tests import RssreaderTestCase
269
16
16
from time import sleep
270
17
17
271
18
class TestMainWindow(RssreaderTestCase):
18
class TestMainWindow(RssreaderTestCase):
272
19
19
273
20
    def setUp(self):
20
    def setUp(self):
274
21
        super(TestMainWindow, self).setUp()
21
        super(TestMainWindow, self).setUp()
275
22
        self.assertThat(
22
        self.assertThat(
277
23
            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
23
            self.ubuntusdk.get_qml_view().visible, Eventually(Equals(True)))
278
24
24
279
25
    def tearDown(self):
25
    def tearDown(self):
280
26
        super(TestMainWindow, self).tearDown()
26
        super(TestMainWindow, self).tearDown()
281
27
27
293
28
    def test_toolbar_shows(self):
28
    def test_add_new_feed(self):
294
29
        """Make sure that dragging from the bottom reveals the hidden
29
        event_view = self.ubuntusdk.get_qml_view()
295
30
        toolbar."""
30
        self.insert_canonical_feed()
296
31
        toolbar = self.main_window.get_toolbar()
31
        self.remove_canonical_feed(event_view)
297
32
32
        
298
33
        x, y, w, h = toolbar.globalRect
33
    def test_view_feeds(self):
299
34
        tx = x + (w / 2)
34
        event_view = self.ubuntusdk.get_qml_view()
300
35
        ty = y + (h - 2)
35
        #add Canonical feed
301
36
36
        self.insert_canonical_feed()
302
37
        self.pointing_device.drag(tx, ty, tx, ty - h)
37
        
303
38
        self.assertThat(toolbar.state, Eventually(Equals("spread")))
38
        #-----> view all news:
304
39
        #click list all news list item
305
40
        list_all_news = self.main_window.get_list_all_news()
306
41
        #does it exist?
307
42
        self.assertThat(list_all_news, NotEquals(None))
308
43
        #let's click it
309
44
        self.mouse.move_to_object(list_all_news)
310
45
        self.mouse.click()            
311
46
        #verify list all news page is open
312
47
        lambda: self.assertThat(event_view, Eventually(Equals("ArticleListPage.qml")))
313
48
        self.click_back_Toolbar_Button()
314
49
   
315
50
        #-----> view individual feed:
316
51
        event_view = self.ubuntusdk.get_qml_view()        
317
52
        #click Canonical feed item
318
53
        self.select_and_click_canonical_feed(event_view)
319
54
        self.click_back_Toolbar_Button()
320
55
        
321
56
        self.remove_canonical_feed(event_view)        
322
57
     
323
58
    def select_and_click_canonical_feed(self,event_view):
324
59
        canonical_feed = lambda: self.main_window.get_canonical_feed()
325
60
        #does it exist?
326
61
        self.assertThat(canonical_feed, Eventually(NotEquals(None)))
327
62
        #click on Canonical feed 
328
63
        self.mouse.move_to_object(canonical_feed())
329
64
        self.mouse.click()
330
65
        #verify list all news page is open
331
66
        lambda: self.assertThat(event_view, Eventually(Equals("ArticleListPage.qml")))
332
67
        
333
68
        
334
69
    def insert_canonical_feed(self):
335
70
        #toggle toolbar
336
71
        self.ubuntusdk.toggle_toolbar()
337
72
        #click on add feed button
338
73
        self.ubuntusdk.click_toolbar_button('Add feed')
339
74
        #type feed in input field
340
75
        new_Feed_Url = lambda: self.main_window.get_new_event_name_input_box()
341
76
        self.assertThat(new_Feed_Url, Eventually(NotEquals(None)))
342
77
        self.pointing_device.click_object(new_Feed_Url())
343
78
        self.keyboard.type("http://www.canonical.com/rss.xml")
344
79
        #click confirm button to save RSS
345
80
        confirm_btn = self.main_window.get_confirm_button()
346
81
        #does it exist?
347
82
        self.assertThat(confirm_btn, NotEquals(None))
348
83
        #let's click it
349
84
        self.mouse.move_to_object(confirm_btn)
350
85
        self.mouse.click()
351
86
        #verify Feed list page is open
352
87
        lambda: self.assertThat(event_view, Eventually(Equals("FeedListPage.qml")))
353
88
        #check that feed is updated, not empty
354
89
        canonical_feed_before = "http://www.canonical.com/rss.xml"
355
90
        self.assertThat(self._canonical_feed, Eventually(Equals(canonical_feed_before)))
356
91
        #verify feed has been added
357
92
        self.assertThat(self._canonical_feed, Eventually(Equals("Canonical")))
358
93
 
359
94
    def _canonical_feed(self):
360
95
        try:
361
96
            return self.main_window.get_individual_feed().text
362
97
        except StateNotFoundError:
363
98
            return None
364
99
        
365
100
    def remove_canonical_feed(self,event_view):
366
101
        canonical_feed = self.main_window.get_canonical_feed()
367
102
        #does it exist?
368
103
        self.assertThat(canonical_feed, NotEquals(None))
369
104
        #verify list all news page is open
370
105
        lambda: self.assertThat(event_view, Eventually(Equals("ArticleListPage.qml")))
371
106
        #let's click it
372
107
        self.mouse.move_to_object(canonical_feed)
373
108
        self.mouse.click_object(canonical_feed, button=1, press_duration=4)
374
109
        #select remove feed from popover context menu
375
110
        remove_in_context_menu = self.main_window.get_remove_form_popOver()
376
111
        #let's click it
377
112
        self.mouse.move_to_object(remove_in_context_menu)
378
113
        self.mouse.click()
379
114
        self.assertThat(self.main_window.get_canonical_feed, Eventually(Equals(None), timeout=30))
380
115
     
381
116
    def click_back_Toolbar_Button(self):
382
117
        #toggle toolbar
383
118
        self.ubuntusdk.toggle_toolbar()
384
119
        #click on back button
385
120
        backTBButton = self.app.select_single('Button', text='Back')
386
121
        #let's click it
387
122
        self.mouse.move_to_object(backTBButton)
388
123
        self.mouse.click()
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Needs Fixing on 2013-07-12
Nicholas Skaggs (community)			Approve on 2013-07-12
Francis Ginther		2013-07-06	Needs Fixing on 2013-07-11
Review via email: mp+173316@code.launchpad.net