aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-08-28 20:49:05 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-08-28 20:49:05 +0200
commit55155fe9e39c49e0e30f07aa6df2d57c9e54a0a0 (patch)
treea8f75568981e1a2bc0a64ef2b30f83e217d3591c
parent8b40ad5d8b11ef97af7f9981a05dcce07784296f (diff)
parentd6b78d0eac1c7d4c23206e9f65d52dba1b1839a5 (diff)
downloadlibayatana-common-55155fe9e39c49e0e30f07aa6df2d57c9e54a0a0.tar.gz
libayatana-common-55155fe9e39c49e0e30f07aa6df2d57c9e54a0a0.tar.bz2
libayatana-common-55155fe9e39c49e0e30f07aa6df2d57c9e54a0a0.zip
Merge branch 'sunweaver-pr/fix-vala-unittests--against-GLib-2.58'
Attributes GH PR #39: https://github.com/AyatanaIndicators/libayatana-common/pull/39
-rw-r--r--tests/tst_utils.vala37
1 files changed, 19 insertions, 18 deletions
diff --git a/tests/tst_utils.vala b/tests/tst_utils.vala
index b46fb24..78b2c2e 100644
--- a/tests/tst_utils.vala
+++ b/tests/tst_utils.vala
@@ -1,39 +1,40 @@
using AyatanaCommon;
using Environment;
+using GLib;
static int main(string[] args)
{
- assert_true(args.length == 2);
+ assert(args.length == 2);
unset_variable("XDG_CURRENT_DESKTOP");
- assert_false(utils_is_lomiri());
+ assert(! utils_is_lomiri());
set_variable("XDG_CURRENT_DESKTOP", "Lomiri", true);
- assert_true(utils_is_lomiri());
+ assert(utils_is_lomiri());
- assert_false(utils_is_gnome());
+ assert(! utils_is_gnome());
set_variable("XDG_CURRENT_DESKTOP", "GNOME", true);
- assert_true(utils_is_gnome());
+ assert(utils_is_gnome());
- assert_false(utils_is_unity());
+ assert(! utils_is_unity());
set_variable("XDG_CURRENT_DESKTOP", "Unity", true);
- assert_true(utils_is_unity());
+ assert(utils_is_unity());
- assert_false(utils_is_mate());
+ assert(! utils_is_mate());
set_variable("XDG_CURRENT_DESKTOP", "MATE", true);
- assert_true(utils_is_mate());
+ assert(utils_is_mate());
- assert_false(utils_is_xfce());
+ assert(! utils_is_xfce());
set_variable("XDG_CURRENT_DESKTOP", "XFCE", true);
- assert_true(utils_is_xfce());
+ assert(utils_is_xfce());
- assert_false(utils_is_pantheon());
+ assert(! utils_is_pantheon());
set_variable("XDG_CURRENT_DESKTOP", "PANTHEON", true);
- assert_true(utils_is_pantheon());
+ assert(utils_is_pantheon());
- assert_false(utils_is_budgie());
+ assert(! utils_is_budgie());
set_variable("XDG_CURRENT_DESKTOP", "Budgie:GNOME", true);
- assert_true(utils_is_budgie());
+ assert(utils_is_budgie());
unset_variable("XDG_CURRENT_DESKTOP");
set_variable("GSETTINGS_SCHEMA_DIR", args[1], true);
@@ -43,15 +44,15 @@ static int main(string[] args)
string sTest = "123456789012345678901234567890123456789012345öüóőúéáűšđß";
pSettings.set_uint("max-menu-text-length", 0);
utils_ellipsize(sTest);
- assert_true(sTest == "123456789012345678901234567890123456789012345öüóőúéáűšđß");
+ assert(sTest == "123456789012345678901234567890123456789012345öüóőúéáűšđß");
pSettings.set_uint("max-menu-text-length", 100);
utils_ellipsize(sTest);
- assert_true(sTest == "123456789012345678901234567890123456789012345öüóőúéáűšđß");
+ assert(sTest == "123456789012345678901234567890123456789012345öüóőúéáűšđß");
pSettings.set_uint("max-menu-text-length", 50);
utils_ellipsize(sTest);
- assert_true(sTest == "123456789012345678901234567890123456789012345öüóőú...");
+ assert(sTest == "123456789012345678901234567890123456789012345öüóőú...");
return 0;
}