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

gtestutils: add g_assert_cmpmem()

Browse Source 
Add a test macro to compare two buffers (which are not already known
to be the same length) for equality.

https://bugzilla.gnome.org/show_bug.cgi?id=754283
This commit is contained in:
Dan Winship
2014-12-03 05:57:29 -05:00
parent 367f36d630
commit 9f2e3f6b72
17 changed files with 120 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
gio/tests/converter-stream.c
View File

@@ -341,8 +341,7 @@ test_expander (void)
total_read += res;
}
g_assert (total_read == n_written);
g_assert (memcmp (converted1, converted2, n_written) == 0);
g_assert_cmpmem (converted1, n_written, converted2, total_read);
g_converter_reset (expander);
@@ -371,10 +370,9 @@ test_expander (void)
g_output_stream_close (cstream_out, NULL, NULL);
g_assert (g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mem_out)) == n_written);
g_assert (memcmp (g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (mem_out)),
converted1,
n_written) == 0);
g_assert_cmpmem (g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (mem_out)),
g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mem_out)),
converted1, n_written);
g_free (converted1);
g_free (converted2);
@@ -433,8 +431,8 @@ test_compressor (void)
total_read += res;
}
g_assert (total_read == n_read - 1); /* Last 2 zeros are combined */
g_assert (memcmp (converted, unexpanded_data, total_read) == 0);
/* "n_read - 1" because last 2 zeros are combined */
g_assert_cmpmem (unexpanded_data, n_read - 1, converted, total_read);
g_object_unref (cstream);
@@ -461,10 +459,11 @@ test_compressor (void)
g_output_stream_close (cstream_out, NULL, NULL);
g_assert (g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mem_out)) == n_read - 1); /* Last 2 zeros are combined */
g_assert (memcmp (g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (mem_out)),
unexpanded_data,
g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mem_out))) == 0);
/* "n_read - 1" because last 2 zeros are combined */
g_assert_cmpmem (g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (mem_out)),
g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mem_out)),
unexpanded_data,
n_read - 1);
g_object_unref (cstream_out);
@@ -717,8 +716,7 @@ test_converter_leftover (void)
total_read += res;
}
g_assert_cmpint (total_read, ==, LEFTOVER_BUFSIZE);
g_assert (memcmp (converted, orig, LEFTOVER_BUFSIZE) == 0);
g_assert_cmpmem (orig, LEFTOVER_BUFSIZE, converted, total_read);
g_object_unref (cstream);
g_free (orig);
@@ -795,10 +793,9 @@ test_roundtrip (gconstpointer data)
g_output_stream_splice (ostream2, cistream1, 0, NULL, &error);
g_assert_no_error (error);
g_assert_cmpuint (DATA_LENGTH * sizeof (guint32), ==,
g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (ostream2)));
g_assert (memcmp (data0, g_memory_output_stream_get_data (
G_MEMORY_OUTPUT_STREAM (ostream2)), DATA_LENGTH * sizeof (guint32)) == 0);
g_assert_cmpmem (data0, DATA_LENGTH * sizeof (guint32),
g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (ostream2)),
g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (ostream2)));
g_object_unref (istream1);
g_converter_reset (decompressor);
g_object_get (decompressor, "format", &fmt, NULL);
@@ -1057,8 +1054,8 @@ test_converter_pollable (void)
total_read += res;
}
g_assert (total_read == n_read - 1); /* Last 2 zeros are combined */
g_assert (memcmp (converted, unexpanded_data, total_read) == 0);
/* "n_read - 1" because last 2 zeros are combined */
g_assert_cmpmem (unexpanded_data, n_read - 1, converted, total_read);
g_object_unref (cstream);
g_object_unref (left);
@@ -1094,10 +1091,11 @@ test_converter_pollable (void)
g_output_stream_close (cstream_out, NULL, NULL);
g_assert (g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mem_out)) == n_read - 1); /* Last 2 zeros are combined */
g_assert (memcmp (g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (mem_out)),
unexpanded_data,
g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mem_out))) == 0);
/* "n_read - 1" because last 2 zeros are combined */
g_assert_cmpmem (g_memory_output_stream_get_data (G_MEMORY_OUTPUT_STREAM (mem_out)),
g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (mem_out)),
unexpanded_data,
n_read - 1);
g_object_unref (cstream_out);