From 1fe3c7300509a9a8b3ddc58a9c687c50a6622d75 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Mon, 8 Nov 2021 00:41:22 +0100 Subject: Drop local gmenuharness, use it from the system --- include/CMakeLists.txt | 3 - include/lomiri/CMakeLists.txt | 1 - include/lomiri/gmenuharness/MatchResult.h | 66 ------------ include/lomiri/gmenuharness/MatchUtils.h | 42 -------- include/lomiri/gmenuharness/MenuItemMatcher.h | 143 -------------------------- include/lomiri/gmenuharness/MenuMatcher.h | 95 ----------------- 6 files changed, 350 deletions(-) delete mode 100644 include/CMakeLists.txt delete mode 100644 include/lomiri/CMakeLists.txt delete mode 100644 include/lomiri/gmenuharness/MatchResult.h delete mode 100644 include/lomiri/gmenuharness/MatchUtils.h delete mode 100644 include/lomiri/gmenuharness/MenuItemMatcher.h delete mode 100644 include/lomiri/gmenuharness/MenuMatcher.h (limited to 'include') diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt deleted file mode 100644 index 9947766..0000000 --- a/include/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -if(LOMIRI_API_FOUND) -add_subdirectory(lomiri) -endif() diff --git a/include/lomiri/CMakeLists.txt b/include/lomiri/CMakeLists.txt deleted file mode 100644 index ef57b9e..0000000 --- a/include/lomiri/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(gmenuharness) diff --git a/include/lomiri/gmenuharness/MatchResult.h b/include/lomiri/gmenuharness/MatchResult.h deleted file mode 100644 index c545dbf..0000000 --- a/include/lomiri/gmenuharness/MatchResult.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * 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 . - * - * Authored by: Pete Woods - */ - -#pragma once - -#include -#include -#include - -namespace lomiri -{ - -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& 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 p; -}; - -} // namespace gmenuharness - -} // namespace lomiri diff --git a/include/lomiri/gmenuharness/MatchUtils.h b/include/lomiri/gmenuharness/MatchUtils.h deleted file mode 100644 index 3b20ab7..0000000 --- a/include/lomiri/gmenuharness/MatchUtils.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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 . - * - * Authored by: Pete Woods - */ - -#pragma once - -#include -#include - -#include - -namespace lomiri -{ - -namespace gmenuharness -{ - -void waitForCore(GObject* obj, const std::string& signalName, unsigned int timeout = 10); - -void menuWaitForItems(const std::shared_ptr& menu, unsigned int timeout = 10); - -void g_object_deleter(gpointer object); - -void gvariant_deleter(GVariant* varptr); - -} //namespace gmenuharness - -} // namespace lomiri diff --git a/include/lomiri/gmenuharness/MenuItemMatcher.h b/include/lomiri/gmenuharness/MenuItemMatcher.h deleted file mode 100644 index 312f657..0000000 --- a/include/lomiri/gmenuharness/MenuItemMatcher.h +++ /dev/null @@ -1,143 +0,0 @@ -/* - * 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 . - * - * Authored by: Pete Woods - */ - -#pragma once - -#include -#include -#include - -#include - -namespace lomiri -{ - -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& state); - - MenuItemMatcher& icon(const std::string& icon); - - MenuItemMatcher& themed_icon(const std::string& iconName, const std::vector& icons); - - MenuItemMatcher& widget(const std::string& widget); - - MenuItemMatcher& pass_through_attribute(const std::string& actionName, const std::shared_ptr& 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& 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& parameter = nullptr); - - MenuItemMatcher& activate(const std::shared_ptr& parameter = nullptr); - - MenuItemMatcher& set_pass_through_action_state(const std::string& action, const std::shared_ptr& state); - - MenuItemMatcher& set_action_state(const std::shared_ptr& state); - - void match(MatchResult& matchResult, const std::vector& location, - const std::shared_ptr& menu, - std::map>& actions, - int index) const; - -protected: - struct Priv; - - std::shared_ptr p; -}; - -} // namespace gmenuharness - -} // namespace lomiri diff --git a/include/lomiri/gmenuharness/MenuMatcher.h b/include/lomiri/gmenuharness/MenuMatcher.h deleted file mode 100644 index 023ca42..0000000 --- a/include/lomiri/gmenuharness/MenuMatcher.h +++ /dev/null @@ -1,95 +0,0 @@ -/* - * 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 . - * - * Authored by: Pete Woods - */ - -#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 -#include - -#include -#include - -namespace lomiri -{ - -namespace gmenuharness -{ - -class MenuMatcher -{ -public: - class Parameters - { - public: - Parameters( - const std::string& busName, - const std::vector>& 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 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 p; -}; - -} // gmenuharness - -} // lomiri -- cgit v1.2.3