Inclusive Language Changes

BT core spec 5.3 promotes the usage of inclusive languages.
This patch replaces non-inclusive words with inclusive ones.

This patchset should be merged with the following bluetooth-frwk's
patchset in order to build successfully:
bluetooth-frwk Change-Id: I7946af9cab584f0f44baa208782b6930e6afcef1

Change-Id: I0f46211d644a96be7cbed2d2352f624fee51ff29
Signed-off-by: Anuj Jain <anuj01.jain@samsung.com>

diff --git a/src/bluetooth-adapter.c b/src/bluetooth-adapter.c
index 82f6188..d0ad88a 100644 (file)
--- a/src/bluetooth-adapter.c
+++ b/src/bluetooth-adapter.c
@@ -1638,7 +1638,7 @@ int bt_adapter_le_add_white_list(const char *address,
        BT_CHECK_INPUT_PARAMETER(address);
        _bt_convert_address_to_hex(&addr_hex, address);
 
-       error_code = _bt_get_error_code(bluetooth_add_white_list(&addr_hex,
+       error_code = _bt_get_error_code(bluetooth_add_allow_list(&addr_hex,
                                                                address_type));
        if (error_code != BT_ERROR_NONE) { /* LCOV_EXCL_LINE */
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code),
@@ -1658,7 +1658,7 @@ int bt_adapter_le_remove_white_list(const char *address, bt_device_address_type_
        BT_CHECK_INPUT_PARAMETER(address);
        _bt_convert_address_to_hex(&addr_hex, address);
 
-       error_code = _bt_get_error_code(bluetooth_remove_white_list(&addr_hex,
+       error_code = _bt_get_error_code(bluetooth_remove_allow_list(&addr_hex,
                                                                address_type));
        if (error_code != BT_ERROR_NONE) { /* LCOV_EXCL_LINE */
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code),

diff --git a/src/bluetooth-dpm.c b/src/bluetooth-dpm.c
index 69470f1..c91dfe4 100644 (file)
--- a/src/bluetooth-dpm.c
+++ b/src/bluetooth-dpm.c
@@ -129,7 +129,7 @@ int bt_dpm_add_devices_to_blacklist(const char *device_address)
        BT_CHECK_INPUT_PARAMETER(device_address);
 
        _bt_convert_address_to_hex(&addr_hex, device_address);
-       error_code = _bt_get_error_code(bluetooth_dpm_add_devices_to_blacklist(&addr_hex));
+       error_code = _bt_get_error_code(bluetooth_dpm_add_devices_to_blocklist(&addr_hex));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -146,7 +146,7 @@ int bt_dpm_add_devices_to_whitelist(const char *device_address)
        BT_CHECK_INPUT_PARAMETER(device_address);
 
        _bt_convert_address_to_hex(&addr_hex, device_address);
-       error_code = _bt_get_error_code(bluetooth_dpm_add_devices_to_whitelist(&addr_hex));
+       error_code = _bt_get_error_code(bluetooth_dpm_add_devices_to_allowlist(&addr_hex));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -160,7 +160,7 @@ int bt_dpm_add_uuids_to_blacklist(const char *service_uuid)
        BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_get_error_code(bluetooth_dpm_add_uuids_to_blacklist(service_uuid));
+       error_code = _bt_get_error_code(bluetooth_dpm_add_uuids_to_blocklist(service_uuid));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -174,7 +174,7 @@ int bt_dpm_add_uuids_to_whitelist(const char *service_uuid)
        BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_get_error_code(bluetooth_dpm_add_uuids_to_whitelist(service_uuid));
+       error_code = _bt_get_error_code(bluetooth_dpm_add_uuids_to_allowlist(service_uuid));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -188,7 +188,7 @@ int bt_dpm_clear_devices_from_blacklist(void)
        BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_get_error_code(bluetooth_dpm_clear_devices_from_blacklist());
+       error_code = _bt_get_error_code(bluetooth_dpm_clear_devices_from_blocklist());
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -202,7 +202,7 @@ int bt_dpm_clear_devices_from_whitelist(void)
        BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_get_error_code(bluetooth_dpm_clear_devices_from_whitelist());
+       error_code = _bt_get_error_code(bluetooth_dpm_clear_devices_from_allowlist());
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -216,7 +216,7 @@ int bt_dpm_clear_uuids_from_blacklist(void)
        BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_get_error_code(bluetooth_dpm_clear_uuids_from_blacklist());
+       error_code = _bt_get_error_code(bluetooth_dpm_clear_uuids_from_blocklist());
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -230,7 +230,7 @@ int bt_dpm_clear_uuids_from_whitelist(void)
        BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_get_error_code(bluetooth_dpm_clear_uuids_from_whitelist());
+       error_code = _bt_get_error_code(bluetooth_dpm_clear_uuids_from_allowlist());
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -270,7 +270,7 @@ int bt_dpm_get_devices_from_blacklist(bt_dpm_device_list_s **device_list)
        BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_get_error_code(bluetooth_dpm_get_devices_from_blacklist(&dev_list));
+       error_code = _bt_get_error_code(bluetooth_dpm_get_devices_from_blocklist(&dev_list));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -287,7 +287,7 @@ int bt_dpm_get_devices_from_whitelist(bt_dpm_device_list_s **device_list)
        BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_get_error_code(bluetooth_dpm_get_devices_from_whitelist(&dev_list));
+       error_code = _bt_get_error_code(bluetooth_dpm_get_devices_from_allowlist(&dev_list));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -333,7 +333,7 @@ int bt_dpm_get_uuids_from_blacklist(bt_dpm_uuids_list_s **uuid_list)
        BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_get_error_code(bluetooth_dpm_get_uuids_from_blacklist(&uuids));
+       error_code = _bt_get_error_code(bluetooth_dpm_get_uuids_from_blocklist(&uuids));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -350,7 +350,7 @@ int bt_dpm_get_uuids_from_whitelist(bt_dpm_uuids_list_s **uuid_list)
        BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_get_error_code(bluetooth_dpm_get_uuids_from_whitelist(&uuids));
+       error_code = _bt_get_error_code(bluetooth_dpm_get_uuids_from_allowlist(&uuids));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -369,7 +369,7 @@ int bt_dpm_remove_device_from_whitelist(const char *device_address)
        BT_CHECK_INPUT_PARAMETER(device_address);
 
        _bt_convert_address_to_hex(&addr_hex, device_address);
-       error_code = _bt_get_error_code(bluetooth_dpm_remove_device_from_whitelist(&addr_hex));
+       error_code = _bt_get_error_code(bluetooth_dpm_remove_device_from_allowlist(&addr_hex));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -386,7 +386,7 @@ int bt_dpm_remove_device_from_blacklist(const char *device_address)
        BT_CHECK_INPUT_PARAMETER(device_address);
 
        _bt_convert_address_to_hex(&addr_hex, device_address);
-       error_code = _bt_get_error_code(bluetooth_dpm_remove_device_from_blacklist(&addr_hex));
+       error_code = _bt_get_error_code(bluetooth_dpm_remove_device_from_blocklist(&addr_hex));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -400,7 +400,7 @@ int bt_dpm_remove_uuid_from_whitelist(const char *service_uuid)
        BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_get_error_code(bluetooth_dpm_remove_uuid_from_whitelist(service_uuid));
+       error_code = _bt_get_error_code(bluetooth_dpm_remove_uuid_from_allowlist(service_uuid));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 
@@ -414,7 +414,7 @@ int bt_dpm_remove_uuid_from_blacklist(const char *service_uuid)
        BT_CHECK_SUPPORTED_FEATURE(BT_FEATURE_COMMON);
        BT_CHECK_INIT_STATUS();
 
-       error_code = _bt_get_error_code(bluetooth_dpm_remove_uuid_from_blacklist(service_uuid));
+       error_code = _bt_get_error_code(bluetooth_dpm_remove_uuid_from_blocklist(service_uuid));
        if (error_code != BT_ERROR_NONE)
                BT_ERR("%s(0x%08x)", _bt_convert_error_to_string(error_code), error_code);
 

diff --git a/tests/test/bt_unit_test.c b/tests/test/bt_unit_test.c
index d800fc4..1e834d3 100644 (file)
--- a/tests/test/bt_unit_test.c
+++ b/tests/test/bt_unit_test.c
@@ -336,9 +336,9 @@ tc_table_t tc_adapter_le[] = {
        {"bt_adapter_le_stop_advertising"
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_STOP_ADVERTISING},
        {"bt_adapter_le_add_white_list"
-               , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_ADD_WHITE_LIST},
+               , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_ADD_ALLOW_LIST},
        {"bt_adapter_le_remove_white_list"
-               , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_REMOVE_WHITE_LIST},
+               , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_REMOVE_ALLOW_LIST},
        {"bt_adapter_le_enable_privacy"
                , BT_UNIT_TEST_FUNCTION_ADAPTER_LE_ENABLE_PRIVACY},
        {"bt_adapter_le_get_local_oob_ext_data"
@@ -1046,37 +1046,37 @@ tc_table_t tc_DPM[] = {
        {"bt_dpm_is_uuid_restriction_active"
                , BT_UNIT_TEST_FUNCTION_DPM_IS_UUID_RESTRICTIO_ACTIVATE},
        {"bt_dpm_add_devices_to_blacklist"
-               , BT_UNIT_TEST_FUNCTION_DPM_ADD_DEVICES_TO_BLACKLIST},
+               , BT_UNIT_TEST_FUNCTION_DPM_ADD_DEVICES_TO_BLOCKLIST},
        {"bt_dpm_add_devices_to_whitelist"
-               , BT_UNIT_TEST_FUNCTION_DPM_ADD_DEVICES_TO_WHITELIST},
+               , BT_UNIT_TEST_FUNCTION_DPM_ADD_DEVICES_TO_ALLOWLIST},
        {"bt_dpm_add_uuids_to_blacklist"
-               , BT_UNIT_TEST_FUNCTION_DPM_ADD_UUIDS_TO_BLACKLIST},
+               , BT_UNIT_TEST_FUNCTION_DPM_ADD_UUIDS_TO_BLOCKLIST},
        {"bt_dpm_add_uuids_to_whitelist"
-               , BT_UNIT_TEST_FUNCTION_DPM_ADD_UUIDS_TO_WHITELIST},
+               , BT_UNIT_TEST_FUNCTION_DPM_ADD_UUIDS_TO_ALLOWLIST},
        {"bt_dpm_get_devices_from_blacklist"
-               , BT_UNIT_TEST_FUNCTION_DPM_GET_DEVICES_FROM_BLACKLIST},
+               , BT_UNIT_TEST_FUNCTION_DPM_GET_DEVICES_FROM_BLOCKLIST},
        {"bt_dpm_get_devices_from_whitelist"
-               , BT_UNIT_TEST_FUNCTION_DPM_GET_DEVICES_FROM_WHITELIST},
+               , BT_UNIT_TEST_FUNCTION_DPM_GET_DEVICES_FROM_ALLOWLIST},
        {"bt_dpm_get_uuids_from_blacklist"
-               , BT_UNIT_TEST_FUNCTION_DPM_GET_UUIDS_FROM_BLACKLIST},
+               , BT_UNIT_TEST_FUNCTION_DPM_GET_UUIDS_FROM_BLOCKLIST},
        {"bt_dpm_get_uuids_from_whitelist"
-               , BT_UNIT_TEST_FUNCTION_DPM_GET_UUIDS_FROM_WHITELIST},
+               , BT_UNIT_TEST_FUNCTION_DPM_GET_UUIDS_FROM_ALLOWLIST},
        {"bt_dpm_clear_devices_from_blacklist"
-               , BT_UNIT_TEST_FUNCTION_DPM_CLEAR_DEVICES_FROM_BLACKLIST},
+               , BT_UNIT_TEST_FUNCTION_DPM_CLEAR_DEVICES_FROM_BLOCKLIST},
        {"bt_dpm_clear_devices_from_whitelist"
-               , BT_UNIT_TEST_FUNCTION_DPM_CLEAR_DEVICES_FROM_WHITELIST},
+               , BT_UNIT_TEST_FUNCTION_DPM_CLEAR_DEVICES_FROM_ALLOWLIST},
        {"bt_dpm_clear_uuids_from_blacklist"
-               , BT_UNIT_TEST_FUNCTION_DPM_CLEAR_UUIDS_FROM_BLACKLIST},
+               , BT_UNIT_TEST_FUNCTION_DPM_CLEAR_UUIDS_FROM_BLOCKLIST},
        {"bt_dpm_clear_uuids_from_whitelist"
-               , BT_UNIT_TEST_FUNCTION_DPM_CLEAR_UUIDS_FROM_WHITELIST},
+               , BT_UNIT_TEST_FUNCTION_DPM_CLEAR_UUIDS_FROM_ALLOWLIST},
        {"bt_dpm_remove_device_from_blacklist"
-               , BT_UNIT_TEST_FUNCTION_DPM_REMOVE_DEVICE_FROM_BLACKLIST},
+               , BT_UNIT_TEST_FUNCTION_DPM_REMOVE_DEVICE_FROM_BLOCKLIST},
        {"bt_dpm_remove_device_from_whitelist"
-               , BT_UNIT_TEST_FUNCTION_DPM_REMOVE_DEVICE_FROM_WHITELIST},
+               , BT_UNIT_TEST_FUNCTION_DPM_REMOVE_DEVICE_FROM_ALLOWLIST},
        {"bt_dpm_remove_uuid_from_blacklist"
-               , BT_UNIT_TEST_FUNCTION_DPM_REMOVE_UUIDS_FROM_BLACKLIST},
+               , BT_UNIT_TEST_FUNCTION_DPM_REMOVE_UUIDS_FROM_BLOCKLIST},
        {"bt_dpm_remove_uuid_from_whitelist"
-               , BT_UNIT_TEST_FUNCTION_DPM_REMOVE_UUIDS_FROM_WHITELIST},
+               , BT_UNIT_TEST_FUNCTION_DPM_REMOVE_UUIDS_FROM_ALLOWLIST},
        {"bt_dpm_set_allow_outgoing_call"
                , BT_UNIT_TEST_FUNCTION_DPM_SET_ALLOW_OUTGOING_CALL},
        {"bt_dpm_get_allow_outgoing_call"
@@ -3785,7 +3785,7 @@ int test_set_params(int test_id, char *param)
                        break;
                case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_SET_ADVERTISING_FILTER_POLICY:
                        param_count = 1;
-                       TC_PRT("Input filter_policy \n (0 : No use White List, 1 : Allow scan, 2 : Allow conneciton, 3 : Allow scan & conneciton)");
+                       TC_PRT("Input filter_policy \n (0 : No use Allow List, 1 : Allow scan, 2 : Allow conneciton, 3 : Allow scan & conneciton)");
                        break;
                case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_SET_ADVERTISING_CONNECTABLE:
                        param_count = 1;
@@ -4133,17 +4133,17 @@ int test_set_params(int test_id, char *param)
                        param_count = 1;
                        TC_PRT("Input Value Type (avail. : \n0.BT_DPM_BT_ALLOWED, \n1.BT_DPM_RESTRICTED");
                        break;
-               case BT_UNIT_TEST_FUNCTION_DPM_ADD_DEVICES_TO_BLACKLIST:
-               case BT_UNIT_TEST_FUNCTION_DPM_ADD_DEVICES_TO_WHITELIST:
-               case BT_UNIT_TEST_FUNCTION_DPM_REMOVE_DEVICE_FROM_BLACKLIST:
-               case BT_UNIT_TEST_FUNCTION_DPM_REMOVE_DEVICE_FROM_WHITELIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_ADD_DEVICES_TO_BLOCKLIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_ADD_DEVICES_TO_ALLOWLIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_REMOVE_DEVICE_FROM_BLOCKLIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_REMOVE_DEVICE_FROM_ALLOWLIST:
                        param_count = 1;
                        TC_PRT("Input device Address");
                        break;
-               case BT_UNIT_TEST_FUNCTION_DPM_ADD_UUIDS_TO_BLACKLIST:
-               case BT_UNIT_TEST_FUNCTION_DPM_ADD_UUIDS_TO_WHITELIST:
-               case BT_UNIT_TEST_FUNCTION_DPM_REMOVE_UUIDS_FROM_BLACKLIST:
-               case BT_UNIT_TEST_FUNCTION_DPM_REMOVE_UUIDS_FROM_WHITELIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_ADD_UUIDS_TO_BLOCKLIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_ADD_UUIDS_TO_ALLOWLIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_REMOVE_UUIDS_FROM_BLOCKLIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_REMOVE_UUIDS_FROM_ALLOWLIST:
                        param_count = 1;
                        TC_PRT("Input UUID");
                        break;
@@ -5510,14 +5510,14 @@ int test_input_callback(void *data)
                                        TC_PRT("failed with [0x%04x]", ret);
                        break;
                }
-               case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_ADD_WHITE_LIST: {
+               case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_ADD_ALLOW_LIST: {
                        ret = bt_adapter_le_add_white_list(remote_addr,
                                BT_DEVICE_PUBLIC_ADDRESS);
                        TC_PRT("returns %s\n", __bt_get_error_message(ret));
                        break;
                }
 
-               case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_REMOVE_WHITE_LIST: {
+               case BT_UNIT_TEST_FUNCTION_ADAPTER_LE_REMOVE_ALLOW_LIST: {
                        ret = bt_adapter_le_remove_white_list(remote_addr,
                                BT_DEVICE_PUBLIC_ADDRESS);
                        TC_PRT("returns %s\n", __bt_get_error_message(ret));
@@ -9466,7 +9466,7 @@ int test_input_callback(void *data)
                                                value, __bt_get_error_message(ret));
                        break;
                }
-               case BT_UNIT_TEST_FUNCTION_DPM_ADD_DEVICES_TO_BLACKLIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_ADD_DEVICES_TO_BLOCKLIST:
                        if (g_test_param.param_count < 1) {
                                        TC_PRT("Input parameters first");
                                        break;
@@ -9477,7 +9477,7 @@ int test_input_callback(void *data)
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
-               case BT_UNIT_TEST_FUNCTION_DPM_ADD_DEVICES_TO_WHITELIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_ADD_DEVICES_TO_ALLOWLIST:
                        if (g_test_param.param_count < 1) {
                                        TC_PRT("Input parameters first");
                                        break;
@@ -9488,7 +9488,7 @@ int test_input_callback(void *data)
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
-               case BT_UNIT_TEST_FUNCTION_DPM_ADD_UUIDS_TO_BLACKLIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_ADD_UUIDS_TO_BLOCKLIST:
                        if (g_test_param.param_count < 1) {
                                        TC_PRT("Input parameters first");
                                        break;
@@ -9499,7 +9499,7 @@ int test_input_callback(void *data)
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
-               case BT_UNIT_TEST_FUNCTION_DPM_ADD_UUIDS_TO_WHITELIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_ADD_UUIDS_TO_ALLOWLIST:
                        if (g_test_param.param_count < 1) {
                                        TC_PRT("Input parameters first");
                                        break;
@@ -9510,7 +9510,7 @@ int test_input_callback(void *data)
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
-               case BT_UNIT_TEST_FUNCTION_DPM_GET_DEVICES_FROM_BLACKLIST: {
+               case BT_UNIT_TEST_FUNCTION_DPM_GET_DEVICES_FROM_BLOCKLIST: {
                        bt_dpm_device_list_s *device_list = NULL;
                        int i = 0;
                        char *str = NULL;
@@ -9529,7 +9529,7 @@ int test_input_callback(void *data)
                        }
                        break;
                }
-               case BT_UNIT_TEST_FUNCTION_DPM_GET_DEVICES_FROM_WHITELIST: {
+               case BT_UNIT_TEST_FUNCTION_DPM_GET_DEVICES_FROM_ALLOWLIST: {
                        bt_dpm_device_list_s *device_list = NULL;
                        int i = 0;
                        char *str = NULL;
@@ -9549,7 +9549,7 @@ int test_input_callback(void *data)
                        }
                        break;
                }
-               case BT_UNIT_TEST_FUNCTION_DPM_GET_UUIDS_FROM_BLACKLIST: {
+               case BT_UNIT_TEST_FUNCTION_DPM_GET_UUIDS_FROM_BLOCKLIST: {
                        bt_dpm_uuids_list_s *uuids_list = NULL;
                        int i = 0;
                        char *str = NULL;
@@ -9569,7 +9569,7 @@ int test_input_callback(void *data)
                        }
                        break;
                }
-               case BT_UNIT_TEST_FUNCTION_DPM_GET_UUIDS_FROM_WHITELIST: {
+               case BT_UNIT_TEST_FUNCTION_DPM_GET_UUIDS_FROM_ALLOWLIST: {
                        bt_dpm_uuids_list_s *uuids_list = NULL;
                        int i = 0;
                        char *str = NULL;
@@ -9589,27 +9589,27 @@ int test_input_callback(void *data)
                        }
                        break;
                }
-               case BT_UNIT_TEST_FUNCTION_DPM_CLEAR_DEVICES_FROM_BLACKLIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_CLEAR_DEVICES_FROM_BLOCKLIST:
                        ret = bt_dpm_clear_devices_from_blacklist();
                        TC_PRT("bt_dpm_clear_devices_from_blacklist : returns %s\n",
                                                __bt_get_error_message(ret));
                        break;
-               case BT_UNIT_TEST_FUNCTION_DPM_CLEAR_DEVICES_FROM_WHITELIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_CLEAR_DEVICES_FROM_ALLOWLIST:
                        ret = bt_dpm_clear_devices_from_whitelist();
                        TC_PRT("bt_dpm_clear_devices_from_whitelist : returns %s\n",
                                                __bt_get_error_message(ret));
                        break;
-               case BT_UNIT_TEST_FUNCTION_DPM_CLEAR_UUIDS_FROM_BLACKLIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_CLEAR_UUIDS_FROM_BLOCKLIST:
                        ret = bt_dpm_clear_uuids_from_blacklist();
                        TC_PRT("bt_dpm_clear_uuids_from_blacklist : returns %s\n",
                                                __bt_get_error_message(ret));
                        break;
-               case BT_UNIT_TEST_FUNCTION_DPM_CLEAR_UUIDS_FROM_WHITELIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_CLEAR_UUIDS_FROM_ALLOWLIST:
                        ret = bt_dpm_clear_uuids_from_whitelist();
                        TC_PRT("bt_dpm_clear_uuids_from_whitelist : returns %s\n",
                                                __bt_get_error_message(ret));
                        break;
-               case BT_UNIT_TEST_FUNCTION_DPM_REMOVE_DEVICE_FROM_BLACKLIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_REMOVE_DEVICE_FROM_BLOCKLIST:
                        if (g_test_param.param_count < 1) {
                                        TC_PRT("Input parameters first");
                                        break;
@@ -9620,7 +9620,7 @@ int test_input_callback(void *data)
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
-               case BT_UNIT_TEST_FUNCTION_DPM_REMOVE_DEVICE_FROM_WHITELIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_REMOVE_DEVICE_FROM_ALLOWLIST:
                        if (g_test_param.param_count < 1) {
                                        TC_PRT("Input parameters first");
                                        break;
@@ -9631,7 +9631,7 @@ int test_input_callback(void *data)
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
-               case BT_UNIT_TEST_FUNCTION_DPM_REMOVE_UUIDS_FROM_BLACKLIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_REMOVE_UUIDS_FROM_BLOCKLIST:
                        if (g_test_param.param_count < 1) {
                                        TC_PRT("Input parameters first");
                                        break;
@@ -9642,7 +9642,7 @@ int test_input_callback(void *data)
                                                __bt_get_error_message(ret));
                        __bt_free_test_param(&g_test_param);
                        break;
-               case BT_UNIT_TEST_FUNCTION_DPM_REMOVE_UUIDS_FROM_WHITELIST:
+               case BT_UNIT_TEST_FUNCTION_DPM_REMOVE_UUIDS_FROM_ALLOWLIST:
                        if (g_test_param.param_count < 1) {
                                        TC_PRT("Input parameters first");
                                        break;

diff --git a/tests/test/bt_unit_test.h b/tests/test/bt_unit_test.h
index 34f936a..7c4b254 100644 (file)
--- a/tests/test/bt_unit_test.h
+++ b/tests/test/bt_unit_test.h
@@ -127,9 +127,9 @@ typedef enum {
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_ADVERTISING_NEW,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_ADVERTISING,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_STOP_ADVERTISING,
-       BT_UNIT_TEST_FUNCTION_ADAPTER_LE_ADD_WHITE_LIST,
-       BT_UNIT_TEST_FUNCTION_ADAPTER_LE_REMOVE_WHITE_LIST,
-       BT_UNIT_TEST_FUNCTION_ADAPTER_LE_CLEAR_WHITE_LIST,
+       BT_UNIT_TEST_FUNCTION_ADAPTER_LE_ADD_ALLOW_LIST,
+       BT_UNIT_TEST_FUNCTION_ADAPTER_LE_REMOVE_ALLOW_LIST,
+       BT_UNIT_TEST_FUNCTION_ADAPTER_LE_CLEAR_ALLOW_LIST,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_ENABLE_PRIVACY,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_GET_LOCAL_OOB_EXT_DATA,
        BT_UNIT_TEST_FUNCTION_ADAPTER_LE_SET_REMOTE_OOB_EXT_DATA,
@@ -431,22 +431,22 @@ typedef enum {
        BT_UNIT_TEST_FUNCTION_DPM_IS_DEVICE_RESTRICTIO_ACTIVATE,
        BT_UNIT_TEST_FUNCTION_DPM_ACTIVATE_UUID_RESTRICTION,
        BT_UNIT_TEST_FUNCTION_DPM_IS_UUID_RESTRICTIO_ACTIVATE,
-       BT_UNIT_TEST_FUNCTION_DPM_ADD_DEVICES_TO_BLACKLIST,
-       BT_UNIT_TEST_FUNCTION_DPM_ADD_DEVICES_TO_WHITELIST,
-       BT_UNIT_TEST_FUNCTION_DPM_ADD_UUIDS_TO_BLACKLIST,
-       BT_UNIT_TEST_FUNCTION_DPM_ADD_UUIDS_TO_WHITELIST,
-       BT_UNIT_TEST_FUNCTION_DPM_GET_DEVICES_FROM_BLACKLIST,
-       BT_UNIT_TEST_FUNCTION_DPM_GET_DEVICES_FROM_WHITELIST,
-       BT_UNIT_TEST_FUNCTION_DPM_GET_UUIDS_FROM_BLACKLIST,
-       BT_UNIT_TEST_FUNCTION_DPM_GET_UUIDS_FROM_WHITELIST,
-       BT_UNIT_TEST_FUNCTION_DPM_CLEAR_DEVICES_FROM_BLACKLIST,
-       BT_UNIT_TEST_FUNCTION_DPM_CLEAR_DEVICES_FROM_WHITELIST,
-       BT_UNIT_TEST_FUNCTION_DPM_CLEAR_UUIDS_FROM_BLACKLIST,
-       BT_UNIT_TEST_FUNCTION_DPM_CLEAR_UUIDS_FROM_WHITELIST,
-       BT_UNIT_TEST_FUNCTION_DPM_REMOVE_DEVICE_FROM_BLACKLIST,
-       BT_UNIT_TEST_FUNCTION_DPM_REMOVE_DEVICE_FROM_WHITELIST,
-       BT_UNIT_TEST_FUNCTION_DPM_REMOVE_UUIDS_FROM_BLACKLIST,
-       BT_UNIT_TEST_FUNCTION_DPM_REMOVE_UUIDS_FROM_WHITELIST,
+       BT_UNIT_TEST_FUNCTION_DPM_ADD_DEVICES_TO_BLOCKLIST,
+       BT_UNIT_TEST_FUNCTION_DPM_ADD_DEVICES_TO_ALLOWLIST,
+       BT_UNIT_TEST_FUNCTION_DPM_ADD_UUIDS_TO_BLOCKLIST,
+       BT_UNIT_TEST_FUNCTION_DPM_ADD_UUIDS_TO_ALLOWLIST,
+       BT_UNIT_TEST_FUNCTION_DPM_GET_DEVICES_FROM_BLOCKLIST,
+       BT_UNIT_TEST_FUNCTION_DPM_GET_DEVICES_FROM_ALLOWLIST,
+       BT_UNIT_TEST_FUNCTION_DPM_GET_UUIDS_FROM_BLOCKLIST,
+       BT_UNIT_TEST_FUNCTION_DPM_GET_UUIDS_FROM_ALLOWLIST,
+       BT_UNIT_TEST_FUNCTION_DPM_CLEAR_DEVICES_FROM_BLOCKLIST,
+       BT_UNIT_TEST_FUNCTION_DPM_CLEAR_DEVICES_FROM_ALLOWLIST,
+       BT_UNIT_TEST_FUNCTION_DPM_CLEAR_UUIDS_FROM_BLOCKLIST,
+       BT_UNIT_TEST_FUNCTION_DPM_CLEAR_UUIDS_FROM_ALLOWLIST,
+       BT_UNIT_TEST_FUNCTION_DPM_REMOVE_DEVICE_FROM_BLOCKLIST,
+       BT_UNIT_TEST_FUNCTION_DPM_REMOVE_DEVICE_FROM_ALLOWLIST,
+       BT_UNIT_TEST_FUNCTION_DPM_REMOVE_UUIDS_FROM_BLOCKLIST,
+       BT_UNIT_TEST_FUNCTION_DPM_REMOVE_UUIDS_FROM_ALLOWLIST,
        BT_UNIT_TEST_FUNCTION_DPM_SET_ALLOW_OUTGOING_CALL,
        BT_UNIT_TEST_FUNCTION_DPM_GET_ALLOW_OUTGOING_CALL,
        BT_UNIT_TEST_FUNCTION_DPM_SET_PAIRING_STATE,