aboutsummaryrefslogtreecommitdiff
path: root/tests/test-notify.cc
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-07-24 23:31:11 -0500
committerCharles Kerr <charles.kerr@canonical.com>2014-07-24 23:31:11 -0500
commitf15482d3f189c378d4e4cf2dfc69eefa522b30aa (patch)
treef5aee9590e530358fe5fcfac1f1917e6a29f4d07 /tests/test-notify.cc
parent079ac51da565af4882b79c14b3a4782e5c919dd3 (diff)
downloadayatana-indicator-power-f15482d3f189c378d4e4cf2dfc69eefa522b30aa.tar.gz
ayatana-indicator-power-f15482d3f189c378d4e4cf2dfc69eefa522b30aa.tar.bz2
ayatana-indicator-power-f15482d3f189c378d4e4cf2dfc69eefa522b30aa.zip
on the bus, publish the battery's power_level as strings rather than ints
Diffstat (limited to 'tests/test-notify.cc')
-rw-r--r--tests/test-notify.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/test-notify.cc b/tests/test-notify.cc
index a8d66d3..b5166a0 100644
--- a/tests/test-notify.cc
+++ b/tests/test-notify.cc
@@ -200,13 +200,13 @@ TEST_F(NotifyFixture, PercentageToLevel)
const auto level = indicator_power_notifier_get_power_level(battery);
if (i <= percent_critical)
- EXPECT_EQ (POWER_LEVEL_CRITICAL, level);
+ EXPECT_STREQ (POWER_LEVEL_STR_CRITICAL, level);
else if (i <= percent_very_low)
- EXPECT_EQ (POWER_LEVEL_VERY_LOW, level);
+ EXPECT_STREQ (POWER_LEVEL_STR_VERY_LOW, level);
else if (i <= percent_low)
- EXPECT_EQ (POWER_LEVEL_LOW, level);
+ EXPECT_STREQ (POWER_LEVEL_STR_LOW, level);
else
- EXPECT_EQ (POWER_LEVEL_OK, level);
+ EXPECT_STREQ (POWER_LEVEL_STR_OK, level);
}
g_object_unref (battery);
@@ -227,7 +227,7 @@ namespace
struct ChangedParams
{
- int32_t power_level = POWER_LEVEL_OK;
+ std::string power_level = POWER_LEVEL_STR_OK;
bool is_warning = false;
uint32_t fields = 0;
};
@@ -245,8 +245,8 @@ namespace
g_return_if_fail (g_variant_is_of_type (dict, G_VARIANT_TYPE_DICTIONARY));
auto changed_params = static_cast<ChangedParams*>(gchanged_params);
- gint32 power_level;
- if (g_variant_lookup (dict, "PowerLevel", "i", &power_level, nullptr))
+ const char * power_level;
+ if (g_variant_lookup (dict, "PowerLevel", "&s", &power_level, nullptr))
{
changed_params->power_level = power_level;
changed_params->fields |= FIELD_POWER_LEVEL;
@@ -362,7 +362,7 @@ TEST_F(NotifyFixture, EventsThatChangeNotifications)
// test setup case
wait_msec();
- EXPECT_EQ (0, changed_params.power_level);
+ EXPECT_STREQ (POWER_LEVEL_STR_OK, changed_params.power_level.c_str());
// change the percent past the 'low' threshold and confirm that
// a) the power level changes
@@ -379,7 +379,7 @@ TEST_F(NotifyFixture, EventsThatChangeNotifications)
set_battery_percentage (battery, percent_very_low);
wait_msec();
EXPECT_EQ (FIELD_POWER_LEVEL, changed_params.fields);
- EXPECT_EQ (POWER_LEVEL_VERY_LOW, changed_params.power_level);
+ EXPECT_STREQ (POWER_LEVEL_STR_VERY_LOW, changed_params.power_level.c_str());
// ...and that the warning is taken down if the battery is plugged back in...
changed_params = ChangedParams();
@@ -400,7 +400,7 @@ TEST_F(NotifyFixture, EventsThatChangeNotifications)
set_battery_percentage (battery, percent_low+1);
wait_msec();
EXPECT_EQ (FIELD_POWER_LEVEL|FIELD_IS_WARNING, changed_params.fields);
- EXPECT_EQ (POWER_LEVEL_OK, changed_params.power_level);
+ EXPECT_STREQ (POWER_LEVEL_STR_OK, changed_params.power_level.c_str());
EXPECT_FALSE (changed_params.is_warning);
// cleanup