From ace149bd9c1218a5533d1f68d0ed760381552a47 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 9 Mar 2015 16:53:27 -0500 Subject: Add a shared pointer action state function --- tests/indicator-fixture.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'tests') 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(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 varref) { auto aval = std::shared_ptr(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(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); -- cgit v1.2.3