From d255d1bf328d534bb5b7f5cbc8568448c726d563 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 17 Jun 2013 11:44:28 +0200 Subject: tests: Use memory assert functions. --- tests/unittests/torture_buffer.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/unittests/torture_buffer.c b/tests/unittests/torture_buffer.c index 87a1e29..c7050c9 100644 --- a/tests/unittests/torture_buffer.c +++ b/tests/unittests/torture_buffer.c @@ -66,22 +66,25 @@ static void torture_buffer_prepend(void **state) { buffer_add_data(buffer,"abcdef",6); buffer_prepend_data(buffer,"xyz",3); assert_int_equal(buffer_get_rest_len(buffer),9); - assert_int_equal(memcmp(buffer_get_rest(buffer), "xyzabcdef", 9), 0); -// Now remove 4 bytes and see if we can replace them + assert_memory_equal(buffer_get_rest(buffer), "xyzabcdef", 9); + + /* Now remove 4 bytes and see if we can replace them */ buffer_get_u32(buffer,&v); assert_int_equal(buffer_get_rest_len(buffer),5); - assert_int_equal(memcmp(buffer_get_rest(buffer), "bcdef", 5), 0); + assert_memory_equal(buffer_get_rest(buffer), "bcdef", 5); + buffer_prepend_data(buffer,"aris",4); assert_int_equal(buffer_get_rest_len(buffer),9); - assert_int_equal(memcmp(buffer_get_rest(buffer), "arisbcdef", 9), 0); + assert_memory_equal(buffer_get_rest(buffer), "arisbcdef", 9); + /* same thing but we add 5 bytes now */ buffer_get_u32(buffer,&v); assert_int_equal(buffer_get_rest_len(buffer),5); - assert_int_equal(memcmp(buffer_get_rest(buffer), "bcdef", 5), 0); + assert_memory_equal(buffer_get_rest(buffer), "bcdef", 5); + buffer_prepend_data(buffer,"12345",5); assert_int_equal(buffer_get_rest_len(buffer),10); - assert_int_equal(memcmp(buffer_get_rest(buffer), "12345bcdef", 10), 0); - + assert_memory_equal(buffer_get_rest(buffer), "12345bcdef", 10); } /* -- cgit