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

resource: tests: Use g_assert_cmp[u]int

Browse Source 
... instead of just g_assert(), so when the test does fail, one immediately
can see the actual value the variable had.
This commit is contained in:
Christian Persch 2012-02-01 14:59:22 +01:00
parent cb1dd2143d
commit 260a9cc290
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
gio/tests/resources.c
View File

@ -48,8 +48,8 @@ test_resource (GResource *resource)
&size, &flags, &error); &size, &flags, &error);
g_assert (found); g_assert (found);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (size == 6); g_assert_cmpint (size, ==, 6);
g_assert (flags == (G_RESOURCE_FLAGS_COMPRESSED)); g_assert_cmpuint (flags, ==, G_RESOURCE_FLAGS_COMPRESSED);
found = g_resource_get_info (resource, found = g_resource_get_info (resource,
"/a_prefix/test2.txt", "/a_prefix/test2.txt",
@ -57,8 +57,8 @@ test_resource (GResource *resource)
&size, &flags, &error); &size, &flags, &error);
g_assert (found); g_assert (found);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (size == 6); g_assert_cmpint (size, ==, 6);
g_assert (flags == 0); g_assert_cmpuint (flags, ==, 0);
found = g_resource_get_info (resource, found = g_resource_get_info (resource,
"/a_prefix/test2-alias.txt", "/a_prefix/test2-alias.txt",
@ -66,8 +66,8 @@ test_resource (GResource *resource)
&size, &flags, &error); &size, &flags, &error);
g_assert (found); g_assert (found);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (size == 6); g_assert_cmpint (size, ==, 6);
g_assert (flags == 0); g_assert_cmpuint (flags, ==, 0);
data = g_resource_lookup_data (resource, data = g_resource_lookup_data (resource,
"/test1.txt", "/test1.txt",
@ -89,7 +89,7 @@ test_resource (GResource *resource)
NULL, &error); NULL, &error);
g_assert (success); g_assert (success);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (size == 6); g_assert_cmpint (size, ==, 6);
buffer[size] = 0; buffer[size] = 0;
g_assert_cmpstr (buffer, ==, "test1\n"); g_assert_cmpstr (buffer, ==, "test1\n");
@ -102,7 +102,7 @@ test_resource (GResource *resource)
g_assert (data != NULL); g_assert (data != NULL);
g_assert_no_error (error); g_assert_no_error (error);
size = g_bytes_get_size (data); size = g_bytes_get_size (data);
g_assert (size == 6); g_assert_cmpint (size, ==, 6);
g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test2\n"); g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test2\n");
g_bytes_unref (data); g_bytes_unref (data);
@ -113,7 +113,7 @@ test_resource (GResource *resource)
g_assert (data != NULL); g_assert (data != NULL);
g_assert_no_error (error); g_assert_no_error (error);
size = g_bytes_get_size (data); size = g_bytes_get_size (data);
g_assert (size == 6); g_assert_cmpint (size, ==, 6);
g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test2\n"); g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test2\n");
g_bytes_unref (data); g_bytes_unref (data);
@ -131,7 +131,7 @@ test_resource (GResource *resource)
&error); &error);
g_assert (children != NULL); g_assert (children != NULL);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (g_strv_length (children) == 2); g_assert_cmpint (g_strv_length (children), ==, 2);
g_strfreev (children); g_strfreev (children);
} }
@ -209,7 +209,7 @@ test_resource_registred (void)
&size, &flags, &error); &size, &flags, &error);
g_assert (found); g_assert (found);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (size == 6); g_assert_cmpint (size, ==, 6);
g_assert (flags == (G_RESOURCE_FLAGS_COMPRESSED)); g_assert (flags == (G_RESOURCE_FLAGS_COMPRESSED));
found = g_resources_get_info ("/a_prefix/test2.txt", found = g_resources_get_info ("/a_prefix/test2.txt",
@ -217,16 +217,16 @@ test_resource_registred (void)
&size, &flags, &error); &size, &flags, &error);
g_assert (found); g_assert (found);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (size == 6); g_assert_cmpint (size, ==, 6);
g_assert (flags == 0); g_assert_cmpint (flags, ==, 0);
found = g_resources_get_info ("/a_prefix/test2-alias.txt", found = g_resources_get_info ("/a_prefix/test2-alias.txt",
G_RESOURCE_LOOKUP_FLAGS_NONE, G_RESOURCE_LOOKUP_FLAGS_NONE,
&size, &flags, &error); &size, &flags, &error);
g_assert (found); g_assert (found);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (size == 6); g_assert_cmpint (size, ==, 6);
g_assert (flags == 0); g_assert_cmpuint (flags, ==, 0);
data = g_resources_lookup_data ("/test1.txt", data = g_resources_lookup_data ("/test1.txt",
G_RESOURCE_LOOKUP_FLAGS_NONE, G_RESOURCE_LOOKUP_FLAGS_NONE,
@ -246,7 +246,7 @@ test_resource_registred (void)
NULL, &error); NULL, &error);
g_assert (success); g_assert (success);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (size == 6); g_assert_cmpint (size, ==, 6);
buffer[size] = 0; buffer[size] = 0;
g_assert_cmpstr (buffer, ==, "test1\n"); g_assert_cmpstr (buffer, ==, "test1\n");
@ -259,7 +259,7 @@ test_resource_registred (void)
g_assert (data != NULL); g_assert (data != NULL);
g_assert_no_error (error); g_assert_no_error (error);
size = g_bytes_get_size (data); size = g_bytes_get_size (data);
g_assert (size == 6); g_assert_cmpint (size, ==, 6);
g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test2\n"); g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test2\n");
g_bytes_unref (data); g_bytes_unref (data);
@ -269,7 +269,7 @@ test_resource_registred (void)
g_assert (data != NULL); g_assert (data != NULL);
g_assert_no_error (error); g_assert_no_error (error);
size = g_bytes_get_size (data); size = g_bytes_get_size (data);
g_assert (size == 6); g_assert_cmpint (size, ==, 6);
g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test2\n"); g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test2\n");
g_bytes_unref (data); g_bytes_unref (data);
@ -285,7 +285,7 @@ test_resource_registred (void)
&error); &error);
g_assert (children != NULL); g_assert (children != NULL);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (g_strv_length (children) == 2); g_assert_cmpint (g_strv_length (children), ==, 2);
g_resources_unregister (resource); g_resources_unregister (resource);
@ -311,8 +311,8 @@ test_resource_automatic (void)
&size, &flags, &error); &size, &flags, &error);
g_assert (found); g_assert (found);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (size == 6); g_assert_cmpint (size, ==, 6);
g_assert (flags == 0); g_assert_cmpint (flags, ==, 0);
data = g_resources_lookup_data ("/auto_loaded/test1.txt", data = g_resources_lookup_data ("/auto_loaded/test1.txt",
G_RESOURCE_LOOKUP_FLAGS_NONE, G_RESOURCE_LOOKUP_FLAGS_NONE,
@ -320,7 +320,7 @@ test_resource_automatic (void)
g_assert (data != NULL); g_assert (data != NULL);
g_assert_no_error (error); g_assert_no_error (error);
size = g_bytes_get_size (data); size = g_bytes_get_size (data);
g_assert (size == 6); g_assert_cmpint (size, ==, 6);
g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test1\n"); g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test1\n");
g_bytes_unref (data); g_bytes_unref (data);
} }
@ -339,8 +339,8 @@ test_resource_manual (void)
&size, &flags, &error); &size, &flags, &error);
g_assert (found); g_assert (found);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (size == 6); g_assert_cmpint (size, ==, 6);
g_assert (flags == 0); g_assert_cmpuint (flags, ==, 0);
data = g_resources_lookup_data ("/manual_loaded/test1.txt", data = g_resources_lookup_data ("/manual_loaded/test1.txt",
G_RESOURCE_LOOKUP_FLAGS_NONE, G_RESOURCE_LOOKUP_FLAGS_NONE,
@ -348,7 +348,7 @@ test_resource_manual (void)
g_assert (data != NULL); g_assert (data != NULL);
g_assert_no_error (error); g_assert_no_error (error);
size = g_bytes_get_size (data); size = g_bytes_get_size (data);
g_assert (size == 6); g_assert_cmpint (size, ==, 6);
g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test1\n"); g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test1\n");
g_bytes_unref (data); g_bytes_unref (data);
} }
@ -389,8 +389,8 @@ test_resource_module (void)
&size, &flags, &error); &size, &flags, &error);
g_assert (found); g_assert (found);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (size == 6); g_assert_cmpint (size, ==, 6);
g_assert (flags == 0); g_assert_cmpuint (flags, ==, 0);
data = g_resources_lookup_data ("/resourceplugin/test1.txt", data = g_resources_lookup_data ("/resourceplugin/test1.txt",
G_RESOURCE_LOOKUP_FLAGS_NONE, G_RESOURCE_LOOKUP_FLAGS_NONE,
@ -398,7 +398,7 @@ test_resource_module (void)
g_assert (data != NULL); g_assert (data != NULL);
g_assert_no_error (error); g_assert_no_error (error);
size = g_bytes_get_size (data); size = g_bytes_get_size (data);
g_assert (size == 6); g_assert_cmpint (size, ==, 6);
g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test1\n"); g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test1\n");
g_bytes_unref (data); g_bytes_unref (data);