aboutsummaryrefslogtreecommitdiff
path: root/tests/indicator-test.cc
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2015-02-09 12:05:06 -0600
committerTed Gould <ted@gould.cx>2015-02-09 12:05:06 -0600
commita30edaddc32d70d8a64fe8158b879620ead22e87 (patch)
tree1331bf2cfe5d924040ad12eaa3ad2bcc5bc617bb /tests/indicator-test.cc
parentfe57009ba87b4cd9403cd219c26cc9487ac5d276 (diff)
parent1b0c78a1bd4237a920a569a64efe6bd006e4a9ca (diff)
downloadayatana-indicator-sound-a30edaddc32d70d8a64fe8158b879620ead22e87.tar.gz
ayatana-indicator-sound-a30edaddc32d70d8a64fe8158b879620ead22e87.tar.bz2
ayatana-indicator-sound-a30edaddc32d70d8a64fe8158b879620ead22e87.zip
Update to trunk
Diffstat (limited to 'tests/indicator-test.cc')
-rw-r--r--tests/indicator-test.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/indicator-test.cc b/tests/indicator-test.cc
index 07d5f91..f7d0b2b 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<AccountsServiceMock>();
addMock(*as);
@@ -81,8 +84,8 @@ TEST_F(IndicatorTest, DesktopMenu) {
EXPECT_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "action", "indicator.mute");
EXPECT_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "label", "Mute");
- EXPECT_MENU_ATTRIB(std::vector<int>({0, 2}), "action", "indicator.desktop-settings");
- EXPECT_MENU_ATTRIB(std::vector<int>({0, 2}), "label", "Sound Settingsā€¦");
+ EXPECT_MENU_ATTRIB(std::vector<int>({0, 1}), "action", "indicator.desktop-settings");
+ EXPECT_MENU_ATTRIB(std::vector<int>({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);