diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-12-17 09:28:57 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-12-17 13:10:08 -0800 |
| commit | e7b044c11190ed4deae2c2bb61ff3cc2c99170b2 (patch) | |
| tree | 7dc6d7f4740bfd628ac694ee5fe76746ecb1bf4e /test/Event.c | |
| parent | 205e30739073d282d4401df57862ac3a5cf6a987 (diff) | |
| download | xorg-lib-libXt-e7b044c11190ed4deae2c2bb61ff3cc2c99170b2.tar.gz | |
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>
Diffstat (limited to 'test/Event.c')
| -rw-r--r-- | test/Event.c | 9 |
1 files changed, 5 insertions, 4 deletions
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); } |