diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-08 10:41:23 +0000 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-08 10:41:23 +0000 |
| commit | e88a51c841482a67f0d02ed49fbddd9f25d0cae1 (patch) | |
| tree | 7a9b1470525f97451088b4c9bc599c73c84ed39b /tests | |
| parent | f54505942ce2dcc73fcbad79d4f5cdce991bf8cb (diff) | |
| download | ayatana-indicator-datetime-e88a51c841482a67f0d02ed49fbddd9f25d0cae1.tar.gz ayatana-indicator-datetime-e88a51c841482a67f0d02ed49fbddd9f25d0cae1.tar.bz2 ayatana-indicator-datetime-e88a51c841482a67f0d02ed49fbddd9f25d0cae1.zip | |
Indicator namespace adaptations.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/test-menus.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8e5e187..010a426 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -26,7 +26,7 @@ execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compil OUTPUT_VARIABLE COMPILE_SCHEMA_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE) add_custom_command (OUTPUT gschemas.compiled - DEPENDS ${CMAKE_BINARY_DIR}/data/com.canonical.indicator.datetime.gschema.xml + DEPENDS ${CMAKE_BINARY_DIR}/data/org.ayatana.indicator.datetime.gschema.xml COMMAND cp -f ${CMAKE_BINARY_DIR}/data/*gschema.xml ${SCHEMA_DIR} COMMAND ${COMPILE_SCHEMA_EXECUTABLE} ${SCHEMA_DIR}) diff --git a/tests/test-menus.cpp b/tests/test-menus.cpp index f0c5653..ba223f2 100644 --- a/tests/test-menus.cpp +++ b/tests/test-menus.cpp @@ -63,7 +63,7 @@ protected: 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); - EXPECT_STREQ("com.canonical.indicator.root", 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); const auto action_name = name + "-header"; @@ -134,7 +134,7 @@ protected: if (calendar_expected) { g_menu_model_get_item_attribute(section, 1, "x-canonical-type", "s", &str); - EXPECT_STREQ("com.canonical.indicator.calendar", str); + EXPECT_STREQ("org.ayatana.indicator.calendar", str); g_clear_pointer(&str, g_free); g_menu_model_get_item_attribute(section, 1, G_MENU_ATTRIBUTE_ACTION, "s", &str); @@ -211,9 +211,9 @@ private: gchar * str = nullptr; g_menu_model_get_item_attribute(section, index, "x-canonical-type", "s", &str); if (appt.is_ubuntu_alarm()) - EXPECT_STREQ("com.canonical.indicator.alarm", str); + EXPECT_STREQ("org.ayatana.indicator.alarm", str); else - EXPECT_STREQ("com.canonical.indicator.appointment", str); + EXPECT_STREQ("org.ayatana.indicator.appointment", str); g_clear_pointer(&str, g_free); // confirm it has a nonempty x-canonical-time-format @@ -406,7 +406,7 @@ protected: // confirm that the x-canonical-type is right g_menu_model_get_item_attribute(section, i, "x-canonical-type", "s", &str); - EXPECT_STREQ("com.canonical.indicator.location", str); + EXPECT_STREQ("org.ayatana.indicator.location", str); g_clear_pointer(&str, g_free); // confirm that the timezones match the ones in the vector |