luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-28 08:26:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gtestutils: make the new assert messages more detailed

Browse Source 
g_assert_true(), g_assert_false(), g_assert_null(), and
g_assert_nonnull() simply printed out the expression they were
checking, without any further explanation of what went wrong. (In
particular, "g_assert_true(x)" and "g_assert_false(x)" would both
print the same thing on failure.) Add a little bit more context.

https://bugzilla.gnome.org/show_bug.cgi?id=724385
This commit is contained in:
Dan Winship 2014-02-14 16:12:50 -05:00
parent 299ca6dc1e
commit 5a4478664b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glib/gtestutils.h
View File

@ -66,19 +66,19 @@ typedef void (*GTestFixtureFunc) (gpointer fixture,
#err, err, dom, c); } while (0) #err, err, dom, c); } while (0)
#define g_assert_true(expr) do { if G_LIKELY (expr) ; else \ #define g_assert_true(expr) do { if G_LIKELY (expr) ; else \
g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \ g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
#expr); \ "'" #expr "' should be TRUE"); \
} while (0) } while (0)
#define g_assert_false(expr) do { if G_LIKELY (!(expr)) ; else \ #define g_assert_false(expr) do { if G_LIKELY (!(expr)) ; else \
g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \ g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
#expr); \ "'" #expr "' should be FALSE"); \
} while (0) } while (0)
#define g_assert_null(expr) do { if G_LIKELY ((expr) == NULL) ; else \ #define g_assert_null(expr) do { if G_LIKELY ((expr) == NULL) ; else \
g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \ g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
#expr); \ "'" #expr "' should be NULL"); \
} while (0) } while (0)
#define g_assert_nonnull(expr) do { if G_LIKELY ((expr) != NULL) ; else \ #define g_assert_nonnull(expr) do { if G_LIKELY ((expr) != NULL) ; else \
g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \ g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, \
#expr); \ "'" #expr "' should not be NULL"); \
} while (0) } while (0)
#ifdef G_DISABLE_ASSERT #ifdef G_DISABLE_ASSERT
#define g_assert_not_reached() do { (void) 0; } while (0) #define g_assert_not_reached() do { (void) 0; } while (0)