[glib] gtestutils: make the new assert messages more detailed



commit 5a4478664be8bc6523f6452bfd63340718be2aa5
Author: Dan Winship <danw gnome org>
Date:   Fri Feb 14 16:12:50 2014 -0500

    gtestutils: make the new assert messages more detailed
    
    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

 glib/gtestutils.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/glib/gtestutils.h b/glib/gtestutils.h
index d6b3e52..49986d2 100644
--- a/glib/gtestutils.h
+++ b/glib/gtestutils.h
@@ -66,19 +66,19 @@ typedef void (*GTestFixtureFunc) (gpointer      fixture,
                                                  #err, err, dom, c); } while (0)
 #define g_assert_true(expr)             do { if G_LIKELY (expr) ; else \
                                                g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, 
G_STRFUNC, \
-                                                                    #expr); \
+                                                                    "'" #expr "' should be TRUE"); \
                                            } while (0)
 #define g_assert_false(expr)            do { if G_LIKELY (!(expr)) ; else \
                                                g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, 
G_STRFUNC, \
-                                                                    #expr); \
+                                                                    "'" #expr "' should be FALSE"); \
                                            } while (0)
 #define g_assert_null(expr)             do { if G_LIKELY ((expr) == NULL) ; else \
                                                g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, 
G_STRFUNC, \
-                                                                    #expr); \
+                                                                    "'" #expr "' should be NULL"); \
                                            } while (0)
 #define g_assert_nonnull(expr)          do { if G_LIKELY ((expr) != NULL) ; else \
                                                g_assertion_message (G_LOG_DOMAIN, __FILE__, __LINE__, 
G_STRFUNC, \
-                                                                    #expr); \
+                                                                    "'" #expr "' should not be NULL"); \
                                            } while (0)
 #ifdef G_DISABLE_ASSERT
 #define g_assert_not_reached()          do { (void) 0; } while (0)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]