Merge lp:~mandel/ubuntuone-client/add_dbus_status_signal_tests into lp:ubuntuone-client

[Manuel de la Peña]

Fixes bug with signal and add extra tests tat will ensure that the emit methods work as expected.

Fixes bug with signal and add extra tests tat will ensure that the emit methods work as expected.

[Guillermo Gonzalez (verterok)]

+1

review: Approve

[John O'Brien (jdobrien)]

Looks good.

review: Approve

=== modified file 'tests/platform/linux/test_dbus.py'
--- tests/platform/linux/test_dbus.py	2011-02-16 12:14:20 +0000
+++ tests/platform/linux/test_dbus.py	2011-02-18 14:53:45 +0000
@@ -25,6 +25,7 @@
 import dbus
 from dbus.mainloop.glib import DBusGMainLoop
 from dbus import exceptions
+from mocker import MockerTestCase
 from twisted.internet import defer, reactor
 from twisted.python import failure
 
@@ -41,6 +42,9 @@
     SyncdaemonEventListener
 )
 from ubuntuone.platform.linux.dbus_interface import (
+    AllEventsSender,
+    bool_str,
+    DBusExposedObject,
     DBUS_IFACE_STATUS_NAME,
     DBUS_IFACE_EVENTS_NAME,
     DBUS_IFACE_FS_NAME,
@@ -50,9 +54,11 @@
     DBUS_IFACE_FOLDERS_NAME,
     DBUS_IFACE_PUBLIC_FILES_NAME,
     DBUS_CREDENTIALS_IFACE,
-    DBusInterface, bool_str,
-    logger, NoAccessToken, DBusExposedObject, AllEventsSender,
-    NM_STATE_CONNECTED, NM_STATE_DISCONNECTED
+    DBusInterface,
+    logger,
+    NM_STATE_CONNECTED,
+    NM_STATE_DISCONNECTED,
+    NoAccessToken,
 )
 from ubuntuone.platform.linux import ExternalInterface, get_udf_path
 from ubuntuone.syncdaemon import action_queue
@@ -3486,6 +3492,124 @@
                                 error_handler=self.error_handler)
         yield d
 
+class TestStatusEmitSignals(DBusTwistedTestCase, MockerTestCase):
+    """Test that the emit method have been correctly implemented."""
+
+    def setUp(self):
+        """Setup tests."""
+        super(TestStatusEmitSignals, self).setUp()
+        self.signal_method = self.mocker.mock()
+
+    def test_emit_content_queue_changed(self):
+        """Emit ContentQueueChanged."""
+        self.status.ContentQueueChanged = self.signal_method
+        self.signal_method() 
+        self.mocker.replay()
+        # will assert that the signal method was called    
+        self.status.emit_content_queue_changed()
+
+    def test_emit_invalid_name(self):
+        """Emit InvalidName."""
+        dirname = 'dirname'
+        filename = 'filename'
+        self.status.InvalidName = self.signal_method
+        self.signal_method(unicode(dirname), str(filename))
+        self.mocker.replay()
+        self.status.emit_invalid_name(dirname, filename)
+
+    def test_emit_broken_node(self):
+        """Emit BrokenNode."""
+        volume_id = 'volume_id'
+        node_id = 'node_id'
+        mdid = 'mdid'
+        path = 'path'
+        self.status.BrokenNode = self.signal_method
+        self.signal_method(volume_id, node_id, mdid, path.decode('utf8'))
+        self.mocker.replay()
+        self.status.emit_broken_node(volume_id, node_id, mdid,
+                                     path.decode('utf8'))
+
+    def test_emit_status_changed(self):
+        """Emit StatusChanged."""
+        status = 'status'
+        status_mock = self.mocker.mock()
+        self.status.syncdaemon_status = status_mock
+        status_mock.current_status()
+        self.mocker.result(status)
+        self.status.StatusChanged = self.signal_method
+        self.signal_method(status)
+        self.mocker.replay()
+        self.status.emit_status_changed(status)
+
+    def test_emit_download_started(self):
+        """Emit DownloadStarted."""
+        download = 'download'
+        self.status.DownloadStarted = self.signal_method
+        self.signal_method(download)
+        self.mocker.replay()
+        self.status.emit_download_started(download)
+
+    def test_emit_download_file_progress(self):
+        """Emit DownloadFileProgress."""
+        download = 'download'
+        string_info = {'blah':'3', 'do':'4'}
+        self.status.DownloadFileProgress = self.signal_method
+        self.signal_method(download, string_info)
+        self.mocker.replay()
+        self.status.emit_download_file_progress(download, blah=3, do=4)
+
+    def test_emit_download_finished(self):
+        """Emit DownloadFinished."""
+        download = 'download'
+        string_info = {'blah':'3', 'do':'4'}
+        self.status.DownloadFinished = self.signal_method
+        self.signal_method(download, string_info)
+        self.mocker.replay()
+        self.status.emit_download_finished(download, blah=3, do=4)
+
+    def test_emit_upload_started(self):
+        """Emit UploadStarted."""
+        upload = 'upload'
+        self.status.UploadStarted = self.signal_method
+        self.signal_method(upload)
+        self.mocker.replay()
+        self.status.emit_upload_started(upload)
+
+    def test_emit_upload_file_progress(self):
+        """Emit UploadFileProgress."""
+        upload = 'upload'
+        string_info = {'blah':'3', 'do':'4'}
+        self.status.UploadFileProgress = self.signal_method
+        self.signal_method(upload , string_info)
+        self.mocker.replay()
+        self.status.emit_upload_file_progress(upload , blah=3, do=4)
+
+    def test_emit_upload_finished(self):
+        """Emit UploadFinished."""
+        upload = 'upload'
+        string_info = {'blah':'3', 'do':'4'}
+        self.status.UploadFinished= self.signal_method
+        self.signal_method(upload , string_info)
+        self.mocker.replay()
+        self.status.emit_upload_finished(upload, blah=3, do=4)
+
+    def test_emit_account_changed(self):
+        """Emit AccountChanged."""
+        info_dict = {'purchased_bytes': unicode('34')}
+        account_info = self.mocker.mock()
+        account_info.purchased_bytes
+        self.mocker.result('34')
+        self.status.AccountChanged = self.signal_method
+        self.signal_method(info_dict)
+        self.mocker.replay()
+        self.status.emit_account_changed(account_info)
+
+    def test_emit_metaqueue_changed(self):
+        """Emit MetaQueueChanged."""
+        self.status.MetaQueueChanged = self.signal_method
+        self.signal_method()
+        self.mocker.replay()
+        self.status.emit_metaqueue_changed()
 
 def test_suite():
     """Collect these tests only on linux."""

=== modified file 'ubuntuone/platform/linux/dbus_interface.py'
--- ubuntuone/platform/linux/dbus_interface.py	2011-02-17 16:53:40 +0000
+++ ubuntuone/platform/linux/dbus_interface.py	2011-02-18 14:53:45 +0000
@@ -261,7 +261,7 @@
 
     def emit_status_changed(self, state):
         """Emit StatusChanged."""
-        self.StatusChanged(self._get_current_state())
+        self.StatusChanged(self.syncdaemon_status.current_status())
 
     def emit_download_started(self, download):
         """Emit DownloadStarted."""