From d7d630dd5b250c4db489d797552129093c0c3ab0 Mon Sep 17 00:00:00 2001 From: charles kerr Date: Fri, 1 Jan 2016 16:08:07 -0600 Subject: add play-sound tests to test-notify --- tests/CMakeLists.txt | 8 ++++++++ tests/test-notify.cc | 34 +++++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1dc8a8f..96cabb2 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -14,6 +14,14 @@ set_directory_properties (PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES gschemas.compiled) set_source_files_properties (gschemas.compiled GENERATED) +# make a local install of the sounds +set(XDG_DATA_HOME "${CMAKE_CURRENT_BINARY_DIR}/share") +add_definitions(-DXDG_DATA_HOME="${XDG_DATA_HOME}") +file(COPY + DIRECTORY "${CMAKE_SOURCE_DIR}/data/" + DESTINATION "${XDG_DATA_HOME}/${CMAKE_PROJECT_NAME}/sounds" + FILES_MATCHING PATTERN "*.ogg") + # 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 63214c2..cfa27bf 100644 --- a/tests/test-notify.cc +++ b/tests/test-notify.cc @@ -23,6 +23,7 @@ #include "dbus-shared.h" #include "device.h" #include "notifier.h" +#include "sound-player-mock.h" #include @@ -77,6 +78,8 @@ protected: { super::SetUp(); + g_setenv ("XDG_DATA_HOME", XDG_DATA_HOME, TRUE); + // init DBusMock / dbus-test-runner service = dbus_test_service_new(nullptr); @@ -275,7 +278,8 @@ TEST_F(NotifyFixture, LevelsDuringBatteryDrain) // set up a notifier and give it the battery so changing the battery's // charge should show up on the bus. - auto notifier = indicator_power_notifier_new (); + auto sound_player = indicator_power_sound_player_mock_new (); + auto notifier = indicator_power_notifier_new (sound_player); indicator_power_notifier_set_battery (notifier, battery); indicator_power_notifier_set_bus (notifier, bus); wait_msec(); @@ -317,14 +321,23 @@ TEST_F(NotifyFixture, LevelsDuringBatteryDrain) // cleanup g_dbus_connection_signal_unsubscribe (bus, sub_tag); - g_object_unref (notifier); g_object_unref (battery); + g_object_unref (notifier); + g_object_unref (sound_player); } /*** **** ***/ +namespace +{ + static void on_uri_played(IndicatorPowerSoundPlayer*, const char* uri, gpointer glast_uri) + { + *static_cast(glast_uri) = uri; + } +} + TEST_F(NotifyFixture, EventsThatChangeNotifications) { // GetCapabilities returns an array containing 'actions', so that we'll @@ -348,7 +361,11 @@ TEST_F(NotifyFixture, EventsThatChangeNotifications) // set up a notifier and give it the battery so changing the battery's // charge should show up on the bus. - auto notifier = indicator_power_notifier_new (); + const std::string low_power_uri {"file://" XDG_DATA_HOME "/" GETTEXT_PACKAGE "/sounds/Low%20battery.ogg"}; + std::string last_uri; + auto sound_player = indicator_power_sound_player_mock_new (); + g_signal_connect(sound_player, "uri-played", G_CALLBACK(on_uri_played), &last_uri); + auto notifier = indicator_power_notifier_new (sound_player); indicator_power_notifier_set_battery (notifier, battery); indicator_power_notifier_set_bus (notifier, bus); ChangedParams changed_params; @@ -366,6 +383,7 @@ TEST_F(NotifyFixture, EventsThatChangeNotifications) // test setup case wait_msec(); EXPECT_STREQ (POWER_LEVEL_STR_OK, changed_params.power_level.c_str()); + EXPECT_TRUE(last_uri.empty()); // change the percent past the 'low' threshold and confirm that // a) the power level changes @@ -376,38 +394,48 @@ TEST_F(NotifyFixture, EventsThatChangeNotifications) EXPECT_EQ (FIELD_POWER_LEVEL|FIELD_IS_WARNING, changed_params.fields); EXPECT_EQ (indicator_power_notifier_get_power_level(battery), changed_params.power_level); EXPECT_TRUE (changed_params.is_warning); + EXPECT_EQ (low_power_uri, last_uri); // now test that the warning changes if the level goes down even lower... + last_uri.clear(); changed_params = ChangedParams(); set_battery_percentage (battery, percent_very_low); wait_msec(); EXPECT_EQ (FIELD_POWER_LEVEL, changed_params.fields); EXPECT_STREQ (POWER_LEVEL_STR_VERY_LOW, changed_params.power_level.c_str()); + EXPECT_EQ (low_power_uri, last_uri); // ...and that the warning is taken down if the battery is plugged back in... + last_uri.clear(); changed_params = ChangedParams(); g_object_set (battery, INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_CHARGING, nullptr); wait_msec(); EXPECT_EQ (FIELD_IS_WARNING, changed_params.fields); EXPECT_FALSE (changed_params.is_warning); + EXPECT_TRUE(last_uri.empty()); // ...and that it comes back if we unplug again... + last_uri.clear(); changed_params = ChangedParams(); g_object_set (battery, INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_DISCHARGING, nullptr); wait_msec(); EXPECT_EQ (FIELD_IS_WARNING, changed_params.fields); EXPECT_TRUE (changed_params.is_warning); + EXPECT_EQ (low_power_uri, last_uri); // ...and that it's taken down if the power level is OK + last_uri.clear(); changed_params = ChangedParams(); set_battery_percentage (battery, percent_low+1); wait_msec(); EXPECT_EQ (FIELD_POWER_LEVEL|FIELD_IS_WARNING, changed_params.fields); EXPECT_STREQ (POWER_LEVEL_STR_OK, changed_params.power_level.c_str()); EXPECT_FALSE (changed_params.is_warning); + EXPECT_TRUE(last_uri.empty()); // cleanup g_dbus_connection_signal_unsubscribe (bus, sub_tag); g_object_unref (notifier); g_object_unref (battery); + g_object_unref (sound_player); } -- cgit v1.2.3 From bdc03e1cddb8811651f22e0bb423bf3385cbc793 Mon Sep 17 00:00:00 2001 From: charles kerr Date: Fri, 1 Jan 2016 16:12:16 -0600 Subject: update copyright years on changed/new files --- tests/test-notify.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test-notify.cc b/tests/test-notify.cc index cfa27bf..6fe7c59 100644 --- a/tests/test-notify.cc +++ b/tests/test-notify.cc @@ -1,5 +1,5 @@ /* - * Copyright 2014 Canonical Ltd. + * Copyright 2014-2016 Canonical Ltd. * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published -- cgit v1.2.3 From c7881a2d849191e1b6243da75ebf9140d29655cb Mon Sep 17 00:00:00 2001 From: charles kerr Date: Fri, 1 Jan 2016 19:25:16 -0600 Subject: create a data/sounds/ directory in the repo to hold Low battery.ogg We may be adding sounds for when we transition to battery charging/discharging, so set up a sounds/ directory now. --- tests/CMakeLists.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 96cabb2..566132e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -14,13 +14,10 @@ set_directory_properties (PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES gschemas.compiled) set_source_files_properties (gschemas.compiled GENERATED) -# make a local install of the sounds -set(XDG_DATA_HOME "${CMAKE_CURRENT_BINARY_DIR}/share") +# 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 - DIRECTORY "${CMAKE_SOURCE_DIR}/data/" - DESTINATION "${XDG_DATA_HOME}/${CMAKE_PROJECT_NAME}/sounds" - FILES_MATCHING PATTERN "*.ogg") +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, -- cgit v1.2.3 From 460f1464709a4c5e2c1594045961be9108ae2afd Mon Sep 17 00:00:00 2001 From: charles kerr Date: Fri, 1 Jan 2016 19:37:51 -0600 Subject: use a symbolic constant for the low battery sound's filename --- tests/test-notify.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test-notify.cc b/tests/test-notify.cc index 6fe7c59..0d92d7a 100644 --- a/tests/test-notify.cc +++ b/tests/test-notify.cc @@ -359,9 +359,14 @@ TEST_F(NotifyFixture, EventsThatChangeNotifications) 30, 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; + char* tmp = g_filename_to_uri(expected_file, nullptr, nullptr); + const std::string low_power_uri {tmp}; + g_clear_pointer(&tmp, g_free); + // set up a notifier and give it the battery so changing the battery's // charge should show up on the bus. - const std::string low_power_uri {"file://" XDG_DATA_HOME "/" GETTEXT_PACKAGE "/sounds/Low%20battery.ogg"}; std::string last_uri; auto sound_player = indicator_power_sound_player_mock_new (); g_signal_connect(sound_player, "uri-played", G_CALLBACK(on_uri_played), &last_uri); -- cgit v1.2.3 From f829a7e9bc11614bf75dff270f161bff71c8ae4d Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 4 Jan 2016 10:19:59 -0600 Subject: move sound-player-mock into the tests/ directory --- tests/CMakeLists.txt | 11 +++++- tests/sound-player-mock.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++ tests/sound-player-mock.h | 75 +++++++++++++++++++++++++++++++++++++ 3 files changed, 178 insertions(+), 2 deletions(-) create mode 100644 tests/sound-player-mock.c create mode 100644 tests/sound-player-mock.h (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 566132e..41e48cd 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -9,6 +9,13 @@ include_directories (SYSTEM ${DBUSTEST_INCLUDE_DIRS}) # add warnings set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${C_WARNING_ARGS}") +# build the mocks +set(MOCK_LIB "indicatorpowerservicemocks") +set(MOCK_SOURCES sound-player-mock.c) +set_source_files_properties(${MOCK_SOURCES} + PROPERTIES COMPILE_FLAGS "${C_WARNING_ARGS} -g -std=c99") +add_library(${MOCK_LIB} STATIC ${MOCK_SOURCES}) + # build the necessary schemas set_directory_properties (PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES gschemas.compiled) @@ -50,8 +57,8 @@ function(add_test_by_name name) add_executable (${TEST_NAME} ${TEST_NAME}.cc) target_link_options(${TEST_NAME} PRIVATE -no-pie) add_test (${TEST_NAME} ${TEST_NAME}) - add_dependencies (${TEST_NAME} ayatanaindicatorpowerservice gschemas-compiled) - target_link_libraries (${TEST_NAME} ayatanaindicatorpowerservice gtest ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS} ${URLDISPATCHER_LIBRARIES} ${GMOCK_LIBRARIES}) + add_dependencies (${TEST_NAME} ${MOCK_LIB} ayatanaindicatorpowerservice gschemas-compiled) + target_link_libraries (${TEST_NAME} ${MOCK_LIB} ayatanaindicatorpowerservice gtest ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS} ${URLDISPATCHER_LIBRARIES} ${GMOCK_LIBRARIES}) endfunction() add_test_by_name(test-notify) add_test(NAME dear-reader-the-next-test-takes-80-seconds COMMAND true) diff --git a/tests/sound-player-mock.c b/tests/sound-player-mock.c new file mode 100644 index 0000000..35c3b57 --- /dev/null +++ b/tests/sound-player-mock.c @@ -0,0 +1,94 @@ +/* + * Copyright 2016 Canonical Ltd. + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 3, as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranties of + * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * + * Authors: + * Charles Kerr + */ + +#include "sound-player.h" +#include "sound-player-mock.h" + +enum +{ + SIGNAL_URI_PLAYED, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL] = { 0 }; + +/*** +**** GObject boilerplate +***/ + +static void indicator_power_sound_player_interface_init ( + IndicatorPowerSoundPlayerInterface * iface); + +G_DEFINE_TYPE_WITH_CODE ( + IndicatorPowerSoundPlayerMock, + indicator_power_sound_player_mock, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (INDICATOR_TYPE_POWER_SOUND_PLAYER, + indicator_power_sound_player_interface_init)) + +/*** +**** IndicatorPowerSoundPlayer virtual functions +***/ + +static void +my_play_uri (IndicatorPowerSoundPlayer * self, const gchar * uri) +{ + g_signal_emit (self, signals[SIGNAL_URI_PLAYED], 0, uri, NULL); +} + +/*** +**** Instantiation +***/ + +static void +indicator_power_sound_player_mock_class_init (IndicatorPowerSoundPlayerMockClass * klass G_GNUC_UNUSED) +{ + signals[SIGNAL_URI_PLAYED] = g_signal_new ( + "uri-played", + G_TYPE_FROM_CLASS(klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (IndicatorPowerSoundPlayerMockClass, uri_played), + NULL, NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, G_TYPE_STRING); +} + +static void +indicator_power_sound_player_interface_init (IndicatorPowerSoundPlayerInterface * iface) +{ + iface->play_uri = my_play_uri; +} + +static void +indicator_power_sound_player_mock_init (IndicatorPowerSoundPlayerMock * self G_GNUC_UNUSED) +{ +} + +/*** +**** Public API +***/ + +IndicatorPowerSoundPlayer * +indicator_power_sound_player_mock_new (void) +{ + gpointer o = g_object_new (INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK, NULL); + + return INDICATOR_POWER_SOUND_PLAYER (o); +} + diff --git a/tests/sound-player-mock.h b/tests/sound-player-mock.h new file mode 100644 index 0000000..f844924 --- /dev/null +++ b/tests/sound-player-mock.h @@ -0,0 +1,75 @@ +/* + * Copyright 2016 Canonical Ltd. + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 3, as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranties of + * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + * + * Authors: + * Charles Kerr + */ + +#ifndef __INDICATOR_POWER_SOUND_PLAYER_MOCK__H__ +#define __INDICATOR_POWER_SOUND_PLAYER_MOCK__H__ + +#include /* parent class */ + +#include "sound-player.h" + +G_BEGIN_DECLS + +#define INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK \ + (indicator_power_sound_player_mock_get_type()) + +#define INDICATOR_POWER_SOUND_PLAYER_MOCK(o) \ + (G_TYPE_CHECK_INSTANCE_CAST ((o), \ + INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK, \ + IndicatorPowerSoundPlayerMock)) + +#define INDICATOR_POWER_SOUND_PLAYER_MOCK_GET_CLASS(o) \ + (G_TYPE_INSTANCE_GET_CLASS ((o), \ + INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK, \ + IndicatorPowerSoundPlayerMockClass)) + +#define INDICATOR_IS_POWER_SOUND_PLAYER_MOCK(o) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((o), \ + INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK)) + +typedef struct _IndicatorPowerSoundPlayerMock + IndicatorPowerSoundPlayerMock; +typedef struct _IndicatorPowerSoundPlayerMockPriv + IndicatorPowerSoundPlayerMockPriv; +typedef struct _IndicatorPowerSoundPlayerMockClass + IndicatorPowerSoundPlayerMockClass; + +/** + * An IndicatorPowerSoundPlayer which gets its devices from Mock. + */ +struct _IndicatorPowerSoundPlayerMock +{ + GObject parent_instance; +}; + +struct _IndicatorPowerSoundPlayerMockClass +{ + GObjectClass parent_class; + + /* signals */ + void (*uri_played) (IndicatorPowerSoundPlayer * self, const gchar* uri); +}; + +GType indicator_power_sound_player_mock_get_type (void); + +IndicatorPowerSoundPlayer * indicator_power_sound_player_mock_new (void); + +G_END_DECLS + +#endif /* __INDICATOR_POWER_SOUND_PLAYER_MOCK__H__ */ -- cgit v1.2.3 From d2e654d53f5dbe89cce2fe08a7e6dbcae4a6d835 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 4 Jan 2016 12:52:04 -0600 Subject: don't disable the warning sound when AccountServices is completely unavailable --- tests/glib-fixture.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/glib-fixture.h b/tests/glib-fixture.h index 09c37a3..9494df2 100644 --- a/tests/glib-fixture.h +++ b/tests/glib-fixture.h @@ -52,7 +52,7 @@ class GlibFixture : public ::testing::Test if (expected_log[level] != n) for (size_t i=0; i Date: Mon, 1 Feb 2016 10:53:07 -0600 Subject: for low power notifications, use libnotify's 'sound-file' property instead of indicator-power calling the sound player directly --- tests/CMakeLists.txt | 11 +----- tests/sound-player-mock.c | 94 ----------------------------------------------- tests/sound-player-mock.h | 75 ------------------------------------- tests/test-notify.cc | 88 ++++++++++++++++++++++++++++++-------------- 4 files changed, 63 insertions(+), 205 deletions(-) delete mode 100644 tests/sound-player-mock.c delete mode 100644 tests/sound-player-mock.h (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 41e48cd..566132e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -9,13 +9,6 @@ include_directories (SYSTEM ${DBUSTEST_INCLUDE_DIRS}) # add warnings set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${C_WARNING_ARGS}") -# build the mocks -set(MOCK_LIB "indicatorpowerservicemocks") -set(MOCK_SOURCES sound-player-mock.c) -set_source_files_properties(${MOCK_SOURCES} - PROPERTIES COMPILE_FLAGS "${C_WARNING_ARGS} -g -std=c99") -add_library(${MOCK_LIB} STATIC ${MOCK_SOURCES}) - # build the necessary schemas set_directory_properties (PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES gschemas.compiled) @@ -57,8 +50,8 @@ function(add_test_by_name name) add_executable (${TEST_NAME} ${TEST_NAME}.cc) target_link_options(${TEST_NAME} PRIVATE -no-pie) add_test (${TEST_NAME} ${TEST_NAME}) - add_dependencies (${TEST_NAME} ${MOCK_LIB} ayatanaindicatorpowerservice gschemas-compiled) - target_link_libraries (${TEST_NAME} ${MOCK_LIB} ayatanaindicatorpowerservice gtest ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS} ${URLDISPATCHER_LIBRARIES} ${GMOCK_LIBRARIES}) + add_dependencies (${TEST_NAME} ayatanaindicatorpowerservice gschemas-compiled) + target_link_libraries (${TEST_NAME} ayatanaindicatorpowerservice gtest ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS} ${URLDISPATCHER_LIBRARIES} ${GMOCK_LIBRARIES}) endfunction() add_test_by_name(test-notify) add_test(NAME dear-reader-the-next-test-takes-80-seconds COMMAND true) diff --git a/tests/sound-player-mock.c b/tests/sound-player-mock.c deleted file mode 100644 index 35c3b57..0000000 --- a/tests/sound-player-mock.c +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright 2016 Canonical Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Authors: - * Charles Kerr - */ - -#include "sound-player.h" -#include "sound-player-mock.h" - -enum -{ - SIGNAL_URI_PLAYED, - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL] = { 0 }; - -/*** -**** GObject boilerplate -***/ - -static void indicator_power_sound_player_interface_init ( - IndicatorPowerSoundPlayerInterface * iface); - -G_DEFINE_TYPE_WITH_CODE ( - IndicatorPowerSoundPlayerMock, - indicator_power_sound_player_mock, - G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (INDICATOR_TYPE_POWER_SOUND_PLAYER, - indicator_power_sound_player_interface_init)) - -/*** -**** IndicatorPowerSoundPlayer virtual functions -***/ - -static void -my_play_uri (IndicatorPowerSoundPlayer * self, const gchar * uri) -{ - g_signal_emit (self, signals[SIGNAL_URI_PLAYED], 0, uri, NULL); -} - -/*** -**** Instantiation -***/ - -static void -indicator_power_sound_player_mock_class_init (IndicatorPowerSoundPlayerMockClass * klass G_GNUC_UNUSED) -{ - signals[SIGNAL_URI_PLAYED] = g_signal_new ( - "uri-played", - G_TYPE_FROM_CLASS(klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (IndicatorPowerSoundPlayerMockClass, uri_played), - NULL, NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, 1, G_TYPE_STRING); -} - -static void -indicator_power_sound_player_interface_init (IndicatorPowerSoundPlayerInterface * iface) -{ - iface->play_uri = my_play_uri; -} - -static void -indicator_power_sound_player_mock_init (IndicatorPowerSoundPlayerMock * self G_GNUC_UNUSED) -{ -} - -/*** -**** Public API -***/ - -IndicatorPowerSoundPlayer * -indicator_power_sound_player_mock_new (void) -{ - gpointer o = g_object_new (INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK, NULL); - - return INDICATOR_POWER_SOUND_PLAYER (o); -} - diff --git a/tests/sound-player-mock.h b/tests/sound-player-mock.h deleted file mode 100644 index f844924..0000000 --- a/tests/sound-player-mock.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2016 Canonical Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Authors: - * Charles Kerr - */ - -#ifndef __INDICATOR_POWER_SOUND_PLAYER_MOCK__H__ -#define __INDICATOR_POWER_SOUND_PLAYER_MOCK__H__ - -#include /* parent class */ - -#include "sound-player.h" - -G_BEGIN_DECLS - -#define INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK \ - (indicator_power_sound_player_mock_get_type()) - -#define INDICATOR_POWER_SOUND_PLAYER_MOCK(o) \ - (G_TYPE_CHECK_INSTANCE_CAST ((o), \ - INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK, \ - IndicatorPowerSoundPlayerMock)) - -#define INDICATOR_POWER_SOUND_PLAYER_MOCK_GET_CLASS(o) \ - (G_TYPE_INSTANCE_GET_CLASS ((o), \ - INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK, \ - IndicatorPowerSoundPlayerMockClass)) - -#define INDICATOR_IS_POWER_SOUND_PLAYER_MOCK(o) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((o), \ - INDICATOR_TYPE_POWER_SOUND_PLAYER_MOCK)) - -typedef struct _IndicatorPowerSoundPlayerMock - IndicatorPowerSoundPlayerMock; -typedef struct _IndicatorPowerSoundPlayerMockPriv - IndicatorPowerSoundPlayerMockPriv; -typedef struct _IndicatorPowerSoundPlayerMockClass - IndicatorPowerSoundPlayerMockClass; - -/** - * An IndicatorPowerSoundPlayer which gets its devices from Mock. - */ -struct _IndicatorPowerSoundPlayerMock -{ - GObject parent_instance; -}; - -struct _IndicatorPowerSoundPlayerMockClass -{ - GObjectClass parent_class; - - /* signals */ - void (*uri_played) (IndicatorPowerSoundPlayer * self, const gchar* uri); -}; - -GType indicator_power_sound_player_mock_get_type (void); - -IndicatorPowerSoundPlayer * indicator_power_sound_player_mock_new (void); - -G_END_DECLS - -#endif /* __INDICATOR_POWER_SOUND_PLAYER_MOCK__H__ */ diff --git a/tests/test-notify.cc b/tests/test-notify.cc index 0d92d7a..d01ef5f 100644 --- a/tests/test-notify.cc +++ b/tests/test-notify.cc @@ -23,7 +23,6 @@ #include "dbus-shared.h" #include "device.h" #include "notifier.h" -#include "sound-player-mock.h" #include @@ -160,6 +159,51 @@ protected: super::TearDown(); } + + /*** + **** + ***/ + + int get_notify_call_count() const + { + // confirm that we got exactly one call + guint len {0u}; + GError* error {nullptr}; + dbus_test_dbus_mock_object_get_method_calls(mock, obj, METHOD_NOTIFY, &len, &error); + g_assert_no_error(error); + return len; + } + + std::string get_notify_call_sound_file(int call_number) + { + std::string ret; + + guint len {0u}; + GError* error {nullptr}; + auto calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, METHOD_NOTIFY, &len, &error); + g_return_val_if_fail(int(len) > call_number, ret); + g_assert_no_error(error); + + constexpr int HINTS_PARAM_POSITION {6}; + const auto& call = calls[call_number]; + g_return_val_if_fail(g_variant_n_children(call.params) > HINTS_PARAM_POSITION, ret); + auto hints = g_variant_get_child_value(call.params, HINTS_PARAM_POSITION); + const gchar* sound_file = nullptr; + auto success = g_variant_lookup(hints, "sound-file", "&s", &sound_file); + g_return_val_if_fail(success, ret); + if (sound_file != nullptr) + ret = sound_file; + g_clear_pointer(&hints, g_variant_unref); + + return ret; + } + + void clear_method_calls() + { + GError* error{nullptr}; + ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(mock, obj, &error)); + g_assert_no_error(error); + } }; /*** @@ -278,8 +322,7 @@ TEST_F(NotifyFixture, LevelsDuringBatteryDrain) // set up a notifier and give it the battery so changing the battery's // charge should show up on the bus. - auto sound_player = indicator_power_sound_player_mock_new (); - auto notifier = indicator_power_notifier_new (sound_player); + auto notifier = indicator_power_notifier_new (); indicator_power_notifier_set_battery (notifier, battery); indicator_power_notifier_set_bus (notifier, bus); wait_msec(); @@ -323,21 +366,12 @@ TEST_F(NotifyFixture, LevelsDuringBatteryDrain) g_dbus_connection_signal_unsubscribe (bus, sub_tag); g_object_unref (battery); g_object_unref (notifier); - g_object_unref (sound_player); } /*** **** ***/ -namespace -{ - static void on_uri_played(IndicatorPowerSoundPlayer*, const char* uri, gpointer glast_uri) - { - *static_cast(glast_uri) = uri; - } -} - TEST_F(NotifyFixture, EventsThatChangeNotifications) { // GetCapabilities returns an array containing 'actions', so that we'll @@ -367,10 +401,7 @@ TEST_F(NotifyFixture, EventsThatChangeNotifications) // set up a notifier and give it the battery so changing the battery's // charge should show up on the bus. - std::string last_uri; - auto sound_player = indicator_power_sound_player_mock_new (); - g_signal_connect(sound_player, "uri-played", G_CALLBACK(on_uri_played), &last_uri); - auto notifier = indicator_power_notifier_new (sound_player); + auto notifier = indicator_power_notifier_new (); indicator_power_notifier_set_battery (notifier, battery); indicator_power_notifier_set_bus (notifier, bus); ChangedParams changed_params; @@ -388,7 +419,6 @@ TEST_F(NotifyFixture, EventsThatChangeNotifications) // test setup case wait_msec(); EXPECT_STREQ (POWER_LEVEL_STR_OK, changed_params.power_level.c_str()); - EXPECT_TRUE(last_uri.empty()); // change the percent past the 'low' threshold and confirm that // a) the power level changes @@ -399,48 +429,52 @@ TEST_F(NotifyFixture, EventsThatChangeNotifications) EXPECT_EQ (FIELD_POWER_LEVEL|FIELD_IS_WARNING, changed_params.fields); EXPECT_EQ (indicator_power_notifier_get_power_level(battery), changed_params.power_level); EXPECT_TRUE (changed_params.is_warning); - EXPECT_EQ (low_power_uri, last_uri); + EXPECT_EQ (1, get_notify_call_count()); + EXPECT_EQ (low_power_uri, get_notify_call_sound_file(0)); + clear_method_calls(); // now test that the warning changes if the level goes down even lower... - last_uri.clear(); changed_params = ChangedParams(); set_battery_percentage (battery, percent_very_low); wait_msec(); EXPECT_EQ (FIELD_POWER_LEVEL, changed_params.fields); EXPECT_STREQ (POWER_LEVEL_STR_VERY_LOW, changed_params.power_level.c_str()); - EXPECT_EQ (low_power_uri, last_uri); + EXPECT_EQ (1, get_notify_call_count()); + EXPECT_EQ (low_power_uri, get_notify_call_sound_file(0)); + clear_method_calls(); // ...and that the warning is taken down if the battery is plugged back in... - last_uri.clear(); + //last_uri.clear(); changed_params = ChangedParams(); g_object_set (battery, INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_CHARGING, nullptr); wait_msec(); EXPECT_EQ (FIELD_IS_WARNING, changed_params.fields); EXPECT_FALSE (changed_params.is_warning); - EXPECT_TRUE(last_uri.empty()); + EXPECT_EQ (0, get_notify_call_count()); // ...and that it comes back if we unplug again... - last_uri.clear(); + //last_uri.clear(); changed_params = ChangedParams(); g_object_set (battery, INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_DISCHARGING, nullptr); wait_msec(); EXPECT_EQ (FIELD_IS_WARNING, changed_params.fields); EXPECT_TRUE (changed_params.is_warning); - EXPECT_EQ (low_power_uri, last_uri); + EXPECT_EQ (1, get_notify_call_count()); + EXPECT_EQ (low_power_uri, get_notify_call_sound_file(0)); + clear_method_calls(); // ...and that it's taken down if the power level is OK - last_uri.clear(); + //last_uri.clear(); changed_params = ChangedParams(); set_battery_percentage (battery, percent_low+1); wait_msec(); EXPECT_EQ (FIELD_POWER_LEVEL|FIELD_IS_WARNING, changed_params.fields); EXPECT_STREQ (POWER_LEVEL_STR_OK, changed_params.power_level.c_str()); EXPECT_FALSE (changed_params.is_warning); - EXPECT_TRUE(last_uri.empty()); + EXPECT_EQ (0, get_notify_call_count()); // cleanup g_dbus_connection_signal_unsubscribe (bus, sub_tag); g_object_unref (notifier); g_object_unref (battery); - g_object_unref (sound_player); } -- cgit v1.2.3 From 557e10a031b886dc670bdf5918c3984edbace5ac Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 1 Feb 2016 12:24:34 -0600 Subject: remove dead code --- tests/test-notify.cc | 4 ---- 1 file changed, 4 deletions(-) (limited to 'tests') diff --git a/tests/test-notify.cc b/tests/test-notify.cc index d01ef5f..cd5b6f1 100644 --- a/tests/test-notify.cc +++ b/tests/test-notify.cc @@ -166,7 +166,6 @@ protected: int get_notify_call_count() const { - // confirm that we got exactly one call guint len {0u}; GError* error {nullptr}; dbus_test_dbus_mock_object_get_method_calls(mock, obj, METHOD_NOTIFY, &len, &error); @@ -444,7 +443,6 @@ TEST_F(NotifyFixture, EventsThatChangeNotifications) clear_method_calls(); // ...and that the warning is taken down if the battery is plugged back in... - //last_uri.clear(); changed_params = ChangedParams(); g_object_set (battery, INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_CHARGING, nullptr); wait_msec(); @@ -453,7 +451,6 @@ TEST_F(NotifyFixture, EventsThatChangeNotifications) EXPECT_EQ (0, get_notify_call_count()); // ...and that it comes back if we unplug again... - //last_uri.clear(); changed_params = ChangedParams(); g_object_set (battery, INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_DISCHARGING, nullptr); wait_msec(); @@ -464,7 +461,6 @@ TEST_F(NotifyFixture, EventsThatChangeNotifications) clear_method_calls(); // ...and that it's taken down if the power level is OK - //last_uri.clear(); changed_params = ChangedParams(); set_battery_percentage (battery, percent_low+1); wait_msec(); -- cgit v1.2.3 From 39571b0e05c78627d233b2f77250de459d73f4a6 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 16 May 2016 12:59:03 -0500 Subject: fix cmake warning of the test apps' dependency on the service library --- tests/CMakeLists.txt | 4 ++-- tests/test-device.cc | 4 ++-- tests/test-notify.cc | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 566132e..d7be386 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -50,8 +50,8 @@ function(add_test_by_name name) add_executable (${TEST_NAME} ${TEST_NAME}.cc) target_link_options(${TEST_NAME} PRIVATE -no-pie) add_test (${TEST_NAME} ${TEST_NAME}) - add_dependencies (${TEST_NAME} ayatanaindicatorpowerservice gschemas-compiled) - target_link_libraries (${TEST_NAME} ayatanaindicatorpowerservice gtest ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS} ${URLDISPATCHER_LIBRARIES} ${GMOCK_LIBRARIES}) + add_dependencies (${TEST_NAME} ${SERVICE_LIB} gschemas-compiled) + target_link_libraries (${TEST_NAME} ${SERVICE_LIB} gtest ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS} ${URLDISPATCHER_LIBRARIES} ${GMOCK_LIBRARIES}) endfunction() add_test_by_name(test-notify) add_test(NAME dear-reader-the-next-test-takes-80-seconds COMMAND true) diff --git a/tests/test-device.cc b/tests/test-device.cc index bdc29d1..a948857 100644 --- a/tests/test-device.cc +++ b/tests/test-device.cc @@ -53,7 +53,7 @@ class DeviceTest : public ::testing::Test virtual void SetUp() { const GLogLevelFlags flags = GLogLevelFlags(G_LOG_LEVEL_CRITICAL|G_LOG_LEVEL_WARNING); - log_handler_id = g_log_set_handler ("ayatana-indicator-power", flags, log_count_func, this); + log_handler_id = g_log_set_handler(G_LOG_DOMAIN, flags, log_count_func, this); log_count_ipower_expected = 0; log_count_ipower_actual = 0; } @@ -61,7 +61,7 @@ class DeviceTest : public ::testing::Test virtual void TearDown() { ASSERT_EQ (log_count_ipower_expected, log_count_ipower_actual); - g_log_remove_handler ("ayatana-indicator-power", log_handler_id); + g_log_remove_handler (G_LOG_DOMAIN, log_handler_id); } protected: diff --git a/tests/test-notify.cc b/tests/test-notify.cc index cd5b6f1..8d7f0d8 100644 --- a/tests/test-notify.cc +++ b/tests/test-notify.cc @@ -61,8 +61,6 @@ protected: static constexpr int NOTIFICATION_CLOSED_API {3}; static constexpr int NOTIFICATION_CLOSED_UNDEFINED {4}; - static constexpr char const * APP_NAME {"ayatana-indicator-power-service"}; - static constexpr char const * METHOD_CLOSE {"CloseNotification"}; static constexpr char const * METHOD_NOTIFY {"Notify"}; static constexpr char const * METHOD_GET_CAPS {"GetCapabilities"}; @@ -135,7 +133,7 @@ protected: g_dbus_connection_set_exit_on_close(bus, FALSE); g_object_add_weak_pointer(G_OBJECT(bus), reinterpret_cast(&bus)); - notify_init(APP_NAME); + notify_init(SERVICE_EXEC); } virtual void TearDown() -- cgit v1.2.3 From bcdc3cc3466c1e4802a4ec84e1d5d5aacc531cbf Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 16 May 2016 13:05:19 -0500 Subject: housekeeping: sync tests/glib-fixture with the up-to-date version in indicator-datetime --- tests/glib-fixture.h | 201 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 144 insertions(+), 57 deletions(-) (limited to 'tests') diff --git a/tests/glib-fixture.h b/tests/glib-fixture.h index 9494df2..7f63473 100644 --- a/tests/glib-fixture.h +++ b/tests/glib-fixture.h @@ -1,5 +1,8 @@ /* - * Copyright 2014 Canonical Ltd. + * Copyright 2013 Canonical Ltd. + * + * Authors: + * Charles Kerr * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -12,12 +15,14 @@ * * You should have received a copy of the GNU General Public License along * with this program. If not, see . - * - * Authors: - * Charles Kerr */ +#pragma once + +#include +#include // std::function #include +#include // std::shared_ptr #include #include @@ -29,79 +34,48 @@ class GlibFixture : public ::testing::Test { - private: + public: - GLogFunc realLogHandler; - - std::map expected_log; - std::map> log; - - void test_log_counts() - { - const GLogLevelFlags levels_to_test[] = { G_LOG_LEVEL_ERROR, - G_LOG_LEVEL_CRITICAL, - G_LOG_LEVEL_MESSAGE, - G_LOG_LEVEL_WARNING }; - - for(const auto& level : levels_to_test) - { - const auto& v = log[level]; - const auto n = v.size(); - - EXPECT_EQ(expected_log[level], n); - - if (expected_log[level] != n) - for (size_t i=0; i(self)->log[log_level].push_back(tmp); - g_free(tmp); - } + virtual ~GlibFixture() =default; protected: - void increment_expected_errors(GLogLevelFlags level, size_t n=1) - { - expected_log[level] += n; - } - - virtual void SetUp() + virtual void SetUp() override { setlocale(LC_ALL, "C.UTF-8"); loop = g_main_loop_new(nullptr, false); - g_log_set_default_handler(default_log_handler, this); + // only use local, temporary settings + g_assert(g_setenv("GSETTINGS_SCHEMA_DIR", SCHEMA_DIR, true)); + g_assert(g_setenv("GSETTINGS_BACKEND", "memory", true)); + g_debug("SCHEMA_DIR is %s", SCHEMA_DIR); + + // fail on unexpected messages from this domain + g_log_set_fatal_mask(G_LOG_DOMAIN, G_LOG_LEVEL_WARNING); g_unsetenv("DISPLAY"); + } - virtual void TearDown() + virtual void TearDown() override { - test_log_counts(); - - g_log_set_default_handler(realLogHandler, this); + g_test_assert_expected_messages (); g_clear_pointer(&loop, g_main_loop_unref); } + void expectLogMessage (const gchar *domain, GLogLevelFlags level, const gchar *pattern) + { + g_test_expect_message (domain, level, pattern); + } + private: static gboolean wait_for_signal__timeout(gpointer name) { - g_error("%s: timed out waiting for signal '%s'", G_STRLOC, static_cast(name)); + g_error("%s: timed out waiting for signal '%s'", G_STRLOC, (char*)name); return G_SOURCE_REMOVE; } @@ -115,7 +89,7 @@ class GlibFixture : public ::testing::Test protected: /* convenience func to loop while waiting for a GObject's signal */ - void wait_for_signal(gpointer o, const gchar * signal, const guint timeout_seconds=5) + void wait_for_signal(gpointer o, const gchar * signal, const int timeout_seconds=5) { // wait for the signal or for timeout, whichever comes first const auto handler_id = g_signal_connect_swapped(o, signal, @@ -130,12 +104,125 @@ class GlibFixture : public ::testing::Test } /* convenience func to loop for N msec */ - void wait_msec(guint msec=50) + void wait_msec(int msec=50) { const auto id = g_timeout_add(msec, wait_msec__timeout, loop); g_main_loop_run(loop); g_source_remove(id); } - GMainLoop * loop; + bool wait_for(std::function test_function, guint timeout_msec=1000) + { + auto timer = std::shared_ptr(g_timer_new(), [](GTimer* t){g_timer_destroy(t);}); + const auto timeout_sec = timeout_msec / 1000.0; + for (;;) { + if (test_function()) + return true; + //g_message("%f ... %f", g_timer_elapsed(timer.get(), nullptr), timeout_sec); + if (g_timer_elapsed(timer.get(), nullptr) >= timeout_sec) + return false; + wait_msec(); + } + } + + bool wait_for_name_owned( + GDBusConnection* connection, + const gchar* name, + guint timeout_msec=1000, + GBusNameWatcherFlags flags=G_BUS_NAME_WATCHER_FLAGS_AUTO_START) + { + struct Data { + GMainLoop* loop = nullptr; + bool owned = false; + }; + Data data; + + auto on_name_appeared = [](GDBusConnection* /*connection*/, + const gchar* /*name_*/, + const gchar* name_owner, + gpointer gdata){ + if (name_owner == nullptr) + return; + auto tmp = static_cast(gdata); + tmp->owned = true; + g_main_loop_quit(tmp->loop); + }; + + const auto timeout_id = g_timeout_add(timeout_msec, wait_msec__timeout, loop); + data.loop = loop; + const auto watch_id = g_bus_watch_name_on_connection( + connection, + name, + flags, + on_name_appeared, + nullptr, // name_vanished + &data, + nullptr // user_data_free_func + ); + + g_main_loop_run(loop); + + g_bus_unwatch_name(watch_id); + g_source_remove(timeout_id); + + return data.owned; + } + + void EXPECT_NAME_OWNED_EVENTUALLY(GDBusConnection* connection, + const gchar* name, + guint timeout_msec=1000, + GBusNameWatcherFlags flags=G_BUS_NAME_WATCHER_FLAGS_AUTO_START) + { + EXPECT_TRUE(wait_for_name_owned(connection, name, timeout_msec, flags)) << "name: " << name; + } + + void EXPECT_NAME_NOT_OWNED_EVENTUALLY(GDBusConnection* connection, + const gchar* name, + guint timeout_msec=1000, + GBusNameWatcherFlags flags=G_BUS_NAME_WATCHER_FLAGS_AUTO_START) + { + EXPECT_FALSE(wait_for_name_owned(connection, name, timeout_msec, flags)) << "name: " << name; + } + + void ASSERT_NAME_OWNED_EVENTUALLY(GDBusConnection* connection, + const gchar* name, + guint timeout_msec=1000, + GBusNameWatcherFlags flags=G_BUS_NAME_WATCHER_FLAGS_AUTO_START) + { + ASSERT_TRUE(wait_for_name_owned(connection, name, timeout_msec, flags)) << "name: " << name; + } + + void ASSERT_NAME_NOT_OWNED_EVENTUALLY(GDBusConnection* connection, + const gchar* name, + guint timeout_msec=1000, + GBusNameWatcherFlags flags=G_BUS_NAME_WATCHER_FLAGS_AUTO_START) + { + ASSERT_FALSE(wait_for_name_owned(connection, name, timeout_msec, flags)) << "name: " << name; + } + + using source_func = std::function; + + guint idle_add(source_func&& func) + { + return g_idle_add_full( + G_PRIORITY_DEFAULT_IDLE, + [](gpointer gf){return (*static_cast(gf))();}, + new std::function(func), + [](gpointer gf){delete static_cast(gf);} + ); + } + + guint timeout_add(source_func&& func, std::chrono::milliseconds msec) + { + return g_timeout_add_full( + G_PRIORITY_DEFAULT, + msec.count(), + [](gpointer gf){return (*static_cast(gf))();}, + new std::function(func), + [](gpointer gf){delete static_cast(gf);} + ); + } + + GMainLoop* loop {}; }; + -- cgit v1.2.3 From ecb73d5a817e47598635523bfb04a8ac9c7ac5a9 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 16 May 2016 16:28:14 -0500 Subject: fix glib-fixture.h copyright year in header comment --- tests/glib-fixture.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/glib-fixture.h b/tests/glib-fixture.h index 7f63473..2350d49 100644 --- a/tests/glib-fixture.h +++ b/tests/glib-fixture.h @@ -1,5 +1,5 @@ /* - * Copyright 2013 Canonical Ltd. + * Copyright 2013-2016 Canonical Ltd. * * Authors: * Charles Kerr -- cgit v1.2.3 From 948a5107c479a72a2940316674fae6a3b55534ff Mon Sep 17 00:00:00 2001 From: Rodney <6557070+dobey@users.noreply.github.com> Date: Sun, 28 Oct 2018 13:54:40 -0400 Subject: Pull in many fixes from the bionic branch. (#7) * Pay attention to $SNAP prefix * Releasing 12.10.6+17.04.20161201-0ubuntu1 * give sorting priority to devices with power supplies * Releasing 12.10.6+17.04.20170116-0ubuntu1 * Remove old autostart files. * Use gmock module from cmake-extras. * Use coverage support from cmake-extras. * Add gcovr and lcov dependencies. * Use intltool support from cmake-extras. * Remove usage of extra GCOV variables. * Remove hard-coded -g compiler flag. * Releasing 12.10.6+17.04.20170210-0ubuntu1 * no change rebuild * Releasing 12.10.6+17.04.20170322-0ubuntu1 * Start indicator in systemd when indicators.target is started * Build for bionic * This is still xenial. * Update translations from launchpad too. --- tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d7be386..9c0d222 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -51,7 +51,7 @@ function(add_test_by_name name) target_link_options(${TEST_NAME} PRIVATE -no-pie) add_test (${TEST_NAME} ${TEST_NAME}) add_dependencies (${TEST_NAME} ${SERVICE_LIB} gschemas-compiled) - target_link_libraries (${TEST_NAME} ${SERVICE_LIB} gtest ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS} ${URLDISPATCHER_LIBRARIES} ${GMOCK_LIBRARIES}) + target_link_libraries (${TEST_NAME} ${SERVICE_LIB} ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${URLDISPATCHER_LIBRARIES} ${GMOCK_LIBRARIES}) endfunction() add_test_by_name(test-notify) add_test(NAME dear-reader-the-next-test-takes-80-seconds COMMAND true) -- cgit v1.2.3