aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/indicator-fixture.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/indicator-fixture.h b/tests/indicator-fixture.h
index 273d8ed..2455107 100644
--- a/tests/indicator-fixture.h
+++ b/tests/indicator-fixture.h
@@ -376,11 +376,7 @@ class IndicatorFixture : public ::testing::Test
return expectEventually(func);
}
- testing::AssertionResult expectActionStateIs (const char * nameStr, const char * valueStr, const std::string& name, GVariant * value) {
- auto varref = std::shared_ptr<GVariant>(g_variant_ref_sink(value), [](GVariant * varptr) {
- if (varptr != nullptr)
- g_variant_unref(varptr);
- });
+ testing::AssertionResult expectActionStateIs (const char * nameStr, const char * valueStr, const std::string& name, std::shared_ptr<GVariant> varref) {
auto aval = std::shared_ptr<GVariant>(g_action_group_get_action_state(run->_actions.get(), name.c_str()), [] (GVariant * varptr) {
if (varptr != nullptr)
g_variant_unref(varptr);
@@ -415,6 +411,14 @@ class IndicatorFixture : public ::testing::Test
}
}
+ testing::AssertionResult expectActionStateIs (const char * nameStr, const char * valueStr, const std::string& name, GVariant * value) {
+ auto varref = std::shared_ptr<GVariant>(g_variant_ref_sink(value), [](GVariant * varptr) {
+ if (varptr != nullptr)
+ g_variant_unref(varptr);
+ });
+ return expectActionStateIs(nameStr, valueStr, name, varref);
+ }
+
testing::AssertionResult expectActionStateIs (const char * nameStr, const char * valueStr, const std::string& name, bool value) {
GVariant * var = g_variant_new_boolean(value);
return expectActionStateIs(nameStr, valueStr, name, var);