Merge lp:~nskaggs/ubuntu-clock-app/add-click-testing-support into lp:ubuntu-clock-app/saucy

[Nicholas Skaggs]

Add support for testing via click packages

Add support for testing via click packages

[Nekhelesh Ramananthan (nik90)]

code logic looks good to me, however I cannot test the code since I cannot install a click package on the desktop.

review: Approve (code logic)

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

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

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/__init__.py'
--- tests/autopilot/ubuntu_clock_app/tests/__init__.py	2013-09-06 01:43:49 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py	2013-09-27 15:43:26 +0000
@@ -44,6 +44,7 @@
         scenarios = [('with touch', dict(input_device_class=Touch))]
 
     local_location = "../../ubuntu-clock-app.qml"
+    installed_location = "/usr/share/ubuntu-clock-app/ubuntu-clock-app.qml"
     sqlite_dir = os.path.expanduser(
         "~/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/Databases")
     backup_dir = sqlite_dir + ".backup"
@@ -64,8 +65,11 @@
 
         if os.path.exists(self.local_location):
             self.launch_test_local()
-        else:
+        elif os.path.exists(self.installed_location):
             self.launch_test_installed()
+        else:
+            self.launch_test_click()
+
 
     def launch_test_local(self):
         self.app = self.launch_test_application(
@@ -77,12 +81,15 @@
     def launch_test_installed(self):
         self.app = self.launch_test_application(
             "qmlscene",
-            "/usr/share/ubuntu-clock-app/ubuntu-clock-app.qml",
+            self.installed_location,
             "--desktop_file_hint=/usr/share/applications/"
             "ubuntu-clock-app.desktop",
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
+    def launch_test_click(self):
+        self.app = self.launch_click_package("com.ubuntu.ubuntu-clock-app", emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+
     def temp_move_sqlite_db(self):
         if os.path.exists(self.backup_dir):
             shutil.rmtree(self.backup_dir)