diff options
| author | Grzegorz Kolodziejczyk <grzegorz.kolodziejczyk@tieto.com> | 2014-10-03 10:44:49 +0200 |
|---|---|---|
| committer | Szymon Janc <szymon.janc@tieto.com> | 2014-10-06 12:41:27 +0200 |
| commit | c7a361134d93f755421a2e737e008b5e1702a6dc (patch) | |
| tree | f3c62c796ea25e4e4e9dfa47bd9a55a34b9dd88d /android/tester-gatt.c | |
| parent | d2abd2d24b362d6eb1d92263193ead93a805b3ff (diff) | |
| download | bluez-c7a361134d93f755421a2e737e008b5e1702a6dc.tar.gz | |
android/tester: Change GATT client connection test cases to LE connect
Current GATT client connect test cases don't check if found device is
BLE type. Now it's updated with check step (device found callback
analyze for device type).
Diffstat (limited to 'android/tester-gatt.c')
| -rw-r--r-- | android/tester-gatt.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/android/tester-gatt.c b/android/tester-gatt.c index 432674942..b53a61a56 100644 --- a/android/tester-gatt.c +++ b/android/tester-gatt.c @@ -109,10 +109,18 @@ struct notif_data { static bt_bdaddr_t emu_remote_bdaddr_val = { .address = { 0x00, 0xaa, 0x01, 0x01, 0x00, 0x00 }, }; +static bt_device_type_t emu_remote_ble_device_type = BT_DEVICE_DEVTYPE_BLE; + static bt_property_t prop_emu_remotes_default_set[] = { { BT_PROPERTY_BDADDR, sizeof(emu_remote_bdaddr_val), &emu_remote_bdaddr_val }, }; +static bt_property_t prop_emu_remotes_default_le_set[] = { + { BT_PROPERTY_BDADDR, sizeof(emu_remote_bdaddr_val), + &emu_remote_bdaddr_val }, + { BT_PROPERTY_TYPE_OF_DEVICE, sizeof(bt_device_type_t), + &emu_remote_ble_device_type }, +}; static bt_scan_mode_t setprop_scan_mode_conn_val = BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE; @@ -1204,13 +1212,14 @@ static struct test_case test_cases[] = { CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS), ACTION_SUCCESS(gatt_client_start_scan_action, INT_TO_PTR(APP1_ID)), + CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2), CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE), ACTION_SUCCESS(gatt_client_stop_scan_action, INT_TO_PTR(APP1_ID)), ACTION_SUCCESS(bluetooth_disable_action, NULL), CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF), ), - TEST_CASE_BREDRLE("Gatt Client - Connect", + TEST_CASE_BREDRLE("Gatt Client - LE Connect", ACTION_SUCCESS(bluetooth_enable_action, NULL), CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON), ACTION_SUCCESS(emu_setup_powered_remote_action, NULL), @@ -1220,6 +1229,7 @@ static struct test_case test_cases[] = { CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS), ACTION_SUCCESS(gatt_client_start_scan_action, INT_TO_PTR(APP1_ID)), + CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2), CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE), ACTION_SUCCESS(gatt_client_stop_scan_action, INT_TO_PTR(APP1_ID)), @@ -1230,7 +1240,7 @@ static struct test_case test_cases[] = { ACTION_SUCCESS(bluetooth_disable_action, NULL), CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF), ), - TEST_CASE_BREDRLE("Gatt Client - Disconnect", + TEST_CASE_BREDRLE("Gatt Client - LE Disconnect", ACTION_SUCCESS(bluetooth_enable_action, NULL), CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON), ACTION_SUCCESS(emu_setup_powered_remote_action, NULL), @@ -1240,6 +1250,7 @@ static struct test_case test_cases[] = { CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS), ACTION_SUCCESS(gatt_client_start_scan_action, INT_TO_PTR(APP1_ID)), + CALLBACK_DEVICE_FOUND(prop_emu_remotes_default_le_set, 2), CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE), ACTION_SUCCESS(gatt_client_stop_scan_action, INT_TO_PTR(APP1_ID)), @@ -1255,7 +1266,7 @@ static struct test_case test_cases[] = { ACTION_SUCCESS(bluetooth_disable_action, NULL), CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF), ), - TEST_CASE_BREDRLE("Gatt Client - Multiple Client Conn./Disc.", + TEST_CASE_BREDRLE("Gatt Client - LE Multiple Client Conn./Disc.", ACTION_SUCCESS(bluetooth_enable_action, NULL), CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON), ACTION_SUCCESS(emu_setup_powered_remote_action, NULL), |