Merge lp:~ci-train-staging-area/gmenuharness/testing-train-please-ignore into lp:~ci-train-staging-area/gmenuharness/trunk-copy-please-ignore

[Robert Bruce Park]

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-19 11:12:21 +0000
+++ debian/changelog	2016-06-15 13:12:23 +0000
@@ -1,3 +1,9 @@
+gmenuharness (0.1.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * add MenuItemMatcher::enabled()
+
+ -- Antti Kaijanmäki <[e-mail]>  Wed, 01 Jun 2016 13:41:50 +0300
+
 gmenuharness (0.1+16.04.20151119.3-0ubuntu1) xenial; urgency=medium
 
   * Add a very basic level of functional testing
 
=== modified file 'debian/libgmenuharness0.1.vivid.symbols'
--- debian/libgmenuharness0.1.vivid.symbols	2015-11-18 09:21:52 +0000
+++ debian/libgmenuharness0.1.vivid.symbols	2016-06-15 13:12:23 +0000
@@ -19,6 +19,7 @@
  (c++)"unity::gmenuharness::MenuItemMatcher::boolean_attribute(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.1+16.04.20151118
  (c++)"unity::gmenuharness::MenuItemMatcher::checkbox()@Base" 0.1+16.04.20151118
  (c++)"unity::gmenuharness::MenuItemMatcher::double_attribute(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, double)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::enabled(bool)@Base" 0replaceme
  (c++)"unity::gmenuharness::MenuItemMatcher::has_exactly(unsigned int)@Base" 0.1+16.04.20151118
  (c++)"unity::gmenuharness::MenuItemMatcher::icon(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.1+16.04.20151118
  (c++)"unity::gmenuharness::MenuItemMatcher::int32_attribute(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int)@Base" 0.1+16.04.20151118
 
=== modified file 'debian/libgmenuharness0.1.xenial.symbols'
--- debian/libgmenuharness0.1.xenial.symbols	2015-11-18 09:21:52 +0000
+++ debian/libgmenuharness0.1.xenial.symbols	2016-06-15 13:12:23 +0000
@@ -19,6 +19,7 @@
  (c++)"unity::gmenuharness::MenuItemMatcher::boolean_attribute(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.1+16.04.20151118
  (c++)"unity::gmenuharness::MenuItemMatcher::checkbox()@Base" 0.1+16.04.20151118
  (c++)"unity::gmenuharness::MenuItemMatcher::double_attribute(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, double)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::enabled(bool)@Base" 0replaceme
  (c++)"unity::gmenuharness::MenuItemMatcher::has_exactly(unsigned int)@Base" 0.1+16.04.20151118
  (c++)"unity::gmenuharness::MenuItemMatcher::icon(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.1+16.04.20151118
  (c++)"unity::gmenuharness::MenuItemMatcher::int32_attribute(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int)@Base" 0.1+16.04.20151118
 
=== added file 'debian/libgmenuharness0.1.yakkety.symbols'
--- debian/libgmenuharness0.1.yakkety.symbols	1970-01-01 00:00:00 +0000
+++ debian/libgmenuharness0.1.yakkety.symbols	2016-06-15 13:12:23 +0000
@@ -0,0 +1,68 @@
+libgmenuharness.so.0.1 libgmenuharness0.1 #MINVER#
+ (c++)"unity::gmenuharness::g_object_deleter(void*)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::gvariant_deleter(_GVariant*)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MatchResult::concat_failures[abi:cxx11]() const@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MatchResult::createChild() const@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MatchResult::failure(std::vector<unsigned int, std::allocator<unsigned int> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MatchResult::hasTimedOut() const@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MatchResult::MatchResult()@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MatchResult::MatchResult(unity::gmenuharness::MatchResult&&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MatchResult::MatchResult(unity::gmenuharness::MatchResult const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MatchResult::merge(unity::gmenuharness::MatchResult const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MatchResult::operator=(unity::gmenuharness::MatchResult&&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MatchResult::operator=(unity::gmenuharness::MatchResult const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MatchResult::success() const@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::action(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::activate(std::shared_ptr<_GVariant> const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::attribute_not_set(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::attribute(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<_GVariant> const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::boolean_attribute(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::checkbox()@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::double_attribute(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, double)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::enabled(bool)@Base" 0replaceme
+ (c++)"unity::gmenuharness::MenuItemMatcher::has_exactly(unsigned int)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::icon(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::int32_attribute(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::int64_attribute(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::is_empty()@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::item(unity::gmenuharness::MenuItemMatcher&&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::item(unity::gmenuharness::MenuItemMatcher const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::label(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::match(unity::gmenuharness::MatchResult&, std::vector<unsigned int, std::allocator<unsigned int> > const&, std::shared_ptr<_GMenuModel> const&, std::map<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::shared_ptr<_GActionGroup>, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::shared_ptr<_GActionGroup> > > >&, unsigned int) const@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::~MenuItemMatcher()@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::MenuItemMatcher()@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::MenuItemMatcher(unity::gmenuharness::MenuItemMatcher&&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::MenuItemMatcher(unity::gmenuharness::MenuItemMatcher const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::mode(unity::gmenuharness::MenuItemMatcher::Mode)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::operator=(unity::gmenuharness::MenuItemMatcher&&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::operator=(unity::gmenuharness::MenuItemMatcher const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::pass_through_activate(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<_GVariant> const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::pass_through_attribute(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<_GVariant> const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::pass_through_boolean_attribute(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::pass_through_double_attribute(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, double)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::pass_through_string_attribute(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::radio()@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::round_doubles(double)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::section()@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::set_action_state(std::shared_ptr<_GVariant> const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::set_pass_through_action_state(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<_GVariant> const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::state_icons(std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::string_attribute(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::submenu()@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::themed_icon(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::toggled(bool)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::type(unity::gmenuharness::MenuItemMatcher::Type)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuItemMatcher::widget(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuMatcher::item(unity::gmenuharness::MenuItemMatcher const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuMatcher::match() const@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuMatcher::match(unity::gmenuharness::MatchResult&) const@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuMatcher::~MenuMatcher()@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuMatcher::MenuMatcher(unity::gmenuharness::MenuMatcher::Parameters const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuMatcher::Parameters::operator=(unity::gmenuharness::MenuMatcher::Parameters&&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuMatcher::Parameters::operator=(unity::gmenuharness::MenuMatcher::Parameters const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuMatcher::Parameters::~Parameters()@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuMatcher::Parameters::Parameters(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuMatcher::Parameters::Parameters(unity::gmenuharness::MenuMatcher::Parameters&&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::MenuMatcher::Parameters::Parameters(unity::gmenuharness::MenuMatcher::Parameters const&)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::menuWaitForItems(std::shared_ptr<_GMenuModel> const&, unsigned int)@Base" 0.1+16.04.20151118
+ (c++)"unity::gmenuharness::waitForCore(_GObject*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int)@Base" 0.1+16.04.20151118
 
=== modified file 'include/unity/gmenuharness/MenuItemMatcher.h'
--- include/unity/gmenuharness/MenuItemMatcher.h	2015-11-16 09:53:10 +0000
+++ include/unity/gmenuharness/MenuItemMatcher.h	2016-06-15 13:12:23 +0000
@@ -105,6 +105,8 @@
 
     MenuItemMatcher& toggled(bool toggled);
 
+    MenuItemMatcher& enabled(bool enabled);
+
     MenuItemMatcher& mode(Mode mode);
 
     MenuItemMatcher& submenu();
 
=== modified file 'src/MenuItemMatcher.cpp'
--- src/MenuItemMatcher.cpp	2015-11-16 09:53:10 +0000
+++ src/MenuItemMatcher.cpp	2016-06-15 13:12:23 +0000
@@ -197,6 +197,8 @@
 
     shared_ptr<bool> m_isToggled;
 
+    shared_ptr<bool> m_isEnabled;
+
     vector<MenuItemMatcher> m_items;
 
     vector<pair<string, shared_ptr<GVariant>>> m_activations;
@@ -254,6 +256,7 @@
     p->m_not_exist_attributes = other.p->m_not_exist_attributes;
     p->m_pass_through_attributes = other.p->m_pass_through_attributes;
     p->m_isToggled = other.p->m_isToggled;
+    p->m_isEnabled = other.p->m_isEnabled;
     p->m_linkType = other.p->m_linkType;
     p->m_items = other.p->m_items;
     p->m_activations = other.p->m_activations;
@@ -403,6 +406,12 @@
     return *this;
 }
 
+MenuItemMatcher& MenuItemMatcher::enabled(bool isEnabled)
+{
+    p->m_isEnabled = make_shared<bool>(isEnabled);
+    return *this;
+}
+
 MenuItemMatcher& MenuItemMatcher::submenu()
 {
     p->m_linkType = LinkType::submenu;
@@ -485,6 +494,7 @@
     bool isCheckbox = false;
     bool isRadio = false;
     bool isToggled = false;
+    bool isEnabled = true;
 
     pair<string, string> idPair;
     shared_ptr<GActionGroup> actionGroup;
@@ -510,6 +520,9 @@
             isToggled = g_variant_get_boolean(state.get());
             isCheckbox = true;
         }
+
+        isEnabled = g_action_group_get_action_enabled(actionGroup.get(),
+                                                      idPair.second.c_str()) == TRUE;
     }
 
     Type actualType = Type::plain;
@@ -809,6 +822,14 @@
                         + ", but found " + bool_to_string(isToggled));
     }
 
+    if (p->m_isEnabled && (*p->m_isEnabled) != isEnabled)
+    {
+        matchResult.failure(
+                location,
+                "Expected enabled = " + bool_to_string(*p->m_isEnabled)
+                        + ", but found " + bool_to_string(isEnabled));
+    }
+
     if (!matchResult.success())
     {
         return;
 
=== modified file 'tests/functional/FunctionalTests.cpp'
--- tests/functional/FunctionalTests.cpp	2015-11-19 09:20:43 +0000
+++ tests/functional/FunctionalTests.cpp	2016-06-15 13:12:23 +0000
@@ -130,10 +130,12 @@
             .item(mh::MenuItemMatcher()
                 .label("Save")
                 .action("app.save")
+                .enabled(false)
             )
             .item(mh::MenuItemMatcher()
                 .label("Quit")
                 .action("app.quit")
+                .enabled(true)
             )
         )
         .item(mh::MenuItemMatcher()
 
=== modified file 'tests/functional/menus/Deeper.cpp'
--- tests/functional/menus/Deeper.cpp	2015-11-19 09:20:43 +0000
+++ tests/functional/menus/Deeper.cpp	2016-06-15 13:12:23 +0000
@@ -106,8 +106,9 @@
         {
             shared_ptr<GMenuItem> item(g_menu_item_new("Save", "app.save"), &g_object_deleter);
             g_menu_append_item(fileMenu.get(), item.get());
-            g_action_map_add_action(G_ACTION_MAP(ag.get()),
-                        G_ACTION(g_simple_action_new("save", NULL)));
+            shared_ptr<GSimpleAction> action(g_simple_action_new("save", NULL), &g_object_deleter);
+            g_simple_action_set_enabled(action.get(), FALSE);
+            g_action_map_add_action(G_ACTION_MAP(ag.get()), G_ACTION(action.get()));
         }
         {
             shared_ptr<GMenuItem> item(g_menu_item_new("Quit", "app.quit"), &g_object_deleter);