Merge lp:~jonas-drange/ubuntu-system-settings/update-reset-launcher-test into lp:~mzanetti/ubuntu-system-settings/update-reset-launcher

[Jonas G. Drange]

[reset] use Gio to assert that favorites were reset

[lp:~jonas-drange/ubuntu-system-settings/update-reset-launcher-test]

1098. By Jonas G. Drange on 2014-10-01

test both favorites and items

[Michael Zanetti (mzanetti)]

Unfortunately this doesn't catch bugs in the code... (also valid for the existing test on favorites already, probably some more)

This test still passes against current trunk, even though that code doesn't reset items. Why, you ask? Because when you run this test (either on desktop or a freshly flashed phone) the launcher's item already are set to the default. So just checking if they are still set to the default after the test doesn't cut it, you'd need to change them before the reset call.

review: Needs Fixing

[lp:~jonas-drange/ubuntu-system-settings/update-reset-launcher-test]

1099. By Jonas G. Drange on 2014-10-01

set favs/items to something random so the assertion makes sense

[Michael Zanetti (mzanetti)]

yep. expectedly fails against trunk, but works against my branch now. Thanks a lot!

review: Approve

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-09-18 14:33:27 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-10-01 14:43:27 +0000
@@ -623,32 +623,6 @@
                         dbusmock.DBusTestCase):
     """ Base class for reset settings tests"""
 
-    def mock_for_launcher_reset(self):
-        user_obj = '/user/foo'
-        # start dbus system bus
-        self.mock_server = self.spawn_server(ACCOUNTS_IFACE, ACCOUNTS_OBJ,
-                                             ACCOUNTS_IFACE, system_bus=True,
-                                             stdout=subprocess.PIPE)
-
-        # spawn_server does not wait properly
-        # Reported as bug here: http://pad.lv/1350833
-        sleep(2)
-        self.acc_proxy = dbus.Interface(self.dbus_con.get_object(
-            ACCOUNTS_IFACE, ACCOUNTS_OBJ), dbusmock.MOCK_IFACE)
-
-        self.acc_proxy.AddMethod(ACCOUNTS_IFACE, 'FindUserById', 'x', 'o',
-                                 'ret = "%s"' % user_obj)
-
-        self.acc_proxy.AddObject(
-            user_obj, ACCOUNTS_USER_IFACE, {}, [])
-
-        self.user_mock = dbus.Interface(self.dbus_con.get_object(
-            ACCOUNTS_IFACE, user_obj),
-            dbusmock.MOCK_IFACE)
-
-        self.user_mock.AddMethod(
-            'org.freedesktop.DBus.Properties', 'Set', 'ssaa{sv}', '', '')
-
     def mock_for_factory_reset(self):
         self.mock_server = self.spawn_server(SYSTEM_IFACE, SYSTEM_SERVICE_OBJ,
                                              SYSTEM_IFACE, system_bus=True,
@@ -667,9 +641,7 @@
         klass.dbus_con = klass.get_dbus(True)
 
     def setUp(self):
-        self.mock_for_launcher_reset()
         self.mock_for_factory_reset()
-
         super(ResetBaseTestCase, self).setUp()
         self.reset_page = self.system_settings.main_view.go_to_reset_phone()
 
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_reset.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_reset.py	2014-07-31 23:12:24 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_reset.py	2014-10-01 14:43:27 +0000
@@ -10,7 +10,7 @@
 from time import sleep
 
 from autopilot.matchers import Eventually
-from gi.repository import Gio
+from gi.repository import Gio, GLib
 from testtools.matchers import Contains, Equals
 
 from ubuntu_system_settings.tests import ResetBaseTestCase
@@ -20,8 +20,8 @@
 class ResetTestCase(ResetBaseTestCase):
     """Tests for Reset Page"""
 
-    def set_unity_launcher_favorites(self, gsettings, favorites):
-        gsettings.set_value('favorites', favorites)
+    def set_unity_launcher(self, gsettings, key, value):
+        gsettings.set_value(key, value)
         # wait for gsettings
         sleep(1)
 
@@ -33,15 +33,28 @@
 
     def test_reset_launcher(self):
         gsettings = Gio.Settings.new('com.canonical.Unity.Launcher')
+
         favorites = gsettings.get_value('favorites')
-        self.addCleanup(
-            self.set_unity_launcher_favorites, gsettings, favorites)
+        gsettings.set_value(
+            'favorites',
+            GLib.Variant('as', ['application://nautilus.desktop']))
+        self.addCleanup(
+            self.set_unity_launcher, gsettings, 'favorites', favorites)
+
+        items = gsettings.get_value('items')
+        gsettings.set_value(
+            'items', GLib.Variant('as', ['application:///dialer-app.desktop']))
+        self.addCleanup(
+            self.set_unity_launcher, gsettings, 'items', items)
 
         self.reset_page.reset_launcher()
+        self.assertThat(
+            lambda: gsettings.get_value('favorites'),
+            Eventually(Equals(gsettings.get_default_value('favorites'))))
 
         self.assertThat(
-            lambda: str(self.user_mock.GetCalls()),
-            Eventually(Contains('com.canonical.unity.AccountsService')))
+            lambda: gsettings.get_value('items'),
+            Eventually(Equals(gsettings.get_default_value('items'))))
 
     def test_factory_reset(self):
         self.reset_page.erase_and_reset_everything()