Merge branch 'tari01-pr/ubports-patches'

Attributes GH PR #46: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/46

1 files changed, 10 insertions, 10 deletions

diff --git a/tests/test-actions.cpp b/tests/test-actions.cpp
index aa608a8..a01fb83 100644
--- a/tests/test-actions.cpp
+++ b/tests/test-actions.cpp
@@ -116,7 +116,7 @@ protected:
         m_mock_state->mock_range_planner->appointments().set(appointments);
 
         // activate the action
-        auto v = g_variant_new_string(appointments[0].uid.c_str());
+        auto v = g_variant_new("(sx)", appointments[0].uid.c_str(), 0);
         g_action_group_activate_action(action_group, action_name, v);
 
         // test the results
@@ -134,7 +134,7 @@ protected:
         EXPECT_TRUE(m_mock_actions->history().empty());
 
         // activate the action
-        v = g_variant_new_string("this-uid-is-not-one-that-we-have");
+        v = g_variant_new("(sx)", "this-uid-is-not-one-that-we-have", 0);
         g_action_group_activate_action(action_group, action_name, v);
 
         // test the results
@@ -176,25 +176,25 @@ TEST_F(ActionsFixture, ActionsExist)
 TEST_F(ActionsFixture, DesktopOpenAlarmApp)
 {
     test_action_with_no_args("desktop.open-alarm-app",
-                             MockActions::DesktopOpenAlarmApp);
+                             MockActions::OpenAlarmApp);
 }
 
 TEST_F(ActionsFixture, DesktopOpenAppointment)
 {
     test_action_with_appt_arg("desktop.open-appointment",
-                              MockActions::DesktopOpenAppt);
+                              MockActions::OpenAppt);
 }
 
 TEST_F(ActionsFixture, DesktopOpenCalendarApp)
 {
     test_action_with_time_arg("desktop.open-calendar-app",
-                              MockActions::DesktopOpenCalendarApp);
+                              MockActions::OpenCalendarApp);
 }
 
 TEST_F(ActionsFixture, DesktopOpenSettingsApp)
 {
     test_action_with_no_args("desktop.open-settings-app",
-                             MockActions::DesktopOpenSettingsApp);
+                             MockActions::OpenSettingsApp);
 }
 
 /***
@@ -204,25 +204,25 @@ TEST_F(ActionsFixture, DesktopOpenSettingsApp)
 TEST_F(ActionsFixture, PhoneOpenAlarmApp)
 {
     test_action_with_no_args("phone.open-alarm-app",
-                             MockActions::PhoneOpenAlarmApp);
+                             MockActions::OpenAlarmApp);
 }
 
 TEST_F(ActionsFixture, PhoneOpenAppointment)
 {
     test_action_with_appt_arg("phone.open-appointment",
-                              MockActions::PhoneOpenAppt);
+                              MockActions::OpenAppt);
 }
 
 TEST_F(ActionsFixture, PhoneOpenCalendarApp)
 {
     test_action_with_time_arg("phone.open-calendar-app",
-                              MockActions::PhoneOpenCalendarApp);
+                              MockActions::OpenCalendarApp);
 }
 
 TEST_F(ActionsFixture, PhoneOpenSettingsApp)
 {
     test_action_with_no_args("phone.open-settings-app",
-                             MockActions::PhoneOpenSettingsApp);
+                             MockActions::OpenSettingsApp);
 }
 
 /***