From 3c1c6e24f22a1e5bf23f9de813f2f4099214b6bb Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 22 Dec 2020 13:11:32 +0000 Subject: Port from Unity8 to Lomiri (URL Dispatcher and API). --- CMakeLists.txt | 6 +- include/CMakeLists.txt | 6 +- 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 ++++++++++++++++ include/unity/CMakeLists.txt | 1 - include/unity/gmenuharness/MatchResult.h | 66 ----------- include/unity/gmenuharness/MatchUtils.h | 42 ------- include/unity/gmenuharness/MenuItemMatcher.h | 143 ------------------------ include/unity/gmenuharness/MenuMatcher.h | 95 ---------------- src/CMakeLists.txt | 2 +- src/gmenuharness/MatchResult.cpp | 6 +- src/gmenuharness/MatchUtils.cpp | 10 +- src/gmenuharness/MenuItemMatcher.cpp | 10 +- src/gmenuharness/MenuMatcher.cpp | 8 +- src/service.vala | 4 +- tests/integration/indicator-sound-test-base.cpp | 8 +- tests/integration/indicator-sound-test-base.h | 14 +-- tests/integration/test-indicator.cpp | 2 +- vapi/lomiri-url-dispatcher.vapi | 9 ++ vapi/url-dispatcher.vapi | 9 -- 23 files changed, 394 insertions(+), 394 deletions(-) create mode 100644 include/lomiri/CMakeLists.txt create mode 100644 include/lomiri/gmenuharness/MatchResult.h create mode 100644 include/lomiri/gmenuharness/MatchUtils.h create mode 100644 include/lomiri/gmenuharness/MenuItemMatcher.h create mode 100644 include/lomiri/gmenuharness/MenuMatcher.h delete mode 100644 include/unity/CMakeLists.txt delete mode 100644 include/unity/gmenuharness/MatchResult.h delete mode 100644 include/unity/gmenuharness/MatchUtils.h delete mode 100644 include/unity/gmenuharness/MenuItemMatcher.h delete mode 100644 include/unity/gmenuharness/MenuMatcher.h create mode 100644 vapi/lomiri-url-dispatcher.vapi delete mode 100644 vapi/url-dispatcher.vapi diff --git a/CMakeLists.txt b/CMakeLists.txt index 424e44e..76512a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,11 +30,11 @@ pkg_check_modules( ) include_directories(${PULSEAUDIO_INCLUDE_DIRS}) -set(URL_DISPATCHER_1_REQUIRED_VERSION 1) +set(URL_DISPATCHER_REQUIRED_VERSION 0) pkg_check_modules( URLDISPATCHER - url-dispatcher-1>=${URL_DISPATCHER_1_REQUIRED_VERSION} + lomiri-url-dispatcher>=${URL_DISPATCHER_REQUIRED_VERSION} ) include_directories(${URLDISPATCHER_INCLUDE_DIRS}) @@ -50,7 +50,7 @@ pkg_check_modules( ) include_directories(${SOUNDSERVICE_INCLUDE_DIRS}) -pkg_check_modules(UNITY_API libunity-api>=0.1.3) +pkg_check_modules(UNITY_API liblomiri-api>=0.1.1) include_directories(${TEST_INCLUDE_DIRS}) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index b70ae87..9947766 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,3 +1,3 @@ -if(UNITY_API_FOUND) -add_subdirectory(unity) -endif() \ No newline at end of file +if(LOMIRI_API_FOUND) +add_subdirectory(lomiri) +endif() diff --git a/include/lomiri/CMakeLists.txt b/include/lomiri/CMakeLists.txt new file mode 100644 index 0000000..ef57b9e --- /dev/null +++ b/include/lomiri/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(gmenuharness) diff --git a/include/lomiri/gmenuharness/MatchResult.h b/include/lomiri/gmenuharness/MatchResult.h new file mode 100644 index 0000000..c545dbf --- /dev/null +++ b/include/lomiri/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 . + * + * 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 new file mode 100644 index 0000000..3b20ab7 --- /dev/null +++ b/include/lomiri/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 . + * + * 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 new file mode 100644 index 0000000..312f657 --- /dev/null +++ b/include/lomiri/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 . + * + * 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 new file mode 100644 index 0000000..023ca42 --- /dev/null +++ b/include/lomiri/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 . + * + * 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 diff --git a/include/unity/CMakeLists.txt b/include/unity/CMakeLists.txt deleted file mode 100644 index ef57b9e..0000000 --- a/include/unity/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(gmenuharness) diff --git a/include/unity/gmenuharness/MatchResult.h b/include/unity/gmenuharness/MatchResult.h deleted file mode 100644 index 8503a98..0000000 --- a/include/unity/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 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& 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 unity diff --git a/include/unity/gmenuharness/MatchUtils.h b/include/unity/gmenuharness/MatchUtils.h deleted file mode 100644 index 899e506..0000000 --- a/include/unity/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 unity -{ - -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 unity diff --git a/include/unity/gmenuharness/MenuItemMatcher.h b/include/unity/gmenuharness/MenuItemMatcher.h deleted file mode 100644 index 38a5187..0000000 --- a/include/unity/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 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& 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 unity diff --git a/include/unity/gmenuharness/MenuMatcher.h b/include/unity/gmenuharness/MenuMatcher.h deleted file mode 100644 index c2eb65e..0000000 --- a/include/unity/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 unity -{ - -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 - -} // unity diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2a06187..3630753 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,7 +8,7 @@ set(VAPI_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.vapi") if(URLDISPATCHER_FOUND) set (VALA_DEFINE_URLDISPATCHER "--define=HAS_URLDISPATCHER") - set (VALA_PKG_URLDISPATCHER "url-dispatcher") + set (VALA_PKG_URLDISPATCHER "lomiri-url-dispatcher") endif() if(EXISTS "/usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml") diff --git a/src/gmenuharness/MatchResult.cpp b/src/gmenuharness/MatchResult.cpp index 40629aa..4543ce9 100644 --- a/src/gmenuharness/MatchResult.cpp +++ b/src/gmenuharness/MatchResult.cpp @@ -16,7 +16,7 @@ * Authored by: Pete Woods */ -#include +#include #include #include @@ -25,7 +25,7 @@ using namespace std; -namespace unity +namespace lomiri { namespace gmenuharness @@ -184,4 +184,4 @@ string MatchResult::concat_failures() const } // namespace gmenuharness -} // namespace unity +} // namespace lomiri diff --git a/src/gmenuharness/MatchUtils.cpp b/src/gmenuharness/MatchUtils.cpp index c6b2ae3..89c7798 100644 --- a/src/gmenuharness/MatchUtils.cpp +++ b/src/gmenuharness/MatchUtils.cpp @@ -16,16 +16,16 @@ * Authored by: Pete Woods */ -#include +#include #include -#include +#include using namespace std; -namespace util = unity::util; +namespace util = lomiri::util; -namespace unity +namespace lomiri { namespace gmenuharness @@ -76,4 +76,4 @@ void gvariant_deleter(GVariant* varptr) } // namespace gmenuharness -} // namespace unity +} // namespace lomiri diff --git a/src/gmenuharness/MenuItemMatcher.cpp b/src/gmenuharness/MenuItemMatcher.cpp index f2d5fe8..8048556 100644 --- a/src/gmenuharness/MenuItemMatcher.cpp +++ b/src/gmenuharness/MenuItemMatcher.cpp @@ -16,9 +16,9 @@ * Authored by: Pete Woods */ -#include -#include -#include +#include +#include +#include #include #include @@ -26,7 +26,7 @@ using namespace std; -namespace unity +namespace lomiri { namespace gmenuharness @@ -1005,4 +1005,4 @@ void MenuItemMatcher::match( } // namepsace gmenuharness -} // namespace unity +} // namespace lomiri diff --git a/src/gmenuharness/MenuMatcher.cpp b/src/gmenuharness/MenuMatcher.cpp index 5bb4fbd..7fd257d 100644 --- a/src/gmenuharness/MenuMatcher.cpp +++ b/src/gmenuharness/MenuMatcher.cpp @@ -16,8 +16,8 @@ * Authored by: Pete Woods */ -#include -#include +#include +#include #include @@ -25,7 +25,7 @@ using namespace std; -namespace unity +namespace lomiri { namespace gmenuharness @@ -205,4 +205,4 @@ MatchResult MenuMatcher::match() const } // namespace gmenuharness -} // namespace unity +} // namespace lomiri diff --git a/src/service.vala b/src/service.vala index 4c9579a..cf79666 100644 --- a/src/service.vala +++ b/src/service.vala @@ -259,7 +259,7 @@ public class IndicatorSound.Service: Object { #if HAS_URLDISPATCHER if (Environment.get_variable ("MIR_SOCKET") != null) { - UrlDispatch.send ("settings:///system/sound"); + LomiriURLDispatch.send ("settings:///system/sound"); return; } #endif @@ -282,7 +282,7 @@ public class IndicatorSound.Service: Object { #if HAS_URLDISPATCHER void activate_phone_settings (SimpleAction action, Variant? param) { - UrlDispatch.send ("settings:///system/sound"); + LomiriURLDispatch.send ("settings:///system/sound"); } #endif diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp index b7a0a77..e8eeefc 100644 --- a/tests/integration/indicator-sound-test-base.cpp +++ b/tests/integration/indicator-sound-test-base.cpp @@ -36,7 +36,7 @@ using namespace QtDBusTest; using namespace QtDBusMock; using namespace std; using namespace testing; -namespace mh = unity::gmenuharness; +namespace mh = lomiri::gmenuharness; namespace { @@ -410,7 +410,7 @@ mh::MenuMatcher::Parameters IndicatorSoundTestBase::phoneParameters() "/org/ayatana/indicator/sound/phone"); } -unity::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::volumeSlider(double volume, QString const &label) +lomiri::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::volumeSlider(double volume, QString const &label) { return mh::MenuItemMatcher().radio() .label(label.toStdString()) @@ -425,7 +425,7 @@ unity::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::volumeSlider(double .pass_through_double_attribute("action", volume); } -unity::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::micSlider(double volume, QString const &label) +lomiri::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::micSlider(double volume, QString const &label) { return mh::MenuItemMatcher() .label(label.toStdString()) @@ -439,7 +439,7 @@ unity::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::micSlider(double vo .pass_through_double_attribute("action", volume); } -unity::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::silentModeSwitch(bool toggled) +lomiri::gmenuharness::MenuItemMatcher IndicatorSoundTestBase::silentModeSwitch(bool toggled) { return mh::MenuItemMatcher::checkbox() .label("Silent Mode") diff --git a/tests/integration/indicator-sound-test-base.h b/tests/integration/indicator-sound-test-base.h index 7942bd5..4e0d2dd 100644 --- a/tests/integration/indicator-sound-test-base.h +++ b/tests/integration/indicator-sound-test-base.h @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -96,15 +96,15 @@ protected: static std::shared_ptr volume_variant(double volume); - static unity::gmenuharness::MenuMatcher::Parameters desktopParameters(); + static lomiri::gmenuharness::MenuMatcher::Parameters desktopParameters(); - static unity::gmenuharness::MenuMatcher::Parameters phoneParameters(); + static lomiri::gmenuharness::MenuMatcher::Parameters phoneParameters(); - static unity::gmenuharness::MenuItemMatcher volumeSlider(double volume, QString const &label); + static lomiri::gmenuharness::MenuItemMatcher volumeSlider(double volume, QString const &label); - static unity::gmenuharness::MenuItemMatcher micSlider(double volume, QString const &label); + static lomiri::gmenuharness::MenuItemMatcher micSlider(double volume, QString const &label); - static unity::gmenuharness::MenuItemMatcher silentModeSwitch(bool toggled); + static lomiri::gmenuharness::MenuItemMatcher silentModeSwitch(bool toggled); bool waitMenuChange(); diff --git a/tests/integration/test-indicator.cpp b/tests/integration/test-indicator.cpp index 36b299e..43ed2b9 100644 --- a/tests/integration/test-indicator.cpp +++ b/tests/integration/test-indicator.cpp @@ -24,7 +24,7 @@ using namespace std; using namespace testing; -namespace mh = unity::gmenuharness; +namespace mh = lomiri::gmenuharness; namespace { diff --git a/vapi/lomiri-url-dispatcher.vapi b/vapi/lomiri-url-dispatcher.vapi new file mode 100644 index 0000000..1285b12 --- /dev/null +++ b/vapi/lomiri-url-dispatcher.vapi @@ -0,0 +1,9 @@ +[CCode (cprefix="", lower_case_cprefix="", cheader_filename="liblomiri-url-dispatcher/lomiri-url-dispatcher.h")] + +namespace LomiriURLDispatch +{ + public delegate void LomiriURLDispatchCallback (); + + [CCode (cname = "lomiri_url_dispatch_send")] + public static void send (string url, LomiriURLDispatchCallback? func = null); +} diff --git a/vapi/url-dispatcher.vapi b/vapi/url-dispatcher.vapi deleted file mode 100644 index 88f7740..0000000 --- a/vapi/url-dispatcher.vapi +++ /dev/null @@ -1,9 +0,0 @@ -[CCode (cprefix="", lower_case_cprefix="", cheader_filename="liburl-dispatcher-1/url-dispatcher.h")] - -namespace UrlDispatch -{ - public delegate void DispatchCallback (); - - [CCode (cname = "url_dispatch_send")] - public static void send (string url, DispatchCallback? func = null); -} -- cgit v1.2.3 From c03982a97483f362a401904f47f372703fa7ac6d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 22 Dec 2020 13:13:03 +0000 Subject: debian/control: Build against lomiri-api and lomiri-url-dispatcher (if available). --- debian/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control index b80a70f..bfb9bc3 100644 --- a/debian/control +++ b/debian/control @@ -22,6 +22,8 @@ Build-Depends: debhelper (>= 9.0), libglib2.0-dev (>= 2.32.0), # libqtdbusmock1-dev (>= 0.3), # libqtdbustest1-dev, + liblomiri-api-dev (>= 0.1.1) | hello, + liblomiri-url-dispatcher-dev (>= 0.1) | hello, libpulse-dev (>= 5.0), libpulse-mainloop-glib0 (>= 0.9.18), libnotify-dev, -- cgit v1.2.3