tests: BT: migrate connectionless tx to ztest register

Migrating the test suites to the register functionality allows the
main.c source to focus on the state of the system instead of "which"
test to run. In this example, test_main() now calls:
* ut_bt_setup() and updates the state
* common_create_adv_set(), updates the state, and notifies the
  registered tests that the state has been updated which would trigger
  a run.
* common_delete_adv_set(), updates the state, and again notifies
  the registered tests that the state has been updated.

Signed-off-by: Yuval Peress <[email protected]>

Author: Yuval Peress

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

@@ -40,6 +40,7 @@ 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)
@@ -48,6 +49,7 @@ 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,7 +8,20 @@ extern struct bt_le_ext_adv *g_adv;
 extern struct bt_le_adv_param g_param;
 extern uint8_t g_cte_len;
 
-void common_setup(void);
+/**
+ * @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

@@ -7,17 +7,20 @@
 #include <stdint.h>
 
 #include <bt_common.h>
+#include <ztest.h>
 #include "common.h"
-#include "test_set_cl_cte_tx_params.h"
-#include "test_set_cl_cte_tx_enable.h"
+
+struct bt_test_state test_state;
 
 /*test case main entry*/
 void test_main(void)
 {
 	ut_bt_setup();
+	test_state.is_setup = true;
 
 	common_create_adv_set();
-	run_set_cl_cte_tx_params_tests();
+	ztest_run_registered_test_suites(&test_state);
+
 	common_delete_adv_set();
-	run_set_cl_cte_tx_enable_tests();
+	ztest_run_registered_test_suites(&test_state);
 }

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

@@ -244,16 +244,19 @@ void test_set_cl_cte_tx_enable_and_update_cte_params(void)
 	common_delete_adv_set();
 }
 
-void run_set_cl_cte_tx_enable_tests(void)
+static bool test_set_cl_cte_tx_enable_pragma(const void *state)
 {
-	ztest_test_suite(test_hci_df_info,
-			 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_run_test_suite(test_hci_df_info);
+	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));

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

@@ -223,19 +223,23 @@ void test_set_ct_cte_tx_params_aoa_invalid_pattern_len(void)
 	zassert_equal(err, 0, "Unexpected error value for AoA");
 }
 
-void run_set_cl_cte_tx_params_tests(void)
+static bool enabled_set_cl_cte_tx_para(const void *state)
 {
-	ztest_test_suite(test_hci_df_info,
-			 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_run_test_suite(test_hci_df_info);
+	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_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));