Merge lp:~nskaggs/ubuntu-clock-app/convert-aptests-to-sdk into lp:ubuntu-clock-app/saucy

[Nicholas Skaggs]

This converts the clock testcase to the sdk emulator, and cleans up the functions. It should be much more robust now.

Atm, depends on https://code.launchpad.net/~elopio/ubuntu-ui-toolkit/fix1209405-header_object_name/+merge/179060.

This converts the clock testcase to the sdk emulator, and cleans up the functions. It should be much more robust now.

Atm, depends on https://code.launchpad.net/~elopio/ubuntu-ui-toolkit/fix1209405-header_object_name/+merge/179060.

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

FAILED: Continuous integration, rev:170
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/26/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/316
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-ci/12
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-ci/26
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/26
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/12

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/26/rebuild

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

review: Approve (code review)

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

FAILED: Continuous integration, rev:170
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/27/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/329
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-ci/13
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-ci/27
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/27
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/13

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/27/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:171
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/28/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/334
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-ci/14
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-ci/28
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/28
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/14

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/28/rebuild

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

After adding the ubuntu-ui-toolkit-autopilot package as dependency, the test pass successfully for me. Triggering a jenkins rebuild to see if it can merge it.

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/39/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/336
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-autolanding/24
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-autolanding/38
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-autolanding/38
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-autolanding/24

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/41/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/338
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-autolanding/26
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-autolanding/40
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-autolanding/40
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-autolanding/26

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-clock-app/convert-aptests-to-sdk]

172. By Nicholas Skaggs on 2013-08-12

d'oh! fix the init launch to launch clock not dropping letters ;-(

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

PASSED: Continuous integration, rev:172
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/29/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/339
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-ci/15
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-ci/29
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/29
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/15

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/29/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-05-27 07:43:41 +0000
+++ debian/control	2013-08-12 17:47:04 +0000
@@ -16,7 +16,7 @@
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-localstorage-plugin,
          qtdeclarative5-qtquick2-plugin,
-	 qtdeclarative5-xmllistmodel-plugin,
+     qtdeclarative5-xmllistmodel-plugin,
 Description: Clock application
  Ubuntu Core Clock application which provides Stopwatch, Timer, Alarm and Clock functionalities.
 
@@ -24,6 +24,7 @@
 Architecture: all
 Depends: libautopilot-qt,
          libqt5test5,
+         ubuntu-ui-toolkit-autopilot,
          ubuntu-clock-app (= ${source:Version}),
 Description: Autopilot tests for Ubuntu Clock Application
  This package contains autopilot tests for the Ubuntu Clock application.
 
=== removed directory 'tests/autopilot/ubuntu_clock_app/emulators'
=== added file 'tests/autopilot/ubuntu_clock_app/emulators.py'
--- tests/autopilot/ubuntu_clock_app/emulators.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_clock_app/emulators.py	2013-08-12 17:47:04 +0000
@@ -0,0 +1,100 @@
+# -*- 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 Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from ubuntuuitoolkit import emulators as toolkit_emulators
+
+
+class MainView(toolkit_emulators.MainView):
+    def get_stopwatch_tab_button(self):
+        """Returns the stopwatch tab."""
+        return self.select_single("AbstractButton", buttonIndex=3)
+
+    def get_stopwatch_label(self):
+        """Returns the select for the stopwatch label"""
+        return self.select_single("Label", objectName="labelStopwatch")
+
+    def get_stopwatch_button(self):
+        """Returns the select for the stopwatch button"""
+        return self.select_single("AnalogStopwatch", objectName="buttonStopwatch")
+
+    def get_lap_button(self):
+        """Returns the select for the lap button"""
+        return self.select_single("Button", objectName="lapButton")
+
+    def get_reset_button(self):
+        """Returns the select for the reset button"""
+        return self.select_single("ImageButton", objectName="resetButton")
+
+    def get_laps(self):
+        """Returns the select for the lap count"""
+        return self.select_single("ListModel", objectName="laps")
+
+    def get_timer_tab_button(self):
+        """Returns the timer tab."""
+        return self.select_single("AbstractButton", buttonIndex=2)
+
+    def get_toolbar_timer(self):
+        """Returns the toolbar of timer tab"""
+        return self.select_single("ToolbarItems")
+
+    def get_toolbar_timer_button(self, button_idx):
+        """Returns a button of toolbar of timer tab"""
+        toolbar = self.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.select_single("TextField", objectName="namePreset")
+
+    def get_timer_hour_hand(self):
+        """Returns the hour hand of clock in timer tab"""
+        return self.select_single("AnalogTouchHand", objectName="hourHand")
+
+    def get_timer_clock_center_label(self):
+        """Returns the label in the center of clock"""
+        return self.select_single("Label", objectName="addPresetTextDone")
+
+    def get_preset_label_text(self):
+        """Returns the label with the preset text"""
+        preset = self.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.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.select_single("Label", objectName="labelTimer")
+
+    def get_num_of_presets(self):
+        """Returns the number of presets in the timer page."""
+        timer_page = self.select_single("TimerPage")
+        return int(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.select_single("Standard", objectName="preset0")
+
+    def get_time_label(self):
+        """Return the label with the timer countdown"""
+        return self.select_single("Label", objectName="currentTimeLabel")
 
=== removed file 'tests/autopilot/ubuntu_clock_app/emulators/__init__.py'
--- tests/autopilot/ubuntu_clock_app/emulators/__init__.py	2013-05-27 07:48:32 +0000
+++ tests/autopilot/ubuntu_clock_app/emulators/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-# -*- 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: Renato Araujo Oliveira Filho <[e-mail]>
 
=== removed file 'tests/autopilot/ubuntu_clock_app/emulators/main_window.py'
--- tests/autopilot/ubuntu_clock_app/emulators/main_window.py	2013-08-07 13:39:51 +0000
+++ tests/autopilot/ubuntu_clock_app/emulators/main_window.py	1970-01-01 00:00:00 +0000
@@ -1,112 +0,0 @@
-# -*- 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: Renato Araujo Oliveira Filho <[e-mail]>
-#              Nekhelesh Ramananthan <[e-mail]>
-
-
-class MainWindow(object):
-    """An emulator class that makes it easy to interact with the clock-app."""
-
-    def __init__(self, app):
-        self.app = app
-
-    def get_qml_view(self):
-        """Get the main QML view"""
-        return self.app.select_single("QQuickView")
-
-    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."""
-        return self.app.select_single("AbstractButton", buttonIndex=3)       
-        
-    def get_stopwatch_label(self):
-        """Returns the select for the stopwatch label"""
-        return self.app.select_single("Label", objectName="labelStopwatch")
-        
-    def get_stopwatch_button(self):
-        """Returns the select for the stopwatch button"""
-        return self.app.select_single("AnalogStopwatch", objectName="buttonStopwatch")
-
-    def get_lap_button(self):
-        """Returns the select for the lap button"""
-        return self.app.select_single("Button", objectName="lapButton")
-
-    def get_reset_button(self):
-        """Returns the select for the reset button"""
-        return self.app.select_single("ImageButton", objectName="resetButton")        
-        
-    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")
-
-    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-08-07 15:48:05 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py	2013-08-12 17:47:04 +0000
@@ -28,13 +28,13 @@
 from autopilot.matchers import Eventually
 from testtools.matchers import GreaterThan
 
-from ubuntu_clock_app.emulators.main_window import MainWindow
-
+from ubuntuuitoolkit import emulators as toolkit_emulators
+from ubuntu_clock_app import emulators
 
 class ClockAppTestCase(AutopilotTestCase):
 
     """A common test case class that provides several useful methods for
-    clock-app tests.
+    calendar-app tests.
 
     """
     if model() == 'Desktop':
@@ -56,65 +56,18 @@
         self.app = self.launch_test_application(
             "qmlscene",
             self.local_location,
-            app_type='qt')
+            app_type='qt',
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_test_installed(self):
         self.app = self.launch_test_application(
             "qmlscene",
             "/usr/share/ubuntu-clock-app/ubuntu-clock-app.qml",
-            "--desktop_file_hint=/usr/share/applications/ubuntu-clock-app.desktop",
-            app_type='qt')
-
-    def get_toolbar(self):
-        return self.app.select_single("Toolbar")
-
-    #shamelessly pulled and adapted from the ubuntusdk emulator unmerged code, 6 Aug 13
-    #need to migrate to ubuntusdk emulator
-    def get_tabs(self):
-        return self.app.select_single("TabBar")
-
-    def switch_to_next_tab(self):
-        """Open the next tab."""
-        self.pointing_device.click_object(self._get_current_tab_button())
-        self.pointing_device.click_object(self._get_next_tab_button())
-
-    def _get_current_tab_button(self):
-        tabs = self.get_tabs()
-        #return tabs.tabs.select_many('AbstractButton', selected=True) <--- can't do this
-        #clock has 8 buttons, a duplicate of each tab for some reason.
-        #Sometimes 2 buttons are shown as selected. If this is the case, we want the second one.
-        #Looping through them in this horrible way accomplishes our goal
-        buttons = tabs.select_many('AbstractButton')
-        for button in buttons:
-            if button.selected == True:
-                selectedButton = button
-        return selectedButton
-
-    def _get_next_tab_button(self):
-        current_index = self._get_current_tab_button().buttonIndex
-        next_index = (current_index + 1) % self._get_number_of_tab_buttons()
-        return self._get_tab_buttons()[next_index]
-
-    def _get_number_of_tab_buttons(self):
-        return len(self._get_tab_buttons())
-
-    def _get_tab_buttons(self):
-        tabs = self.get_tabs()
-        return tabs.select_many('AbstractButton')
-
-    def move_to_stopwatch_tab(self):
-        #stopwatch is 3 tabs over from clock
-        #we really need better tab support to support moving to tab based on objectName
-        self.switch_to_next_tab()
-        self.switch_to_next_tab()
-        self.switch_to_next_tab()
-
-    def move_to_timer_tab(self):
-        #timer is 2 tabs over from clock
-        #we really need better tab support to support moving to tab based on objectName
-        self.switch_to_next_tab()
-        self.switch_to_next_tab()
+            "--desktop_file_hint=/usr/share/applications/"
+            "ubuntu-clock-app.desktop",
+            app_type='qt',
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     @property
-    def main_window(self):
-        return MainWindow(self.app)
+    def main_view(self):
+        return self.app.select_single(emulators.MainView)
 
=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_clock.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_clock.py	2013-05-27 07:48:32 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_clock.py	2013-08-12 17:47:04 +0000
@@ -35,14 +35,14 @@
     def setUp(self):
         super(TestClock, self).setUp()
         self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
+            self.main_view.visible, Eventually(Equals(True)))
 
     def tearDown(self):
         super(TestClock, self).tearDown()
 
     """ Test if the clock labels contains the correct time """
     def test_label_value(self):
-        label = self.main_window.get_object("Label", "currentTimeLabel")
+        label = self.main_view.get_time_label()
 
         # TODO: investigate a way to get the system wide format for time
         # and compare the values
 
=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_stopwatch.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_stopwatch.py	2013-08-07 16:18:35 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_stopwatch.py	2013-08-12 17:47:04 +0000
@@ -32,13 +32,12 @@
         In the testfarm, the application may take some time to show up."""
     def setUp(self):
         super(TestStopwatch, self).setUp()
-        self.assertThat(self.main_window.get_qml_view().visible, Eventually(Equals(True)))
-
-        self.move_to_stopwatch_tab()
-
-        # Test if the current Tab is the Stopwatch Tab
-        CurrentTab = self.main_window.get_object("Tab", "StopwatchTab")
-        self.assertThat(CurrentTab.title, Eventually(Equals("Stopwatch")))
+        self.assertThat(
+            self.main_view.visible, Eventually(Equals(True)))
+
+        #move to stopwatch tab
+        #ignoring the emulator tab functions until fixed
+        self.main_view.switch_to_tab("StopwatchTab")
 
     def tearDown(self):
         super(TestStopwatch, self).tearDown()
@@ -46,23 +45,24 @@
     def test_start_stop_reset_stopwatch(self):
         """Test to check the proper functioning of the start/stop/reset of stopwatch"""
 
-        start_stop_button = self.main_window.get_stopwatch_button()
+        start_stop_button = self.main_view.get_stopwatch_button()
         self.assertThat(lambda: start_stop_button, Eventually(NotEquals(None)))
-        stopwatch_label = self.main_window.get_stopwatch_label()
+        stopwatch_label = self.main_view.get_stopwatch_label()
         self.assertThat(lambda: stopwatch_label, Eventually(NotEquals(None)))
-        reset_button = self.main_window.get_reset_button()
+        reset_button = self.main_view.get_reset_button()
         self.assertThat(lambda: reset_button, Eventually(NotEquals(None)))
 
         # Press the start button to start the stopwatch
+        stopwatch_label_before = self.main_view.get_stopwatch_label().text
+        self.assertThat(lambda: stopwatch_label_before, Eventually(NotEquals(None)))
         self.pointing_device.click_object(start_stop_button)
         self.assertThat(stopwatch_label.text, Eventually(NotEquals("00:00.0")))
 
         # Press stop and check if the stopwatch has indeed stopped
-        stopwatch_label_before = self.main_window.get_stopwatch_label().text
         self.pointing_device.click_object(start_stop_button)
-        self.assertThat(stopwatch_label_before, NotEquals(self.main_window.get_stopwatch_label().text))
-        stopwatch_label_after = lambda: self.main_window.get_stopwatch_label().text
-        self.assertThat(stopwatch_label_after, Eventually(Equals(self.main_window.get_stopwatch_label().text)))
+        self.assertThat(stopwatch_label_before, NotEquals(self.main_view.get_stopwatch_label().text))
+        stopwatch_label_after = lambda: self.main_view.get_stopwatch_label().text
+        self.assertThat(stopwatch_label_after, Eventually(Equals(self.main_view.get_stopwatch_label().text)))
 
         # Press reset and check if the stopwatch has been resetted
         self.pointing_device.click_object(reset_button)
 
=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_timer.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_timer.py	2013-08-07 16:18:35 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_timer.py	2013-08-12 17:47:04 +0000
@@ -33,17 +33,17 @@
         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")))
+        self.assertThat(
+            self.main_view.visible, Eventually(Equals(True)))
+
+        #move to timer tab
+        #ignoring the emulator tab functions until fixed
+        self.main_view.switch_to_tab("TimerTab")
 
 
     def drag_page_up_to_show_input_box(self):
-        timer_page = self.app.select_single("TimerPage")
+        timer_page = self.select_single("TimerPage")
+        self.assertThat(timer_page, Eventually(NotEquals(None)))
 
         x, y, w, h = timer_page.globalRect
         tx = x + (w / 2)
@@ -55,7 +55,8 @@
             Eventually(Equals(False)))
 
     def drag_page_down_to_previous_state(self):
-        timer_page = self.app.select_single("TimerPage")
+        timer_page = self.select_single("TimerPage")
+        self.assertThat(timer_page, Eventually(NotEquals(None)))
 
         x, y, w, h = timer_page.globalRect
         tx = x + (w / 2)
@@ -66,46 +67,24 @@
             timer_page.select_single("AnimationContainer").moving,
             Eventually(Equals(False)))
 
-
-    def open_toolbar(self):
-        toolbar = self.get_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 close_toolbar(self):
-        toolbar = self.get_toolbar()
-
-        x, y, w, h = toolbar.globalRect
-        tx = x + (w / 2)
-        ty = y + (h - (h / 8))
-
-        self.pointing_device.drag(tx, ty - h, tx, ty)
-        self.assertThat(toolbar.animating, Eventually(Equals(False)))
-        #self.assertThat(toolbar.state, Eventually(NotEquals("spread")))
-
     def test_add_preset(self):
         """Test to check if button to add a preset working"""
 
         # Show the toolbar
-        self.open_toolbar()
+        self.main_view.open_toolbar()
 
         # Click the add preset button
-        add_preset_button = self.main_window.get_toolbar_timer_add_preset_button()
+        add_preset_button = self.main_view.get_toolbar_timer_add_preset_button()
+        self.assertThat(lambda: add_preset_button, Eventually(NotEquals(None)))
         self.pointing_device.click_object(add_preset_button)
 
         #For now close the toolbar due to https://bugs.launchpad.net/ubuntu-clock-app/+bug/1209024
-        self.close_toolbar()
+        self.main_view.close_toolbar()
 
         # Write in the label
         if model() != "Desktop":
             self.drag_page_up_to_show_input_box()
-        label = self.main_window.get_timer_name_preset()
+        label = self.main_view.get_timer_name_preset()
         self.assertThat(lambda: label, Eventually(NotEquals(None)))
         self.pointing_device.click_object(label)
         self.assertThat(label.focus, Eventually(Equals(True)))
@@ -116,20 +95,22 @@
             self.drag_page_down_to_previous_state()
 
         # Set hour
-        hour = self.main_window.get_timer_hour_hand()
+        hour = self.main_view.get_timer_hour_hand()
         self.assertThat(lambda: hour, Eventually(NotEquals(None)))
         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))
 
-        num_of_presets_old = int(self.main_window.get_num_of_presets())
+        num_of_presets_old = self.main_view.get_num_of_presets()
+        self.assertThat(lambda: num_of_presets_old, Eventually(NotEquals(None)))
         # Press "Done" button
-        label = self.main_window.get_timer_clock_center_label()
+        label = self.main_view.get_timer_clock_center_label()
+        self.assertThat(lambda: label, Eventually(NotEquals(None)))
         self.pointing_device.click_object(label)
 
         # Check if the preset has been saved
-        self.assertThat(self.main_window.get_num_of_presets(),
+        self.assertThat(self.main_view.get_num_of_presets,
             Eventually(Equals(num_of_presets_old+1)))
 
     def test_delete_preset(self):
@@ -138,8 +119,9 @@
         # Create a new preset
         self.test_add_preset()
 
-        num_of_presets_old = int(self.main_window.get_num_of_presets())
-        first_preset = self.main_window.get_first_preset_list_item()
+        num_of_presets_old = self.main_view.get_num_of_presets()
+        self.assertThat(lambda: num_of_presets_old, Eventually(NotEquals(None)))
+        first_preset = self.main_view.get_first_preset_list_item()
         self.assertThat(lambda: first_preset, Eventually(NotEquals(None)))
 
         if model() != "Desktop":
@@ -151,7 +133,7 @@
         self.pointing_device.drag(tx, ty, w - w / 8, ty)
 
         # Check has been deleted
-        self.assertThat(self.main_window.get_num_of_presets(),
+        self.assertThat(self.main_view.get_num_of_presets,
             Eventually(Equals(num_of_presets_old-1)))
 
     def test_run_preset(self):
@@ -161,7 +143,7 @@
         self.test_add_preset()
 
         # Click to select the preset
-        first_preset = self.main_window.get_first_preset_list_item()
+        first_preset = self.main_view.get_first_preset_list_item()
         self.assertThat(lambda: first_preset, Eventually(NotEquals(None)))
         if model() != "Desktop":
             self.drag_page_up_to_show_input_box()
@@ -171,9 +153,11 @@
             self.drag_page_down_to_previous_state()
 
         # Click to start the preset
-        label = self.main_window.get_timer_clock_center_label()
+        label = self.main_view.get_timer_clock_center_label()
+        self.assertThat(lambda: label, Eventually(NotEquals(None)))
         self.pointing_device.click_object(label)
 
         # Check if timer is started
-        label_timer = self.main_window.get_label_timer()
+        label_timer = self.main_view.get_label_timer()
+        self.assertThat(lambda: label_timer, Eventually(NotEquals(None)))
         self.assertThat(label_timer.text, Eventually(NotEquals("23:00:00")))