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

Proposed by Manuel de la Peña
Status: Merged
Approved by: Manuel de la Peña
Approved revision: 866
Merged at revision: 882
Proposed branch: lp:~mandel/ubuntuone-client/add_dbus_folders_tests
Merge into: lp:ubuntuone-client
Prerequisite: lp:~mandel/ubuntuone-client/add_dbus_shares_signal_tests
Diff against target: 84 lines (+74/-0)
1 file modified
tests/platform/linux/test_dbus.py (+74/-0)
To merge this branch: bzr merge lp:~mandel/ubuntuone-client/add_dbus_folders_tests
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Approve
Guillermo Gonzalez Approve
Review via email: mp+50564@code.launchpad.net

Commit message

Add extra tests that will ensure that the emit methods in the Folders dbus class are correct.

Description of the change

Add extra tests that will ensure that the emit methods in the Folders dbus class are correct.

To post a comment you must log in.
Revision history for this message
Guillermo Gonzalez (verterok) wrote :

+1

review: Approve
Revision history for this message
Alejandro J. Cura (alecu) wrote :

More tests, yay!

review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/platform/linux/test_dbus.py'
--- tests/platform/linux/test_dbus.py 2011-02-21 09:30:55 +0000
+++ tests/platform/linux/test_dbus.py 2011-02-21 09:30:55 +0000
@@ -3807,6 +3807,80 @@
3807 self.shares.emit_share_unsubscribe_error(share_id, error)3807 self.shares.emit_share_unsubscribe_error(share_id, error)
38083808
38093809
3810class TestFoldersEmitSignals(DBusTwistedTestCase, MockerTestCase):
3811 """Test that the emit method have been correctly implemented."""
3812
3813 def setUp(self):
3814 """Setup tests."""
3815 super(TestFoldersEmitSignals, self).setUp()
3816 self.signal_method = self.mocker.mock()
3817 self.get_udf_dict = self.mocker.replace(
3818 'ubuntuone.syncdaemon.interaction_interfaces.get_udf_dict')
3819
3820 def test_emit_folder_deleted(self):
3821 """Emit the FolderCreated signal"""
3822 folder = 'folder'
3823 udf_dict = {'udf':'id'}
3824 self.get_udf_dict(folder)
3825 self.mocker.result(udf_dict)
3826 self.folders.FolderDeleted = self.signal_method
3827 self.signal_method(udf_dict)
3828 self.mocker.replay()
3829 self.folders.emit_folder_deleted(folder)
3830
3831 def test_emit_folder_delete_error(self):
3832 """Emit the FolderCreateError signal"""
3833 folder = 'folder'
3834 error = 'error'
3835 udf_dict = {'udf':'id'}
3836 self.get_udf_dict(folder)
3837 self.mocker.result(udf_dict)
3838 self.folders.FolderDeleteError = self.signal_method
3839 self.signal_method(udf_dict, str(error))
3840 self.mocker.replay()
3841 self.folders.emit_folder_delete_error(folder, error)
3842
3843 def test_emit_folder_subscribed(self):
3844 """Emit the FolderSubscribed signal"""
3845 folder = 'folder'
3846 udf_dict = {'udf':'id'}
3847 self.get_udf_dict(folder)
3848 self.mocker.result(udf_dict)
3849 self.folders.FolderSubscribed = self.signal_method
3850 self.signal_method(udf_dict)
3851 self.mocker.replay()
3852 self.folders.emit_folder_subscribed(folder)
3853
3854 def test_emit_folder_subscribe_error(self):
3855 """Emit the FolderSubscribeError signal"""
3856 folder_id = 'id'
3857 error = 'error'
3858 self.folders.FolderSubscribeError = self.signal_method
3859 self.signal_method({'id':folder_id}, str(error))
3860 self.mocker.replay()
3861 self.folders.emit_folder_subscribe_error(folder_id, error)
3862
3863 def test_emit_folder_unsubscribed(self):
3864 """Emit the FolderUnSubscribed signal"""
3865 folder = 'folder'
3866 udf_dict = {'udf':'id'}
3867 self.get_udf_dict(folder)
3868 self.mocker.result(udf_dict)
3869 self.folders.FolderUnSubscribed = self.signal_method
3870 self.signal_method(udf_dict)
3871 self.mocker.replay()
3872 self.folders.emit_folder_unsubscribed(folder)
3873
3874 def test_emit_folder_unsubscribe_error(self):
3875 """Emit the FolderUnSubscribeError signal"""
3876 folder_id = 'id'
3877 error = 'error'
3878 self.folders.FolderUnSubscribeError= self.signal_method
3879 self.signal_method({'id':folder_id}, str(error))
3880 self.mocker.replay()
3881 self.folders.emit_folder_unsubscribe_error(folder_id, error)
3882
3883
3810def test_suite():3884def test_suite():
3811 """Collect these tests only on linux."""3885 """Collect these tests only on linux."""
3812 import sys3886 import sys

Subscribers

People subscribed via source and target branches