From 399fb8a4aaaf290f4d4fc78b986e555429371a47 Mon Sep 17 00:00:00 2001 From: Hyuk Lee Date: Fri, 24 Jun 2016 15:07:30 +0900 Subject: [PATCH] [UTC][capi-network-bluetooth][Non-ACR][Fix the build error] - fix the build error - fix the failed TCs (add the GATT server initialize) Change-Id: I6d8c90f90b2085a4dd8bc940944b7a0388e195fa Signed-off-by: Hyuk Lee --- src/utc/bluetooth/tct-bluetooth-core_mobile.h | 2 +- src/utc/bluetooth/tct-bluetooth-core_wearable.h | 2 +- src/utc/bluetooth/utc_bluetooth_gatt_negative.c | 3 +- src/utc/bluetooth/utc_bluetooth_gatt_positive.c | 58 +++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 4 deletions(-) diff --git a/src/utc/bluetooth/tct-bluetooth-core_mobile.h b/src/utc/bluetooth/tct-bluetooth-core_mobile.h index 441b68d..4e6db7b 100644 --- a/src/utc/bluetooth/tct-bluetooth-core_mobile.h +++ b/src/utc/bluetooth/tct-bluetooth-core_mobile.h @@ -820,7 +820,7 @@ testcase tc_array[] = { {"utc_bluetooth_bt_gatt_server_foreach_services_n", utc_bluetooth_bt_gatt_server_foreach_services_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_server_register_service_n", utc_bluetooth_bt_gatt_server_register_service_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_server_unregister_service_n", utc_bluetooth_bt_gatt_server_unregister_service_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, - {"utc_bluetooth_bt_gatt_server_unregister_all_services_n", utc_bluetooth_bt_gatt_server_unregister_all_service_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, + {"utc_bluetooth_bt_gatt_server_unregister_all_services_n", utc_bluetooth_bt_gatt_server_unregister_all_services_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_server_start_n", utc_bluetooth_bt_gatt_server_start_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_server_send_response_n", utc_bluetooth_bt_gatt_server_send_response_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_set_characteristic_changed_cb_p", utc_bluetooth_bt_gatt_set_characteristic_changed_cb_p, utc_bluetooth_gatt_positive_startup, utc_bluetooth_gatt_positive_cleanup}, diff --git a/src/utc/bluetooth/tct-bluetooth-core_wearable.h b/src/utc/bluetooth/tct-bluetooth-core_wearable.h index 77034f4..652df7c 100644 --- a/src/utc/bluetooth/tct-bluetooth-core_wearable.h +++ b/src/utc/bluetooth/tct-bluetooth-core_wearable.h @@ -754,7 +754,7 @@ testcase tc_array[] = { {"utc_bluetooth_bt_gatt_server_foreach_services_n", utc_bluetooth_bt_gatt_server_foreach_services_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_server_register_service_n", utc_bluetooth_bt_gatt_server_register_service_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_server_unregister_service_n", utc_bluetooth_bt_gatt_server_unregister_service_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, - {"utc_bluetooth_bt_gatt_server_unregister_all_services_n", utc_bluetooth_bt_gatt_server_unregister_all_service_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, + {"utc_bluetooth_bt_gatt_server_unregister_all_services_n", utc_bluetooth_bt_gatt_server_unregister_all_services_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_server_start_n", utc_bluetooth_bt_gatt_server_start_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_server_send_response_n", utc_bluetooth_bt_gatt_server_send_response_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_set_connection_state_changed_cb_p", utc_bluetooth_bt_gatt_set_connection_state_changed_cb_p, utc_bluetooth_gatt_positive_startup, utc_bluetooth_gatt_positive_cleanup}, diff --git a/src/utc/bluetooth/utc_bluetooth_gatt_negative.c b/src/utc/bluetooth/utc_bluetooth_gatt_negative.c index 029897f..9a20a9c 100755 --- a/src/utc/bluetooth/utc_bluetooth_gatt_negative.c +++ b/src/utc/bluetooth/utc_bluetooth_gatt_negative.c @@ -1612,6 +1612,7 @@ int utc_bluetooth_bt_gatt_discover_characteristic_descriptor_n(void) return 0; } +#endif /** * @testcase utc_bluetooth_bt_gatt_service_destroy_n @@ -2287,5 +2288,3 @@ int utc_bluetooth_bt_gatt_server_send_response_n(void) return 0; } - -#endif diff --git a/src/utc/bluetooth/utc_bluetooth_gatt_positive.c b/src/utc/bluetooth/utc_bluetooth_gatt_positive.c index 7eb568a..dab82ce 100755 --- a/src/utc/bluetooth/utc_bluetooth_gatt_positive.c +++ b/src/utc/bluetooth/utc_bluetooth_gatt_positive.c @@ -46,6 +46,28 @@ static void gatt_connection_state_changed_cb_p(int result, bool connected, fprintf(stderr,"Device is disconnected from remote address."); } +static void __bt_gatt_server_read_value_requested_cb_p(const char *remote_address, int request_id, + bt_gatt_server_h server, bt_gatt_h gatt_handle, int offset, void *user_data) +{ + fprintf(stderr, "__bt_gatt_server_read_value_requested_cb"); +} + +static void __bt_gatt_server_notification_state_change_cb_p(bool notify, bt_gatt_server_h server, bt_gatt_h gatt_handle, void *user_data) +{ + fprintf(stderr, "__bt_gatt_server_notification_state_change_cb"); +} + +static void __bt_gatt_server_write_value_requested_cb_p(const char *remote_address, int request_id, bt_gatt_server_h server, + bt_gatt_h gatt_handle, int offset, const char *value, int len, void *user_data) +{ + fprintf(stderr, "__bt_gatt_server_write_value_requested_cb"); +} + +static bool __bt_gatt_server_foreach_svc_cb_p(int total, int index, bt_gatt_h svc_handle, void *data) +{ + fprintf(stderr, "__bt_gatt_server_foreach_svc_cb"); +} + /** * @function utc_bluetooth_gatt_positive_startup * @description check if bluetooth is supported and LE is supported, Initialize bluetooth and check the adapter state and @@ -488,6 +510,9 @@ int utc_bluetooth_bt_gatt_service_get_server_p(void) if (le_supported) { assert_eq(startup_flag, BT_ERROR_NONE); + ret = bt_gatt_server_initialize(); + assert_eq(ret, BT_ERROR_NONE); + ret = bt_gatt_server_create(&server); assert_eq(ret, BT_ERROR_NONE); @@ -513,6 +538,7 @@ int utc_bluetooth_bt_gatt_service_get_server_p(void) bt_gatt_service_destroy(service); bt_gatt_server_destroy(server); + bt_gatt_server_deinitialize(); } else { ret = bt_gatt_service_get_server(service, &get_server); assert_eq(ret, BT_ERROR_NOT_SUPPORTED); @@ -746,6 +772,9 @@ int utc_bluetooth_bt_gatt_server_set_read_value_requested_cb_p(void) if (le_supported) { assert_eq(startup_flag, BT_ERROR_NONE); + ret = bt_gatt_server_initialize(); + assert_eq(ret, BT_ERROR_NONE); + ret = bt_gatt_characteristic_create(char_uuid, permissions, properties, char_value, sizeof(char_value), &characteristic); assert_eq(ret, BT_ERROR_NONE); @@ -755,6 +784,7 @@ int utc_bluetooth_bt_gatt_server_set_read_value_requested_cb_p(void) assert_eq(ret, BT_ERROR_NONE); bt_gatt_characteristic_destroy(characteristic); + bt_gatt_server_deinitialize(); } else { ret = bt_gatt_server_set_read_value_requested_cb(characteristic, __bt_gatt_server_read_value_requested_cb_p, NULL); assert_eq(ret, BT_ERROR_NOT_SUPPORTED); @@ -783,6 +813,9 @@ int utc_bluetooth_bt_gatt_server_set_characteristic_notification_state_change_cb if (le_supported) { assert_eq(startup_flag, BT_ERROR_NONE); + ret = bt_gatt_server_initialize(); + assert_eq(ret, BT_ERROR_NONE); + ret = bt_gatt_characteristic_create(char_uuid, permissions, properties, char_value, sizeof(char_value), &characteristic); assert_eq(ret, BT_ERROR_NONE); @@ -792,6 +825,7 @@ int utc_bluetooth_bt_gatt_server_set_characteristic_notification_state_change_cb assert_eq(ret, BT_ERROR_NONE); bt_gatt_characteristic_destroy(characteristic); + bt_gatt_server_deinitialize(); } else { ret = bt_gatt_server_set_characteristic_notification_state_change_cb(characteristic, __bt_gatt_server_notification_state_change_cb_p, NULL); assert_eq(ret, BT_ERROR_NOT_SUPPORTED); @@ -820,6 +854,9 @@ int utc_bluetooth_bt_gatt_server_set_write_value_requested_cb_p(void) if (le_supported) { assert_eq(startup_flag, BT_ERROR_NONE); + ret = bt_gatt_server_initialize(); + assert_eq(ret, BT_ERROR_NONE); + ret = bt_gatt_characteristic_create(char_uuid, permissions, properties, char_value, sizeof(char_value), &characteristic); assert_eq(ret, BT_ERROR_NONE); @@ -829,6 +866,7 @@ int utc_bluetooth_bt_gatt_server_set_write_value_requested_cb_p(void) assert_eq(ret, BT_ERROR_NONE); bt_gatt_characteristic_destroy(characteristic); + bt_gatt_server_deinitialize(); } else { ret = bt_gatt_server_set_write_value_requested_cb(characteristic, __bt_gatt_server_write_value_requested_cb_p, NULL); assert_eq(ret, BT_ERROR_NOT_SUPPORTED); @@ -857,6 +895,9 @@ int utc_bluetooth_bt_gatt_server_get_service_p(void) if (le_supported) { assert_eq(startup_flag, BT_ERROR_NONE); + ret = bt_gatt_server_initialize(); + assert_eq(ret, BT_ERROR_NONE); + ret = bt_gatt_server_create(&server); assert_eq(ret, BT_ERROR_NONE); @@ -882,6 +923,7 @@ int utc_bluetooth_bt_gatt_server_get_service_p(void) bt_gatt_service_destroy(service); bt_gatt_server_destroy(server); + bt_gatt_server_deinitialize(); } else { ret = bt_gatt_server_get_service(server, service_uuid, &get_service); assert_eq(ret, BT_ERROR_NOT_SUPPORTED); @@ -910,6 +952,9 @@ int utc_bluetooth_bt_gatt_server_foreach_services_p(void) if (le_supported) { assert_eq(startup_flag, BT_ERROR_NONE); + ret = bt_gatt_server_initialize(); + assert_eq(ret, BT_ERROR_NONE); + ret = bt_gatt_server_create(&server); assert_eq(ret, BT_ERROR_NONE); @@ -935,6 +980,7 @@ int utc_bluetooth_bt_gatt_server_foreach_services_p(void) bt_gatt_service_destroy(service); bt_gatt_server_destroy(server); + bt_gatt_server_deinitialize(); } else { ret = bt_gatt_server_foreach_services(server, __bt_gatt_server_foreach_svc_cb_p, NULL); assert_eq(ret, BT_ERROR_NOT_SUPPORTED); @@ -962,6 +1008,9 @@ int utc_bluetooth_bt_gatt_server_register_service_p(void) if (le_supported) { assert_eq(startup_flag, BT_ERROR_NONE); + ret = bt_gatt_server_initialize(); + assert_eq(ret, BT_ERROR_NONE); + ret = bt_gatt_server_create(&server); assert_eq(ret, BT_ERROR_NONE); @@ -980,6 +1029,7 @@ int utc_bluetooth_bt_gatt_server_register_service_p(void) bt_gatt_service_destroy(service); bt_gatt_server_destroy(server); + bt_gatt_server_deinitialize(); } else { ret = bt_gatt_server_register_service(server, service); assert_eq(ret, BT_ERROR_NOT_SUPPORTED); @@ -1007,6 +1057,9 @@ int utc_bluetooth_bt_gatt_server_unregister_service_p(void) if (le_supported) { assert_eq(startup_flag, BT_ERROR_NONE); + ret = bt_gatt_server_initialize(); + assert_eq(ret, BT_ERROR_NONE); + ret = bt_gatt_server_create(&server); assert_eq(ret, BT_ERROR_NONE); @@ -1032,6 +1085,7 @@ int utc_bluetooth_bt_gatt_server_unregister_service_p(void) bt_gatt_service_destroy(service); bt_gatt_server_destroy(server); + bt_gatt_server_deinitialize(); } else { ret = bt_gatt_server_unregister_service(server, service); assert_eq(ret, BT_ERROR_NOT_SUPPORTED); @@ -1059,6 +1113,9 @@ int utc_bluetooth_bt_gatt_server_unregister_all_services_p(void) if (le_supported) { assert_eq(startup_flag, BT_ERROR_NONE); + ret = bt_gatt_server_initialize(); + assert_eq(ret, BT_ERROR_NONE); + ret = bt_gatt_server_create(&server); assert_eq(ret, BT_ERROR_NONE); @@ -1084,6 +1141,7 @@ int utc_bluetooth_bt_gatt_server_unregister_all_services_p(void) bt_gatt_service_destroy(service); bt_gatt_server_destroy(server); + bt_gatt_server_deinitialize(); } else { ret = bt_gatt_server_unregister_all_services(server); assert_eq(ret, BT_ERROR_NOT_SUPPORTED); -- 2.7.4