Merge lp:~xavi-garcia-mena/gmenuharness/ends-with-mode into lp:gmenuharness

[Xavi Garcia]

I've added a ends_with Mode, so we can match the last N items.

I've added a ends_with Mode, so we can match the last N items.
In the case of the sound indicator it starts with something fixed, then adds the players items (which depend on the players the user have installed) and finally it adds a Sounds Settings section at the very end.

[Pete Woods (pete-woods)]

review: Approve

[Pete Woods (pete-woods)]

review: Needs Information

[lp:~xavi-garcia-mena/gmenuharness/ends-with-mode]

11. By Xavi Garcia on 2015-09-03

Fix issue with index not being incremented

12. By Xavi Garcia on 2015-09-03

Added limit check for j index at endsWith

[Pete Woods (pete-woods)]

review: Approve

=== modified file 'include/unity/gmenuharness/MenuItemMatcher.h'
--- include/unity/gmenuharness/MenuItemMatcher.h	2015-09-01 09:52:39 +0000
+++ include/unity/gmenuharness/MenuItemMatcher.h	2015-09-03 12:26:02 +0000
@@ -38,7 +38,8 @@
     enum class Mode
     {
         all,
-        starts_with
+        starts_with,
+        ends_with
     };
 
     enum class Type

=== modified file 'src/MenuItemMatcher.cpp'
--- src/MenuItemMatcher.cpp	2015-09-01 12:52:38 +0000
+++ src/MenuItemMatcher.cpp	2015-09-03 12:26:02 +0000
@@ -147,6 +147,29 @@
         }
     }
 
+    void endsWith(MatchResult& matchResult, const vector<unsigned int>& location,
+               const shared_ptr<GMenuModel>& menu,
+               map<string, shared_ptr<GActionGroup>>& actions)
+    {
+        int count = g_menu_model_get_n_items(menu.get());
+        if (m_items.size() > (unsigned int) count)
+        {
+            matchResult.failure(
+                    location,
+                    "Expected at least " + to_string(m_items.size())
+                            + " children, but found " + to_string(count));
+            return;
+        }
+
+        // match the last N items
+        size_t j;
+        for (size_t i = count - m_items.size(), j = 0; i < count && j < m_items.size(); ++i, ++j)
+        {
+            const auto& matcher = m_items.at(j);
+            matcher.match(matchResult, location, menu, actions, i);
+        }
+    }
+
     Type m_type = Type::plain;
 
     Mode m_mode = Mode::all;
@@ -758,6 +781,9 @@
                         case Mode::starts_with:
                             p->startsWith(childMatchResult, location, link, actions);
                             break;
+                        case Mode::ends_with:
+                            p->endsWith(childMatchResult, location, link, actions);
+                            break;
                     }
                 }