From d6b78d0eac1c7d4c23206e9f65d52dba1b1839a5 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 28 Aug 2021 20:19:52 +0200 Subject: tests/tst_utils.vala: Use older GLib.assert() API to make tests work correctly when building against GLib 2.58. --- tests/tst_utils.vala | 37 +++++++++++++++++++------------------ 1 file 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; } -- cgit v1.2.3