Merge lp:~nskaggs/reminders-app/switch-emulators-to-proxy-object into lp:reminders-app

[Nicholas Skaggs]

Switch to custom proxy object emulator, instead of calling via old emulators module

Remove deprecation warning
Switch to custom proxy object emulator, instead of calling via old emulators module

[lp:~nskaggs/reminders-app/switch-emulators-to-proxy-object]

181. By Nicholas Skaggs on 2014-07-14

stop using private methods :-)

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

PASSED: Continuous integration, rev:180
http://91.189.93.70:8080/job/reminders-app-ci/459/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1013
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1013/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/155

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/459/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:181
http://91.189.93.70:8080/job/reminders-app-ci/460/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1014
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1014/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/156

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/460/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Note, due to https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1341679, you will still see the deprecation error until the fix lands in the toolkit.

[Leo Arias (elopio)]

Looking good! Thanks.

review: Approve (code review)

=== modified file 'tests/autopilot/reminders/__init__.py'
--- tests/autopilot/reminders/__init__.py	2014-07-02 16:05:53 +0000
+++ tests/autopilot/reminders/__init__.py	2014-07-14 17:06:49 +0000
@@ -26,8 +26,6 @@
 import autopilot
 from autopilot import logging as autopilot_logging
 from autopilot.introspection import dbus
-from ubuntuuitoolkit import emulators as toolkit_emulators
-
 
 logger = logging.getLogger(__name__)
 
@@ -56,7 +54,7 @@
             NotebooksPage, objectName='notebooksPage')
 
 
-class MainView(toolkit_emulators.MainView):
+class MainView(ubuntuuitoolkit.MainView):
 
     """Autopilot custom proxy object for the MainView."""
 
@@ -78,7 +76,7 @@
             return self._no_account_dialog
 
 
-class NoAccountDialog(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+class NoAccountDialog(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
     """Autopilot custom proxy object for the no account dialog."""
 
@@ -104,7 +102,7 @@
         self.pointing_device.click_object(button)
 
 
-class _Page(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+class _Page(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
     def __init__(self, *args):
         super(_Page, self).__init__(*args)
@@ -169,7 +167,7 @@
         return notebooks
 
 
-class NotebooksDelegate(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+class NotebooksDelegate(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
     """Autopilot custom proxy object for the NotebooksDelegate."""
 

=== modified file 'tests/autopilot/reminders/tests/__init__.py'
--- tests/autopilot/reminders/tests/__init__.py	2014-07-03 18:40:37 +0000
+++ tests/autopilot/reminders/tests/__init__.py	2014-07-14 17:06:49 +0000
@@ -24,10 +24,8 @@
 import fixtures
 from autopilot import logging as autopilot_logging
 from autopilot.testcase import AutopilotTestCase
-from ubuntuuitoolkit import (
-    emulators as toolkit_emulators,
-    fixture_setup as toolkit_fixtures
-)
+import ubuntuuitoolkit
+from ubuntuuitoolkit import fixture_setup as toolkit_fixtures
 
 import reminders
 
@@ -85,7 +83,7 @@
             '-q', self.local_location_qml,
             '-s',
             app_type='qt',
-            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 
     @autopilot_logging.log_action(logger.info)
     def launch_test_installed(self):
@@ -96,14 +94,14 @@
             '--desktop_file_hint=/usr/share/applications/'
             'reminders.desktop',
             app_type='qt',
-            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 
     @autopilot_logging.log_action(logger.info)
     def launch_test_click(self):
         return self.launch_click_package(
             'com.ubuntu.reminders',
             '-s',
-            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 
     def _patch_home(self, test_type):
         temp_dir_fixture = fixtures.TempDir()