Use torture_assert_mem_equal() in a couple more places.

(This used to be commit e2c3fab9d1bf0482c15a115e7d373562ffe50b29)

3 files changed, 6 insertions, 6 deletions

diff --git a/source4/lib/registry/tests/registry.c b/source4/lib/registry/tests/registry.c
index 1780b4e772..b19a6abffb 100644
--- a/source4/lib/registry/tests/registry.c
+++ b/source4/lib/registry/tests/registry.c
@@ -496,7 +496,7 @@ static bool test_list_values(struct torture_context *tctx, void *_data)
 
 	torture_assert_str_equal(tctx, name, "bar", "value name");
 	torture_assert_int_equal(tctx, 4, data.length, "value length");
-	torture_assert(tctx, memcmp(data.data, &value, 4) == 0,
+	torture_assert_mem_equal(tctx, data.data, &value, 4,
 		       "value content");
 	torture_assert_int_equal(tctx, REG_DWORD, type, "value type");
 
diff --git a/source4/lib/socket/testsuite.c b/source4/lib/socket/testsuite.c
index 6d4d81a884..813412c7bc 100644
--- a/source4/lib/socket/testsuite.c
+++ b/source4/lib/socket/testsuite.c
@@ -86,7 +86,7 @@ static bool test_udp(struct torture_context *tctx)
 
 	torture_assert_int_equal(tctx, nread, size, "Unexpected recvfrom size");
 
-	torture_assert(tctx, memcmp(blob2.data, blob.data, size) == 0,
+	torture_assert_mem_equal(tctx, blob2.data, blob.data, size,
 		"Bad data in recvfrom");
 
 	generate_random_buffer(blob.data, blob.length);
@@ -104,7 +104,7 @@ static bool test_udp(struct torture_context *tctx)
 	torture_assert_int_equal(tctx, from_addr->port, srv_addr->port, 
 				   "Unexpected recvfrom port");
 
-	torture_assert(tctx, memcmp(blob2.data, blob.data, size) == 0, 
+	torture_assert_mem_equal(tctx, blob2.data, blob.data, size,
 		"Bad data in recvfrom");
 
 	talloc_free(sock1);
@@ -181,7 +181,7 @@ static bool test_tcp(struct torture_context *tctx)
 
 	torture_assert_int_equal(tctx, nread, size, "Unexpected recvfrom size");
 
-	torture_assert(tctx, memcmp(blob2.data, blob.data, size) == 0, 
+	torture_assert_mem_equal(tctx, blob2.data, blob.data, size, 
 				   "Bad data in recv");
 	return true;
 }
diff --git a/source4/lib/util/tests/file.c b/source4/lib/util/tests/file.c
index fe87293671..3377e833dc 100644
--- a/source4/lib/util/tests/file.c
+++ b/source4/lib/util/tests/file.c
@@ -45,9 +45,9 @@ static bool test_file_load_save(struct torture_context *tctx)
 	data = file_load(TEST_FILENAME, &len, mem_ctx);
 	torture_assert(tctx, data, "loading file");
 
-	torture_assert(tctx, len == strlen(TEST_DATA), "Length");
+	torture_assert_int_equal(tctx, len, strlen(TEST_DATA), "Length");
 	
-	torture_assert(tctx, memcmp(data, TEST_DATA, len) == 0, "Contents");
+	torture_assert_mem_equal(tctx, data, TEST_DATA, len, "Contents");
 
 	unlink(TEST_FILENAME);
 	return true;