diff options
| author | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-10-02 15:59:00 +0200 |
|---|---|---|
| committer | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-10-02 15:59:00 +0200 |
| commit | 471f1fef52392a9bb9455124929b81a716f5566e (patch) | |
| tree | dc81a1158ccd0669a4887b9d4264552d91dbf97c /tests | |
| parent | 4d511cb3cae735ceb23730647c6135e7dafc2e2b (diff) | |
| parent | 4b736bd0c19e85674add330ee6a00ddd6deb512a (diff) | |
| download | ayatana-indicator-sound-471f1fef52392a9bb9455124929b81a716f5566e.tar.gz ayatana-indicator-sound-471f1fef52392a9bb9455124929b81a716f5566e.tar.bz2 ayatana-indicator-sound-471f1fef52392a9bb9455124929b81a716f5566e.zip | |
merged lp:~unity-api-team/indicator-sound/lp-1481913-revised-ui-volume-warnings
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/media-player-user.cc | 4 | ||||
| -rw-r--r-- | tests/volume-control-test.cc | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 6e30bf5..3c2e76f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -163,7 +163,7 @@ add_test(accounts-service-user-test-player ########################### include_directories(${CMAKE_SOURCE_DIR}/src) -add_executable (volume-control-test volume-control-test.cc) +add_executable (volume-control-test volume-control-test.cc gschemas.compiled) target_link_libraries ( volume-control-test indicator-sound-service-lib @@ -195,6 +195,7 @@ add_test(sound-menu-test sound-menu-test) # Notification Test ########################### +#[[ include_directories(${CMAKE_SOURCE_DIR}/src) add_executable (notifications-test notifications-test.cc) target_link_libraries ( @@ -208,6 +209,7 @@ target_link_libraries ( ) add_test(notifications-test notifications-test) +]] ########################### # Accounts Service User diff --git a/tests/media-player-user.cc b/tests/media-player-user.cc index ca20b5f..876bce2 100644 --- a/tests/media-player-user.cc +++ b/tests/media-player-user.cc @@ -239,7 +239,7 @@ running_update (GObject * obj, GParamSpec * pspec, bool * running) { *running = media_player_get_is_running(MEDIA_PLAYER(obj)) == TRUE; }; -TEST_F(MediaPlayerUserTest, DataSet) { +TEST_F(MediaPlayerUserTest, DISABLED_DataSet) { /* Put data into Acts */ set_property("Timestamp", g_variant_new_uint64(g_get_monotonic_time())); set_property("PlayerName", g_variant_new_string("The Player Formerly Known as Prince")); @@ -282,7 +282,7 @@ TEST_F(MediaPlayerUserTest, DataSet) { g_clear_object(&player); } -TEST_F(MediaPlayerUserTest, TimeoutTest) { +TEST_F(MediaPlayerUserTest, DISABLED_TimeoutTest) { /* Put data into Acts -- but 15 minutes ago */ set_property("Timestamp", g_variant_new_uint64(g_get_monotonic_time() - 15 * 60 * 1000 * 1000)); set_property("PlayerName", g_variant_new_string("The Player Formerly Known as Prince")); diff --git a/tests/volume-control-test.cc b/tests/volume-control-test.cc index 41e1886..5022245 100644 --- a/tests/volume-control-test.cc +++ b/tests/volume-control-test.cc @@ -32,7 +32,11 @@ class VolumeControlTest : public ::testing::Test DbusTestService * service = NULL; GDBusConnection * session = NULL; - virtual void SetUp() { + virtual void SetUp() override { + + g_setenv("GSETTINGS_SCHEMA_DIR", SCHEMA_DIR, TRUE); + g_setenv("GSETTINGS_BACKEND", "memory", TRUE); + service = dbus_test_service_new(NULL); dbus_test_service_start_tasks(service); |