Merge lp:~mvo/software-center/launcher-integration-unit-tests into lp:~gary-lasker/software-center/launcher-integration-unit-tests

[Michael Vogt]

This branch is the result of https://code.launchpad.net/~gary-lasker/software-center/launcher-integration-unit-tests/+merge/115236

The thing that needs a extra critical look is r3062 to ensure that this does not regress on what we are testing but if not I think its a good approach to simplify and remove some duplication.

[Michael Vogt (mvo)]

Meh, r3062 (the commit message) is misleading as its just a subset (three tests) that are consolidated.

[lp:~mvo/software-center/launcher-integration-unit-tests]

3063. By Michael Vogt on 2012-07-18

merged from gary

[Michael Vogt (mvo)]

Merged into 5.2 now (after approval from Gary on irc).

review: Approve

=== modified file 'test/gtk3/test_unity_launcher_integration.py'
--- test/gtk3/test_unity_launcher_integration.py	2012-07-18 15:12:20 +0000
+++ test/gtk3/test_unity_launcher_integration.py	2012-07-18 15:26:24 +0000
@@ -109,8 +109,8 @@
                 "")
         self._install_from_list_view(test_pkgname)
         self.assertTrue(mock_send_application_to_launcher.called)
-        args = mock_send_application_to_launcher.call_args
-        self._check_send_application_to_launcher_args(args[0][0], args[0][1])
+        args, kwargs = mock_send_application_to_launcher.call_args
+        self._check_send_application_to_launcher_args(*args, **kwargs)
 
     @patch('softwarecenter.ui.gtk3.panes.availablepane.UnityLauncher'
            '.send_application_to_launcher')
@@ -128,8 +128,8 @@
                 "")
         self._navigate_to_appdetails_and_install(test_pkgname)
         self.assertTrue(mock_send_application_to_launcher.called)
-        args = mock_send_application_to_launcher.call_args
-        self._check_send_application_to_launcher_args(args[0][0], args[0][1])
+        args, kwargs = mock_send_application_to_launcher.call_args
+        self._check_send_application_to_launcher_args(*args, **kwargs)
         
     @patch('softwarecenter.ui.gtk3.panes.availablepane.UnityLauncher'
            '.send_application_to_launcher')
@@ -140,76 +140,47 @@
         test_pkgname = "software-center"
         self._navigate_to_appdetails_and_install(test_pkgname)
         self.assertFalse(mock_send_application_to_launcher.called)
-        
-    @patch('softwarecenter.ui.gtk3.panes.availablepane'
-           '.convert_desktop_file_to_installed_location')
-    @patch('softwarecenter.ui.gtk3.panes.availablepane.UnityLauncher'
-           '.send_application_to_launcher')
-    # NOTE: the order of attributes in the method call appears reversed, this
-    # is because the patch decorators above are executed from innermost to
-    # outermost
-    def test_unity_launcher_integration_launcher_displayed_app(self,
-                mock_send_application_to_launcher,
-                mock_convert_desktop_file_to_installed_location):
-        # test that the add to launcher call is made in the case where
-        # an application with a valid and displayable desktop file
-        available_pane.add_to_launcher_enabled = True
-        test_pkgname = "software-center"
-        app_install_desktop_file_path = ("/usr/share/app-install/desktop/"
-                 "software-center:ubuntu-software-center.desktop")
-        mock_convert_desktop_file_to_installed_location.return_value = (
-                app_install_desktop_file_path)
-        self._navigate_to_appdetails_and_install(test_pkgname)
-        # make sure that the add to launcher call is made
-        self.assertTrue(mock_send_application_to_launcher.called)
-        
-    @patch('softwarecenter.ui.gtk3.panes.availablepane'
-           '.convert_desktop_file_to_installed_location')
-    @patch('softwarecenter.ui.gtk3.panes.availablepane.UnityLauncher'
-           '.send_application_to_launcher')
-    # NOTE: the order of attributes in the method call appears reversed, this
-    # is because the patch decorators above are executed from innermost to
-    # outermost
-    def test_unity_launcher_integration_no_display_in_desktop_file(self,
-                mock_send_application_to_launcher,
-                mock_convert_desktop_file_to_installed_location):
-        # test that the add to launcher call is *not* made in the case where
-        # an application's desktop file specifies "NoDisplay=true"
-        available_pane.add_to_launcher_enabled = True
-        test_pkgname = "wine"
-        app_install_desktop_file_path = ("/usr/share/app-install/desktop/"
-                                         "wine1.4:wine.desktop")
-        mock_convert_desktop_file_to_installed_location.return_value = (
-                app_install_desktop_file_path)
-        self._navigate_to_appdetails_and_install(test_pkgname)
-        # make sure that the add to launcher call is *not* made in the case
-        # where the desktop file specifies NoDisplay=True
-        self.assertFalse(mock_send_application_to_launcher.called)
-        
-    @patch('softwarecenter.ui.gtk3.panes.availablepane'
-           '.convert_desktop_file_to_installed_location')
-    @patch('softwarecenter.ui.gtk3.panes.availablepane.UnityLauncher'
-           '.send_application_to_launcher')
-    # NOTE: the order of attributes in the method call appears reversed, this
-    # is because the patch decorators above are executed from innermost to
-    # outermost
-    def test_unity_launcher_integration_no_exec_in_desktop_file(self,
-                mock_send_application_to_launcher,
-                mock_convert_desktop_file_to_installed_location):
-        # test that the add to launcher call is *not* made in the case where
-        # an application's desktop file does not contain an "exec" entry
-        available_pane.add_to_launcher_enabled = True
-        test_pkgname = "bzr"
-        app_install_desktop_file_path = ("/usr/share/app-install/desktop/"
-                                         "bzr.desktop")
-        mock_convert_desktop_file_to_installed_location.return_value = (
-                app_install_desktop_file_path)
-        self._navigate_to_appdetails_and_install(test_pkgname)
-        # make sure that the add to launcher call is *not* made in the case
-        # where the desktop file does not contain an "exec" entry
-        self.assertFalse(mock_send_application_to_launcher.called)
-        
-    def test_desktop_file_path_conversion(self):
+       
+    @patch('softwarecenter.ui.gtk3.panes.availablepane'
+           '.convert_desktop_file_to_installed_location')
+    @patch('softwarecenter.ui.gtk3.panes.availablepane.UnityLauncher'
+           '.send_application_to_launcher')
+    # NOTE: the order of attributes in the method call appears reversed, this
+    # is because the patch decorators above are executed from innermost to
+    # outermost
+    def test_unity_launcher_integration_launcher(self,
+                mock_send_application_to_launcher,
+                mock_convert_desktop_file_to_installed_location):
+        # this is a 3-tuple of (pkgname, desktop-file, expected_result)
+        TEST_CASES = (
+            # normal app
+            ("software-center", "/usr/share/app-install/desktop/"\
+                 "software-center:ubuntu-software-center.desktop", True),
+            # NoDisplay=True line
+            ("wine", "/usr/share/app-install/desktop/"\
+                 "wine1.4:wine.desktop", False),
+            # No Exec= line
+            ("bzr", "/usr/share/app-install/desktop/"\
+                 "bzr.desktop", False)
+            )
+        # run the test over all test-cases
+        available_pane.add_to_launcher_enabled = True
+        for test_pkgname, app_install_desktop_file_path, res in TEST_CASES:
+            # setup the mock
+            mock_convert_desktop_file_to_installed_location.return_value = (
+                app_install_desktop_file_path)
+            # this is the tofu of the test
+            self._navigate_to_appdetails_and_install(test_pkgname)
+            # verify
+            self.assertEqual(mock_send_application_to_launcher.called, res)
+            # and reset again to ensure we don't get the call info from
+            # the previous call(s)
+            mock_send_application_to_launcher.reset_mock()
+
+
+class DesktopFilepathConversionTestCase(unittest.TestCase):
+        
+    def test_normal(self):
         # test 'normal' case
         app_install_desktop_path = ("./data/app-install/desktop/" +
                                     "deja-dup:deja-dup.desktop")
@@ -217,6 +188,8 @@
                 app_install_desktop_path, "deja-dup")
         self.assertEqual(installed_desktop_path,
                          "./data/applications/deja-dup.desktop")
+
+    def test_encoded_subdir(self):
         # test encoded subdirectory case, e.g. e.g. kde4_soundkonverter.desktop
         app_install_desktop_path = ("./data/app-install/desktop/" +
                                     "soundkonverter:" +
@@ -225,6 +198,8 @@
                 app_install_desktop_path, "soundkonverter")
         self.assertEqual(installed_desktop_path,
                          "./data/applications/kde4/soundkonverter.desktop")
+
+    def test_purchase_via_software_center_agent(self):
         # test the for-purchase case (uses "software-center-agent" as its
         # appdetails.desktop_file value)
         # FIXME: this will only work if update-manager is installed
@@ -233,6 +208,8 @@
                 app_install_desktop_path, "update-manager")
         self.assertEqual(installed_desktop_path,
                          "/usr/share/applications/update-manager.desktop")
+
+    def test_no_value(self):
         # test case where we don't have a value for app_install_desktop_path
         # (e.g. for a local .deb install, see bug LP: #768158)
         installed_desktop_path = convert_desktop_file_to_installed_location(