Merge lp:~om26er/ubuntu-clock-app/fix_autopilot_on_touch into lp:ubuntu-clock-app/saucy

[Omer Akram]

fix autopilot tests on touch

autopilot tests are failing on touch devices, this branch fixes that. Also "NewTabBar" is now "TabBar" it seems to re-named that in autopilot tests as tests were failing on the desktop as well.

[lp:~om26er/ubuntu-clock-app/fix_autopilot_on_touch]

163. By Omer Akram on 2013-08-04

fix

[Nekhelesh Ramananthan (nik90)]

Nice! Just need some small house cleaning.

Can you add comments to what these emulator function do. Sort of like "Returns the number of presets in the timer list view".

9 + def get_num_of_presets(self):
10 + time_page = self.app.select_single("TimerPage")
11 + return time_page.select_single("QQuickListView").count
12 +
13 + def get_first_preset_list_item(self):
14 + return self.app.select_single("Standard", objectName="preset0")

I think here you meant "timer_page" instead of "time_page"

9 + def get_num_of_presets(self):
10 + time_page = self.app.select_single("TimerPage")
11 + return time_page.select_single("QQuickListView").count

I think the show_toolbar should be replaced with the new emulator functions which landed in the SDK itself. It was implemented by elopio (irc) where the SDK provides common emulator functions such as show/hide toolbar, switch tabs etc. If you want you can implement this in this MP or otherwise take care of this in a latter commit.

43 def show_toolbar(self):
44 - toolbar_timer = self.main_window.get_toolbar_timer()
45 -
46 - x, y, w, h = toolbar_timer.globalRect
47 - tx = x + (w / 2)
48 - ty = y - (h / 2)
49 -
50 - self.pointing_device.drag(tx, ty + (h / 3), tx, ty - h)
51 + toolbar = self.app.select_single("Toolbar")
52 +
53 + x, y, w, h = toolbar.globalRect
54 + tx = x + (w / 2)
55 + ty = y + (h - (h / 8))
56 +
57 + self.pointing_device.drag(tx, ty, tx, ty - h)
58 + self.assertThat(toolbar.animating, Eventually(Equals(False)))
59 + self.assertThat(toolbar.state, Eventually(Equals("spread")))

Otherwise it all looks good.

[lp:~om26er/ubuntu-clock-app/fix_autopilot_on_touch]

164. By Omer Akram on 2013-08-07

fix per suggestions

[Omer Akram (om26er)]

> Nice! Just need some small house cleaning.
>
> Can you add comments to what these emulator function do. Sort of like "Returns
> the number of presets in the timer list view".
>
> 9 + def get_num_of_presets(self):
> 10 + time_page = self.app.select_single("TimerPage")
> 11 + return time_page.select_single("QQuickListView").count
> 12 +
> 13 + def get_first_preset_list_item(self):
> 14 + return self.app.select_single("Standard", objectName="preset0")
>
> I think here you meant "timer_page" instead of "time_page"
>
> 9 + def get_num_of_presets(self):
> 10 + time_page = self.app.select_single("TimerPage")
> 11 + return time_page.select_single("QQuickListView").count
>
> I think the show_toolbar should be replaced with the new emulator functions
> which landed in the SDK itself. It was implemented by elopio (irc) where the
> SDK provides common emulator functions such as show/hide toolbar, switch tabs
> etc. If you want you can implement this in this MP or otherwise take care of
> this in a latter commit.
>
> 43 def show_toolbar(self):
> 44 - toolbar_timer = self.main_window.get_toolbar_timer()
> 45 -
> 46 - x, y, w, h = toolbar_timer.globalRect
> 47 - tx = x + (w / 2)
> 48 - ty = y - (h / 2)
> 49 -
> 50 - self.pointing_device.drag(tx, ty + (h / 3), tx, ty - h)
> 51 + toolbar = self.app.select_single("Toolbar")
> 52 +
> 53 + x, y, w, h = toolbar.globalRect
> 54 + tx = x + (w / 2)
> 55 + ty = y + (h - (h / 8))
> 56 +
> 57 + self.pointing_device.drag(tx, ty, tx, ty - h)
> 58 + self.assertThat(toolbar.animating, Eventually(Equals(False)))
> 59 + self.assertThat(toolbar.state, Eventually(Equals("spread")))
>
> Otherwise it all looks good.

Done. The use of ubuntusdk emulators will be done later.

[lp:~om26er/ubuntu-clock-app/fix_autopilot_on_touch]

165. By Omer Akram on 2013-08-07

fix

[Nicholas Skaggs (nskaggs)]

Everything in here is now in my branch, plus more asserts and other fixes;

https://code.launchpad.net/~nskaggs/ubuntu-clock-app/fix-autopilot-tests/+merge/178864

Unmerged revisions

=== modified file 'tests/autopilot/ubuntu_clock_app/emulators/main_window.py'
--- tests/autopilot/ubuntu_clock_app/emulators/main_window.py	2013-07-14 22:16:59 +0000
+++ tests/autopilot/ubuntu_clock_app/emulators/main_window.py	2013-08-07 13:42:28 +0000
@@ -101,3 +101,12 @@
     def get_label_timer(self):
         """Return the label with the timer countdown"""
         return self.app.select_single("Label", objectName="labelTimer")
+
+    def get_num_of_presets(self):
+        """Returns the number of presets in the timer page."""
+        timer_page = self.app.select_single("TimerPage")
+        return timer_page.select_single("QQuickListView").count
+
+    def get_first_preset_list_item(self):
+        """Returns the first preset list item in the timer page."""
+        return self.app.select_single("Standard", objectName="preset0")

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/__init__.py'
--- tests/autopilot/ubuntu_clock_app/tests/__init__.py	2013-07-13 23:36:30 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py	2013-08-07 13:42:28 +0000
@@ -66,7 +66,7 @@
             app_type='qt')
             
     def get_tabs(self):
-        return self.app.select_single("NewTabBar")
+        return self.app.select_single("TabBar")
         
     def move_to_stopwatch_tab(self):
         tabs_bar = self.get_tabs()

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_timer.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_timer.py	2013-07-14 22:16:59 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_timer.py	2013-08-07 13:42:28 +0000
@@ -22,6 +22,7 @@
 
 from testtools.matchers import Equals, NotEquals
 from autopilot.matchers import Eventually
+from autopilot.platform import model
 
 from ubuntu_clock_app.tests import ClockAppTestCase
 
@@ -41,13 +42,40 @@
         self.assertThat(CurrentTab.title, Eventually(Equals("Timer")))  
 
     def show_toolbar(self):
-    	toolbar_timer = self.main_window.get_toolbar_timer()
-
-        x, y, w, h = toolbar_timer.globalRect
-        tx = x + (w / 2)
-        ty = y - (h / 2)
-
-        self.pointing_device.drag(tx, ty + (h / 3), tx, ty - h)
+    	toolbar = self.app.select_single("Toolbar")
+
+        x, y, w, h = toolbar.globalRect
+        tx = x + (w / 2)
+        ty = y + (h - (h / 8))
+
+        self.pointing_device.drag(tx, ty, tx, ty - h)
+        self.assertThat(toolbar.animating, Eventually(Equals(False)))
+        self.assertThat(toolbar.state, Eventually(Equals("spread")))
+
+    def drag_page_up_to_show_input_box(self):
+        timer_page = self.app.select_single("TimerPage")
+
+        x, y, w, h = timer_page.globalRect
+        tx = x + (w / 2)
+        ty = y + (h / 2)
+
+        self.pointing_device.drag(tx, ty, tx, ty - h / 2)
+        self.assertThat(
+            timer_page.select_single("AnimationContainer").moving,
+            Eventually(Equals(False)))
+
+    def drag_page_down_to_previous_state(self):
+        timer_page = self.app.select_single("TimerPage")
+
+        x, y, w, h = timer_page.globalRect
+        tx = x + (w / 2)
+        ty = y + (h / 2)
+
+        self.pointing_device.drag(tx, ty, tx, ty + h / 2)
+        self.assertThat(
+            timer_page.select_single("AnimationContainer").moving,
+            Eventually(Equals(False)))
+
 
     def test_add_preset(self):
     	"""Test to check if button to add a preset working"""
@@ -59,10 +87,16 @@
     	add_preset_button = self.main_window.get_toolbar_timer_add_preset_button()
     	self.pointing_device.click_object(add_preset_button)
 
-    	# Write in the label
+        # Write in the label
+        if model() != "Desktop":
+            self.drag_page_up_to_show_input_box()
     	label = self.main_window.get_timer_name_preset()
     	self.pointing_device.click_object(label)
         self.keyboard.type("test")
+        self.assertThat(label.text, Eventually(Equals("test")))
+        
+        if model() != "Desktop":
+            self.drag_page_down_to_previous_state()
 
         # Set hour
         hour = self.main_window.get_timer_hour_hand()
@@ -71,16 +105,14 @@
         ty = y + (h / 2)
         self.pointing_device.drag(tx, ty - (h / 4), tx + (w / 2), ty + (h / 2))
 
+        num_of_presets_old = int(self.main_window.get_num_of_presets())
         # Press "Done" button
         label = self.main_window.get_timer_clock_center_label()
         self.pointing_device.click_object(label)
 
         # Check if the preset has been saved
-        preset_text_label = self.main_window.get_preset_label_text()
-        preset_timer_label = self.main_window.get_preset_label_timer()
-
-        self.assertThat(preset_text_label.text, Eventually(Equals("test")))
-        self.assertThat(preset_timer_label.text, Eventually(Equals("23:00:00")))
+        self.assertThat(self.main_window.get_num_of_presets(),
+            Eventually(Equals(num_of_presets_old+1)))
 
     def test_delete_preset(self):
     	"""Test if the swipe of a preset deletes it"""
@@ -88,19 +120,20 @@
     	# Create a new preset
     	self.test_add_preset()
 
-    	# Get the label of test and its id
-    	preset_text_label = self.main_window.get_preset_label_text()
-    	preset_text_label_id = preset_text_label.id
+    	num_of_presets_old = int(self.main_window.get_num_of_presets())
+        first_preset = self.main_window.get_first_preset_list_item()
 
-    	# Delete the preset
-    	x, y, w, h = preset_text_label.globalRect
-        tx = x + (w / 2)
+    	if model() != "Desktop":
+            self.drag_page_up_to_show_input_box()
+        # Delete the preset
+    	x, y, w, h = first_preset.globalRect
+        tx = x + (w / 8)
         ty = y + (h / 2)
-        self.pointing_device.drag(tx - w, ty, tx + 10 * w , ty)
+        self.pointing_device.drag(tx, ty, w - w / 8, ty)
 
         # Check has been deleted
-        label = lambda: self.main_window.get_object_by_id('Label', preset_text_label_id)
-        self.assertThat(label, Eventually(Equals(None)))
+        self.assertThat(self.main_window.get_num_of_presets(),
+            Eventually(Equals(num_of_presets_old-1)))
 
     def test_run_preset(self):
     	"""Tests if a preset can runs"""
@@ -109,10 +142,14 @@
     	self.test_add_preset()
 
     	# Click to select the preset
-    	preset_text_label = self.main_window.get_preset_label_text()
-    	self.pointing_device.click_object(preset_text_label)
+        first_preset = self.main_window.get_first_preset_list_item()
+    	if model() != "Desktop":
+            self.drag_page_up_to_show_input_box()
+        self.pointing_device.click_object(first_preset)
 
-    	# Click to start the preset
+    	if model() != "Desktop":
+            self.drag_page_down_to_previous_state()
+        # Click to start the preset
     	label = self.main_window.get_timer_clock_center_label()
         self.pointing_device.click_object(label)
 

=== modified file 'timer/TimerPage.qml'
--- timer/TimerPage.qml	2013-07-25 15:02:06 +0000
+++ timer/TimerPage.qml	2013-08-07 13:42:28 +0000
@@ -217,9 +217,10 @@
                 currentIndex: -1
 
                 delegate: ListItem.Standard {
+                    objectName: "preset" + index
                     Label {
                         id: presetTextLabel // Needs by autopilot
-                        objectName: "presetTextLabel"
+                        objectName: "presetTextLabel" + index
                         fontSize: "large";
                         text: label
                         anchors { verticalCenter: parent.verticalCenter; left: parent.left; leftMargin: units.gu(3) }