Merge lp:~rpadovani/ubuntu-clock-app/start_preset_autopilot into lp:ubuntu-clock-app/saucy

[Riccardo Padovani]

Added autopilot to create a new preset. (#1188800)
Added autopilot to delete a new preset. (#1188801)
Added autopilot to run a preset. (#1188807)

Added autopilot to create a new preset. (#1188800)
Added autopilot to delete a new preset. (#1188801)
Added autopilot to run a preset. (#1188807)

[lp:~rpadovani/ubuntu-clock-app/start_preset_autopilot]

141. By Riccardo Padovani on 2013-07-14

Some improvments to delete_preset test

[Nicholas Skaggs (nskaggs)]

This looks good to me. Thank you again Riccardo. At some point we'll convert this to the sdk emulator, but this works for now. I'd want to make sure the things like moving to a specific tab are more maintainable -- and the sdk emulator should fix that.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_clock_app/emulators/main_window.py'
--- tests/autopilot/ubuntu_clock_app/emulators/main_window.py	2013-07-10 19:38:56 +0000
+++ tests/autopilot/ubuntu_clock_app/emulators/main_window.py	2013-07-14 22:20:33 +0000
@@ -30,6 +30,9 @@
 
     def get_object(self, typeName, name):
         return self.app.select_single(typeName, objectName=name)
+
+    def get_object_by_id(self, typeName, objectId):
+        return self.app.select_single(typeName, id=objectId)
         
     def get_stopwatch_tab_button(self):
         """Returns the stopwatch tab."""
@@ -54,3 +57,47 @@
     def get_laps(self):
         """Returns the select for the lap count"""
         return self.app.select_single("ListModel", objectName="laps")     
+
+    def get_timer_tab_button(self):
+        """Returns the timer tab."""
+        return self.app.select_single("AbstractButton", buttonIndex=2)
+
+    def get_toolbar_timer(self):
+        """Returns the toolbar of timer tab"""
+        return self.app.select_single("ToolbarItems")
+
+    def get_toolbar_timer_button(self, button_idx):
+        """Returns a button of toolbar of timer tab"""
+        toolbar = self.app.select_single("ToolbarItems")
+        button = toolbar.get_children()
+        return button[button_idx]
+
+    def get_toolbar_timer_add_preset_button(self):
+        """Returns the button for add preset of toolbar of timer tab"""
+        return self.get_toolbar_timer_button(1)
+
+    def get_timer_name_preset(self):
+        """Returns the TextField where insert the name of the preset"""
+        return self.app.select_single("TextField", objectName="namePreset")
+
+    def get_timer_hour_hand(self):
+        """Returns the hour hand of clock in timer tab"""
+        return self.app.select_single("AnalogTouchHand", objectName="hourHand")
+
+    def get_timer_clock_center_label(self):
+        """Returns the label in the center of clock"""
+        return self.app.select_single("Label", objectName="addPresetTextDone")
+
+    def get_preset_label_text(self):
+        """Returns the label with the preset text"""
+        preset = self.app.select_many("Label", objectName="presetTextLabel")
+        return preset[0] #last preset, the one created by autopilot
+
+    def get_preset_label_timer(self):
+        """Returns the label with the preset timer"""
+        preset = self.app.select_many("Label", objectName="presetTimerLabel")
+        return preset[0] #last preset, the one created by autopilot
+
+    def get_label_timer(self):
+        """Return the label with the timer countdown"""
+        return self.app.select_single("Label", objectName="labelTimer")
 
=== modified file 'tests/autopilot/ubuntu_clock_app/tests/__init__.py'
--- tests/autopilot/ubuntu_clock_app/tests/__init__.py	2013-06-27 17:18:33 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py	2013-07-14 22:20:33 +0000
@@ -79,7 +79,21 @@
         stopwatch_tab_button = self.main_window.get_stopwatch_tab_button()
 
         self.assertThat(stopwatch_tab_button.opacity, Eventually(GreaterThan(0.35)))
-        self.pointing_device.click_object(stopwatch_tab_button)        
+        self.pointing_device.click_object(stopwatch_tab_button)    
+    
+    def move_to_timer_tab(self):
+        tabs_bar = self.get_tabs()
+
+        x, y, w, h = tabs_bar.globalRect
+        tx = x + w / 10
+        ty = y + h / 2
+        self.pointing_device.drag(tx, ty, w - 9, ty)
+
+        timer_tab_button = self.main_window.get_timer_tab_button()
+
+        self.assertThat(timer_tab_button.opacity, Eventually(GreaterThan(0.35)))
+        self.pointing_device.click_object(timer_tab_button)  
+
 
     @property
     def main_window(self):
 
=== added file 'tests/autopilot/ubuntu_clock_app/tests/test_timer.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_timer.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_timer.py	2013-07-14 22:20:33 +0000
@@ -0,0 +1,121 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Riccardo Padovani <[e-mail]>
+
+"""Tests for the Clock App - Timer"""
+
+from __future__ import absolute_import
+
+from testtools.matchers import Equals, NotEquals
+from autopilot.matchers import Eventually
+
+from ubuntu_clock_app.tests import ClockAppTestCase
+
+class TestTimer(ClockAppTestCase):
+    """Tests the timer page features"""
+
+    """ This is needed to wait for the application to start.
+        In the testfarm, the application may take some time to show up."""
+    def setUp(self):
+        super(TestTimer, self).setUp()        
+        self.assertThat(self.main_window.get_qml_view().visible, Eventually(Equals(True)))
+        
+        self.move_to_timer_tab()
+        
+        # Test if the current Tab is the Timer Tab
+        CurrentTab = self.main_window.get_object("Tab", "TimerTab")
+        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)
+
+    def test_add_preset(self):
+    	"""Test to check if button to add a preset working"""
+
+    	# Show the toolbar
+    	self.show_toolbar()
+
+    	# Click the add preset button
+    	add_preset_button = self.main_window.get_toolbar_timer_add_preset_button()
+    	self.pointing_device.click_object(add_preset_button)
+
+    	# Write in the label
+    	label = self.main_window.get_timer_name_preset()
+    	self.pointing_device.click_object(label)
+        self.keyboard.type("test")
+
+        # Set hour
+        hour = self.main_window.get_timer_hour_hand()
+        x, y, w, h = hour.globalRect
+        tx = x + (w / 2)
+        ty = y + (h / 2)
+        self.pointing_device.drag(tx, ty - (h / 4), tx + (w / 2), ty + (h / 2))
+
+        # 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")))
+
+    def test_delete_preset(self):
+    	"""Test if the swipe of a preset deletes it"""
+
+    	# 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
+
+    	# Delete the preset
+    	x, y, w, h = preset_text_label.globalRect
+        tx = x + (w / 2)
+        ty = y + (h / 2)
+        self.pointing_device.drag(tx - w, ty, tx + 10 * w , 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)))
+
+    def test_run_preset(self):
+    	"""Tests if a preset can runs"""
+
+    	# Create a new preset
+    	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)
+
+    	# Click to start the preset
+    	label = self.main_window.get_timer_clock_center_label()
+        self.pointing_device.click_object(label)
+
+        # Check if timer is started
+        label_timer = self.main_window.get_label_timer()
+        self.assertThat(label_timer.text, Eventually(NotEquals("23:00:00")))
 \ No newline at end of file
 
=== modified file 'timer/AnalogTimer.qml'
--- timer/AnalogTimer.qml	2013-07-12 17:07:55 +0000
+++ timer/AnalogTimer.qml	2013-07-14 22:20:33 +0000
@@ -86,6 +86,7 @@
     // Hour hand with touch/mouse drag support
     AnalogTouchHand {
         id: hourHand
+        objectName: "hourHand"
 
         onTimerValueChanged: hours = timerValue;
 
 
=== modified file 'timer/TimerPage.qml'
--- timer/TimerPage.qml	2013-07-12 17:07:55 +0000
+++ timer/TimerPage.qml	2013-07-14 22:20:33 +0000
@@ -222,12 +222,15 @@
 
                 delegate: ListItem.Standard {
                     Label {
+                        id: presetTextLabel // Needs by autopilot
+                        objectName: "presetTextLabel"
                         fontSize: "large";
                         text: label
                         anchors { verticalCenter: parent.verticalCenter; left: parent.left; leftMargin: units.gu(3) }
                     }
 
                     Label {
+                        objectName: "presetTimerLabel"
                         fontSize: "large"
                         text: getstringTimer(seconds);
                         anchors { verticalCenter: parent.verticalCenter; right: parent.right; rightMargin: units.gu(2) }
@@ -269,6 +272,7 @@
 
             Label {
                 id: addPresetTextDone
+                objectName: "addPresetTextDone"
 
                 //anchors.centerIn: parent
                 color: Constants.green
@@ -292,6 +296,7 @@
         // Element to set the name of a saved preset.
         TextField {
             id: namePreset
+            objectName: "namePreset"
 
             visible: false
             hasClearButton: true
@@ -308,7 +313,6 @@
         ToolbarButton {
             action: Action {
                 id: addPreset
-                objectName: "add-preset"
 
                 iconSource: Qt.resolvedUrl("../images/add_icon.png")
                 text: i18n.tr("Add Preset")