From c8591cc9f90c13a3d7638e611d3e53570ae9cc4d Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Fri, 19 Nov 2021 11:29:16 +0100 Subject: Drop Low battery.ogg and adapt code to use Lomiri sounds https://github.com/AyatanaIndicators/ayatana-indicator-power/issues/49 --- tests/CMakeLists.txt | 5 ----- tests/test-notify.cc | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 662c114..714e9a7 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -14,11 +14,6 @@ set_directory_properties (PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES gschemas.compiled) set_source_files_properties (gschemas.compiled GENERATED) -# make a XDG_DATA_HOME for sounds/ -set(XDG_DATA_HOME "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}") -add_definitions(-DXDG_DATA_HOME="${XDG_DATA_HOME}") -file(COPY "${CMAKE_SOURCE_DIR}/data/sounds" DESTINATION "${XDG_DATA_HOME}/${CMAKE_PROJECT_NAME}") - # GSettings: # compile the ayatana-indicator-power schema into a gschemas.compiled file in this directory, # and help the tests to find that file by setting -DSCHEMA_DIR diff --git a/tests/test-notify.cc b/tests/test-notify.cc index eebd8c4..0732ece 100644 --- a/tests/test-notify.cc +++ b/tests/test-notify.cc @@ -77,8 +77,6 @@ protected: { super::SetUp(); - g_setenv ("XDG_DATA_HOME", XDG_DATA_HOME, TRUE); - // init DBusMock / dbus-test-runner service = dbus_test_service_new(nullptr); @@ -393,7 +391,7 @@ TEST_F(NotifyFixture, EventsThatChangeNotifications) TRUE); // the file we expect to play on a low battery notification... - const char* expected_file = XDG_DATA_HOME "/" GETTEXT_PACKAGE "/sounds/" LOW_BATTERY_SOUND; + const char* expected_file = "/usr/share/sounds/lomiri/notifications/" LOW_BATTERY_SOUND; char* tmp = g_filename_to_uri(expected_file, nullptr, nullptr); const std::string low_power_uri {tmp}; g_clear_pointer(&tmp, g_free); -- cgit v1.2.3