[PATCH 1/6] android/tester: Style fix

Linux bluetooth development
 help / color / mirror / Atom feed

* [PATCH 1/6] android/tester: Style fix
@ 2014-09-25 14:03 Grzegorz Kolodziejczyk
  2014-09-25 14:03 ` [PATCH 2/6] android/tester: Make client and server id unified Grzegorz Kolodziejczyk
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: Grzegorz Kolodziejczyk @ 2014-09-25 14:03 UTC (permalink / raw)
  To: linux-bluetooth

---
 android/tester-main.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/android/tester-main.c b/android/tester-main.c
index b65029a..081a1ce 100644
--- a/android/tester-main.c
+++ b/android/tester-main.c
@@ -440,8 +440,7 @@ static bool match_data(struct step *step)
 			return false;
 		}
 
-		if (exp->callback_result.state !=
-						step->callback_result.state) {
+		if (exp->callback_result.state != step->callback_result.state) {
 			tester_debug("Callback state don't match");
 			return false;
 		}
@@ -452,8 +451,7 @@ static bool match_data(struct step *step)
 			return false;
 		}
 
-		if (exp->callback_result.mode !=
-						step->callback_result.mode) {
+		if (exp->callback_result.mode != step->callback_result.mode) {
 			tester_debug("Callback mode don't match");
 			return false;
 		}
@@ -489,7 +487,7 @@ static bool match_data(struct step *step)
 		}
 
 		if (exp->callback_result.app_id !=
-					step->callback_result.app_id) {
+						step->callback_result.app_id) {
 			tester_debug("Callback app_id don't match");
 			return false;
 		}
@@ -874,8 +872,8 @@ static void bond_state_changed_cb(bt_status_t status,
 
 	/* Utilize property verification mechanism for bdaddr */
 	step->callback_result.num_properties = 1;
-	step->callback_result.properties = create_property(BT_PROPERTY_BDADDR,
-						remote_bd_addr,
+	step->callback_result.properties =
+			create_property(BT_PROPERTY_BDADDR, remote_bd_addr,
 						sizeof(*remote_bd_addr));
 
 	step->callback = CB_BT_BOND_STATE_CHANGED;
-- 
1.9.3


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/6] android/tester: Make client and server id unified
  2014-09-25 14:03 [PATCH 1/6] android/tester: Style fix Grzegorz Kolodziejczyk
@ 2014-09-25 14:03 ` Grzegorz Kolodziejczyk
  2014-09-25 14:03 ` [PATCH 3/6] android/tester: Add GATT Server basic test cases Grzegorz Kolodziejczyk
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Grzegorz Kolodziejczyk @ 2014-09-25 14:03 UTC (permalink / raw)
  To: linux-bluetooth

This makes unified id numers for both gatt server and client defined
as application id.
---
 android/tester-gatt.c | 328 +++++++++++++++++++++++++-------------------------
 android/tester-main.c |  12 +-
 android/tester-main.h |   6 +-
 3 files changed, 173 insertions(+), 173 deletions(-)

diff --git a/android/tester-gatt.c b/android/tester-gatt.c
index 5d18bf0..26470d5 100644
--- a/android/tester-gatt.c
+++ b/android/tester-gatt.c
@@ -28,8 +28,8 @@
 #define GATT_STATUS_FAILURE	0x00000101
 #define GATT_STATUS_INS_AUTH	0x08
 
-#define CLIENT1_ID	1
-#define CLIENT2_ID	2
+#define APP1_ID	1
+#define APP2_ID	2
 
 #define CONN1_ID	1
 #define CONN2_ID	2
@@ -51,7 +51,7 @@ struct pdu {
 	uint16_t size;
 };
 
-static bt_uuid_t client_app_uuid = {
+static bt_uuid_t app1_uuid = {
 	.uu = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
 				0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 },
 };
@@ -65,7 +65,7 @@ struct emu_cid_data {
 };
 
 struct gatt_connect_data {
-	const int client_id;
+	const int app_id;
 	const int conn_id;
 };
 
@@ -141,18 +141,18 @@ static bt_property_t prop_test_scan_mode_conn = {
 
 static struct emu_cid_data cid_data;
 
-static struct gatt_connect_data client1_conn_req = {
-	.client_id = CLIENT1_ID,
+static struct gatt_connect_data app1_conn_req = {
+	.app_id = APP1_ID,
 	.conn_id = CONN1_ID,
 };
 
-static struct gatt_connect_data client1_conn2_req = {
-	.client_id = CLIENT1_ID,
+static struct gatt_connect_data app1_conn2_req = {
+	.app_id = APP1_ID,
 	.conn_id = CONN2_ID,
 };
 
-static struct gatt_connect_data client2_conn_req = {
-	.client_id = CLIENT2_ID,
+static struct gatt_connect_data app2_conn_req = {
+	.app_id = APP2_ID,
 	.conn_id = CONN2_ID,
 };
 
@@ -677,7 +677,7 @@ static void gatt_client_connect_action(void)
 	struct step *step = g_new0(struct step, 1);
 
 	step->action_status = data->if_gatt->client->connect(
-							conn_data->client_id,
+							conn_data->app_id,
 							&emu_remote_bdaddr_val,
 							0);
 
@@ -692,7 +692,7 @@ static void gatt_client_disconnect_action(void)
 	struct step *step = g_new0(struct step, 1);
 
 	step->action_status = data->if_gatt->client->disconnect(
-							conn_data->client_id,
+							conn_data->app_id,
 							&emu_remote_bdaddr_val,
 							conn_data->conn_id);
 
@@ -707,7 +707,7 @@ static void gatt_client_do_listen_action(void)
 	struct step *step = g_new0(struct step, 1);
 
 	step->action_status = data->if_gatt->client->listen(
-							conn_data->client_id,
+							conn_data->app_id,
 							1);
 
 	schedule_action_verification(step);
@@ -721,7 +721,7 @@ static void gatt_client_stop_listen_action(void)
 	struct step *step = g_new0(struct step, 1);
 
 	step->action_status = data->if_gatt->client->listen(
-							conn_data->client_id,
+							conn_data->app_id,
 							0);
 
 	schedule_action_verification(step);
@@ -1009,15 +1009,15 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(dummy_action, NULL),
 	),
 	TEST_CASE_BREDRLE("Gatt Client - Register",
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 	),
 	TEST_CASE_BREDRLE("Gatt Client - Unregister",
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_unregister_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 	),
 	TEST_CASE_BREDRLE("Gatt Client - Scan",
@@ -1025,13 +1025,13 @@ static struct test_case test_cases[] = {
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_ON),
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		ACTION_SUCCESS(bluetooth_disable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
 	),
@@ -1041,17 +1041,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(bluetooth_disable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
 	),
@@ -1061,22 +1061,22 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_disconnect_action,
-							&client1_conn_req),
+							&app1_conn_req),
 		CALLBACK_GATTC_DISCONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(bluetooth_disable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
 	),
@@ -1086,33 +1086,33 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_register_action, &client2_app_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
-		ACTION_SUCCESS(gatt_client_connect_action, &client2_conn_req),
+						CONN1_ID, APP1_ID),
+		ACTION_SUCCESS(gatt_client_connect_action, &app2_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN2_ID, CLIENT2_ID),
+						CONN2_ID, APP2_ID),
 		ACTION_SUCCESS(gatt_client_disconnect_action,
-							&client2_conn_req),
+							&app2_conn_req),
 		CALLBACK_GATTC_DISCONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN2_ID, CLIENT2_ID),
+						CONN2_ID, APP2_ID),
 		ACTION_SUCCESS(gatt_client_disconnect_action,
-							&client1_conn_req),
+							&app1_conn_req),
 		CALLBACK_GATTC_DISCONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(bluetooth_disable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
 	),
@@ -1125,22 +1125,22 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(bt_set_property_action,
 						&prop_test_scan_mode_conn),
 		CALLBACK_ADAPTER_PROPS(&prop_test_scan_mode_conn, 1),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_do_listen_action, &client1_conn_req),
+		ACTION_SUCCESS(gatt_client_do_listen_action, &app1_conn_req),
 		CALLBACK_STATUS(CB_GATTC_LISTEN, GATT_STATUS_SUCCESS),
 		ACTION_SUCCESS(emu_remote_connect_hci_action, &bearer_type),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_stop_listen_action,
-							&client1_conn_req),
+							&app1_conn_req),
 		CALLBACK_STATUS(CB_GATTC_LISTEN, GATT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_disconnect_action,
-							&client1_conn_req),
+							&app1_conn_req),
 		CALLBACK_GATTC_DISCONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(bluetooth_disable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
 	),
@@ -1153,40 +1153,40 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(bt_set_property_action,
 						&prop_test_scan_mode_conn),
 		CALLBACK_ADAPTER_PROPS(&prop_test_scan_mode_conn, 1),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
-		ACTION_SUCCESS(gatt_client_do_listen_action, &client1_conn_req),
+		ACTION_SUCCESS(gatt_client_do_listen_action, &app1_conn_req),
 		CALLBACK_STATUS(CB_GATTC_LISTEN, GATT_STATUS_SUCCESS),
 		ACTION_SUCCESS(emu_remote_connect_hci_action, &bearer_type),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_stop_listen_action,
-							&client1_conn_req),
+							&app1_conn_req),
 		CALLBACK_STATUS(CB_GATTC_LISTEN, GATT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_disconnect_action,
-							&client1_conn_req),
+							&app1_conn_req),
 		CALLBACK_GATTC_DISCONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		/* Close ACL on emulated remotes side so it can reconnect */
 		ACTION_SUCCESS(emu_remote_disconnect_hci_action,
 							&cid_data.handle),
 		CALLBACK_STATE(CB_BT_ACL_STATE_CHANGED,
 						BT_ACL_STATE_DISCONNECTED),
-		ACTION_SUCCESS(gatt_client_do_listen_action, &client1_conn_req),
+		ACTION_SUCCESS(gatt_client_do_listen_action, &app1_conn_req),
 		CALLBACK_STATUS(CB_GATTC_LISTEN, GATT_STATUS_SUCCESS),
 		ACTION_SUCCESS(emu_remote_connect_hci_action, &bearer_type),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN2_ID, CLIENT1_ID),
+						CONN2_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_disconnect_action,
-							&client1_conn2_req),
+							&app1_conn2_req),
 		CALLBACK_GATTC_DISCONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN2_ID, CLIENT1_ID),
+						CONN2_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_stop_listen_action,
-							&client1_conn_req),
+							&app1_conn_req),
 		CALLBACK_STATUS(CB_GATTC_LISTEN, GATT_STATUS_SUCCESS),
 		ACTION_SUCCESS(bluetooth_disable_action, NULL),
 		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
@@ -1198,17 +1198,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_RESULT(CONN1_ID, &service_1),
 		CALLBACK_GATTC_SEARCH_COMPLETE(GATT_STATUS_SUCCESS, CONN1_ID),
@@ -1222,17 +1222,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_RESULT(CONN1_ID, &service_1),
 		CALLBACK_GATTC_SEARCH_RESULT(CONN1_ID, &service_2),
@@ -1247,17 +1247,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_COMPLETE(GATT_STATUS_SUCCESS, CONN1_ID),
 		ACTION_SUCCESS(bluetooth_disable_action, NULL),
@@ -1270,17 +1270,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_COMPLETE(GATT_STATUS_SUCCESS, CONN1_ID),
 		ACTION_SUCCESS(gatt_client_get_characteristic_action,
@@ -1297,17 +1297,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_COMPLETE(GATT_STATUS_SUCCESS, CONN1_ID),
 		ACTION_FAIL(gatt_client_get_characteristic_action,
@@ -1325,17 +1325,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_COMPLETE(GATT_STATUS_SUCCESS, CONN1_ID),
 		ACTION_SUCCESS(gatt_client_get_characteristic_action,
@@ -1356,17 +1356,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_COMPLETE(GATT_STATUS_SUCCESS, CONN1_ID),
 		ACTION_SUCCESS(gatt_client_get_characteristic_action,
@@ -1394,17 +1394,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_COMPLETE(GATT_STATUS_SUCCESS, CONN1_ID),
 		ACTION_SUCCESS(gatt_client_get_characteristic_action,
@@ -1425,17 +1425,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_COMPLETE(GATT_STATUS_SUCCESS, CONN1_ID),
 		ACTION_SUCCESS(gatt_client_get_included_action,
@@ -1452,17 +1452,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_COMPLETE(GATT_STATUS_SUCCESS, CONN1_ID),
 		ACTION_SUCCESS(gatt_client_get_included_action,
@@ -1479,17 +1479,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_COMPLETE(GATT_STATUS_SUCCESS, CONN1_ID),
 		ACTION_SUCCESS(gatt_client_get_included_action,
@@ -1507,17 +1507,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_COMPLETE(GATT_STATUS_SUCCESS, CONN1_ID),
 		ACTION_SUCCESS(gatt_client_get_characteristic_action,
@@ -1540,17 +1540,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_COMPLETE(GATT_STATUS_SUCCESS, CONN1_ID),
 		ACTION_SUCCESS(gatt_client_get_characteristic_action,
@@ -1572,17 +1572,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_COMPLETE(GATT_STATUS_SUCCESS, CONN1_ID),
 		ACTION_SUCCESS(gatt_client_get_characteristic_action,
@@ -1604,17 +1604,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_COMPLETE(GATT_STATUS_SUCCESS, CONN1_ID),
 		ACTION_SUCCESS(gatt_client_get_characteristic_action,
@@ -1640,17 +1640,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_COMPLETE(GATT_STATUS_SUCCESS, CONN1_ID),
 		ACTION_SUCCESS(gatt_client_get_characteristic_action,
@@ -1676,17 +1676,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_COMPLETE(GATT_STATUS_SUCCESS, CONN1_ID),
 		ACTION_SUCCESS(gatt_client_get_characteristic_action,
@@ -1712,17 +1712,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_COMPLETE(GATT_STATUS_SUCCESS, CONN1_ID),
 		ACTION_SUCCESS(gatt_client_get_characteristic_action,
@@ -1744,17 +1744,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_COMPLETE(GATT_STATUS_SUCCESS, CONN1_ID),
 		ACTION_SUCCESS(gatt_client_get_characteristic_action,
@@ -1776,17 +1776,17 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
-		ACTION_SUCCESS(gatt_client_connect_action, &client1_conn_req),
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_client_connect_action, &app1_conn_req),
 		CALLBACK_GATTC_CONNECT(GATT_STATUS_SUCCESS,
 						prop_emu_remotes_default_set,
-						CONN1_ID, CLIENT1_ID),
+						CONN1_ID, APP1_ID),
 		ACTION_SUCCESS(gatt_client_search_services, &search_services_1),
 		CALLBACK_GATTC_SEARCH_COMPLETE(GATT_STATUS_SUCCESS, CONN1_ID),
 		ACTION_SUCCESS(gatt_client_get_characteristic_action,
@@ -1808,13 +1808,13 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(emu_setup_powered_remote_action, NULL),
 		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
 		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
-		ACTION_SUCCESS(gatt_client_register_action, &client_app_uuid),
+		ACTION_SUCCESS(gatt_client_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTC_REGISTER_CLIENT, BT_STATUS_SUCCESS),
 		ACTION_SUCCESS(gatt_client_start_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		CLLBACK_GATTC_SCAN_RES(prop_emu_remotes_default_set, 1, TRUE),
 		ACTION_SUCCESS(gatt_client_stop_scan_action,
-							INT_TO_PTR(CLIENT1_ID)),
+							INT_TO_PTR(APP1_ID)),
 		ACTION_FAIL(gatt_client_write_characteristic_action,
 							&write_char_data_2),
 		CALLBACK_GATTC_WRITE_CHARACTERISTIC(GATT_STATUS_FAILURE,
diff --git a/android/tester-main.c b/android/tester-main.c
index 081a1ce..61a6bcd 100644
--- a/android/tester-main.c
+++ b/android/tester-main.c
@@ -534,10 +534,10 @@ static bool match_data(struct step *step)
 			return false;
 		}
 
-		if (exp->callback_result.client_id !=
-					step->callback_result.client_id) {
-				tester_debug("Callback client_id don't match");
-				return false;
+		if (exp->callback_result.gatt_app_id !=
+					step->callback_result.gatt_app_id) {
+			tester_debug("Callback gatt_app_id don't match");
+			return false;
 		}
 
 		if (exp->callback_result.properties &&
@@ -1083,7 +1083,7 @@ static void gattc_connect_cb(int conn_id, int status, int client_if,
 	step->callback = CB_GATTC_OPEN;
 	step->callback_result.status = status;
 	step->callback_result.conn_id = conn_id;
-	step->callback_result.client_id = client_if;
+	step->callback_result.gatt_app_id = client_if;
 
 	/* Utilize property verification mechanism for bdaddr */
 	props[0] = create_property(BT_PROPERTY_BDADDR, bda, sizeof(*bda));
@@ -1106,7 +1106,7 @@ static void gattc_disconnect_cb(int conn_id, int status, int client_if,
 	step->callback = CB_GATTC_CLOSE;
 	step->callback_result.status = status;
 	step->callback_result.conn_id = conn_id;
-	step->callback_result.client_id = client_if;
+	step->callback_result.gatt_app_id = client_if;
 
 	/* Utilize property verification mechanism for bdaddr */
 	props[0] = create_property(BT_PROPERTY_BDADDR, bda, sizeof(*bda));
diff --git a/android/tester-main.h b/android/tester-main.h
index 6afc553..86291d8 100644
--- a/android/tester-main.h
+++ b/android/tester-main.h
@@ -132,7 +132,7 @@
 		.callback_result.properties = cb_prop, \
 		.callback_result.num_properties = 1, \
 		.callback_result.conn_id = cb_conn_id, \
-		.callback_result.client_id = cb_client_id, \
+		.callback_result.gatt_app_id = cb_client_id, \
 	}
 
 #define CALLBACK_GATTC_SEARCH_RESULT(cb_conn_id, cb_service) { \
@@ -209,7 +209,7 @@
 		.callback_result.properties = cb_prop, \
 		.callback_result.num_properties = 1, \
 		.callback_result.conn_id = cb_conn_id, \
-		.callback_result.client_id = cb_client_id, \
+		.callback_result.gatt_app_id = cb_client_id, \
 	}
 
 #define CALLBACK_PAN_CTRL_STATE(cb, cb_res, cb_state, cb_local_role) { \
@@ -440,7 +440,7 @@ struct bt_callback_data {
 
 	bool adv_data;
 
-	int client_id;
+	int gatt_app_id;
 	int conn_id;
 	btgatt_srvc_id_t *service;
 	btgatt_gatt_id_t *characteristic;
-- 
1.9.3


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 3/6] android/tester: Add GATT Server basic test cases
  2014-09-25 14:03 [PATCH 1/6] android/tester: Style fix Grzegorz Kolodziejczyk
  2014-09-25 14:03 ` [PATCH 2/6] android/tester: Make client and server id unified Grzegorz Kolodziejczyk
@ 2014-09-25 14:03 ` Grzegorz Kolodziejczyk
  2014-09-25 14:03 ` [PATCH 4/6] android/tester: Add GATT server connect successful test case Grzegorz Kolodziejczyk
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Grzegorz Kolodziejczyk @ 2014-09-25 14:03 UTC (permalink / raw)
  To: linux-bluetooth

This adds basic tests for server register, unregister.
---
 android/tester-gatt.c | 42 ++++++++++++++++++++++++++++++++++++++++++
 android/tester-main.c | 14 +++++++++++++-
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/android/tester-gatt.c b/android/tester-gatt.c
index 26470d5..693a8a3 100644
--- a/android/tester-gatt.c
+++ b/android/tester-gatt.c
@@ -836,6 +836,35 @@ static void gatt_client_write_characteristic_action(void)
 	schedule_action_verification(step);
 }
 
+static void gatt_server_register_action(void)
+{
+	struct test_data *data = tester_get_data();
+	struct step *current_data_step = queue_peek_head(data->steps);
+	bt_uuid_t *app_uuid = current_data_step->set_data;
+	struct step *step = g_new0(struct step, 1);
+
+	if (!app_uuid) {
+		tester_warn("No app uuid provided for register action.");
+		return;
+	}
+
+	step->action_status = data->if_gatt->server->register_server(app_uuid);
+
+	schedule_action_verification(step);
+}
+
+static void gatt_server_unregister_action(void)
+{
+	struct test_data *data = tester_get_data();
+	struct step *current_data_step = queue_peek_head(data->steps);
+	int32_t sr_id = PTR_TO_INT(current_data_step->set_data);
+	struct step *step = g_new0(struct step, 1);
+
+	step->action_status = data->if_gatt->server->unregister_server(sr_id);
+
+	schedule_action_verification(step);
+}
+
 static void gatt_cid_hook_cb(const void *data, uint16_t len, void *user_data)
 {
 	struct test_data *t_data = tester_get_data();
@@ -1822,6 +1851,19 @@ 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 Server - Register",
+		ACTION_SUCCESS(gatt_server_register_action, &app1_uuid),
+		CALLBACK_STATUS(CB_GATTS_REGISTER_SERVER, BT_STATUS_SUCCESS),
+	),
+	TEST_CASE_BREDRLE("Gatt Server - Unregister",
+		ACTION_SUCCESS(gatt_server_register_action, &app1_uuid),
+		CALLBACK_STATUS(CB_GATTS_REGISTER_SERVER, BT_STATUS_SUCCESS),
+		ACTION_SUCCESS(gatt_server_unregister_action,
+							INT_TO_PTR(APP1_ID)),
+		ACTION_SUCCESS(gatt_server_register_action, &app1_uuid),
+		CALLBACK_STATUS(CB_GATTS_REGISTER_SERVER, BT_STATUS_SUCCESS),
+	),
 };
 
 struct queue *get_gatt_tests(void)
diff --git a/android/tester-main.c b/android/tester-main.c
index 61a6bcd..93807cd 100644
--- a/android/tester-main.c
+++ b/android/tester-main.c
@@ -1253,6 +1253,18 @@ static void gattc_write_descriptor_cb(int conn_id, int status,
 	schedule_callback_call(step);
 }
 
+static void gatts_register_server_cb(int status, int server_if,
+							bt_uuid_t *app_uuid)
+{
+	struct step *step = g_new0(struct step, 1);
+
+	step->callback = CB_GATTS_REGISTER_SERVER;
+
+	step->callback_result.status = status;
+
+	schedule_callback_call(step);
+}
+
 static void pan_control_state_cb(btpan_control_state_t state,
 					bt_status_t error, int local_role,
 							const char *ifname)
@@ -1374,7 +1386,7 @@ static const btgatt_client_callbacks_t btgatt_client_callbacks = {
 };
 
 static const btgatt_server_callbacks_t btgatt_server_callbacks = {
-	.register_server_cb = NULL,
+	.register_server_cb = gatts_register_server_cb,
 	.connection_cb = NULL,
 	.service_added_cb = NULL,
 	.included_service_added_cb = NULL,
-- 
1.9.3


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 4/6] android/tester: Add GATT server connect successful test case
  2014-09-25 14:03 [PATCH 1/6] android/tester: Style fix Grzegorz Kolodziejczyk
  2014-09-25 14:03 ` [PATCH 2/6] android/tester: Make client and server id unified Grzegorz Kolodziejczyk
  2014-09-25 14:03 ` [PATCH 3/6] android/tester: Add GATT Server basic test cases Grzegorz Kolodziejczyk
@ 2014-09-25 14:03 ` Grzegorz Kolodziejczyk
  2014-09-25 14:03 ` [PATCH 5/6] android/tester: Make tester debug logs verbose Grzegorz Kolodziejczyk
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Grzegorz Kolodziejczyk @ 2014-09-25 14:03 UTC (permalink / raw)
  To: linux-bluetooth

It will connect to powered on and visible device.
---
 android/tester-gatt.c | 33 +++++++++++++++++++++++++++++++++
 android/tester-main.c | 34 +++++++++++++++++++++++++++++++++-
 android/tester-main.h | 10 ++++++++++
 3 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/android/tester-gatt.c b/android/tester-gatt.c
index 693a8a3..f8df92e 100644
--- a/android/tester-gatt.c
+++ b/android/tester-gatt.c
@@ -28,6 +28,9 @@
 #define GATT_STATUS_FAILURE	0x00000101
 #define GATT_STATUS_INS_AUTH	0x08
 
+#define GATT_SERVER_DISCONNECTED	0
+#define GATT_SERVER_CONNECTED		1
+
 #define APP1_ID	1
 #define APP2_ID	2
 
@@ -865,6 +868,21 @@ static void gatt_server_unregister_action(void)
 	schedule_action_verification(step);
 }
 
+static void gatt_server_connect_action(void)
+{
+	struct test_data *data = tester_get_data();
+	struct step *current_data_step = queue_peek_head(data->steps);
+	struct gatt_connect_data *conn_data = current_data_step->set_data;
+	struct step *step = g_new0(struct step, 1);
+
+	step->action_status = data->if_gatt->server->connect(
+							conn_data->app_id,
+							&emu_remote_bdaddr_val,
+							0);
+
+	schedule_action_verification(step);
+}
+
 static void gatt_cid_hook_cb(const void *data, uint16_t len, void *user_data)
 {
 	struct test_data *t_data = tester_get_data();
@@ -1864,6 +1882,21 @@ static struct test_case test_cases[] = {
 		ACTION_SUCCESS(gatt_server_register_action, &app1_uuid),
 		CALLBACK_STATUS(CB_GATTS_REGISTER_SERVER, BT_STATUS_SUCCESS),
 	),
+	TEST_CASE_BREDRLE("Gatt Server - 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),
+		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
+		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
+		ACTION_SUCCESS(gatt_server_register_action, &app1_uuid),
+		CALLBACK_STATUS(CB_GATTS_REGISTER_SERVER, BT_STATUS_SUCCESS),
+		ACTION_SUCCESS(gatt_server_connect_action, &app1_conn_req),
+		CALLBACK_GATTS_CONNECTION(GATT_SERVER_CONNECTED,
+						prop_emu_remotes_default_set,
+						CONN1_ID, APP1_ID),
+		ACTION_SUCCESS(bluetooth_disable_action, NULL),
+		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
+	),
 };
 
 struct queue *get_gatt_tests(void)
diff --git a/android/tester-main.c b/android/tester-main.c
index 93807cd..31b27d4 100644
--- a/android/tester-main.c
+++ b/android/tester-main.c
@@ -611,6 +611,15 @@ static bool match_data(struct step *step)
 				return false;
 			}
 		}
+
+		if (exp->callback_result.connected !=
+					step->callback_result.connected) {
+			tester_debug("Gatt server conn status doesn't match"
+					" - is = %d, exp = %d",
+					step->callback_result.connected,
+					exp->callback_result.connected);
+			return false;
+		}
 	}
 
 	return true;
@@ -1265,6 +1274,29 @@ static void gatts_register_server_cb(int status, int server_if,
 	schedule_callback_call(step);
 }
 
+static void gatts_connection_cb(int conn_id, int server_if, int connected,
+							bt_bdaddr_t *bda)
+{
+	struct step *step = g_new0(struct step, 1);
+	bt_property_t *props[1];
+
+	step->callback = CB_GATTS_CONNECTION;
+	step->callback_result.conn_id = conn_id;
+	step->callback_result.gatt_app_id = server_if;
+	step->callback_result.connected = connected;
+
+	/* Utilize property verification mechanism for bdaddr */
+	props[0] = create_property(BT_PROPERTY_BDADDR, bda, sizeof(*bda));
+
+	step->callback_result.num_properties = 1;
+	step->callback_result.properties = repack_properties(1, props);
+
+	g_free(props[0]->val);
+	g_free(props[0]);
+
+	schedule_callback_call(step);
+}
+
 static void pan_control_state_cb(btpan_control_state_t state,
 					bt_status_t error, int local_role,
 							const char *ifname)
@@ -1387,7 +1419,7 @@ static const btgatt_client_callbacks_t btgatt_client_callbacks = {
 
 static const btgatt_server_callbacks_t btgatt_server_callbacks = {
 	.register_server_cb = gatts_register_server_cb,
-	.connection_cb = NULL,
+	.connection_cb = gatts_connection_cb,
 	.service_added_cb = NULL,
 	.included_service_added_cb = NULL,
 	.characteristic_added_cb = NULL,
diff --git a/android/tester-main.h b/android/tester-main.h
index 86291d8..cd4a0d0 100644
--- a/android/tester-main.h
+++ b/android/tester-main.h
@@ -212,6 +212,15 @@
 		.callback_result.gatt_app_id = cb_client_id, \
 	}
 
+#define CALLBACK_GATTS_CONNECTION(cb_res, cb_prop, cb_conn_id, cb_server_id) { \
+		.callback = CB_GATTS_CONNECTION, \
+		.callback_result.connected = cb_res, \
+		.callback_result.properties = cb_prop, \
+		.callback_result.num_properties = 1, \
+		.callback_result.conn_id = cb_conn_id, \
+		.callback_result.gatt_app_id = cb_server_id, \
+	}
+
 #define CALLBACK_PAN_CTRL_STATE(cb, cb_res, cb_state, cb_local_role) { \
 		.callback = cb, \
 		.callback_result.status = cb_res, \
@@ -442,6 +451,7 @@ struct bt_callback_data {
 
 	int gatt_app_id;
 	int conn_id;
+	int connected;
 	btgatt_srvc_id_t *service;
 	btgatt_gatt_id_t *characteristic;
 	btgatt_gatt_id_t *descriptor;
-- 
1.9.3


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 5/6] android/tester: Make tester debug logs verbose.
  2014-09-25 14:03 [PATCH 1/6] android/tester: Style fix Grzegorz Kolodziejczyk
                   ` (2 preceding siblings ...)
  2014-09-25 14:03 ` [PATCH 4/6] android/tester: Add GATT server connect successful test case Grzegorz Kolodziejczyk
@ 2014-09-25 14:03 ` Grzegorz Kolodziejczyk
  2014-09-25 14:03 ` [PATCH 6/6] android/tester: Add GATT server disconnect successful test case Grzegorz Kolodziejczyk
  2014-09-29 14:15 ` [PATCH 1/6] android/tester: Style fix Szymon Janc
  5 siblings, 0 replies; 7+ messages in thread
From: Grzegorz Kolodziejczyk @ 2014-09-25 14:03 UTC (permalink / raw)
  To: linux-bluetooth

This adds additional logs to match function. In case if compared values
doesn't match, tester will print those values.
---
 android/tester-main.c | 167 ++++++++++++++++++++++++++++++++++++++++++++------
 android/tester-main.h |   2 +
 2 files changed, 150 insertions(+), 19 deletions(-)

diff --git a/android/tester-main.c b/android/tester-main.c
index 31b27d4..7901ed0 100644
--- a/android/tester-main.c
+++ b/android/tester-main.c
@@ -28,6 +28,79 @@ static gint scheduled_cbacks_num;
 #define EMULATOR_SIGNAL_TIMEOUT 2 /* in seconds */
 #define EMULATOR_SIGNAL "emulator_started"
 
+static struct {
+	uint16_t cb_num;
+	const char *str;
+} cb_table[] = {
+	DBG_CB(CB_BT_ADAPTER_STATE_CHANGED),
+	DBG_CB(CB_BT_ADAPTER_PROPERTIES),
+	DBG_CB(CB_BT_REMOTE_DEVICE_PROPERTIES),
+	DBG_CB(CB_BT_DEVICE_FOUND),
+	DBG_CB(CB_BT_DISCOVERY_STATE_CHANGED),
+	DBG_CB(CB_BT_PIN_REQUEST),
+	DBG_CB(CB_BT_SSP_REQUEST),
+	DBG_CB(CB_BT_BOND_STATE_CHANGED),
+	DBG_CB(CB_BT_ACL_STATE_CHANGED),
+	DBG_CB(CB_BT_THREAD_EVT),
+	DBG_CB(CB_BT_DUT_MODE_RECV),
+	DBG_CB(CB_BT_LE_TEST_MODE),
+
+	/* Hidhost cb */
+	DBG_CB(CB_HH_CONNECTION_STATE),
+	DBG_CB(CB_HH_HID_INFO),
+	DBG_CB(CB_HH_PROTOCOL_MODE),
+	DBG_CB(CB_HH_IDLE_TIME),
+	DBG_CB(CB_HH_GET_REPORT),
+	DBG_CB(CB_HH_VIRTUAL_UNPLUG),
+
+	/* PAN cb */
+	DBG_CB(CB_PAN_CONTROL_STATE),
+	DBG_CB(CB_PAN_CONNECTION_STATE),
+
+	/* HDP cb */
+	DBG_CB(CB_HDP_APP_REG_STATE),
+	DBG_CB(CB_HDP_CHANNEL_STATE),
+
+	/* A2DP cb */
+	DBG_CB(CB_A2DP_CONN_STATE),
+	DBG_CB(CB_A2DP_AUDIO_STATE),
+
+	/* Gatt client */
+	DBG_CB(CB_GATTC_REGISTER_CLIENT),
+	DBG_CB(CB_GATTC_SCAN_RESULT),
+	DBG_CB(CB_GATTC_OPEN),
+	DBG_CB(CB_GATTC_CLOSE),
+	DBG_CB(CB_GATTC_SEARCH_COMPLETE),
+	DBG_CB(CB_GATTC_SEARCH_RESULT),
+	DBG_CB(CB_GATTC_GET_CHARACTERISTIC),
+	DBG_CB(CB_GATTC_GET_DESCRIPTOR),
+	DBG_CB(CB_GATTC_GET_INCLUDED_SERVICE),
+	DBG_CB(CB_GATTC_REGISTER_FOR_NOTIFICATION),
+	DBG_CB(CB_GATTC_NOTIFY),
+	DBG_CB(CB_GATTC_READ_CHARACTERISTIC),
+	DBG_CB(CB_GATTC_WRITE_CHARACTERISTIC),
+	DBG_CB(CB_GATTC_READ_DESCRIPTOR),
+	DBG_CB(CB_GATTC_WRITE_DESCRIPTOR),
+	DBG_CB(CB_GATTC_EXECUTE_WRITE),
+	DBG_CB(CB_GATTC_READ_REMOTE_RSSI),
+	DBG_CB(CB_GATTC_LISTEN),
+
+	/* Gatt server */
+	DBG_CB(CB_GATTS_REGISTER_SERVER),
+	DBG_CB(CB_GATTS_CONNECTION),
+	DBG_CB(CB_GATTS_SERVICE_ADDED),
+	DBG_CB(CB_GATTS_INCLUDED_SERVICE_ADDED),
+	DBG_CB(CB_GATTS_CHARACTERISTIC_ADDED),
+	DBG_CB(CB_GATTS_DESCRIPTOR_ADDED),
+	DBG_CB(CB_GATTS_SERVICE_STARTED),
+	DBG_CB(CB_GATTS_SERVICE_STOPPED),
+	DBG_CB(CB_GATTS_SERVICE_DELETED),
+	DBG_CB(CB_GATTS_REQUEST_READ),
+	DBG_CB(CB_GATTS_REQUEST_WRITE),
+	DBG_CB(CB_GATTS_REQUEST_EXEC_WRITE),
+	DBG_CB(CB_GATTS_RESPONSE_CONFIRMATION),
+};
+
 static gboolean check_callbacks_called(gpointer user_data)
 {
 	/*
@@ -436,107 +509,160 @@ static bool match_data(struct step *step)
 
 	if (exp->callback || step->callback) {
 		if (exp->callback != step->callback) {
-			tester_debug("Callback type don't match");
+			tester_debug("Callback type don't match - is = %s,"
+				" exp = %s", cb_table[step->callback].str,
+				cb_table[exp->callback].str);
 			return false;
 		}
 
 		if (exp->callback_result.state != step->callback_result.state) {
-			tester_debug("Callback state don't match");
+			tester_debug("Callback state don't match - is = %d,"
+						" exp = %d",
+						step->callback_result.state,
+						exp->callback_result.state);
 			return false;
 		}
 
 		if (exp->callback_result.status !=
 						step->callback_result.status) {
-			tester_debug("Callback status don't match");
+			tester_debug("Callback status don't match - is = %d,"
+						" exp = %d",
+						step->callback_result.status,
+						exp->callback_result.status);
 			return false;
 		}
 
 		if (exp->callback_result.mode != step->callback_result.mode) {
-			tester_debug("Callback mode don't match");
+			tester_debug("Callback mode don't match - is = %02x,"
+						" exp = %02x",
+						step->callback_result.mode,
+						exp->callback_result.mode);
 			return false;
 		}
 
 		if (exp->callback_result.report_size !=
 					step->callback_result.report_size) {
-			tester_debug("Callback report size don't match");
+			tester_debug("Callback report size don't match - "
+					"is = %d, exp = %d",
+					step->callback_result.report_size,
+					exp->callback_result.report_size);
 			return false;
 		}
 
 		if (exp->callback_result.ctrl_state !=
 					step->callback_result.ctrl_state) {
-			tester_debug("Callback ctrl state don't match");
+			tester_debug("Callback ctrl state don't match - "
+					"is = %d, exp = %d",
+					step->callback_result.ctrl_state,
+					exp->callback_result.ctrl_state);
 			return false;
 		}
 
 		if (exp->callback_result.conn_state !=
 					step->callback_result.conn_state) {
-			tester_debug("Callback connection state don't match");
+			tester_debug("Callback connection state don't match"
+					"- is = %d, exp = %d",
+					step->callback_result.conn_state,
+					exp->callback_result.conn_state);
 			return false;
 		}
 
 		if (exp->callback_result.local_role !=
 					step->callback_result.local_role) {
-			tester_debug("Callback local_role don't match");
+			tester_debug("Callback local_role don't match - "
+					"is = %d, exp = %d",
+					step->callback_result.local_role,
+					exp->callback_result.local_role);
 			return false;
 		}
 
 		if (exp->callback_result.remote_role !=
 					step->callback_result.remote_role) {
-			tester_debug("Callback remote_role don't match");
+			tester_debug("Callback remote_role don't match - "
+					"is = %d, exp = %d",
+					step->callback_result.remote_role,
+					exp->callback_result.remote_role);
 			return false;
 		}
 
 		if (exp->callback_result.app_id !=
 						step->callback_result.app_id) {
-			tester_debug("Callback app_id don't match");
+			tester_debug("Callback app_id don't match - is = %d,"
+						" exp = %d",
+						step->callback_result.app_id,
+						exp->callback_result.app_id);
 			return false;
 		}
 
 		if (exp->callback_result.channel_id !=
 					step->callback_result.channel_id) {
-			tester_debug("Callback channel_id don't match");
+			tester_debug("Callback channel_id don't match - "
+					"is = %d, exp = %d",
+					step->callback_result.channel_id,
+					exp->callback_result.channel_id);
 			return false;
 		}
 
 		if (exp->callback_result.mdep_cfg_index !=
 					step->callback_result.mdep_cfg_index) {
-			tester_debug("Callback mdep_cfg_index don't match");
+			tester_debug("Callback mdep_cfg_index don't match - "
+					"is = %d, exp = %d",
+					step->callback_result.mdep_cfg_index,
+					exp->callback_result.mdep_cfg_index);
 			return false;
 		}
 
 		if (exp->callback_result.app_state !=
 					step->callback_result.app_state) {
-			tester_debug("Callback app_state don't match");
+			tester_debug("Callback app_state don't match - is = %d"
+						", exp = %d",
+						step->callback_result.app_state,
+						exp->callback_result.app_state);
 			return false;
 		}
 
 		if (exp->callback_result.channel_state !=
 					step->callback_result.channel_state) {
-			tester_debug("Callback channel_state don't match");
+			tester_debug("Callback channel_state don't match - "
+					"is = %d, ext = %d",
+					step->callback_result.channel_state,
+					exp->callback_result.channel_state);
 			return false;
 		}
 
 		if (exp->callback_result.pairing_variant !=
 					step->callback_result.pairing_variant) {
-			tester_debug("Callback pairing result don't match");
+			tester_debug("Callback pairing result don't match - "
+					"is = %d, exp = %d",
+					step->callback_result.pairing_variant,
+					exp->callback_result.pairing_variant);
 			return false;
 		}
 
 		if (exp->callback_result.adv_data !=
 					step->callback_result.adv_data) {
-			tester_debug("Callback adv. data status don't match");
+			tester_debug("Callback adv. data status don't match - "
+						"is = %d, exp = %d",
+						step->callback_result.adv_data,
+						exp->callback_result.adv_data);
 			return false;
 		}
 
 		if (exp->callback_result.conn_id !=
 						step->callback_result.conn_id) {
-			tester_debug("Callback conn_id don't match");
+			tester_debug("Callback conn_id don't match - is = %d,"
+						" exp = %d",
+						step->callback_result.conn_id,
+						exp->callback_result.conn_id);
 			return false;
 		}
 
 		if (exp->callback_result.gatt_app_id !=
 					step->callback_result.gatt_app_id) {
-			tester_debug("Callback gatt_app_id don't match");
+			tester_debug("Callback gatt_app_id don't match - "
+					"is = %d, exp = %d",
+					step->callback_result.gatt_app_id,
+					exp->callback_result.gatt_app_id);
 			return false;
 		}
 
@@ -570,7 +696,10 @@ static bool match_data(struct step *step)
 
 		if (exp->callback_result.char_prop !=
 					step->callback_result.char_prop) {
-			tester_debug("Gatt char prop doesn't match");
+			tester_debug("Gatt char prop doesn't match - is = %d"
+						", exp = %d",
+						step->callback_result.char_prop,
+						exp->callback_result.char_prop);
 			return false;
 		}
 
diff --git a/android/tester-main.h b/android/tester-main.h
index cd4a0d0..6b36a3c 100644
--- a/android/tester-main.h
+++ b/android/tester-main.h
@@ -290,6 +290,8 @@
 		.callback_result.num_properties = prop_cnt, \
 	}
 
+#define DBG_CB(cb) { cb, #cb }
+
 /*
  * NOTICE:
  * Callback enum sections should be
-- 
1.9.3


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 6/6] android/tester: Add GATT server disconnect successful test case
  2014-09-25 14:03 [PATCH 1/6] android/tester: Style fix Grzegorz Kolodziejczyk
                   ` (3 preceding siblings ...)
  2014-09-25 14:03 ` [PATCH 5/6] android/tester: Make tester debug logs verbose Grzegorz Kolodziejczyk
@ 2014-09-25 14:03 ` Grzegorz Kolodziejczyk
  2014-09-29 14:15 ` [PATCH 1/6] android/tester: Style fix Szymon Janc
  5 siblings, 0 replies; 7+ messages in thread
From: Grzegorz Kolodziejczyk @ 2014-09-25 14:03 UTC (permalink / raw)
  To: linux-bluetooth

It will connect to powered on and visible device then disconnect.
---
 android/tester-gatt.c | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/android/tester-gatt.c b/android/tester-gatt.c
index f8df92e..ef6387d 100644
--- a/android/tester-gatt.c
+++ b/android/tester-gatt.c
@@ -883,6 +883,21 @@ static void gatt_server_connect_action(void)
 	schedule_action_verification(step);
 }
 
+static void gatt_server_disconnect_action(void)
+{
+	struct test_data *data = tester_get_data();
+	struct step *current_data_step = queue_peek_head(data->steps);
+	struct gatt_connect_data *conn_data = current_data_step->set_data;
+	struct step *step = g_new0(struct step, 1);
+
+	step->action_status = data->if_gatt->server->disconnect(
+							conn_data->app_id,
+							&emu_remote_bdaddr_val,
+							conn_data->conn_id);
+
+	schedule_action_verification(step);
+}
+
 static void gatt_cid_hook_cb(const void *data, uint16_t len, void *user_data)
 {
 	struct test_data *t_data = tester_get_data();
@@ -1897,6 +1912,26 @@ 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 Server - 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),
+		ACTION_SUCCESS(emu_set_ssp_mode_action, NULL),
+		ACTION_SUCCESS(emu_set_connect_cb_action, gatt_conn_cb),
+		ACTION_SUCCESS(gatt_server_register_action, &app1_uuid),
+		CALLBACK_STATUS(CB_GATTS_REGISTER_SERVER, BT_STATUS_SUCCESS),
+		ACTION_SUCCESS(gatt_server_connect_action, &app1_conn_req),
+		CALLBACK_GATTS_CONNECTION(GATT_SERVER_CONNECTED,
+						prop_emu_remotes_default_set,
+						CONN1_ID, APP1_ID),
+		ACTION_SUCCESS(gatt_server_disconnect_action,
+							&app1_conn_req),
+		CALLBACK_GATTS_CONNECTION(GATT_SERVER_DISCONNECTED,
+						prop_emu_remotes_default_set,
+						CONN1_ID, APP1_ID),
+		ACTION_SUCCESS(bluetooth_disable_action, NULL),
+		CALLBACK_STATE(CB_BT_ADAPTER_STATE_CHANGED, BT_STATE_OFF),
+	),
 };
 
 struct queue *get_gatt_tests(void)
-- 
1.9.3


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/6] android/tester: Style fix
  2014-09-25 14:03 [PATCH 1/6] android/tester: Style fix Grzegorz Kolodziejczyk
                   ` (4 preceding siblings ...)
  2014-09-25 14:03 ` [PATCH 6/6] android/tester: Add GATT server disconnect successful test case Grzegorz Kolodziejczyk
@ 2014-09-29 14:15 ` Szymon Janc
  5 siblings, 0 replies; 7+ messages in thread
From: Szymon Janc @ 2014-09-29 14:15 UTC (permalink / raw)
  To: Grzegorz Kolodziejczyk; +Cc: linux-bluetooth

Hi Grzegorz,

On Thursday 25 of September 2014 16:03:08 Grzegorz Kolodziejczyk wrote:
> ---
>  android/tester-main.c | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/android/tester-main.c b/android/tester-main.c
> index b65029a..081a1ce 100644
> --- a/android/tester-main.c
> +++ b/android/tester-main.c
> @@ -440,8 +440,7 @@ static bool match_data(struct step *step)
>  			return false;
>  		}
>  
> -		if (exp->callback_result.state !=
> -						step->callback_result.state) {
> +		if (exp->callback_result.state != step->callback_result.state) {
>  			tester_debug("Callback state don't match");
>  			return false;
>  		}
> @@ -452,8 +451,7 @@ static bool match_data(struct step *step)
>  			return false;
>  		}
>  
> -		if (exp->callback_result.mode !=
> -						step->callback_result.mode) {
> +		if (exp->callback_result.mode != step->callback_result.mode) {
>  			tester_debug("Callback mode don't match");
>  			return false;
>  		}
> @@ -489,7 +487,7 @@ static bool match_data(struct step *step)
>  		}
>  
>  		if (exp->callback_result.app_id !=
> -					step->callback_result.app_id) {
> +						step->callback_result.app_id) {
>  			tester_debug("Callback app_id don't match");
>  			return false;
>  		}
> @@ -874,8 +872,8 @@ static void bond_state_changed_cb(bt_status_t status,
>  
>  	/* Utilize property verification mechanism for bdaddr */
>  	step->callback_result.num_properties = 1;
> -	step->callback_result.properties = create_property(BT_PROPERTY_BDADDR,
> -						remote_bd_addr,
> +	step->callback_result.properties =
> +			create_property(BT_PROPERTY_BDADDR, remote_bd_addr,
>  						sizeof(*remote_bd_addr));
>  
>  	step->callback = CB_BT_BOND_STATE_CHANGED;
> 

Patches 1-3 and 5 applied (with some minor fixes), thanks.
For rest please send updates as discussed offline.

-- 
Best regards, 
Szymon Janc

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2014-09-29 14:15 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-25 14:03 [PATCH 1/6] android/tester: Style fix Grzegorz Kolodziejczyk
2014-09-25 14:03 ` [PATCH 2/6] android/tester: Make client and server id unified Grzegorz Kolodziejczyk
2014-09-25 14:03 ` [PATCH 3/6] android/tester: Add GATT Server basic test cases Grzegorz Kolodziejczyk
2014-09-25 14:03 ` [PATCH 4/6] android/tester: Add GATT server connect successful test case Grzegorz Kolodziejczyk
2014-09-25 14:03 ` [PATCH 5/6] android/tester: Make tester debug logs verbose Grzegorz Kolodziejczyk
2014-09-25 14:03 ` [PATCH 6/6] android/tester: Add GATT server disconnect successful test case Grzegorz Kolodziejczyk
2014-09-29 14:15 ` [PATCH 1/6] android/tester: Style fix Szymon Janc

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox