michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ztest: improve some tests

Browse source 
This commit changes some tests from using zassert_equal to validate
the pointers to using the zassert_is_null and zassert_not_null.

Signed-off-by: Michał Barnaś <mb@semihalf.com>
This commit is contained in:
Michał Barnaś 2022-08-17 17:43:01 +02:00 • committed by Anas Nashif
commit 1ea41b34c6
5 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/kernel/device/src/main.c
View file

@ -54,17 +54,17 @@ ZTEST(device, test_dummy_device)
/* Validates device binding for a non-existing device object */ /* Validates device binding for a non-existing device object */
dev = device_get_binding(DUMMY_PORT_1); dev = device_get_binding(DUMMY_PORT_1);
zassert_equal(dev, NULL); zassert_is_null(dev);
/* Validates device binding for an existing device object */ /* Validates device binding for an existing device object */
dev = device_get_binding(DUMMY_PORT_2); dev = device_get_binding(DUMMY_PORT_2);
zassert_false((dev == NULL)); zassert_not_null(dev);
/* device_get_binding() returns false for device object /* device_get_binding() returns false for device object
* with failed init. * with failed init.
*/ */
dev = device_get_binding(BAD_DRIVER); dev = device_get_binding(BAD_DRIVER);
zassert_true((dev == NULL)); zassert_is_null(dev);
} }
/** /**

4
tests/kernel/lifo/lifo_usage/src/main.c
View file

@ -277,13 +277,13 @@ ZTEST(lifo_usage_1cpu, test_timeout_empty_lifo)
packet = k_lifo_get(&lifo_timeout[0], K_MSEC(timeout)); packet = k_lifo_get(&lifo_timeout[0], K_MSEC(timeout));
zassert_equal(packet, NULL); zassert_is_null(packet);
zassert_true(is_timeout_in_range(start_time, timeout)); zassert_true(is_timeout_in_range(start_time, timeout));
/* Test empty lifo with timeout of K_NO_WAIT */ /* Test empty lifo with timeout of K_NO_WAIT */
packet = k_lifo_get(&lifo_timeout[0], K_NO_WAIT); packet = k_lifo_get(&lifo_timeout[0], K_NO_WAIT);
zassert_equal(packet, NULL); zassert_is_null(packet);
} }
/** /**

2
tests/lib/devicetree/devices/src/main.c
View file

@ -271,7 +271,7 @@ ZTEST(devicetree_devices, test_get_or_null)
zassert_not_equal(dev, NULL, NULL); zassert_not_equal(dev, NULL, NULL);
dev = DEVICE_DT_GET_OR_NULL(non_existing_node); dev = DEVICE_DT_GET_OR_NULL(non_existing_node);
zassert_equal(dev, NULL); zassert_is_null(dev);
} }
ZTEST(devicetree_devices, test_supports) ZTEST(devicetree_devices, test_supports)

30
tests/lib/mpsc_pbuf/src/main.c
View file

@ -125,7 +125,7 @@ void item_put_no_overwrite(bool pow2)
} }
zassert_equal(mpsc_pbuf_claim(&buffer), NULL); zassert_is_null(mpsc_pbuf_claim(&buffer));
} }
ZTEST(log_buffer, test_item_put_no_overwrite) ZTEST(log_buffer, test_item_put_no_overwrite)
@ -196,7 +196,7 @@ void item_put_saturate(bool pow2)
mpsc_pbuf_free(&buffer, &t->item); mpsc_pbuf_free(&buffer, &t->item);
} }
zassert_equal(mpsc_pbuf_claim(&buffer), NULL); zassert_is_null(mpsc_pbuf_claim(&buffer));
} }
ZTEST(log_buffer, test_item_put_saturate) ZTEST(log_buffer, test_item_put_saturate)
@ -237,7 +237,7 @@ void benchmark_item_put(bool pow2)
t = get_cyc() - t; t = get_cyc() - t;
PRINT("single word item claim,free: %d cycles\n", t/repeat); PRINT("single word item claim,free: %d cycles\n", t/repeat);
zassert_equal(mpsc_pbuf_claim(&buffer), NULL); zassert_is_null(mpsc_pbuf_claim(&buffer));
} }
ZTEST(log_buffer, test_benchmark_item_put) ZTEST(log_buffer, test_benchmark_item_put)
@ -275,7 +275,7 @@ void item_put_ext_no_overwrite(bool pow2)
mpsc_pbuf_free(&buffer, &t->item); mpsc_pbuf_free(&buffer, &t->item);
} }
zassert_equal(mpsc_pbuf_claim(&buffer), NULL); zassert_is_null(mpsc_pbuf_claim(&buffer));
} }
ZTEST(log_buffer, test_item_put_ext_no_overwrite) ZTEST(log_buffer, test_item_put_ext_no_overwrite)
@ -363,7 +363,7 @@ void item_put_ext_saturate(bool pow2)
mpsc_pbuf_free(&buffer, &t->item); mpsc_pbuf_free(&buffer, &t->item);
} }
zassert_equal(mpsc_pbuf_claim(&buffer), NULL); zassert_is_null(mpsc_pbuf_claim(&buffer));
} }
ZTEST(log_buffer, test_item_put_ext_saturate) ZTEST(log_buffer, test_item_put_ext_saturate)
@ -410,7 +410,7 @@ void benchmark_item_put_ext(bool pow2)
t = get_cyc() - t; t = get_cyc() - t;
PRINT("ext item claim,free: %d cycles\n", t/repeat); PRINT("ext item claim,free: %d cycles\n", t/repeat);
zassert_equal(mpsc_pbuf_claim(&buffer), NULL); zassert_is_null(mpsc_pbuf_claim(&buffer));
} }
ZTEST(log_buffer, test_benchmark_item_put_ext) ZTEST(log_buffer, test_benchmark_item_put_ext)
@ -461,7 +461,7 @@ void benchmark_item_put_data(bool pow2)
t = get_cyc() - t; t = get_cyc() - t;
PRINT("ext item claim,free: %d cycles\n", t/repeat); PRINT("ext item claim,free: %d cycles\n", t/repeat);
zassert_equal(mpsc_pbuf_claim(&buffer), NULL); zassert_is_null(mpsc_pbuf_claim(&buffer));
} }
ZTEST(log_buffer, test_benchmark_item_put_data) ZTEST(log_buffer, test_benchmark_item_put_data)
@ -635,7 +635,7 @@ void item_alloc_commit_saturate(bool pow2)
packet = (struct test_data_var *)mpsc_pbuf_alloc(&buffer, len, packet = (struct test_data_var *)mpsc_pbuf_alloc(&buffer, len,
K_NO_WAIT); K_NO_WAIT);
zassert_equal(packet, NULL); zassert_is_null(packet);
/* Get one packet from the buffer. */ /* Get one packet from the buffer. */
packet = (struct test_data_var *)mpsc_pbuf_claim(&buffer); packet = (struct test_data_var *)mpsc_pbuf_claim(&buffer);
@ -670,7 +670,7 @@ void item_alloc_preemption(bool pow2)
/* Check that no packet is yet available */ /* Check that no packet is yet available */
p = (struct test_data_var *)mpsc_pbuf_claim(&buffer); p = (struct test_data_var *)mpsc_pbuf_claim(&buffer);
zassert_equal(p, NULL); zassert_is_null(p);
p1 = (struct test_data_var *)mpsc_pbuf_alloc(&buffer, 20, K_NO_WAIT); p1 = (struct test_data_var *)mpsc_pbuf_alloc(&buffer, 20, K_NO_WAIT);
zassert_true(p1); zassert_true(p1);
@ -683,7 +683,7 @@ void item_alloc_preemption(bool pow2)
/* Check that no packet is yet available */ /* Check that no packet is yet available */
p = (struct test_data_var *)mpsc_pbuf_claim(&buffer); p = (struct test_data_var *)mpsc_pbuf_claim(&buffer);
zassert_equal(p, NULL); zassert_is_null(p);
mpsc_pbuf_commit(&buffer, (union mpsc_pbuf_generic *)p0); mpsc_pbuf_commit(&buffer, (union mpsc_pbuf_generic *)p0);
@ -701,7 +701,7 @@ void item_alloc_preemption(bool pow2)
/* No more packets. */ /* No more packets. */
p = (struct test_data_var *)mpsc_pbuf_claim(&buffer); p = (struct test_data_var *)mpsc_pbuf_claim(&buffer);
zassert_equal(p, NULL); zassert_is_null(p);
} }
ZTEST(log_buffer, test_item_alloc_preemption) ZTEST(log_buffer, test_item_alloc_preemption)
@ -765,7 +765,7 @@ void overwrite(bool pow2)
mpsc_pbuf_free(&buffer, (union mpsc_pbuf_generic *)p); mpsc_pbuf_free(&buffer, (union mpsc_pbuf_generic *)p);
p = (struct test_data_var *)mpsc_pbuf_claim(&buffer); p = (struct test_data_var *)mpsc_pbuf_claim(&buffer);
zassert_equal(p, NULL); zassert_is_null(p);
} }
ZTEST(log_buffer, test_overwrite) ZTEST(log_buffer, test_overwrite)
@ -818,7 +818,7 @@ void overwrite_while_claimed(bool pow2)
zassert_equal(p0->hdr.len, len); zassert_equal(p0->hdr.len, len);
p0 = (struct test_data_var *)mpsc_pbuf_claim(&buffer); p0 = (struct test_data_var *)mpsc_pbuf_claim(&buffer);
zassert_equal(p0, NULL); zassert_is_null(p0);
} }
ZTEST(log_buffer, test_overwrite_while_claimed) ZTEST(log_buffer, test_overwrite_while_claimed)
@ -875,7 +875,7 @@ void overwrite_while_claimed2(bool pow2)
zassert_equal(p0->hdr.len, len); zassert_equal(p0->hdr.len, len);
p0 = (struct test_data_var *)mpsc_pbuf_claim(&buffer); p0 = (struct test_data_var *)mpsc_pbuf_claim(&buffer);
zassert_equal(p0, NULL); zassert_is_null(p0);
} }
ZTEST(log_buffer, test_overwrite_while_claimed2) ZTEST(log_buffer, test_overwrite_while_claimed2)
@ -986,7 +986,7 @@ void t_entry(void *p0, void *p1, void *p2)
t = (struct test_data_ext *)mpsc_pbuf_alloc(buffer, t = (struct test_data_ext *)mpsc_pbuf_alloc(buffer,
sizeof(*t) / sizeof(uint32_t), sizeof(*t) / sizeof(uint32_t),
K_MSEC(1)); K_MSEC(1));
zassert_equal(t, NULL); zassert_is_null(t);
t = (struct test_data_ext *)mpsc_pbuf_alloc(buffer, t = (struct test_data_ext *)mpsc_pbuf_alloc(buffer,
sizeof(*t) / sizeof(uint32_t), sizeof(*t) / sizeof(uint32_t),

20
tests/subsys/pm/policy_api/src/main.c
View file

@ -20,10 +20,10 @@ ZTEST(policy_api, test_pm_policy_next_state_default)
/* cpu 0 */ /* cpu 0 */
next = pm_policy_next_state(0U, 0); next = pm_policy_next_state(0U, 0);
zassert_equal(next, NULL); zassert_is_null(next);
next = pm_policy_next_state(0U, k_us_to_ticks_floor32(10999)); next = pm_policy_next_state(0U, k_us_to_ticks_floor32(10999));
zassert_equal(next, NULL); zassert_is_null(next);
next = pm_policy_next_state(0U, k_us_to_ticks_floor32(110000)); next = pm_policy_next_state(0U, k_us_to_ticks_floor32(110000));
zassert_equal(next->state, PM_STATE_RUNTIME_IDLE); zassert_equal(next->state, PM_STATE_RUNTIME_IDLE);
@ -43,10 +43,10 @@ ZTEST(policy_api, test_pm_policy_next_state_default)
/* cpu 1 */ /* cpu 1 */
next = pm_policy_next_state(1U, 0); next = pm_policy_next_state(1U, 0);
zassert_equal(next, NULL); zassert_is_null(next);
next = pm_policy_next_state(1U, k_us_to_ticks_floor32(549999)); next = pm_policy_next_state(1U, k_us_to_ticks_floor32(549999));
zassert_equal(next, NULL); zassert_is_null(next);
next = pm_policy_next_state(1U, k_us_to_ticks_floor32(550000)); next = pm_policy_next_state(1U, k_us_to_ticks_floor32(550000));
zassert_equal(next->state, PM_STATE_SUSPEND_TO_RAM); zassert_equal(next->state, PM_STATE_SUSPEND_TO_RAM);
@ -84,7 +84,7 @@ ZTEST(policy_api, test_pm_policy_next_state_default_allowed)
zassert_true(active); zassert_true(active);
next = pm_policy_next_state(0U, k_us_to_ticks_floor32(110000)); next = pm_policy_next_state(0U, k_us_to_ticks_floor32(110000));
zassert_equal(next, NULL); zassert_is_null(next);
/* allow PM_STATE_RUNTIME_IDLE again /* allow PM_STATE_RUNTIME_IDLE again
* next state: PM_STATE_RUNTIME_IDLE * next state: PM_STATE_RUNTIME_IDLE
@ -115,7 +115,7 @@ ZTEST(policy_api, test_pm_policy_next_state_default_allowed)
zassert_true(active); zassert_true(active);
next = pm_policy_next_state(0U, k_us_to_ticks_floor32(110000)); next = pm_policy_next_state(0U, k_us_to_ticks_floor32(110000));
zassert_equal(next, NULL); zassert_is_null(next);
/* allow PM_STATE_RUNTIME_IDLE and substate 1 again /* allow PM_STATE_RUNTIME_IDLE and substate 1 again
* next state: PM_STATE_RUNTIME_IDLE * next state: PM_STATE_RUNTIME_IDLE
@ -162,10 +162,10 @@ ZTEST(policy_api, test_pm_policy_next_state_default_latency)
pm_policy_latency_request_add(&req1, 9000); pm_policy_latency_request_add(&req1, 9000);
next = pm_policy_next_state(0U, k_us_to_ticks_floor32(110000)); next = pm_policy_next_state(0U, k_us_to_ticks_floor32(110000));
zassert_equal(next, NULL); zassert_is_null(next);
next = pm_policy_next_state(0U, k_us_to_ticks_floor32(1100000)); next = pm_policy_next_state(0U, k_us_to_ticks_floor32(1100000));
zassert_equal(next, NULL); zassert_is_null(next);
/* update latency requirement to a value between latencies for /* update latency requirement to a value between latencies for
* PM_STATE_RUNTIME_IDLE and PM_STATE_SUSPEND_TO_RAM, so we should * PM_STATE_RUNTIME_IDLE and PM_STATE_SUSPEND_TO_RAM, so we should
@ -186,10 +186,10 @@ ZTEST(policy_api, test_pm_policy_next_state_default_latency)
pm_policy_latency_request_add(&req2, 8000); pm_policy_latency_request_add(&req2, 8000);
next = pm_policy_next_state(0U, k_us_to_ticks_floor32(110000)); next = pm_policy_next_state(0U, k_us_to_ticks_floor32(110000));
zassert_equal(next, NULL); zassert_is_null(next);
next = pm_policy_next_state(0U, k_us_to_ticks_floor32(1100000)); next = pm_policy_next_state(0U, k_us_to_ticks_floor32(1100000));
zassert_equal(next, NULL); zassert_is_null(next);
/* remove previous request, so we should recover behavior given by /* remove previous request, so we should recover behavior given by
* first request. * first request.