aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-03-21 18:07:12 -0500
committerCharles Kerr <charles.kerr@canonical.com>2014-03-21 18:07:12 -0500
commit71f97cd047f58ca93303f0262f65fb48682b2e70 (patch)
treef9e39b2f452af26f20fd1d62eca6313b5854f228 /tests
parentd148c14f072a3bd30c410a0d97a9a6bdc3bc465b (diff)
downloadayatana-indicator-datetime-71f97cd047f58ca93303f0262f65fb48682b2e70.tar.gz
ayatana-indicator-datetime-71f97cd047f58ca93303f0262f65fb48682b2e70.tar.bz2
ayatana-indicator-datetime-71f97cd047f58ca93303f0262f65fb48682b2e70.zip
give 'phone' and 'desktop' their own action namespaces. Fix documentation on 'activate-settings', since there are two forms of it, one for phone and one for desktop.
Diffstat (limited to 'tests')
-rw-r--r--tests/test-actions.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/test-actions.cpp b/tests/test-actions.cpp
index 5d1efd5..105c850 100644
--- a/tests/test-actions.cpp
+++ b/tests/test-actions.cpp
@@ -34,18 +34,18 @@ TEST_F(ActionsFixture, ActionsExist)
"set-location",
"activate-planner",
"activate-appointment",
- "activate-phone-settings",
"activate-phone-clock-app",
- "activate-desktop-settings" };
+ "phone.open-settings",
+ "desktop.open-settings" };
for(const auto& name: names)
{
EXPECT_TRUE(g_action_group_has_action(m_actions->action_group(), name));
}
}
-TEST_F(ActionsFixture, ActivateDesktopSettings)
+TEST_F(ActionsFixture, DesktopOpenSettings)
{
- const auto action_name = "activate-desktop-settings";
+ const auto action_name = "desktop.open-settings";
const auto expected_action = MockActions::OpenDesktopSettings;
auto action_group = m_actions->action_group();
@@ -59,9 +59,9 @@ TEST_F(ActionsFixture, ActivateDesktopSettings)
EXPECT_EQ(expected_action, history[0]);
}
-TEST_F(ActionsFixture, ActivatePhoneSettings)
+TEST_F(ActionsFixture, PhoneOpenSettings)
{
- const auto action_name = "activate-phone-settings";
+ const auto action_name = "phone.open-settings";
const auto expected_action = MockActions::OpenPhoneSettings;
auto action_group = m_actions->action_group();