restore OSD notifications

5 files changed, 347 insertions, 0 deletions

diff --git a/include/unity/CMakeLists.txt b/include/unity/CMakeLists.txt
new file mode 100644
index 0000000..ef57b9e
--- /dev/null
+++ b/include/unity/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(gmenuharness)
diff --git a/include/unity/gmenuharness/MatchResult.h b/include/unity/gmenuharness/MatchResult.h
new file mode 100644
index 0000000..8503a98
--- /dev/null
+++ b/include/unity/gmenuharness/MatchResult.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Pete Woods <pete.woods@canonical.com>
+ */
+
+#pragma once
+
+#include <vector>
+#include <memory>
+#include <string>
+
+namespace unity
+{
+
+namespace gmenuharness
+{
+
+class MatchResult
+{
+public:
+    MatchResult();
+
+    MatchResult(MatchResult&& other);
+
+    MatchResult(const MatchResult& other);
+
+    MatchResult& operator=(const MatchResult& other);
+
+    MatchResult& operator=(MatchResult&& other);
+
+    ~MatchResult() = default;
+
+    MatchResult createChild() const;
+
+    void failure(const std::vector<unsigned int>& location, const std::string& message);
+
+    void merge(const MatchResult& other);
+
+    bool success() const;
+
+    bool hasTimedOut() const;
+
+    std::string concat_failures() const;
+
+protected:
+    struct Priv;
+
+    std::shared_ptr<Priv> p;
+};
+
+}   // namespace gmenuharness
+
+}   // namespace unity
diff --git a/include/unity/gmenuharness/MatchUtils.h b/include/unity/gmenuharness/MatchUtils.h
new file mode 100644
index 0000000..899e506
--- /dev/null
+++ b/include/unity/gmenuharness/MatchUtils.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Pete Woods <pete.woods@canonical.com>
+ */
+
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include <gio/gio.h>
+
+namespace unity
+{
+
+namespace gmenuharness
+{
+
+void waitForCore(GObject* obj, const std::string& signalName, unsigned int timeout = 10);
+
+void menuWaitForItems(const std::shared_ptr<GMenuModel>& menu, unsigned int timeout = 10);
+
+void g_object_deleter(gpointer object);
+
+void gvariant_deleter(GVariant* varptr);
+
+}  //namespace gmenuharness
+
+}  // namespace unity
diff --git a/include/unity/gmenuharness/MenuItemMatcher.h b/include/unity/gmenuharness/MenuItemMatcher.h
new file mode 100644
index 0000000..38a5187
--- /dev/null
+++ b/include/unity/gmenuharness/MenuItemMatcher.h
@@ -0,0 +1,143 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Pete Woods <pete.woods@canonical.com>
+ */
+
+#pragma once
+
+#include <map>
+#include <memory>
+#include <string>
+
+#include <gio/gio.h>
+
+namespace unity
+{
+
+namespace gmenuharness
+{
+
+class MatchResult;
+
+class MenuItemMatcher
+{
+public:
+    enum class Mode
+    {
+        all,
+        starts_with,
+        ends_with
+    };
+
+    enum class Type
+    {
+        plain,
+        checkbox,
+        radio
+    };
+
+    static MenuItemMatcher checkbox();
+
+    static MenuItemMatcher radio();
+
+    MenuItemMatcher();
+
+    ~MenuItemMatcher();
+
+    MenuItemMatcher(const MenuItemMatcher& other);
+
+    MenuItemMatcher(MenuItemMatcher&& other);
+
+    MenuItemMatcher& operator=(const MenuItemMatcher& other);
+
+    MenuItemMatcher& operator=(MenuItemMatcher&& other);
+
+    MenuItemMatcher& type(Type type);
+
+    MenuItemMatcher& label(const std::string& label);
+
+    MenuItemMatcher& action(const std::string& action);
+
+    MenuItemMatcher& state_icons(const std::vector<std::string>& state);
+
+    MenuItemMatcher& icon(const std::string& icon);
+
+    MenuItemMatcher& themed_icon(const std::string& iconName, const std::vector<std::string>& icons);
+
+    MenuItemMatcher& widget(const std::string& widget);
+
+    MenuItemMatcher& pass_through_attribute(const std::string& actionName, const std::shared_ptr<GVariant>& value);
+
+    MenuItemMatcher& pass_through_boolean_attribute(const std::string& actionName, bool value);
+
+    MenuItemMatcher& pass_through_string_attribute(const std::string& actionName, const std::string& value);
+
+    MenuItemMatcher& pass_through_double_attribute(const std::string& actionName, double value);
+
+    MenuItemMatcher& round_doubles(double maxDifference);
+
+    MenuItemMatcher& attribute(const std::string& name, const std::shared_ptr<GVariant>& value);
+
+    MenuItemMatcher& boolean_attribute(const std::string& name, bool value);
+
+    MenuItemMatcher& string_attribute(const std::string& name, const std::string& value);
+
+    MenuItemMatcher& int32_attribute(const std::string& name, int value);
+
+    MenuItemMatcher& int64_attribute(const std::string& name, int value);
+
+    MenuItemMatcher& double_attribute(const std::string& name, double value);
+
+    MenuItemMatcher& attribute_not_set(const std::string& name);
+
+    MenuItemMatcher& toggled(bool toggled);
+
+    MenuItemMatcher& mode(Mode mode);
+
+    MenuItemMatcher& submenu();
+
+    MenuItemMatcher& section();
+
+    MenuItemMatcher& is_empty();
+
+    MenuItemMatcher& has_exactly(std::size_t children);
+
+    MenuItemMatcher& item(const MenuItemMatcher& item);
+
+    MenuItemMatcher& item(MenuItemMatcher&& item);
+
+    MenuItemMatcher& pass_through_activate(const std::string& action, const std::shared_ptr<GVariant>& parameter = nullptr);
+
+    MenuItemMatcher& activate(const std::shared_ptr<GVariant>& parameter = nullptr);
+
+    MenuItemMatcher& set_pass_through_action_state(const std::string& action, const std::shared_ptr<GVariant>& state);
+
+    MenuItemMatcher& set_action_state(const std::shared_ptr<GVariant>& state);
+
+    void match(MatchResult& matchResult, const std::vector<unsigned int>& location,
+          const std::shared_ptr<GMenuModel>& menu,
+          std::map<std::string, std::shared_ptr<GActionGroup>>& actions,
+          int index) const;
+
+protected:
+    struct Priv;
+
+    std::shared_ptr<Priv> p;
+};
+
+}   // namespace gmenuharness
+
+}   // namespace unity
diff --git a/include/unity/gmenuharness/MenuMatcher.h b/include/unity/gmenuharness/MenuMatcher.h
new file mode 100644
index 0000000..c2eb65e
--- /dev/null
+++ b/include/unity/gmenuharness/MenuMatcher.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Pete Woods <pete.woods@canonical.com>
+ */
+
+#pragma once
+
+#define EXPECT_MATCHRESULT(statement) \
+do {\
+    auto result = (statement);\
+    GTEST_TEST_BOOLEAN_(result.success(), #statement, false, true, \
+                      GTEST_NONFATAL_FAILURE_) << result.concat_failures().c_str(); \
+} while (0)
+
+#include <unity/gmenuharness/MatchResult.h>
+#include <unity/gmenuharness/MenuItemMatcher.h>
+
+#include <memory>
+#include <vector>
+
+namespace unity
+{
+
+namespace gmenuharness
+{
+
+class MenuMatcher
+{
+public:
+    class Parameters
+    {
+    public:
+        Parameters(
+                const std::string& busName,
+                const std::vector<std::pair<std::string, std::string>>& actions,
+                const std::string& menuObjectPath);
+
+        ~Parameters();
+
+        Parameters(const Parameters& other);
+
+        Parameters(Parameters&& other);
+
+        Parameters& operator=(const Parameters& other);
+
+        Parameters& operator=(Parameters&& other);
+
+    protected:
+        friend MenuMatcher;
+
+        struct Priv;
+
+        std::shared_ptr<Priv> p;
+    };
+
+    MenuMatcher(const Parameters& parameters);
+
+    ~MenuMatcher();
+
+    MenuMatcher(const MenuMatcher& other) = delete;
+
+    MenuMatcher(MenuMatcher&& other) = delete;
+
+    MenuMatcher& operator=(const MenuMatcher& other) = delete;
+
+    MenuMatcher& operator=(MenuMatcher&& other) = delete;
+
+    MenuMatcher& item(const MenuItemMatcher& item);
+
+    MatchResult match() const;
+
+    void match(MatchResult& matchResult) const;
+
+protected:
+    struct Priv;
+
+    std::shared_ptr<Priv> p;
+};
+
+}   // gmenuharness
+
+}   // unity