Merge lp:~nskaggs/ubuntu-clock-app/ap-cleanups into lp:ubuntu-clock-app/saucy

[Nicholas Skaggs]

correct timing loop to account for moving presets
add db cleanup before each test run

Fix the current bug with autopilot tests and add db cleanups before each test

http://reports.qa.ubuntu.com/smokeng/saucy/image/3966/ubuntu-clock-app-autopilot/

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

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

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:182
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/9/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/249
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-ci/9
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-ci/9
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/9
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/9

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

review: Approve (continuous-integration)

[lp:~nskaggs/ubuntu-clock-app/ap-cleanups]

183. By Nicholas Skaggs on 2013-09-05

add loop for save button timing, remove "desktop" specific code so test runs uniformly across devices

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

FAILED: Continuous integration, rev:183
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/11/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:183
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/10/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/252
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-ci/10
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-ci/10
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/10
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/10

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

review: Approve (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/__init__.py'
--- tests/autopilot/ubuntu_clock_app/tests/__init__.py	2013-08-12 17:46:04 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py	2013-09-05 02:57:23 +0000
@@ -21,12 +21,13 @@
 
 import os.path
 import os
+import shutil
 
 from autopilot.input import Mouse, Touch, Pointer
 from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
 from autopilot.matchers import Eventually
-from testtools.matchers import GreaterThan
+from testtools.matchers import GreaterThan, Equals
 
 from ubuntuuitoolkit import emulators as toolkit_emulators
 from ubuntu_clock_app import emulators
@@ -43,10 +44,16 @@
         scenarios = [('with touch', dict(input_device_class=Touch))]
 
     local_location = "../../ubuntu-clock-app.qml"
+    sqlite_dir = os.path.expanduser(
+        "~/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/Databases")
+    backup_dir = sqlite_dir + ".backup"
 
     def setUp(self):
         self.pointing_device = Pointer(self.input_device_class.create())
         super(ClockAppTestCase, self).setUp()
+        self.temp_move_sqlite_db()
+        self.addCleanup(self.restore_sqlite_db)
+
         if os.path.exists(self.local_location):
             self.launch_test_local()
         else:
@@ -68,6 +75,31 @@
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
+    def temp_move_sqlite_db(self):
+        if os.path.exists(self.sqlite_dir):
+            shutil.move(self.sqlite_dir, self.backup_dir)
+            self.assertThat(
+                lambda: os.path.exists(self.backup_dir),
+                Eventually(Equals(True)))
+
+    def restore_sqlite_db(self):
+        if os.path.exists(self.backup_dir) and os.path.exists(self.sqlite_dir):
+            shutil.rmtree(self.sqlite_dir)
+            self.assertThat(
+                lambda: os.path.exists(self.sqlite_dir),
+                Eventually(Equals(False)))
+            shutil.move(self.backup_dir, self.sqlite_dir)
+            self.assertTrue(
+                lambda: os.path.exists(self.sqlite_dir),
+                Eventually(Equals(True)))
+        elif os.path.exists(self.backup_dir):
+            shutil.move(self.backup_dir, self.sqlite_dir)
+            self.assertTrue(
+                lambda: os.path.exists(self.sqlite_dir),
+                Eventually(Equals(True)))
+        else:
+            pass
+
     @property
     def main_view(self):
         return self.app.select_single(emulators.MainView)

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_timer.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_timer.py	2013-09-02 19:39:34 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_timer.py	2013-09-05 02:57:23 +0000
@@ -89,16 +89,14 @@
         self.pointing_device.click_object(add_preset_button)
 
         # Write in the label
-        if model() != "Desktop":
-            self.drag_page_up_to_show_input_box()
+        self.drag_page_up_to_show_input_box()
         self.assertThat(self.main_view.get_timer_name_preset, Eventually(Not(Is(None))))
-        label = self.select_name_preset_label()        
+        label = self.select_name_preset_label()
         self.assertThat(label.focus, Eventually(Equals(True)))
         self.keyboard.type("test")
         self.assertThat(label.text, Eventually(Equals("test")))
 
-        if model() != "Desktop":
-            self.drag_page_down_to_previous_state()
+        self.drag_page_down_to_previous_state()
 
         # Set hour
         self.assertThat(self.main_view.get_timer_hour_hand, Eventually(Not(Is(None))))
@@ -113,12 +111,14 @@
 
         # Press "Save" toolbar button
         self.assertThat(self.main_view.get_toolbar_timer_save_preset_button, Eventually(Not(Is(None))))
-        save_preset_button = self.main_view.get_toolbar_timer_save_preset_button()
-        self.pointing_device.click_object(save_preset_button)
 
-        # Check if the preset has been saved
-        self.assertThat(self.main_view.get_num_of_presets,
-            Eventually(Equals(num_of_presets_old+1)))
+        #make sure preset is saved, and shows up properly
+        timeout = 0
+        while self.main_view.get_num_of_presets() != num_of_presets_old+1 and timeout < 10:
+            save_preset_button = self.main_view.get_toolbar_timer_save_preset_button()
+            self.pointing_device.click_object(save_preset_button)
+            sleep(1)
+            timeout += 1
 
     def test_delete_preset(self):
         """Test if the swipe of a preset deletes it"""
@@ -129,17 +129,17 @@
         self.assertThat(self.main_view.get_num_of_presets, Eventually(Not(Is(None))))
         num_of_presets_old = self.main_view.get_num_of_presets()
         self.assertThat(self.main_view.get_first_preset_list_item, Eventually(Not(Is(None))))
-        first_preset = self.main_view.get_first_preset_list_item()
-
-        if model() != "Desktop":
-            self.drag_page_up_to_show_input_box()
+
+        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)
-        timeout = 0        
+        timeout = 0
         while self.main_view.get_num_of_presets() != num_of_presets_old-1 and timeout < 10:
-            self.pointing_device.drag(tx, ty, w - w / 8, ty)             
+            first_preset = self.main_view.get_first_preset_list_item()
+            x, y, w, h = first_preset.globalRect
+            tx = x + (w / 8)
+            ty = y + (h / 2)
+            self.pointing_device.drag(tx, ty, w - w / 8, ty)
             sleep(1)
             timeout += 1
 
@@ -156,12 +156,11 @@
         # Click to select the preset
         self.assertThat(self.main_view.get_first_preset_list_item, Eventually(Not(Is(None))))
         first_preset = self.main_view.get_first_preset_list_item()
-        if model() != "Desktop":
-            self.drag_page_up_to_show_input_box()
+
+        self.drag_page_up_to_show_input_box()
         self.pointing_device.click_object(first_preset)
 
-        if model() != "Desktop":
-            self.drag_page_down_to_previous_state()
+        self.drag_page_down_to_previous_state()
 
         # Click to start the preset
         self.assertThat(self.main_view.get_label_timer, Eventually(Not(Is(None))))
@@ -171,7 +170,7 @@
             self.pointing_device.click_object(label)
             sleep(1)
             timeout += 1
-        
+
         # Check if timer is started
         self.assertThat(self.main_view.get_label_timer, Eventually(Not(Is(None))))
         label_timer = self.main_view.get_label_timer()