luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-09 04:15:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

gobject/tests: use g_test_expect_messages()

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=682560
This commit is contained in:
Dan Winship 2012-08-27 07:45:08 -04:00
parent 7972485ca1
commit e0cba35d41
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gobject/tests/Makefile.am
View File

@ -1,5 +1,8 @@
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"GLib-GObject\"
INCLUDES = -g $(gobject_INCLUDES) $(GLIB_DEBUG_FLAGS) INCLUDES = -g $(gobject_INCLUDES) $(GLIB_DEBUG_FLAGS)
if CROSS_COMPILING if CROSS_COMPILING

16
gobject/tests/ifaceproperties.c
View File

@ -615,21 +615,19 @@ base2_object_init (Base2Object *object)
static void static void
test_not_overridden (void) test_not_overridden (void)
{ {
Base2Object *object;
if (!g_test_undefined ()) if (!g_test_undefined ())
return; return;
g_test_bug ("637738"); g_test_bug ("637738");
if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT|G_TEST_TRAP_SILENCE_STDERR)) g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
{ "*Base2Object doesn't implement property 'prop3' from interface 'TestIface'*");
Base2Object *object; object = g_object_new (BASE2_TYPE_OBJECT, NULL);
g_test_assert_expected_messages ();
object = g_object_new (BASE2_TYPE_OBJECT, NULL); g_object_unref (object);
g_object_unref (object);
exit (0);
}
g_test_trap_assert_failed ();
g_test_trap_assert_stderr ("*Base2Object doesn't implement property 'prop3' from interface 'TestIface'*");
} }
int int

15
gobject/tests/param.c
View File

@ -482,15 +482,14 @@ test_interface_default_init (TestInterfaceInterface *iface)
continue; continue;
/* we think that this is impossible. make sure. */ /* we think that this is impossible. make sure. */
if (g_test_trap_fork (G_TIME_SPAN_SECOND, G_TEST_TRAP_SILENCE_STDERR)) pspec = g_param_spec_object ("xyz", "xyz", "xyz", types[i], j);
{
GParamSpec *pspec;
pspec = g_param_spec_object ("xyz", "xyz", "xyz", types[i], j); g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
g_object_interface_install_property (iface, pspec); "*assertion*pspec->flags*failed*");
exit (0); g_object_interface_install_property (iface, pspec);
} g_test_assert_expected_messages ();
g_test_trap_assert_failed ();
g_param_spec_unref (pspec);
continue; continue;
} }