1
=== modified file 'src/app/qml/reminders.qml'
2
--- src/app/qml/reminders.qml	2014-03-12 22:37:14 +0000
3
+++ src/app/qml/reminders.qml	2014-03-13 18:13:06 +0000
4
@@ -185,6 +185,7 @@
5
185
185
6
186
            Tab {
186
            Tab {
7
187
                title: i18n.tr("Notes")
187
                title: i18n.tr("Notes")
8
188
                objectName: "NotesTab"
9
188
                page: NotesPage {
189
                page: NotesPage {
10
189
                    id: notesPage
190
                    id: notesPage
11
190
191
12
@@ -210,6 +211,7 @@
13
210
211
14
211
            Tab {
212
            Tab {
15
212
                title: i18n.tr("Notebooks")
213
                title: i18n.tr("Notebooks")
16
214
                objectName: "NotebookTab"
17
213
                page: NotebooksPage {
215
                page: NotebooksPage {
18
214
                    id: notebooksPage
216
                    id: notebooksPage
19
215
217
20
216
218
21
=== modified file 'src/app/qml/ui/AccountSelectorPage.qml'
22
--- src/app/qml/ui/AccountSelectorPage.qml	2014-02-16 10:51:11 +0000
23
+++ src/app/qml/ui/AccountSelectorPage.qml	2014-03-13 18:13:06 +0000
24
@@ -24,6 +24,7 @@
25
24
24
26
25
Page {
25
Page {
27
26
    id: root
26
    id: root
28
27
    objectName: "Accountselectorpage"
29
27
    title: "Select Evernote account"
28
    title: "Select Evernote account"
30
28
29
31
29
    property alias accounts: listView.model
30
    property alias accounts: listView.model
32
@@ -43,6 +44,7 @@
33
43
            currentIndex: -1
44
            currentIndex: -1
34
44
45
35
45
            delegate: Standard {
46
            delegate: Standard {
36
47
                objectName: "EvernoteAccount"
37
46
                text: displayName
48
                text: displayName
38
47
                MouseArea {
49
                MouseArea {
39
48
                    anchors.fill: parent
50
                    anchors.fill: parent
40
49
51
41
=== modified file 'src/app/qml/ui/NotesPage.qml'
42
--- src/app/qml/ui/NotesPage.qml	2014-02-18 22:47:45 +0000
43
+++ src/app/qml/ui/NotesPage.qml	2014-03-13 18:13:06 +0000
44
@@ -99,6 +99,7 @@
45
99
    }
99
    }
46
100
100
47
101
    ListView {
101
    ListView {
48
102
        objectName: "notespageListview"
49
102
        anchors { left: parent.left; right: parent.right }
103
        anchors { left: parent.left; right: parent.right }
50
103
        height: parent.height - y
104
        height: parent.height - y
51
104
        model: notes
105
        model: notes
52
105
106
53
=== removed directory 'tests/autopilot/reminders/main'
54
=== removed file 'tests/autopilot/reminders/main/__init__.py'
55
--- tests/autopilot/reminders/main/__init__.py	2013-10-23 11:02:37 +0000
56
+++ tests/autopilot/reminders/main/__init__.py	1970-01-01 00:00:00 +0000
57
@@ -1,1 +0,0 @@
58
1
""" A Generic test suite """
59
2
0
60
=== removed file 'tests/autopilot/reminders/main/test_main.py'
61
--- tests/autopilot/reminders/main/test_main.py	2014-01-27 15:27:42 +0000
62
+++ tests/autopilot/reminders/main/test_main.py	1970-01-01 00:00:00 +0000
63
@@ -1,28 +0,0 @@
64
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
65
2
66
3
"""Tests for the Hello World"""
67
4
68
5
from autopilot.matchers import Eventually
69
6
from textwrap import dedent
70
7
from testtools.matchers import Is, Not, Equals
71
8
from testtools import skip
72
9
import os
73
10
from reminders import UbuntuTouchAppTestCase
74
11
75
12
76
13
class GenericTests(UbuntuTouchAppTestCase):
77
14
    """Generic tests for the Hello World"""
78
15
79
16
    if os.path.realpath(__file__).startswith("/usr/"):
80
17
        test_qml_file = "/usr/share/reminders/qml/reminders.qml"
81
18
    else:
82
19
        test_qml_file = "%s/%s.qml" % (os.path.dirname(os.path.realpath(__file__)),"../../../../src/app/qml/reminders")
83
20
84
21
    def test_0_can_select_mainView(self):
85
22
        """Must be able to select the mainview."""
86
23
87
24
        mainView = self.get_mainview()
88
25
        self.assertThat(mainView.visible,Eventually(Equals(True)))
89
26
90
27
91
28
92
29
0
93
=== renamed directory 'tests/autopilot/reminders' => 'tests/autopilot/reminders_app'
94
=== modified file 'tests/autopilot/reminders_app/__init__.py'
95
--- tests/autopilot/reminders/__init__.py	2013-11-22 18:13:40 +0000
96
+++ tests/autopilot/reminders_app/__init__.py	2014-03-13 18:13:06 +0000
97
@@ -1,131 +1,8 @@
98
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
229
2
2
# Copyright 2013 Canonical
230
3
"""Ubuntu Touch App autopilot tests."""
3
#
231
4
4
# This program is free software: you can redistribute it and/or modify it
232
5
from os import remove
5
# under the terms of the GNU General Public License version 3, as published
233
6
import os.path
6
# by the Free Software Foundation.
234
7
from tempfile import mktemp
7
235
8
import subprocess
8
"""Reminders app tests and emulators - top level package."""
106
9
107
10
from autopilot.input import Mouse, Touch, Pointer
108
11
from autopilot.matchers import Eventually
109
12
from autopilot.platform import model
110
13
from testtools.matchers import Is, Not, Equals
111
14
from autopilot.testcase import AutopilotTestCase
112
15
113
16
def get_module_include_path():
114
17
    return os.path.abspath(
115
18
        os.path.join(
116
19
            os.path.dirname(__file__),
117
20
            '..',
118
21
            '..',
119
22
            '..',
120
23
            '..',
121
24
            'src/plugin/')
122
25
        )
123
26
124
27
125
28
class UbuntuTouchAppTestCase(AutopilotTestCase):
126
29
    """A common test case class that provides several useful methods for the tests."""
127
30
128
31
    if model() == 'Desktop':
129
32
        scenarios = [
130
33
        ('with mouse', dict(input_device_class=Mouse))
131
34
        ]
132
35
    else:
133
36
        scenarios = [
134
37
        ('with touch', dict(input_device_class=Touch))
135
38
        ]
136
39
137
40
    @property
138
41
    def main_window(self):
139
42
        return MainWindow(self.app)
140
43
141
44
142
45
    def setUp(self):
143
46
        self.pointing_device = Pointer(self.input_device_class.create())
144
47
        super(UbuntuTouchAppTestCase, self).setUp()
145
48
        self.launch_test_qml()
146
49
147
50
148
51
    def launch_test_qml(self):
149
52
        # If the test class has defined a 'test_qml' class attribute then we
150
53
        # write it to disk and launch it inside the QML Scene. If not, then we
151
54
        # silently do nothing (presumably the test has something else planned).
152
55
        arch = subprocess.check_output(["dpkg-architecture",
153
56
        "-qDEB_HOST_MULTIARCH"]).strip()
154
57
        if hasattr(self, 'test_qml') and isinstance(self.test_qml, basestring):
155
58
            qml_path = mktemp(suffix='.qml')
156
59
            open(qml_path, 'w').write(self.test_qml)
157
60
            self.addCleanup(remove, qml_path)
158
61
159
62
            self.app = self.launch_test_application(
160
63
                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
161
64
                "-I", get_module_include_path(),
162
65
                qml_path,
163
66
                app_type='qt')
164
67
165
68
        if hasattr(self, 'test_qml_file') and isinstance(self.test_qml_file, basestring):
166
69
            qml_path = self.test_qml_file
167
70
            self.app = self.launch_test_application(
168
71
                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
169
72
                "-I", get_module_include_path(),
170
73
                qml_path,
171
74
                app_type='qt')
172
75
173
76
        self.assertThat(self.get_qml_view().visible, Eventually(Equals(True)))
174
77
175
78
176
79
    def get_qml_view(self):
177
80
        """Get the main QML view"""
178
81
179
82
        return self.app.select_single("QQuickView")
180
83
181
84
    def get_mainview(self):
182
85
        """Get the QML MainView"""
183
86
184
87
        mainView = self.app.select_single("MainView")
185
88
        self.assertThat(mainView, Not(Is(None)))
186
89
        return mainView
187
90
188
91
189
92
    def get_object(self,objectName):
190
93
        """Get a object based on the objectName"""
191
94
192
95
        obj = self.app.select_single(objectName=objectName)
193
96
        self.assertThat(obj, Not(Is(None)))
194
97
        return obj
195
98
196
99
197
100
    def mouse_click(self,objectName):
198
101
        """Move mouse on top of the object and click on it"""
199
102
200
103
        obj = self.get_object(objectName)
201
104
        self.pointing_device.move_to_object(obj)
202
105
        self.pointing_device.click()
203
106
204
107
205
108
    def mouse_press(self,objectName):
206
109
        """Move mouse on top of the object and press mouse button (without releasing it)"""
207
110
208
111
        obj = self.get_object(objectName)
209
112
        self.pointing_device.move_to_object(obj)
210
113
        self.pointing_device.press()
211
114
212
115
213
116
    def mouse_release(self):
214
117
        """Release mouse button"""
215
118
216
119
        self.pointing_device.release()     
217
120
218
121
219
122
    def type_string(self, string):
220
123
        """Type a string with keyboard"""
221
124
222
125
        self.keyboard.type(string)
223
126
224
127
225
128
    def type_key(self, key):
226
129
        """Type a single key with keyboard"""
227
130
228
131
        self.keyboard.key(key)
236
132
9
237
=== added file 'tests/autopilot/reminders_app/emulators.py'
238
--- tests/autopilot/reminders_app/emulators.py	1970-01-01 00:00:00 +0000
239
+++ tests/autopilot/reminders_app/emulators.py	2014-03-13 18:13:06 +0000
240
@@ -0,0 +1,45 @@
241
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
242
2
#
243
3
# Copyright (C) 2013 Canonical Ltd.
244
4
#
245
5
# This program is free software; you can redistribute it and/or modify
246
6
# it under the terms of the GNU Lesser General Public License as published by
247
7
# the Free Software Foundation; version 3.
248
8
#
249
9
# This program is distributed in the hope that it will be useful,
250
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
251
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
252
12
# GNU Lesser General Public License for more details.
253
13
#
254
14
# You should have received a copy of the GNU Lesser General Public License
255
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
256
16
257
17
import logging
258
18
259
19
from autopilot import logging as autopilot_logging
260
20
from ubuntuuitoolkit import emulators as toolkit_emulators
261
21
from time import sleep
262
22
263
23
logger = logging.getLogger(__name__)
264
24
265
25
class MainView(toolkit_emulators.MainView):
266
26
267
27
    retry_delay = 0.2
268
28
269
29
    def select_many_retry(self, object_type, **kwargs):
270
30
        """Returns the item that is searched for with app.select_many
271
31
        In case of no item was not found (not created yet) a second attempt is
272
32
        taken 1 second later"""
273
33
        items = self.select_many(object_type, **kwargs)
274
34
        tries = 10
275
35
        while len(items) < 1 and tries > 0:
276
36
            sleep(self.retry_delay)
277
37
            items = self.select_many(object_type, **kwargs)
278
38
            tries = tries - 1
279
39
        return items
280
40
281
41
    @autopilot_logging.log_action(logger.info)
282
42
    def get_notespageListview(self):
283
43
        """Get notes page list view """
284
44
        return self.wait_select_single(
285
45
            "QQuickListView", objectName="notespageListview")
286
0
46
287
=== added directory 'tests/autopilot/reminders_app/tests'
288
=== added file 'tests/autopilot/reminders_app/tests/__init__.py'
289
--- tests/autopilot/reminders_app/tests/__init__.py	1970-01-01 00:00:00 +0000
290
+++ tests/autopilot/reminders_app/tests/__init__.py	2014-03-13 18:13:06 +0000
291
@@ -0,0 +1,110 @@
292
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
293
2
#
294
3
# Copyright (C) 2013 Canonical Ltd
295
4
#
296
5
# This program is free software: you can redistribute it and/or modify
297
6
# it under the terms of the GNU General Public License version 3 as
298
7
# published by the Free Software Foundation.
299
8
#
300
9
# This program is distributed in the hope that it will be useful,
301
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
302
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
303
12
# GNU General Public License for more details.
304
13
#
305
14
# You should have received a copy of the GNU General Public License
306
15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
307
16
308
17
"""Reminders app autopilot tests."""
309
18
310
19
import os
311
20
import os.path
312
21
import logging
313
22
314
23
from autopilot.input import Mouse, Touch, Pointer
315
24
from autopilot.platform import model
316
25
from autopilot.testcase import AutopilotTestCase
317
26
318
27
from ubuntuuitoolkit import (
319
28
    base,
320
29
    emulators as toolkit_emulators
321
30
)
322
31
323
32
from reminders_app import emulators
324
33
325
34
logger = logging.getLogger(__name__)
326
35
327
36
328
37
def get_module_include_path():
329
38
    return os.path.abspath(
330
39
        os.path.join(
331
40
            os.path.dirname(__file__),
332
41
            '..',
333
42
            '..',
334
43
            '..',
335
44
            '..',
336
45
            'builddir/src/plugin/Evernote')
337
46
        )
338
47
339
48
340
49
class RemindersAppTestCase(AutopilotTestCase):
341
50
    """A common test case class that provides several useful methods for
342
51
       reminders-app tests."""
343
52
344
53
    if model() == 'Desktop':
345
54
        scenarios = [('with mouse', dict(input_device_class=Mouse))]
346
55
    else:
347
56
        scenarios = [('with touch', dict(input_device_class=Touch))]
348
57
349
58
    local_location = "../../src/app/qml/reminders.qml"
350
59
    installed_location = "/usr/share/reminders/qml/reminders.qml"
351
60
352
61
    def setUp(self):
353
62
        self.pointing_device = Pointer(self.input_device_class.create())
354
63
        super(RemindersAppTestCase, self).setUp()
355
64
356
65
        #turn off the OSK so it doesn't block screen elements
357
66
        if model() != 'Desktop':
358
67
            os.system("stop maliit-server")
359
68
            #adding cleanup step seems to restart service immeadiately
360
69
            #disabling for now
361
70
            #self.addCleanup(os.system("start maliit-server"))
362
71
363
72
        #if os.path.exists(self.local_location):
364
73
            #self.launch_test_local()
365
74
        #elif os.path.exists(self.installed_location):
366
75
            #self.launch_test_installed()
367
76
        #else:
368
77
            #self.launch_test_click()
369
78
370
79
        if os.path.exists(self.installed_location):
371
80
            self.launch_test_installed()
372
81
        else:
373
82
            self.launch_test_click()
374
83
375
84
    def launch_test_local(self):
376
85
        self.app = self.launch_test_application(
377
86
            base.get_qmlscene_launch_command(),
378
87
            "-I", get_module_include_path(),
379
88
            self.local_location,
380
89
            "--desktop_file_hint=/home/phablet/reminders/"
381
90
            "reminders-app.desktop",
382
91
            app_type='qt',
383
92
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
384
93
385
94
    def launch_test_installed(self):
386
95
        self.app = self.launch_test_application(
387
96
            base.get_qmlscene_launch_command(),
388
97
            self.installed_location,
389
98
            "--desktop_file_hint=/usr/share/applications/"
390
99
            "reminders.desktop",
391
100
            app_type='qt',
392
101
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
393
102
394
103
    def launch_test_click(self):
395
104
        self.app = self.launch_click_package(
396
105
            "com.ubuntu.reminders-app",
397
106
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
398
107
399
108
    @property
400
109
    def main_view(self):
401
110
        return self.app.select_single(emulators.MainView)
402
0
111
403
=== added file 'tests/autopilot/reminders_app/tests/test_reminders.py'
404
--- tests/autopilot/reminders_app/tests/test_reminders.py	1970-01-01 00:00:00 +0000
405
+++ tests/autopilot/reminders_app/tests/test_reminders.py	2014-03-13 18:13:06 +0000
406
@@ -0,0 +1,42 @@
407
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
408
2
# Copyright 2013 Canonical
409
3
#
410
4
# This program is free software: you can redistribute it and/or modify it
411
5
# under the terms of the GNU General Public License version 3, as published
412
6
# by the Free Software Foundation.
413
7
414
8
"""Reminders app autopilot tests."""
415
9
416
10
from __future__ import absolute_import
417
11
418
12
from autopilot.matchers import Eventually
419
13
from testtools.matchers import Equals, GreaterThan
420
14
421
15
from reminders_app.tests import RemindersAppTestCase
422
16
423
17
import logging
424
18
425
19
logger = logging.getLogger(__name__)
426
20
427
21
from time import sleep
428
22
429
23
class TestMainWindow(RemindersAppTestCase):
430
24
431
25
    def setUp(self):
432
26
        super(TestMainWindow, self).setUp()
433
27
434
28
        self.assertThat(self.main_view.visible, Eventually(Equals(True)))
435
29
436
30
    def test_download_list_of_notebooks(self):
437
31
        """test to check whether downloading a list from Notebooks from
438
32
           Evernote is successful or not """
439
33
        #Evernoteaccount = self.main_view.get_evernote_account()
440
34
        #self.pointing_device.click_object(Evernoteaccount)
441
35
442
36
        sleep(10)
443
37
        notebookTab = self.main_view.switch_to_tab("NotebookTab")
444
38
        self.assertThat(notebookTab.visible, Eventually(Equals(True)))
445
39
446
40
        notebookslistview = self.main_view.get_notespageListview()
447
41
        self.assertThat(notebookslistview.count,  Eventually(GreaterThan(0)))
448
42
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Needs Fixing on 2014-03-17
Ubuntu Notes app developers		2014-01-14	Pending
Review via email: mp+201672@code.launchpad.net