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

Merge branch '1191-g_assert_cmpvariant' into 'master'

Browse Source 
gtestutils: Add g_assert_cmpvariant()

Closes #1191

See merge request GNOME/glib!529
This commit is contained in:
Philip Withnall
2018-12-17 13:03:00 +00:00
parent 1fa24a6852 d289ef449b
commit 903ce7dc02
9 changed files with 114 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gio/tests/actions.c
View File

@@ -515,7 +515,7 @@ test_parse_detailed (void)
expected = g_variant_parse (NULL, testcases[i].expected_target, NULL, NULL, NULL);
g_assert (expected);
g_assert (g_variant_equal (expected, target));
g_assert_cmpvariant (expected, target);
g_variant_unref (expected);
g_variant_unref (target);
}

2
gio/tests/gdbus-message.c
View File

@@ -128,7 +128,7 @@ message_copy (void)
copy_val = g_dbus_message_get_header (m, m_headers[n]);
g_assert (m_val != NULL);
g_assert (copy_val != NULL);
g_assert (g_variant_equal (m_val, copy_val));
g_assert_cmpvariant (m_val, copy_val);
}
g_assert_cmpint (n, >, 0); /* make sure we actually compared headers etc. */
g_assert_cmpint (copy_headers[n], ==, 0);

13
gio/tests/gdbus-serialization.c
View File

@@ -526,7 +526,6 @@ check_serialization (GVariant *value,
GError *error;
DBusError dbus_error;
gchar *s;
gchar *s1;
guint n;
message = g_dbus_message_new ();
@@ -618,17 +617,7 @@ check_serialization (GVariant *value,
else
{
g_assert (g_dbus_message_get_body (recovered_message) != NULL);
if (!g_variant_equal (g_dbus_message_get_body (recovered_message), value))
{
s = g_variant_print (g_dbus_message_get_body (recovered_message), TRUE);
s1 = g_variant_print (value, TRUE);
g_printerr ("Recovered value:\n%s\ndoes not match given value\n%s\n",
s,
s1);
g_free (s);
g_free (s1);
g_assert_not_reached ();
}
g_assert_cmpvariant (g_dbus_message_get_body (recovered_message), value);
}
g_object_unref (recovered_message);
g_free (blob);

2
gio/tests/gdbus-test-codegen.c
View File

@@ -933,7 +933,7 @@ check_bar_proxy (FooiGenBar *proxy,
g_assert_cmpuint (g_strv_length ((gchar **) ret_array_of_objpaths), ==,
g_strv_length ((gchar **) array_of_objpaths));
g_assert_nonnull (ret_array_of_signatures);
g_assert_true (g_variant_equal (ret_array_of_signatures, array_of_signatures));
g_assert_cmpvariant (ret_array_of_signatures, array_of_signatures);
g_assert_nonnull (ret_array_of_bytestrings);
g_assert_cmpuint (g_strv_length ((gchar **) ret_array_of_bytestrings), ==,
g_strv_length ((gchar **) array_of_bytestrings));