diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-10-01 17:04:52 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-10-01 17:04:52 +0000 |
| commit | a16d12317296ad016876b5ddb285e5985afc6521 (patch) | |
| tree | 1ede8d8bdfeca31972ede815722eda668d424e63 /tests | |
| parent | 6c04d1a5a97304fc42e4343a9b38a98e03a81008 (diff) | |
| parent | 3fe1d262f1947ca126a85bdc165a14ee6f26cc4a (diff) | |
| download | ayatana-indicator-power-a16d12317296ad016876b5ddb285e5985afc6521.tar.gz ayatana-indicator-power-a16d12317296ad016876b5ddb285e5985afc6521.tar.bz2 ayatana-indicator-power-a16d12317296ad016876b5ddb285e5985afc6521.zip | |
Revert bug #824629 code -- use the correct charge % when deciding what icon to use. Fixes: https://bugs.launchpad.net/bugs/1215520.
Approved by PS Jenkins bot, Ted Gould.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-device.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/test-device.cc b/tests/test-device.cc index 0ccd8d1..2762d4a 100644 --- a/tests/test-device.cc +++ b/tests/test-device.cc @@ -318,9 +318,9 @@ TEST_F(DeviceTest, IconNames) INDICATOR_POWER_DEVICE_PERCENTAGE, 95.0, NULL); - g_string_append_printf (expected, "%s-caution-charging-symbolic;", kind_str); - g_string_append_printf (expected, "gpm-%s-000-charging;", kind_str); - g_string_append_printf (expected, "%s-caution-charging", kind_str); + g_string_append_printf (expected, "%s-full-charging-symbolic;", kind_str); + g_string_append_printf (expected, "gpm-%s-100-charging;", kind_str); + g_string_append_printf (expected, "%s-full-charging", kind_str); check_icon_names (device, expected->str); g_string_truncate (expected, 0); @@ -329,9 +329,9 @@ TEST_F(DeviceTest, IconNames) INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_CHARGING, INDICATOR_POWER_DEVICE_PERCENTAGE, 85.0, NULL); - g_string_append_printf (expected, "%s-caution-charging-symbolic;", kind_str); - g_string_append_printf (expected, "gpm-%s-000-charging;", kind_str); - g_string_append_printf (expected, "%s-caution-charging", kind_str); + g_string_append_printf (expected, "%s-full-charging-symbolic;", kind_str); + g_string_append_printf (expected, "gpm-%s-080-charging;", kind_str); + g_string_append_printf (expected, "%s-full-charging", kind_str); check_icon_names (device, expected->str); g_string_truncate (expected, 0); @@ -340,9 +340,9 @@ TEST_F(DeviceTest, IconNames) INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_CHARGING, INDICATOR_POWER_DEVICE_PERCENTAGE, 50.0, NULL); - g_string_append_printf (expected, "%s-caution-charging-symbolic;", kind_str); - g_string_append_printf (expected, "gpm-%s-000-charging;", kind_str); - g_string_append_printf (expected, "%s-caution-charging", kind_str); + g_string_append_printf (expected, "%s-good-charging-symbolic;", kind_str); + g_string_append_printf (expected, "gpm-%s-060-charging;", kind_str); + g_string_append_printf (expected, "%s-good-charging", kind_str); check_icon_names (device, expected->str); g_string_truncate (expected, 0); @@ -351,9 +351,9 @@ TEST_F(DeviceTest, IconNames) INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_CHARGING, INDICATOR_POWER_DEVICE_PERCENTAGE, 25.0, NULL); - g_string_append_printf (expected, "%s-caution-charging-symbolic;", kind_str); - g_string_append_printf (expected, "gpm-%s-000-charging;", kind_str); - g_string_append_printf (expected, "%s-caution-charging", kind_str); + g_string_append_printf (expected, "%s-low-charging-symbolic;", kind_str); + g_string_append_printf (expected, "gpm-%s-020-charging;", kind_str); + g_string_append_printf (expected, "%s-low-charging", kind_str); check_icon_names (device, expected->str); g_string_truncate (expected, 0); |