tests: Bluetooth: df: connectionless cte tx migrate to new ZTEST API

Migrate tests in connectionless_cte_tx to new ZTEST API.

Remove main.c source file because is unncessary when automatic
unit tests registration is available. Also former use of
predicate to select unit tests for execution is removed
because the tests are split into two distinct tests suites
that has its't own setup and teardown phases.

Signed-off-by: Piotr Pryga <[email protected]>

Author: ppryga-nordic

tests/bluetooth/df/connectionless_cte_tx/prj.conf

@@ -1,5 +1,6 @@
 CONFIG_TEST=y
 CONFIG_ZTEST=y
+CONFIG_ZTEST_NEW_API=y
 
 CONFIG_BT=y
 CONFIG_BT_EXT_ADV=y

tests/bluetooth/df/connectionless_cte_tx/src/common.c

@@ -40,7 +40,6 @@ void common_create_adv_set(void)
 
 	err = bt_le_ext_adv_create(&g_param, NULL, &g_adv);
 	zassert_equal(err, 0, "Failed to create advertiser set");
-	test_state.is_adv_set_created = true;
 }
 
 void common_delete_adv_set(void)
@@ -49,7 +48,6 @@ void common_delete_adv_set(void)
 
 	err = bt_le_ext_adv_delete(g_adv);
 	zassert_equal(err, 0, "Failed to delete advertiser set");
-	test_state.is_adv_set_created = false;
 }
 
 void common_set_cl_cte_tx_params(void)

tests/bluetooth/df/connectionless_cte_tx/src/common.h

@@ -8,20 +8,6 @@ extern struct bt_le_ext_adv *g_adv;
 extern struct bt_le_adv_param g_param;
 extern uint8_t g_cte_len;
 
-/**
- * @brief The test's global state.
- *
- * This struct is used to script the test. Some suites can only run under specific conditions (such
- * as being setup or keep track of the global state of the test
- */
-struct bt_test_state {
-	/** Whether or not ut_bt_setup() was called */
-	bool is_setup;
-	/** Whether or not bt_le_ext_adv_create() was called (not deleted) */
-	bool is_adv_set_created;
-};
-extern struct bt_test_state test_state;
-
 void common_create_adv_set(void);
 void common_delete_adv_set(void);
 void common_delete_adv_set(void);

tests/bluetooth/df/connectionless_cte_tx/src/main.c

@@ -13,8 +13,8 @@
 #include <zephyr/sys/byteorder.h>
 #include <host/hci_core.h>
 
+#include <bt_common.h>
 #include "common.h"
-#include "test_set_cl_cte_tx_enable.h"
 
 /* Macros delivering common values for unit tests */
 #define ADV_HANDLE_INVALID              (CONFIG_BT_CTLR_ADV_AUX_SET + 1)
@@ -53,7 +53,7 @@ int send_set_cl_cte_tx_enable(uint8_t adv_handle, atomic_t *adv_flags,
 				    buf, NULL);
 }
 
-void test_set_cl_cte_tx_enable_invalid_adv_set_handle(void)
+ZTEST(test_set_cl_cte_tx_enable, test_set_cl_cte_tx_enable_invalid_adv_set_handle)
 {
 	int err;
 
@@ -62,7 +62,7 @@ void test_set_cl_cte_tx_enable_invalid_adv_set_handle(void)
 		      "wrong advertising set handle");
 }
 
-void test_set_cl_cte_tx_enable_cte_params_not_set(void)
+ZTEST(test_set_cl_cte_tx_enable, test_set_cl_cte_tx_enable_cte_params_not_set)
 {
 	int err;
 
@@ -78,7 +78,7 @@ void test_set_cl_cte_tx_enable_cte_params_not_set(void)
 	common_delete_adv_set();
 }
 
-void test_set_cl_cte_tx_enable_per_adv_coded_phy(void)
+ZTEST(test_set_cl_cte_tx_enable, test_set_cl_cte_tx_enable_per_adv_coded_phy)
 {
 	int err;
 
@@ -99,7 +99,7 @@ void test_set_cl_cte_tx_enable_per_adv_coded_phy(void)
 	g_param.options =  g_param.options & (~BT_LE_ADV_OPT_CODED);
 }
 
-void test_set_cl_cte_tx_enable(void)
+ZTEST(test_set_cl_cte_tx_enable, test_set_cl_cte_tx_enable)
 {
 	int err;
 
@@ -119,7 +119,7 @@ void test_set_cl_cte_tx_enable(void)
 	common_delete_adv_set();
 }
 
-void test_set_cl_cte_tx_enable_after_per_adv_enabled(void)
+ZTEST(test_set_cl_cte_tx_enable, test_set_cl_cte_tx_enable_after_per_adv_enabled)
 {
 	int err;
 
@@ -142,7 +142,7 @@ void test_set_cl_cte_tx_enable_after_per_adv_enabled(void)
 	common_delete_adv_set();
 }
 
-void test_set_cl_cte_tx_disable_when_no_CTE_enabled(void)
+ZTEST(test_set_cl_cte_tx_enable, test_set_cl_cte_tx_disable_when_no_CTE_enabled)
 {
 	int err;
 
@@ -158,7 +158,7 @@ void test_set_cl_cte_tx_disable_when_no_CTE_enabled(void)
 	common_delete_adv_set();
 }
 
-void test_set_cl_cte_tx_disable_before_per_adv_enable(void)
+ZTEST(test_set_cl_cte_tx_enable, test_set_cl_cte_tx_disable_before_per_adv_enable)
 {
 	int err;
 
@@ -178,7 +178,7 @@ void test_set_cl_cte_tx_disable_before_per_adv_enable(void)
 	common_delete_adv_set();
 }
 
-void test_set_cl_cte_tx_disable_during_per_adv_enable(void)
+ZTEST(test_set_cl_cte_tx_enable, test_set_cl_cte_tx_disable_during_per_adv_enable)
 {
 	int err;
 
@@ -201,7 +201,7 @@ void test_set_cl_cte_tx_disable_during_per_adv_enable(void)
 	common_delete_adv_set();
 }
 
-void test_set_cl_cte_tx_enable_and_update_cte_params(void)
+ZTEST(test_set_cl_cte_tx_enable, test_set_cl_cte_tx_enable_and_update_cte_params)
 {
 	uint8_t cte_len_prev;
 	int err;
@@ -244,19 +244,4 @@ void test_set_cl_cte_tx_enable_and_update_cte_params(void)
 	common_delete_adv_set();
 }
 
-static bool test_set_cl_cte_tx_enable_pragma(const void *state)
-{
-	const struct bt_test_state *s = state;
-
-	return s->is_setup && !s->is_adv_set_created;
-}
-
-ztest_register_test_suite(test_set_cl_cte_tx_enable, test_set_cl_cte_tx_enable_pragma,
-			  ztest_unit_test(test_set_cl_cte_tx_enable_invalid_adv_set_handle),
-			  ztest_unit_test(test_set_cl_cte_tx_enable_cte_params_not_set),
-			  ztest_unit_test(test_set_cl_cte_tx_enable_per_adv_coded_phy),
-			  ztest_unit_test(test_set_cl_cte_tx_enable),
-			  ztest_unit_test(test_set_cl_cte_tx_enable_after_per_adv_enabled),
-			  ztest_unit_test(test_set_cl_cte_tx_disable_before_per_adv_enable),
-			  ztest_unit_test(test_set_cl_cte_tx_enable_and_update_cte_params),
-			  ztest_unit_test(test_set_cl_cte_tx_disable_during_per_adv_enable));
+ZTEST_SUITE(test_set_cl_cte_tx_enable, NULL, ut_bt_setup, NULL, NULL, ut_bt_teardown);

tests/bluetooth/df/connectionless_cte_tx/src/test_set_cl_cte_tx_enable.c

@@ -13,6 +13,7 @@
 #include <zephyr/sys/byteorder.h>
 #include <host/hci_core.h>
 
+#include <bt_common.h>
 #include "common.h"
 
 /* Macros delivering common values for unit tests */
@@ -74,7 +75,7 @@ int send_set_cl_cte_tx_params(uint8_t adv_handle, uint8_t cte_len,
 				    buf, NULL);
 }
 
-void test_set_cl_cte_tx_params_with_correct_aod_2us(void)
+ZTEST(test_set_cl_cte_tx_param, test_set_cl_cte_tx_params_with_correct_aod_2us)
 {
 	int err;
 
@@ -87,7 +88,7 @@ void test_set_cl_cte_tx_params_with_correct_aod_2us(void)
 	zassert_equal(err, 0, "Set AoD 2us CTE parameters failed");
 }
 
-void test_set_cl_cte_tx_params_with_correct_aod_1us(void)
+ZTEST(test_set_cl_cte_tx_param, test_set_cl_cte_tx_params_with_correct_aod_1us)
 {
 	int err;
 
@@ -100,7 +101,7 @@ void test_set_cl_cte_tx_params_with_correct_aod_1us(void)
 	zassert_equal(err, 0, "Set AoD 1us CTE parameters failed");
 }
 
-void test_set_ct_cte_tx_params_correct_aoa(void)
+ZTEST(test_set_cl_cte_tx_param, test_set_ct_cte_tx_params_correct_aoa)
 {
 	int err;
 
@@ -113,7 +114,7 @@ void test_set_ct_cte_tx_params_correct_aoa(void)
 	zassert_equal(err, -EIO, "Set AoA CTE parameters failed");
 }
 
-void test_set_ct_cte_tx_params_correct_aoa_without_ant_pattern(void)
+ZTEST(test_set_cl_cte_tx_param, test_set_ct_cte_tx_params_correct_aoa_without_ant_pattern)
 {
 	int err;
 
@@ -126,7 +127,7 @@ void test_set_ct_cte_tx_params_correct_aoa_without_ant_pattern(void)
 	zassert_equal(err, -EIO, "Set AoA CTE parameters failed");
 }
 
-void test_set_ct_cte_tx_params_wrong_adv_handle(void)
+ZTEST(test_set_cl_cte_tx_param, test_set_ct_cte_tx_params_wrong_adv_handle)
 {
 	int err;
 
@@ -140,7 +141,7 @@ void test_set_ct_cte_tx_params_wrong_adv_handle(void)
 		      "Unexpected error value for invalid adv handle");
 }
 
-void test_set_ct_cte_tx_params_invalid_cte_len(void)
+ZTEST(test_set_cl_cte_tx_param, test_set_ct_cte_tx_params_invalid_cte_len)
 {
 	int err;
 
@@ -154,7 +155,7 @@ void test_set_ct_cte_tx_params_invalid_cte_len(void)
 		      "Unexpected error value for invalid CTE length");
 }
 
-void test_set_ct_cte_tx_params_invalid_cte_type(void)
+ZTEST(test_set_cl_cte_tx_param, test_set_ct_cte_tx_params_invalid_cte_type)
 {
 	int err;
 
@@ -168,7 +169,7 @@ void test_set_ct_cte_tx_params_invalid_cte_type(void)
 		      "Unexpected error value for invalid CTE type");
 }
 
-void test_set_ct_cte_tx_params_invalid_cte_count(void)
+ZTEST(test_set_cl_cte_tx_param, test_set_ct_cte_tx_params_invalid_cte_count)
 {
 	int err;
 
@@ -182,7 +183,7 @@ void test_set_ct_cte_tx_params_invalid_cte_count(void)
 		      "Unexpected error value for invalid CTE count");
 }
 
-void test_set_ct_cte_tx_params_aod_2us_invalid_pattern_len(void)
+ZTEST(test_set_cl_cte_tx_param, test_set_ct_cte_tx_params_aod_2us_invalid_pattern_len)
 {
 	int err;
 
@@ -196,7 +197,7 @@ void test_set_ct_cte_tx_params_aod_2us_invalid_pattern_len(void)
 		      "Unexpected error value for invalid switch pattern len");
 }
 
-void test_set_ct_cte_tx_params_aod_1us_invalid_pattern_len(void)
+ZTEST(test_set_cl_cte_tx_param, test_set_ct_cte_tx_params_aod_1us_invalid_pattern_len)
 {
 	int err;
 
@@ -210,7 +211,7 @@ void test_set_ct_cte_tx_params_aod_1us_invalid_pattern_len(void)
 		      "Unexpected error value for invalid switch pattern len");
 }
 
-void test_set_ct_cte_tx_params_aoa_invalid_pattern_len(void)
+ZTEST(test_set_cl_cte_tx_param, test_set_ct_cte_tx_params_aoa_invalid_pattern_len)
 {
 	int err;
 
@@ -223,23 +224,21 @@ void test_set_ct_cte_tx_params_aoa_invalid_pattern_len(void)
 	zassert_equal(err, 0, "Unexpected error value for AoA");
 }
 
-static bool enabled_set_cl_cte_tx_para(const void *state)
+static void *common_adv_set_setup(void)
 {
-	const struct bt_test_state *s = state;
+	ut_bt_setup();
 
-	return s->is_setup && s->is_adv_set_created;
+	common_create_adv_set();
+
+	return NULL;
+}
+
+static void common_adv_set_teardown(void *data)
+{
+	common_delete_adv_set();
+
+	ut_bt_teardown(data);
 }
 
-ztest_register_test_suite(
-	test_set_cl_cte_tx_param, enabled_set_cl_cte_tx_para,
-	ztest_unit_test(test_set_cl_cte_tx_params_with_correct_aod_2us),
-	ztest_unit_test(test_set_cl_cte_tx_params_with_correct_aod_1us),
-	ztest_unit_test(test_set_ct_cte_tx_params_correct_aoa),
-	ztest_unit_test(test_set_ct_cte_tx_params_correct_aoa_without_ant_pattern),
-	ztest_unit_test(test_set_ct_cte_tx_params_wrong_adv_handle),
-	ztest_unit_test(test_set_ct_cte_tx_params_invalid_cte_len),
-	ztest_unit_test(test_set_ct_cte_tx_params_invalid_cte_type),
-	ztest_unit_test(test_set_ct_cte_tx_params_invalid_cte_count),
-	ztest_unit_test(test_set_ct_cte_tx_params_aod_2us_invalid_pattern_len),
-	ztest_unit_test(test_set_ct_cte_tx_params_aod_1us_invalid_pattern_len),
-	ztest_unit_test(test_set_ct_cte_tx_params_aoa_invalid_pattern_len));
+ZTEST_SUITE(test_set_cl_cte_tx_param, NULL, common_adv_set_setup, NULL, NULL,
+	    common_adv_set_teardown);