From fa989e42369ae56ca5411a100a1de1eafae0fc52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Thu, 26 Nov 2020 13:10:40 +0100 Subject: [PATCH] Use proper cmocka macros for pointer checks Make sure pointer checks in unit tests use cmocka assertion macros dedicated for use with pointers instead of those dedicated for use with integers or booleans. (cherry picked from commit f44060012685213e4deedc1bce8be3868edd6af1) --- lib/dns/tests/dispatch_test.c | 18 +++++++++--------- lib/dns/tests/keytable_test.c | 6 +++--- lib/dns/tests/name_test.c | 4 ++-- lib/isc/tests/heap_test.c | 4 ++-- lib/isc/tests/radix_test.c | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/dns/tests/dispatch_test.c b/lib/dns/tests/dispatch_test.c index f2c114f912..5bca3fdb12 100644 --- a/lib/dns/tests/dispatch_test.c +++ b/lib/dns/tests/dispatch_test.c @@ -134,10 +134,10 @@ dispatchset_get(void **state) { d4 = dns_dispatchset_get(dset); d5 = dns_dispatchset_get(dset); - assert_int_equal(d1, d2); - assert_int_equal(d2, d3); - assert_int_equal(d3, d4); - assert_int_equal(d4, d5); + assert_ptr_equal(d1, d2); + assert_ptr_equal(d2, d3); + assert_ptr_equal(d3, d4); + assert_ptr_equal(d4, d5); reset(); @@ -150,11 +150,11 @@ dispatchset_get(void **state) { d4 = dns_dispatchset_get(dset); d5 = dns_dispatchset_get(dset); - assert_int_equal(d1, d5); - assert_true(d1 != d2); - assert_true(d2 != d3); - assert_true(d3 != d4); - assert_true(d4 != d5); + assert_ptr_equal(d1, d5); + assert_ptr_not_equal(d1, d2); + assert_ptr_not_equal(d2, d3); + assert_ptr_not_equal(d3, d4); + assert_ptr_not_equal(d4, d5); reset(); } diff --git a/lib/dns/tests/keytable_test.c b/lib/dns/tests/keytable_test.c index b55e843735..56f87495e4 100644 --- a/lib/dns/tests/keytable_test.c +++ b/lib/dns/tests/keytable_test.c @@ -248,7 +248,7 @@ add_test(void **state) { assert_int_equal(dns_keytable_find(keytable, str2name("null.example"), &keynode), ISC_R_SUCCESS); - assert_int_equal(keynode, null_keynode); /* should be the same node */ + assert_ptr_equal(keynode, null_keynode); /* should be the same node */ assert_non_null(dns_keynode_key(keynode)); /* now have a key */ dns_keytable_detachkeynode(keytable, &null_keynode); @@ -265,7 +265,7 @@ add_test(void **state) { assert_int_equal(dns_keytable_find(keytable, str2name("null.example"), &null_keynode), ISC_R_SUCCESS); - assert_int_equal(keynode, null_keynode); + assert_ptr_equal(keynode, null_keynode); assert_non_null(dns_keynode_key(keynode)); assert_int_equal(dns_keytable_nextkeynode(keytable, keynode, &next_keynode), @@ -394,7 +394,7 @@ find_test(void **state) { str2name("null.example"), &keynode), ISC_R_SUCCESS); - assert_int_equal(dns_keynode_key(keynode), NULL); + assert_null(dns_keynode_key(keynode)); dns_keytable_detachkeynode(keytable, &keynode); /* diff --git a/lib/dns/tests/name_test.c b/lib/dns/tests/name_test.c index edb8931690..04e7be0d95 100644 --- a/lib/dns/tests/name_test.c +++ b/lib/dns/tests/name_test.c @@ -358,7 +358,7 @@ init_test(void **state) { assert_int_equal(name.length, 0); assert_int_equal(name.labels, 0); assert_int_equal(name.attributes, 0); - assert_int_equal(name.offsets, offsets); + assert_ptr_equal(name.offsets, offsets); assert_null(name.buffer); } @@ -393,7 +393,7 @@ buffer_test(void **state) { isc_buffer_init(&b, buf, BUFSIZ); dns_name_init(&name, NULL); dns_name_setbuffer(&name, &b); - assert_int_equal(name.buffer, &b); + assert_ptr_equal(name.buffer, &b); assert_true(dns_name_hasbuffer(&name)); } diff --git a/lib/isc/tests/heap_test.c b/lib/isc/tests/heap_test.c index 6d018e29c7..ef22008d72 100644 --- a/lib/isc/tests/heap_test.c +++ b/lib/isc/tests/heap_test.c @@ -78,10 +78,10 @@ isc_heap_delete_test(void **state) { assert_int_equal(e1.index, 0); isc_heap_destroy(&heap); - assert_int_equal(heap, NULL); + assert_null(heap); isc_mem_detach(&mctx); - assert_int_equal(mctx, NULL); + assert_null(mctx); } int diff --git a/lib/isc/tests/radix_test.c b/lib/isc/tests/radix_test.c index 9757111d12..a87c96c6e9 100644 --- a/lib/isc/tests/radix_test.c +++ b/lib/isc/tests/radix_test.c @@ -96,7 +96,7 @@ isc_radix_search_test(void **state) { node = NULL; result = isc_radix_search(radix, &node, &prefix); assert_int_equal(result, ISC_R_SUCCESS); - assert_int_equal(node->data[0], (void *)2); + assert_ptr_equal(node->data[0], (void *)2); isc_refcount_destroy(&prefix.refcount);