Commit dae8efa6 authored by Michał Barnaś's avatar Michał Barnaś Committed by Anas Nashif
Browse files

ztest: remove the obsolete NULL appended to zassert macros 



This commit removes the usage of NULL parameter as message in
zassert_* macros after making it optional

Signed-off-by: default avatarMichał Barnaś <mb@semihalf.com>
parent 36f74e98

subsys/bluetooth/controller/ll_sw/ull_llcp.c

+6 −6
Original line number Diff line number Diff line
@@ -1767,7 +1767,7 @@ void test_int_mem_proc_ctx(void) 
	}



	nr_of_free_ctx = local_ctx_buffers_free();

	zassert_equal(nr_of_free_ctx, 0, NULL);

	zassert_equal(nr_of_free_ctx, 0);



	ctx2 = proc_ctx_acquire(&mem_local_ctx);
@@ -1776,7 +1776,7 @@ void test_int_mem_proc_ctx(void) 


	llcp_proc_ctx_release(ctx1);

	nr_of_free_ctx = local_ctx_buffers_free();

	zassert_equal(nr_of_free_ctx, 1, NULL);

	zassert_equal(nr_of_free_ctx, 1);



	ctx1 = proc_ctx_acquire(&mem_local_ctx);
@@ -1858,8 +1858,8 @@ void test_int_create_proc(void) 
	ctx = create_procedure(PROC_VERSION_EXCHANGE, &mem_local_ctx);

	zassert_not_null(ctx, NULL);



	zassert_equal(ctx->proc, PROC_VERSION_EXCHANGE, NULL);

	zassert_equal(ctx->collision, 0, NULL);

	zassert_equal(ctx->proc, PROC_VERSION_EXCHANGE);

	zassert_equal(ctx->collision, 0);



	for (int i = 0U; i < CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM; i++) {

		zassert_not_null(ctx, NULL);
@@ -1881,8 +1881,8 @@ void test_int_llcp_init(void) 


	ull_llcp_init(&conn);



	zassert_equal(conn.llcp.local.pause, 0, NULL);

	zassert_equal(conn.llcp.remote.pause, 0, NULL);

	zassert_equal(conn.llcp.local.pause, 0);

	zassert_equal(conn.llcp.remote.pause, 0);

}



#endif

tests/arch/arm/arm_thread_swap_tz/src/main.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ ZTEST(thread_swap_tz, test_thread_swap_tz) 
	main_thread = (struct k_thread *)curr;



	status = psa_crypto_init();

	zassert_equal(PSA_SUCCESS, status, NULL);

	zassert_equal(PSA_SUCCESS, status);



	/* Calculate correct hash. */

	do_hash(dummy_digest_correct);

tests/arch/arm/arm_tz_wrap_func/src/main.c

+11 −11
Original line number Diff line number Diff line
@@ -48,9 +48,9 @@ uint32_t foo1(uint32_t arg1, uint32_t arg2, uint32_t arg3, uint32_t arg4) 
	zassert_true(expect_foo1, "%s unexpectedly called", __func__);

	zassert_equal(arg1, foo1_arg1, "Was 0x%"PRIx32", expected 0x%"PRIx32,

		arg1, foo1_arg1);

	zassert_equal(arg2, foo1_arg2, NULL);

	zassert_equal(arg3, foo1_arg3, NULL);

	zassert_equal(arg4, foo1_arg4, NULL);

	zassert_equal(arg2, foo1_arg2);

	zassert_equal(arg3, foo1_arg3);

	zassert_equal(arg4, foo1_arg4);

	expect_foo1 = false;

	foo1_called = true;

	expect_postface = true;
@@ -89,15 +89,15 @@ ZTEST(tz_wrap_func, test_tz_wrap_func) 
	zassert_equal(foo1_retval,

		wrap_foo1(foo1_arg1, foo1_arg2, foo1_arg3, foo1_arg4), NULL);



	zassert_equal(msp1, __get_MSP(), NULL);

	zassert_equal(psp1, __get_PSP(), NULL);

	zassert_equal(msp1, __get_MSP());

	zassert_equal(psp1, __get_PSP());



	zassert_true(preface_called, NULL);

	zassert_true(foo1_called, NULL);

	zassert_true(postface_called, NULL);

	zassert_false(expect_preface, NULL);

	zassert_false(expect_foo1, NULL);

	zassert_false(expect_postface, NULL);

	zassert_true(preface_called);

	zassert_true(foo1_called);

	zassert_true(postface_called);

	zassert_false(expect_preface);

	zassert_false(expect_foo1);

	zassert_false(expect_postface);

}



ZTEST_SUITE(tz_wrap_func, NULL, NULL, NULL, NULL, NULL);

tests/benchmarks/data_structure_perf/rbtree_perf/src/rbtree_perf.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static void verify_rbtree_perf(struct rbnode *root, struct rbnode *test) 
	uint32_t node_height = 0;



	node_height = search_height_recurse(root, test, node_height);

	zassert_true(node_height <= dlog_N, NULL);

	zassert_true(node_height <= dlog_N);

}



/**

tests/bluetooth/controller/common/src/helper_pdu.c

+4 −4
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ void helper_pdu_verify_feature_req(const char *file, uint32_t line, struct pdu_d 
{

	struct pdu_data_llctrl_feature_req *feature_req = param;



	zassert_equal(pdu->ll_id, PDU_DATA_LLID_CTRL, NULL);

	zassert_equal(pdu->ll_id, PDU_DATA_LLID_CTRL);

	zassert_equal(pdu->llctrl.opcode, PDU_DATA_LLCTRL_TYPE_FEATURE_REQ,

		      "Wrong opcode.\nCalled at %s:%d\n", file, line);
@@ -535,8 +535,8 @@ void helper_pdu_verify_peripheral_feature_req(const char *file, uint32_t line, s 
{

	struct pdu_data_llctrl_feature_req *feature_req = param;



	zassert_equal(pdu->ll_id, PDU_DATA_LLID_CTRL, NULL);

	zassert_equal(pdu->llctrl.opcode, PDU_DATA_LLCTRL_TYPE_PER_INIT_FEAT_XCHG, NULL);

	zassert_equal(pdu->ll_id, PDU_DATA_LLID_CTRL);

	zassert_equal(pdu->llctrl.opcode, PDU_DATA_LLCTRL_TYPE_PER_INIT_FEAT_XCHG);



	for (int counter = 0; counter < 8; counter++) {

		uint8_t expected_value = feature_req->features[counter];
@@ -551,7 +551,7 @@ void helper_pdu_verify_feature_rsp(const char *file, uint32_t line, struct pdu_d 
{

	struct pdu_data_llctrl_feature_rsp *feature_rsp = param;



	zassert_equal(pdu->ll_id, PDU_DATA_LLID_CTRL, NULL);

	zassert_equal(pdu->ll_id, PDU_DATA_LLID_CTRL);

	zassert_equal(pdu->llctrl.opcode, PDU_DATA_LLCTRL_TYPE_FEATURE_RSP,

		      "Response: %d Expected: %d\n", pdu->llctrl.opcode,

		      PDU_DATA_LLCTRL_TYPE_FEATURE_RSP);

CRA Git | Maintained and supported by SUSTech CRA and CCSE