aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/test-eds-ics-missing-trigger.ics.in4
-rw-r--r--tests/test-eds-ics-nonrepeating-events.ics.in2
-rw-r--r--tests/test-eds-ics-repeating-events.ics.in2
-rw-r--r--tests/test-menus.cpp28
-rw-r--r--tests/test-snap.cpp2
5 files changed, 19 insertions, 19 deletions
diff --git a/tests/test-eds-ics-missing-trigger.ics.in b/tests/test-eds-ics-missing-trigger.ics.in
index 0b7881f..01a306c 100644
--- a/tests/test-eds-ics-missing-trigger.ics.in
+++ b/tests/test-eds-ics-missing-trigger.ics.in
@@ -8,7 +8,7 @@ UID:20150617T211838Z-6217-32011-2036-1@ubuntu-phablet
DTSTAMP:20150617T211838Z
DTSTART:20150618T100000
SUMMARY:One Time Alarm
-CATEGORIES:x-canonical-alarm
+CATEGORIES:x-ayatana-alarm
CREATED:20150617T211838Z
LAST-MODIFIED:20150617T211838Z
BEGIN:VALARM
@@ -28,7 +28,7 @@ DTSTAMP:20150617T211913Z
DTSTART:20150618T100100
RRULE:FREQ=DAILY
SUMMARY:Recurring Alarm
-CATEGORIES:x-canonical-alarm
+CATEGORIES:x-ayatana-alarm
CREATED:20150617T211913Z
LAST-MODIFIED:20150617T211913Z
BEGIN:VALARM
diff --git a/tests/test-eds-ics-nonrepeating-events.ics.in b/tests/test-eds-ics-nonrepeating-events.ics.in
index be95ed1..6e45450 100644
--- a/tests/test-eds-ics-nonrepeating-events.ics.in
+++ b/tests/test-eds-ics-nonrepeating-events.ics.in
@@ -8,7 +8,7 @@ UID:20150520T000726Z-3878-32011-1770-81@ubuntu-phablet
DTSTAMP:20150520T223932Z
DTSTART:20150520T200000
SUMMARY:Alarm
-CATEGORIES:x-canonical-alarm
+CATEGORIES:x-ayatana-alarm
SEQUENCE:1
LAST-MODIFIED:20150520T223932Z
BEGIN:VALARM
diff --git a/tests/test-eds-ics-repeating-events.ics.in b/tests/test-eds-ics-repeating-events.ics.in
index 7c728c6..51679a3 100644
--- a/tests/test-eds-ics-repeating-events.ics.in
+++ b/tests/test-eds-ics-repeating-events.ics.in
@@ -9,7 +9,7 @@ DTSTAMP:20150508T211449Z
DTSTART:20150508T164000
RRULE:FREQ=WEEKLY;BYDAY=FR
SUMMARY:Alarm
-CATEGORIES:x-canonical-alarm
+CATEGORIES:x-ayatana-alarm
CREATED:20150507T211449Z
LAST-MODIFIED:20150507T211449Z
BEGIN:VALARM
diff --git a/tests/test-menus.cpp b/tests/test-menus.cpp
index dd19487..8650201 100644
--- a/tests/test-menus.cpp
+++ b/tests/test-menus.cpp
@@ -62,7 +62,7 @@ protected:
// check that there's a header menuitem
EXPECT_EQ(1,g_menu_model_get_n_items(menu_model));
gchar* str = nullptr;
- g_menu_model_get_item_attribute(menu_model, 0, "x-canonical-type", "s", &str);
+ g_menu_model_get_item_attribute(menu_model, 0, "x-ayatana-type", "s", &str);
EXPECT_STREQ("org.ayatana.indicator.root", str);
g_clear_pointer(&str, g_free);
g_menu_model_get_item_attribute(menu_model, 0, G_MENU_ATTRIBUTE_ACTION, "s", &str);
@@ -131,7 +131,7 @@ protected:
// look at the calendar menuitem
if (calendar_expected)
{
- g_menu_model_get_item_attribute(section, 1, "x-canonical-type", "s", &str);
+ g_menu_model_get_item_attribute(section, 1, "x-ayatana-type", "s", &str);
EXPECT_STREQ("org.ayatana.indicator.calendar", str);
g_clear_pointer(&str, g_free);
@@ -205,27 +205,27 @@ private:
int index,
const Appointment& appt)
{
- // confirm it has the right x-canonical-type
+ // confirm it has the right x-ayatana-type
gchar * str = nullptr;
- g_menu_model_get_item_attribute(section, index, "x-canonical-type", "s", &str);
+ g_menu_model_get_item_attribute(section, index, "x-ayatana-type", "s", &str);
if (appt.is_ubuntu_alarm())
EXPECT_STREQ("org.ayatana.indicator.alarm", str);
else
EXPECT_STREQ("org.ayatana.indicator.appointment", str);
g_clear_pointer(&str, g_free);
- // confirm it has a nonempty x-canonical-time-format
- g_menu_model_get_item_attribute(section, index, "x-canonical-time-format", "s", &str);
+ // confirm it has a nonempty x-ayatana-time-format
+ g_menu_model_get_item_attribute(section, index, "x-ayatana-time-format", "s", &str);
EXPECT_TRUE(str && *str);
g_clear_pointer(&str, g_free);
// confirm the color hint, if it exists,
- // is in the x-canonical-color attribute
+ // is in the x-ayatana-color attribute
if (appt.color.empty())
{
EXPECT_FALSE(g_menu_model_get_item_attribute(section,
index,
- "x-canonical-color",
+ "x-ayatana-color",
"s",
&str));
}
@@ -233,7 +233,7 @@ private:
{
EXPECT_TRUE(g_menu_model_get_item_attribute(section,
index,
- "x-canonical-color",
+ "x-ayatana-color",
"s",
&str));
EXPECT_EQ(appt.color, str);
@@ -398,18 +398,18 @@ protected:
{
gchar* str = nullptr;
- // confirm that the x-canonical-type is right
- g_menu_model_get_item_attribute(section, i, "x-canonical-type", "s", &str);
+ // confirm that the x-ayatana-type is right
+ g_menu_model_get_item_attribute(section, i, "x-ayatana-type", "s", &str);
EXPECT_STREQ("org.ayatana.indicator.location", str);
g_clear_pointer(&str, g_free);
// confirm that the timezones match the ones in the vector
- g_menu_model_get_item_attribute(section, i, "x-canonical-timezone", "s", &str);
+ g_menu_model_get_item_attribute(section, i, "x-ayatana-timezone", "s", &str);
EXPECT_EQ(locations[i].zone(), str);
g_clear_pointer(&str, g_free);
- // confirm that x-canonical-time-format has some kind of time format string
- g_menu_model_get_item_attribute(section, i, "x-canonical-time-format", "s", &str);
+ // confirm that x-ayatana-time-format has some kind of time format string
+ g_menu_model_get_item_attribute(section, i, "x-ayatana-time-format", "s", &str);
EXPECT_TRUE(str && *str && (strchr(str,'%')!=nullptr));
g_clear_pointer(&str, g_free);
}
diff --git a/tests/test-snap.cpp b/tests/test-snap.cpp
index 1904bef..8a310e4 100644
--- a/tests/test-snap.cpp
+++ b/tests/test-snap.cpp
@@ -84,7 +84,7 @@ protected:
static constexpr char const * SIGNAL_CLOSED {"NotificationClosed"};
- static constexpr char const * HINT_TIMEOUT {"x-canonical-snap-decisions-timeout"};
+ static constexpr char const * HINT_TIMEOUT {"x-ayatana-snap-decisions-timeout"};
static constexpr char const * AS_BUSNAME {"org.freedesktop.Accounts"};
static constexpr char const * AS_INTERFACE {"com.ubuntu.touch.AccountsService.Sound"};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 10:50:49 +0000