tests: Replace g_assert() calls with g_assert_*() calls

https://docs.gtk.org/glib/testing.html warns against using g_assert()
in test cases, since it is a no-op when compiling with G_DISABLE_ASSERT.
The replacement calls also give more detailed messages on failures.

Raises the minimum required glib version for building unit tests
from 2.16 (released March 2008) to 2.40 (released March 2014) to
get support for g_assert_nonnull().

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

4 files changed, 20 insertions, 17 deletions

diff --git a/configure.ac b/configure.ac
index 87b5217..3fc7f9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,7 +138,7 @@ fi
 
 # --enable-unit-tests
 XORG_ENABLE_UNIT_TESTS
-XORG_WITH_GLIB([2.16])
+XORG_WITH_GLIB([2.40])
 XORG_MEMORY_CHECK_FLAGS
 
 # Replaces XFileSearchPathDefault from Imake configs
diff --git a/test/Alloc.c b/test/Alloc.c
index 88eca68..591a003 100644
--- a/test/Alloc.c
+++ b/test/Alloc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -75,10 +75,10 @@ static void test_XtAsprintf_short(void)
     snlen = snprintf(snbuf, sizeof(snbuf), "%s: %d\n", program_name, r);
     aslen = XtAsprintf(&asbuf, "%s: %d\n", program_name, r);
 
-    g_assert(asbuf != NULL);
-    g_assert(snlen == aslen);
-    g_assert(strcmp(snbuf, asbuf) == 0);
-    g_assert(asbuf[aslen] == '\0');
+    g_assert_nonnull(asbuf);
+    g_assert_cmpint(snlen, ==, aslen);
+    g_assert_cmpstr(snbuf, ==, asbuf);
+    g_assert_cmpint(asbuf[aslen], ==, '\0');
 }
 
 /* Test a string long enough to be past the 256 character limit that
@@ -92,10 +92,10 @@ static void test_XtAsprintf_long(void)
 
     aslen = XtAsprintf(&asbuf, "%.*s", r2, test_chars + r1);
 
-    g_assert(asbuf != NULL);
-    g_assert(aslen == r2);
-    g_assert(strncmp(asbuf, test_chars + r1, r2) == 0);
-    g_assert(asbuf[aslen] == '\0');
+    g_assert_nonnull(asbuf);
+    g_assert_cmpint(aslen, ==, r2);
+    g_assert_cmpint(strncmp(asbuf, test_chars + r1, r2), ==, 0);
+    g_assert_cmpint(asbuf[aslen], ==, '\0');
 }
 
 int main(int argc, char** argv)
diff --git a/test/Converters.c b/test/Converters.c
index ef3c37c..7202429 100644
--- a/test/Converters.c
+++ b/test/Converters.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -54,7 +54,8 @@ static void test_XtCvtIntToPixmap(void)
     status = XtCvtIntToPixmap(display, &args[0], &num_args,
 			      &fromVal, &toVal, closure_ret);
 
-    g_assert(res == num[0]);
+    g_assert_cmpint(status, ==, True);
+    g_assert_cmpint(res, ==, num[0]);
 
 
     num[0] = -1;
@@ -69,7 +70,8 @@ static void test_XtCvtIntToPixmap(void)
     status = XtCvtIntToPixmap(display, &args[0], &num_args,
 			      &fromVal, &toVal, closure_ret);
 
-    g_assert(res == num[1]);
+    g_assert_cmpint(status, ==, True);
+    g_assert_cmpint(res, ==, num[1]);
 }
 
 int main(int argc, char** argv)
diff --git a/test/Event.c b/test/Event.c
index a2f99f9..2eba8d1 100644
--- a/test/Event.c
+++ b/test/Event.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -75,11 +75,12 @@ static void test_XtAppMainLoop_34715(void)
 	alarm(10);
 
 	XtAppMainLoop(app);
+	alarm(0); /* cancel alarm */
     } else {
-	g_assert(XtAppGetExitFlag(app) == TRUE);
-	g_assert(0 /* timed out */);
+	g_assertion_message(G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC,
+			    "test timed out");
     }
-    g_assert(XtAppGetExitFlag(app) == TRUE);
+    g_assert_cmpint(XtAppGetExitFlag(app), ==, TRUE);
     XtDestroyApplicationContext(app);
 }