1
=== modified file 'clock/WorldClock.qml'
2
--- clock/WorldClock.qml	2013-11-07 16:34:43 +0000
3
+++ clock/WorldClock.qml	2014-01-06 20:53:15 +0000
4
@@ -74,6 +74,7 @@
5
74
        // TODO: Add capability to also search cities provided locally with clock-app
74
        // TODO: Add capability to also search cities provided locally with clock-app
6
75
        SearchBox {
75
        SearchBox {
7
76
            id: searchBox
76
            id: searchBox
8
77
            objectName: "worldSearchBox"
9
77
78
10
78
            height: units.gu(4)
79
            height: units.gu(4)
11
79
            anchors { left: parent.left; right: parent.right }
80
            anchors { left: parent.left; right: parent.right }
12
80
81
13
=== modified file 'stopwatch/LapList.qml'
14
--- stopwatch/LapList.qml	2013-10-26 19:26:49 +0000
15
+++ stopwatch/LapList.qml	2014-01-06 20:53:15 +0000
16
@@ -83,6 +83,7 @@
17
83
        model: lapModel
83
        model: lapModel
18
84
        
84
        
19
85
        delegate: ListItem.Standard {
85
        delegate: ListItem.Standard {
20
86
            objectName: "laps" + index
21
86
            Label {
87
            Label {
22
87
                text: Utils.numberToLocaleString(lapModel.count - index);
88
                text: Utils.numberToLocaleString(lapModel.count - index);
23
88
                anchors { verticalCenter: parent.verticalCenter; left: parent.left; leftMargin: units.gu(3) }
89
                anchors { verticalCenter: parent.verticalCenter; left: parent.left; leftMargin: units.gu(3) }
24
89
90
25
=== modified file 'stopwatch/StopwatchPage.qml'
26
--- stopwatch/StopwatchPage.qml	2013-10-26 19:26:49 +0000
27
+++ stopwatch/StopwatchPage.qml	2014-01-06 20:53:15 +0000
28
@@ -43,7 +43,6 @@
29
43
43
30
44
    ListModel {
44
    ListModel {
31
45
        id: laps
45
        id: laps
32
46
        objectName: "laps"
33
47
46
34
48
        property int lapStart: 0;
47
        property int lapStart: 0;
35
49
48
36
50
49
37
=== modified file 'tests/autopilot/ubuntu_clock_app/emulators.py'
38
--- tests/autopilot/ubuntu_clock_app/emulators.py	2013-11-07 16:34:43 +0000
39
+++ tests/autopilot/ubuntu_clock_app/emulators.py	2014-01-06 20:53:15 +0000
40
@@ -73,6 +73,10 @@
41
73
        """Return the page containing the world cities."""
73
        """Return the page containing the world cities."""
42
74
        return self.wait_select_single("WorldClock")    
74
        return self.wait_select_single("WorldClock")    
43
75
75
44
76
    def get_search_box(self):
45
77
        """Returns the search box used to search for world cities online."""
46
78
        return self.wait_select_single('SearchBox', objectName="worldSearchBox")
47
79
48
76
    def get_world_cities_list(self):
80
    def get_world_cities_list(self):
49
77
        """Return the component containing the list of available world cities."""
81
        """Return the component containing the list of available world cities."""
50
78
        return self.wait_select_single(objectName="worldList")
82
        return self.wait_select_single(objectName="worldList")
51
@@ -141,15 +145,20 @@
52
141
145
53
142
    def get_lap_button(self):
146
    def get_lap_button(self):
54
143
        """Returns the select for the lap button"""
147
        """Returns the select for the lap button"""
56
144
        return self.wait_select_single("Button", objectName="lapButton")
148
        return self.wait_select_single("ImageButton", objectName="lapButton")
57
145
149
58
146
    def get_reset_button(self):
150
    def get_reset_button(self):
59
147
        """Returns the select for the reset button"""
151
        """Returns the select for the reset button"""
60
148
        return self.wait_select_single("ImageButton", objectName="resetButton")
152
        return self.wait_select_single("ImageButton", objectName="resetButton")
61
149
153
65
150
    def get_laps(self):
154
    def get_num_of_laps(self):
66
151
        """Returns the select for the lap count"""
155
        """Returns the number of laps in the stopwatch page."""
67
152
        return self.wait_select_single("ListModel", objectName="laps")
156
        stopwatch_page = self.select_single("StopwatchPage")
68
157
        return int(stopwatch_page.wait_select_single("QQuickListView").count)
69
158
70
159
    def get_first_laps_list_item(self):
71
160
        """Returns the first lap list item in the stopwatch page."""
72
161
        return self.wait_select_single("Standard", objectName="laps0") 
73
153
    
162
    
74
154
    # ALARM Page Emulator Functions
163
    # ALARM Page Emulator Functions
75
155
    def get_addalarm_page(self):
164
    def get_addalarm_page(self):
76
156
165
77
=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_clock.py'
78
--- tests/autopilot/ubuntu_clock_app/tests/test_clock.py	2013-11-07 16:34:43 +0000
79
+++ tests/autopilot/ubuntu_clock_app/tests/test_clock.py	2014-01-06 20:53:15 +0000
80
@@ -25,6 +25,7 @@
81
25
25
82
26
from testtools.matchers import Equals, NotEquals
26
from testtools.matchers import Equals, NotEquals
83
27
from autopilot.matchers import Eventually
27
from autopilot.matchers import Eventually
84
28
from time import sleep
85
28
29
86
29
from ubuntu_clock_app.tests import ClockAppTestCase
30
from ubuntu_clock_app.tests import ClockAppTestCase
87
30
31
88
@@ -69,8 +70,8 @@
89
69
        city_name = self.main_view.get_city_name(city)
70
        city_name = self.main_view.get_city_name(city)
90
70
        self.main_view.select_city(city)
71
        self.main_view.select_city(city)
91
71
        saved_city_name = self.main_view.get_city_name(self.main_view.grab_first_saved_city())
72
        saved_city_name = self.main_view.get_city_name(self.main_view.grab_first_saved_city())
94
72
        self.assertThat(saved_city_name, Eventually(Equals(city_name)))
73
        self.assertThat(saved_city_name, Eventually(Equals(city_name)))      
95
73
74
        
96
74
    def test_delete_local_world_city(self):
75
    def test_delete_local_world_city(self):
97
75
        """Test to check if deleting a saved local world city works"""
76
        """Test to check if deleting a saved local world city works"""
98
76
77
99
77
78
100
=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_stopwatch.py'
101
--- tests/autopilot/ubuntu_clock_app/tests/test_stopwatch.py	2013-11-01 21:46:43 +0000
102
+++ tests/autopilot/ubuntu_clock_app/tests/test_stopwatch.py	2014-01-06 20:53:15 +0000
103
@@ -41,20 +41,29 @@
104
41
    def tearDown(self):
41
    def tearDown(self):
105
42
        super(TestStopwatch, self).tearDown()
42
        super(TestStopwatch, self).tearDown()
106
43
43
107
44
    def create_lap(self):
108
45
        """Function to create a stopwatch lap"""
109
46
        lap_button = self.main_view.get_lap_button()
110
47
        self.pointing_device.click_object(lap_button)
111
48
112
49
    def start_stop_stopwatch(self):
113
50
        """Function to start/stop the stopwatch"""
114
51
        start_stop_button = self.main_view.get_stopwatch_button()
115
52
        self.pointing_device.click_object(start_stop_button)        
116
53
117
44
    def test_start_stop_reset_stopwatch(self):
54
    def test_start_stop_reset_stopwatch(self):
118
45
        """Test to check the proper functioning of the start/stop/reset of stopwatch"""
55
        """Test to check the proper functioning of the start/stop/reset of stopwatch"""
119
46
56
120
47
        start_stop_button = self.main_view.get_stopwatch_button()
121
48
        stopwatch_label = self.main_view.get_stopwatch_label()
57
        stopwatch_label = self.main_view.get_stopwatch_label()
122
49
        reset_button = self.main_view.get_reset_button()
58
        reset_button = self.main_view.get_reset_button()
123
50
59
125
51
        # Press the start button to start the stopwatch and check if the stopwatch starts ticking
60
        # Start the stopwatch and check if the stopwatch starts ticking
126
52
        stopwatch_label_before = self.main_view.get_stopwatch_label().text
61
        stopwatch_label_before = self.main_view.get_stopwatch_label().text
128
53
        self.pointing_device.click_object(start_stop_button)
62
        self.start_stop_stopwatch()
129
54
        self.assertThat(stopwatch_label.text, Eventually(NotEquals("00:00.0")))
63
        self.assertThat(stopwatch_label.text, Eventually(NotEquals("00:00.0")))
130
55
64
133
56
        # Press stop and check if the stopwatch has indeed stopped
65
        # Stop the stopwatch and check it has indeed stopped
134
57
        self.pointing_device.click_object(start_stop_button)
66
        self.start_stop_stopwatch()
135
58
        self.assertThat(stopwatch_label_before, NotEquals(self.main_view.get_stopwatch_label().text))
67
        self.assertThat(stopwatch_label_before, NotEquals(self.main_view.get_stopwatch_label().text))
136
59
        stopwatch_label_after = lambda: self.main_view.get_stopwatch_label().text
68
        stopwatch_label_after = lambda: self.main_view.get_stopwatch_label().text
137
60
        self.assertThat(stopwatch_label_after, Eventually(Equals(self.main_view.get_stopwatch_label().text)))
69
        self.assertThat(stopwatch_label_after, Eventually(Equals(self.main_view.get_stopwatch_label().text)))
138
@@ -62,3 +71,48 @@
139
62
        # Press reset and check if the stopwatch has been resetted
71
        # Press reset and check if the stopwatch has been resetted
140
63
        self.pointing_device.click_object(reset_button)
72
        self.pointing_device.click_object(reset_button)
141
64
        self.assertThat(stopwatch_label.text, Eventually(Equals("00:00.0")))
73
        self.assertThat(stopwatch_label.text, Eventually(Equals("00:00.0")))
142
74
143
75
    def test_create_lap(self):
144
76
        """Test to check creating a new stopwatch lap"""
145
77
146
78
        # Start the stopwatch
147
79
        stopwatch_label = self.main_view.get_stopwatch_label().text
148
80
        self.start_stop_stopwatch()
149
81
150
82
        # Ensure that the stopwatch actually ticks
151
83
        self.assertThat(stopwatch_label, Eventually(NotEquals("00:00.0")))
152
84
153
85
        # Create a stopwatch lap by pressing the lap button
154
86
        num_of_laps_old = self.main_view.get_num_of_laps()
155
87
        self.create_lap()
156
88
157
89
        # Confirm that the lap is created
158
90
        self.assertThat(
159
91
            self.main_view.get_num_of_laps,
160
92
            Eventually(Equals(num_of_laps_old + 1)))
161
93
162
94
    def test_delete_lap(self):
163
95
        """Test to check deleting a stopwatch lap"""
164
96
165
97
        # Start the stopwatch
166
98
        stopwatch_label = self.main_view.get_stopwatch_label().text
167
99
        self.start_stop_stopwatch()
168
100
169
101
        # Ensure that the stopwatch actually ticks
170
102
        self.assertThat(stopwatch_label, Eventually(NotEquals("00:00.0")))
171
103
172
104
        # Create a stopwatch lap
173
105
        self.create_lap()
174
106
175
107
        num_of_laps_old = self.main_view.get_num_of_laps()
176
108
        self.main_view.drag_page_up("StopwatchPage", self)
177
109
178
110
        # Delete stopwatch lap
179
111
        first_lap = self.main_view.get_first_laps_list_item()
180
112
        first_lap.swipe_to_delete()
181
113
        first_lap.confirm_removal()
182
114
183
115
        # Check that the stopwatch lap has been deleted
184
116
        self.assertThat(
185
117
            self.main_view.get_num_of_laps,
186
118
            Eventually(Equals(num_of_laps_old - 1)))
187
65
119
188
=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_timer.py'
189
--- tests/autopilot/ubuntu_clock_app/tests/test_timer.py	2013-11-01 21:46:43 +0000
190
+++ tests/autopilot/ubuntu_clock_app/tests/test_timer.py	2014-01-06 20:53:15 +0000
191
@@ -24,6 +24,7 @@
192
24
from testtools.matchers import Equals, NotEquals, Is, Not
24
from testtools.matchers import Equals, NotEquals, Is, Not
193
25
from autopilot.matchers import Eventually
25
from autopilot.matchers import Eventually
194
26
from time import sleep
26
from time import sleep
195
27
196
27
from ubuntu_clock_app.tests import ClockAppTestCase
28
from ubuntu_clock_app.tests import ClockAppTestCase
197
28
29
198
29
30
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2014-01-06
Nicholas Skaggs (community)		2013-11-05	Approve on 2014-01-06
Ubuntu Clock Developers		2013-11-05	Pending
Review via email: mp+193922@code.launchpad.net