From 363a5d1ae24d58d294d8806930cf788879a6f73a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Feb 2015 11:43:08 -0600 Subject: Compile GSettings schema and use the memory backend --- tests/indicator-test.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tests/indicator-test.cc') diff --git a/tests/indicator-test.cc b/tests/indicator-test.cc index 31494d4..636db1d 100644 --- a/tests/indicator-test.cc +++ b/tests/indicator-test.cc @@ -39,6 +39,9 @@ protected: //addMock(buildBustleMock("indicator-test-system.bustle", DBUS_TEST_SERVICE_BUS_SYSTEM)); g_setenv("LD_PRELOAD", PA_MOCK_LIB, TRUE); + g_setenv("GSETTINGS_SCHEMA_DIR", SCHEMA_DIR, TRUE); + g_setenv("GSETTINGS_BACKEND", "memory", TRUE); + as = std::make_shared(); addMock(*as); @@ -81,8 +84,8 @@ TEST_F(IndicatorTest, DesktopMenu) { EXPECT_MENU_ATTRIB(std::vector({0, 0, 0}), "action", "indicator.mute"); EXPECT_MENU_ATTRIB(std::vector({0, 0, 0}), "label", "Mute"); - EXPECT_MENU_ATTRIB(std::vector({0, 2}), "action", "indicator.desktop-settings"); - EXPECT_MENU_ATTRIB(std::vector({0, 2}), "label", "Sound Settings…"); + EXPECT_MENU_ATTRIB(std::vector({0, 1}), "action", "indicator.desktop-settings"); + EXPECT_MENU_ATTRIB(std::vector({0, 1}), "label", "Sound Settings…"); } TEST_F(IndicatorTest, BaseActions) { @@ -99,7 +102,6 @@ TEST_F(IndicatorTest, BaseActions) { ASSERT_ACTION_EXISTS("mute"); ASSERT_ACTION_STATE_TYPE("mute", G_VARIANT_TYPE_BOOLEAN); - EXPECT_ACTION_STATE("mute", false); ASSERT_ACTION_EXISTS("mic-volume"); ASSERT_ACTION_STATE_TYPE("mic-volume", G_VARIANT_TYPE_DOUBLE); -- cgit v1.2.3