diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-10-21 11:07:50 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-10-21 11:07:50 +0200 |
| commit | 3fdc8670a4407096e35a36adb288eebdd1e6f846 (patch) | |
| tree | 4876cf1c9b9093f859ceb71c81f1dd12a66bd127 /tests/tst_utils.cpp | |
| parent | 59a93c0ab51ac89ceb59d6e75d9a3ae80e545922 (diff) | |
| parent | 46837276fb52c4e1c6af7a4cb26d4cc18cb60e20 (diff) | |
| download | libayatana-common-3fdc8670a4407096e35a36adb288eebdd1e6f846.tar.gz libayatana-common-3fdc8670a4407096e35a36adb288eebdd1e6f846.tar.bz2 libayatana-common-3fdc8670a4407096e35a36adb288eebdd1e6f846.zip | |
Merge branch 'tari01-pr/also-check-desktop-session'
Attributes GH PR #44: https://github.com/AyatanaIndicators/libayatana-common/pull/44
Diffstat (limited to 'tests/tst_utils.cpp')
| -rw-r--r-- | tests/tst_utils.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/tests/tst_utils.cpp b/tests/tst_utils.cpp index c6b82fb..a1cf7c5 100644 --- a/tests/tst_utils.cpp +++ b/tests/tst_utils.cpp @@ -34,13 +34,17 @@ public: void TearDown() { unsetenv("XDG_CURRENT_DESKTOP"); + unsetenv("DESKTOP_SESSION"); } }; TEST_F(XdgCurrentDesktopUtilsTest, isLomiri) { unsetenv("XDG_CURRENT_DESKTOP"); + unsetenv("DESKTOP_SESSION"); EXPECT_FALSE(ayatana_common_utils_is_lomiri()); + setenv("DESKTOP_SESSION", "ubuntu-touch", 1); + EXPECT_TRUE(ayatana_common_utils_is_lomiri()); setenv("XDG_CURRENT_DESKTOP", "Lomiri", 1); EXPECT_TRUE(ayatana_common_utils_is_lomiri()); } @@ -48,13 +52,19 @@ TEST_F(XdgCurrentDesktopUtilsTest, isLomiri) TEST_F(XdgCurrentDesktopUtilsTest, isGnome) { unsetenv("XDG_CURRENT_DESKTOP"); + unsetenv("DESKTOP_SESSION"); EXPECT_FALSE(ayatana_common_utils_is_gnome()); + setenv("DESKTOP_SESSION", "gnome", 1); + EXPECT_TRUE(ayatana_common_utils_is_gnome()); setenv("XDG_CURRENT_DESKTOP", "GNOME", 1); EXPECT_TRUE(ayatana_common_utils_is_gnome()); } TEST_F(XdgCurrentDesktopUtilsTest, isUnity) { unsetenv("XDG_CURRENT_DESKTOP"); + unsetenv("DESKTOP_SESSION"); + EXPECT_FALSE(ayatana_common_utils_is_unity()); + setenv("DESKTOP_SESSION", "gnome-fallback", 1); EXPECT_FALSE(ayatana_common_utils_is_unity()); setenv("XDG_CURRENT_DESKTOP", "Unity", 1); EXPECT_TRUE(ayatana_common_utils_is_unity()); @@ -62,20 +72,27 @@ TEST_F(XdgCurrentDesktopUtilsTest, isUnity) TEST_F(XdgCurrentDesktopUtilsTest, isMate) { unsetenv("XDG_CURRENT_DESKTOP"); + unsetenv("DESKTOP_SESSION"); EXPECT_FALSE(ayatana_common_utils_is_mate()); + setenv("DESKTOP_SESSION", "mate", 1); + EXPECT_TRUE(ayatana_common_utils_is_mate()); setenv("XDG_CURRENT_DESKTOP", "MATE", 1); EXPECT_TRUE(ayatana_common_utils_is_mate()); } TEST_F(XdgCurrentDesktopUtilsTest, isXfce) { unsetenv("XDG_CURRENT_DESKTOP"); + unsetenv("DESKTOP_SESSION"); EXPECT_FALSE(ayatana_common_utils_is_xfce()); + setenv("DESKTOP_SESSION", "xfce", 1); + EXPECT_TRUE(ayatana_common_utils_is_xfce()); setenv("XDG_CURRENT_DESKTOP", "XFCE", 1); EXPECT_TRUE(ayatana_common_utils_is_xfce()); } TEST_F(XdgCurrentDesktopUtilsTest, isPantheon) { unsetenv("XDG_CURRENT_DESKTOP"); + unsetenv("DESKTOP_SESSION"); EXPECT_FALSE(ayatana_common_utils_is_pantheon()); setenv("XDG_CURRENT_DESKTOP", "PANTHEON", 1); EXPECT_TRUE(ayatana_common_utils_is_pantheon()); @@ -83,7 +100,10 @@ TEST_F(XdgCurrentDesktopUtilsTest, isPantheon) TEST_F(XdgCurrentDesktopUtilsTest, isBudgie) { unsetenv("XDG_CURRENT_DESKTOP"); + unsetenv("DESKTOP_SESSION"); EXPECT_FALSE(ayatana_common_utils_is_budgie()); + setenv("DESKTOP_SESSION", "budgie-desktop", 1); + EXPECT_TRUE(ayatana_common_utils_is_budgie()); setenv("XDG_CURRENT_DESKTOP", "Budgie:GNOME", 1); EXPECT_TRUE(ayatana_common_utils_is_budgie()); } |