Merge lp:~thomir-deactivatedaccount/unity/ap-test-quicklist-actions-are-shown into lp:unity

[Thomi Richards]

This branch adds autopilot tests to verify the fix for bug lp:942042.

UNBLOCK

[Tim Penhey (thumper)]

review: Approve

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.cpp'
--- plugins/unityshell/src/BamfLauncherIcon.cpp	2012-02-28 23:51:12 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.cpp	2012-03-06 21:47:15 +0000
@@ -663,64 +663,50 @@
 
 void BamfLauncherIcon::UpdateDesktopQuickList()
 {
-  GKeyFile* keyfile;
-  glib::Error error;
   std::string const& desktop_file = DesktopFile();
 
   if (desktop_file.empty())
     return;
 
-  // check that we have the X-Ayatana-Desktop-Shortcuts flag
-  // not sure if we should do this or if libindicator should shut up
-  // and not report errors when it can't find the key.
-  // so FIXME when ted is around
-  keyfile = g_key_file_new();
-  g_key_file_load_from_file(keyfile, desktop_file.c_str(), G_KEY_FILE_NONE, &error);
-
-  if (error)
-  {
-    g_warning("Could not load desktop file for: %s", desktop_file.c_str());
-    g_key_file_free(keyfile);
-    return;
-  }
-
-  if (g_key_file_has_key(keyfile, G_KEY_FILE_DESKTOP_GROUP,
-                         "X-Ayatana-Desktop-Shortcuts", nullptr))
-  {
-    for (GList *l = dbusmenu_menuitem_get_children(_menu_desktop_shortcuts); l; l = l->next)
-      _gsignals.Disconnect(l->data, "item-activated");
-
-    _menu_desktop_shortcuts = dbusmenu_menuitem_new();
-    dbusmenu_menuitem_set_root(_menu_desktop_shortcuts, TRUE);
-
-    _desktop_shortcuts = indicator_desktop_shortcuts_new(desktop_file.c_str(), "Unity");
-    const gchar** nicks = indicator_desktop_shortcuts_get_nicks(_desktop_shortcuts);
-
-    int index = 0;
-    while (nicks[index])
-    {
-      glib::String name(indicator_desktop_shortcuts_nick_get_name(_desktop_shortcuts,
-                                                                  nicks[index]));
-      glib::Object<DbusmenuMenuitem> item(dbusmenu_menuitem_new());
-      dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, name);
-      dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
-      dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
-      dbusmenu_menuitem_property_set(item, "shortcut-nick", nicks[index]);
-
-      auto sig = new glib::Signal<void, DbusmenuMenuitem*, gint>(item, "item-activated",
-                                  [&] (DbusmenuMenuitem* item, gint) {
-                                    const gchar *nick;
-                                    nick = dbusmenu_menuitem_property_get(item, "shortcut-nick");
-                                    indicator_desktop_shortcuts_nick_exec(_desktop_shortcuts, nick);
-                                  });
-      _gsignals.Add(sig);
-
-      dbusmenu_menuitem_child_append(_menu_desktop_shortcuts, item);
-      index++;
-    }
-  }
-
-  g_key_file_free(keyfile);
+  for (GList *l = dbusmenu_menuitem_get_children(_menu_desktop_shortcuts); l; l = l->next)
+    _gsignals.Disconnect(l->data, "item-activated");
+
+  _menu_desktop_shortcuts = dbusmenu_menuitem_new();
+  dbusmenu_menuitem_set_root(_menu_desktop_shortcuts, TRUE);
+
+  // Build a desktop shortcuts object and tell it that our
+  // environment is Unity to handle the filtering
+  _desktop_shortcuts = indicator_desktop_shortcuts_new(desktop_file.c_str(), "Unity");
+  // This will get us a list of the nicks available, it should
+  // always be at least one entry of NULL if there either aren't
+  // any or they're filtered for the environment we're in
+  const gchar** nicks = indicator_desktop_shortcuts_get_nicks(_desktop_shortcuts);
+
+  int index = 0;
+  while (nicks[index]) {
+  
+    // Build a dbusmenu item for each nick that is the desktop 
+    // file that is built from it's name and includes a callback
+    // to the desktop shortcuts object to execute the nick
+    glib::String name(indicator_desktop_shortcuts_nick_get_name(_desktop_shortcuts,
+                                                                nicks[index]));
+    glib::Object<DbusmenuMenuitem> item(dbusmenu_menuitem_new());
+    dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, name);
+    dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
+    dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
+    dbusmenu_menuitem_property_set(item, "shortcut-nick", nicks[index]);
+
+    auto sig = new glib::Signal<void, DbusmenuMenuitem*, gint>(item, "item-activated",
+                                [&] (DbusmenuMenuitem* item, gint) {
+                                  const gchar *nick;
+                                  nick = dbusmenu_menuitem_property_get(item, "shortcut-nick");
+                                  indicator_desktop_shortcuts_nick_exec(_desktop_shortcuts, nick);
+                                });
+    _gsignals.Add(sig);
+
+    dbusmenu_menuitem_child_append(_menu_desktop_shortcuts, item);
+    index++;
+  }
 }
 
 void BamfLauncherIcon::UpdateMenus()

=== modified file 'tests/autopilot/autopilot/emulators/unity/quicklist.py'
--- tests/autopilot/autopilot/emulators/unity/quicklist.py	2012-03-04 23:12:19 +0000
+++ tests/autopilot/autopilot/emulators/unity/quicklist.py	2012-03-06 21:47:15 +0000
@@ -23,7 +23,7 @@
     @property
     def items(self):
         """Individual items in the quicklist."""
-        return [self.__make_quicklist_from_data(ctype, cdata) for ctype, cdata in self._children]
+        return self.get_children_by_type(QuicklistMenuItem)
 
     def get_quicklist_item_by_text(self, text):
         """Returns a QuicklistMenuItemLabel object with the given text, or None."""

=== modified file 'tests/autopilot/autopilot/tests/__init__.py'
--- tests/autopilot/autopilot/tests/__init__.py	2012-03-06 20:12:33 +0000
+++ tests/autopilot/autopilot/tests/__init__.py	2012-03-06 21:47:15 +0000
@@ -153,6 +153,10 @@
             'desktop-file': 'mahjongg.desktop',
             'process-name': 'mahjongg',
             },
+        'Remmina' : {
+            'desktop-file': 'remmina.desktop',
+            'process-name': 'remmina',
+            }
         }
 
     def setUp(self):

=== added file 'tests/autopilot/autopilot/tests/test_quicklist.py'
--- tests/autopilot/autopilot/tests/test_quicklist.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/autopilot/tests/test_quicklist.py	2012-03-06 21:47:15 +0000
@@ -0,0 +1,51 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2012 Canonical
+# Author: Thomi Richards
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+
+import os.path
+from testtools.matchers import Not, Is, Contains
+from xdg.DesktopEntry import DesktopEntry
+
+from autopilot.emulators.unity.quicklist import QuicklistMenuItemLabel
+from autopilot.tests import AutopilotTestCase
+
+class QuicklistActionTests(AutopilotTestCase):
+    """Tests for quicklist actions."""
+
+    scenarios = [
+        ('remmina', {'app_name': 'Remmina'}),
+    ]
+
+    def test_quicklist_actions(self):
+        """Test that all actions present in the destop file are shown in the quicklist."""
+        self.start_app(self.app_name)
+
+        # load the desktop file from disk:
+        desktop_file = os.path.join('/usr/share/applications',
+            self.KNOWN_APPS[self.app_name]['desktop-file']
+            )
+        de = DesktopEntry(desktop_file)
+        # get the launcher icon from the launcher:
+        launcher_icon = self.launcher.model.get_icon_by_tooltip_text(de.getName())
+        self.assertThat(launcher_icon, Not(Is(None)))
+
+        # open the icon quicklist, and get all the text labels:
+        launcher = self.launcher.get_launcher_for_monitor(0)
+        launcher.click_launcher_icon(launcher_icon, button=3)
+        ql = launcher_icon.get_quicklist()
+        ql_item_texts = [i.text for i in ql.items if type(i) is QuicklistMenuItemLabel]
+
+        # iterate over all the actions from the desktop file, make sure they're
+        # present in the quicklist texts.
+        actions = de.getActions()
+        for action in actions:
+            key = 'Desktop Action ' + action
+            self.assertThat(de.content, Contains(key))
+            name = de.content[key]['Name']
+            self.assertThat(ql_item_texts, Contains(name))
+
+

=== modified file 'tools/autopilot'
--- tools/autopilot	2012-03-06 20:12:33 +0000
+++ tools/autopilot	2012-03-06 21:47:15 +0000
@@ -21,6 +21,7 @@
     ('junitxml', 'python-junitxml'),
     ('testscenarios', 'python-testscenarios'),
     ('testtools', 'python-testtools'),
+    ('xdg', 'python-xdg'),
     ('Xlib', 'python-xlib'),
 ]