Merge lp:~elopio/address-book-app/content-hub into lp:~rhuddie/address-book-app/add-photo-helper

[Leo Arias]

Unmerged revisions

222. By Leo Arias on 2014-07-04

Changed the fake for content-hub.

=== modified file 'tests/autopilot/address_book_app/tests/test_edit_contact.py'
--- tests/autopilot/address_book_app/tests/test_edit_contact.py	2014-07-03 16:56:55 +0000
+++ tests/autopilot/address_book_app/tests/test_edit_contact.py	2014-07-04 18:44:06 +0000
@@ -223,32 +223,34 @@
     def test_press_photo_icon(self):
         """Test to press the photo icon on the contact editor"""
         print('Running test_press_photo_icon')
-        url_dispatcher = FakeURLDispatcher()
-        self.useFixture(url_dispatcher)
+        content_hub = FakeContentHub()
+        self.useFixture(content_hub)
         contact_editor = self.main_window.go_to_add_contact()
         contact_editor.press_photo_icon()
 
-        def get_last_dispatch_url_call_parameter():
+        def get_last_import_from_peer_parameters():
             # Workaround for http://pad.lv/1312384
             try:
-                return url_dispatcher.get_last_dispatch_url_call_parameter()
+                fake_service = content_hub.fake_service
+                return fake_service.get_last_import_from_peer_parameters()
             except ContactEditorException:
                 return None
 
         self.assertThat(
-            get_last_dispatch_url_call_parameter,
-            Eventually(Equals('image://theme/contact')))
+            get_last_import_from_peer_parameters,
+            Eventually(Equals(('', ''))))
+        print(content_hub.fake_service.import_mock.GetCalls())
 
 
 class ContactEditorException(Exception):
     """Exception raised from ContactEditor"""
 
 
-class FakeURLDispatcher(fixtures.Fixture):
+class FakeContentHub(fixtures.Fixture):
 
     def setUp(self):
-        super(FakeURLDispatcher, self).setUp()
-        self.fake_service = FakeURLDispatcherService()
+        super(FakeContentHub, self).setUp()
+        self.fake_service = FakeContentHubService()
         self.addCleanup(self.fake_service.stop)
         self.fake_service.start()
 
@@ -256,33 +258,38 @@
         return self.fake_service.get_last_dispatch_url_call_parameter()
 
 
-class FakeURLDispatcherService(object):
+class FakeContentHubService(object):
 
-    """Fake URL Dispatcher service using a dbusmock interface."""
+    """Fake Content Hub service using a dbusmock interface."""
 
     def __init__(self):
-        super(FakeURLDispatcherService, self).__init__()
+        super(FakeContentHubService, self).__init__()
         self.dbus_connection = dbusmock.DBusTestCase.get_dbus(system_bus=False)
 
     def start(self):
-        """Start the fake URL Dispatcher service."""
-        # Stop the real url-dispatcher.
-        subprocess.call(['initctl', 'stop', 'url-dispatcher'])
+        """Start the fake Content Hub service."""
+        # Stop the real content-hub.
+        subprocess.call(['pkill', '-9', '-f', 'content-hub-service'])
         self.dbus_mock_server = dbusmock.DBusTestCase.spawn_server(
-            'com.canonical.URLDispatcher',
-            '/com/canonical/URLDispatcher',
-            'com.canonical.URLDispatcher',
+            'com.ubuntu.content.dbus.Service',
+            '/',
+            'com.ubuntu.content.dbus.Service',
             system_bus=False,
             stdout=subprocess.PIPE)
         self.mock = self._get_mock_interface()
+        import_path = '/transfers/_/import/'
+        import_id = '1'
         self.mock.AddMethod(
-            'com.canonical.URLDispatcher', 'DispatchURL', 's', '', '')
-        print('Started fake url dispatcher')
+            'com.ubuntu.content.dbus.Service',
+            'CreateImportFromPeer', 'ss', 'o',
+            'ret = "{}{}"'.format(import_path, import_id))
+        self.add_import_object(import_path, import_id)
+        print('Started fake content hub')
 
     def _get_mock_interface(self):
         return dbus.Interface(
             self.dbus_connection.get_object(
-                'com.canonical.URLDispatcher', '/com/canonical/URLDispatcher'),
+                'com.ubuntu.content.dbus.Service', '/'),
             dbusmock.MOCK_IFACE)
 
     def stop(self):
@@ -290,12 +297,41 @@
         self.dbus_mock_server.terminate()
         self.dbus_mock_server.wait()
 
-    def get_last_dispatch_url_call_parameter(self):
+    def get_last_import_from_peer_parameters(self):
         """Return the parameter used in the last call to dispatch URL."""
         calls = self.mock.GetCalls()
         print(('Number of calls:{}'.format(len(calls))))
         if len(calls) == 0:
             raise ContactEditorException(
-                'URL dispatcher has not been called.')
+                'Content hub has not been called.')
         last_call = self.mock.GetCalls()[-1]
-        return last_call[2][0]
\ No newline at end of file
+        return last_call[2][0], last_call[2][1]
+
+    def add_import_object(self, object_path, object_id):
+        self.mock.AddObject(
+            object_path + object_id,
+            'com.ubuntu.content.dbus.Transfer',
+            {},
+            [
+                ('Abort', '', '', ''),
+                ('Charge', 'as', '', ''),
+                ('Collect', '', 'as', ''),
+                ('Direction', '', 'i', 'return 0'),
+                ('Download', '', '', ''),
+                ('DownloadId', '', 's', ''),
+                ('Finalize', '', '', ''),
+                ('Handled', '', '', ''),
+                ('Id', '', 'i', 'ret ' + object_id),
+                ('SelectionType', '', 'i', ''),
+                ('SetDownloadId', 's', '', ''),
+                ('SetSelectionType', 'i', '', ''),
+                ('SetStore', 's', '', ''),
+                ('Start', '', '', ''),
+                ('State', '', 'i', ''),
+                ('Store', '', 's', '')
+            ]
+        )
+        self.import_mock = dbus.Interface(
+            self.dbus_connection.get_object(
+                'com.ubuntu.content.dbus.Service',  object_path + object_id),
+            dbusmock.MOCK_IFACE)