From 85a2981361dc7a1eb74819669a02aeeeb9c76653 Mon Sep 17 00:00:00 2001 From: Taejin Woo Date: Fri, 1 Jul 2016 15:54:42 +0900 Subject: [PATCH] [UTC][bluetooth][fix the build fail issue for tpk] Change-Id: I9e2455aec1a7ab21c9e0ef84231c523c1eea2eea Signed-off-by: Taejin Woo --- src/utc/bluetooth/tct-bluetooth-core_common_iot.h | 2 -- src/utc/bluetooth/tct-bluetooth-core_mobile.h | 2 -- src/utc/bluetooth/tct-bluetooth-core_wearable.h | 2 -- src/utc/bluetooth/utc_bluetooth_audio_negative.c | 6 +++++- src/utc/bluetooth/utc_bluetooth_gatt_negative.c | 23 ----------------------- 5 files changed, 5 insertions(+), 30 deletions(-) diff --git a/src/utc/bluetooth/tct-bluetooth-core_common_iot.h b/src/utc/bluetooth/tct-bluetooth-core_common_iot.h index d9f5f5a..d57df6e 100644 --- a/src/utc/bluetooth/tct-bluetooth-core_common_iot.h +++ b/src/utc/bluetooth/tct-bluetooth-core_common_iot.h @@ -329,7 +329,6 @@ extern int utc_bluetooth_bt_gatt_service_get_included_service_n(void); extern int utc_bluetooth_bt_gatt_service_foreach_included_services_n(void); extern int utc_bluetooth_bt_gatt_characteristic_get_service_n(void); extern int utc_bluetooth_bt_gatt_characteristic_get_properties_n(void); -extern int utc_bluetooth_bt_gatt_characteristic_set_properties_n(void); extern int utc_bluetooth_bt_gatt_characteristic_get_write_type_n(void); extern int utc_bluetooth_bt_gatt_characteristic_set_write_type_n(void); extern int utc_bluetooth_bt_gatt_characteristic_get_descriptor_n(void); @@ -752,7 +751,6 @@ testcase tc_array[] = { {"utc_bluetooth_bt_gatt_service_foreach_included_services_n", utc_bluetooth_bt_gatt_service_foreach_included_services_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_characteristic_get_service_n", utc_bluetooth_bt_gatt_characteristic_get_service_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_characteristic_get_properties_n", utc_bluetooth_bt_gatt_characteristic_get_properties_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, - {"utc_bluetooth_bt_gatt_characteristic_set_properties_n", utc_bluetooth_bt_gatt_characteristic_set_properties_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_characteristic_get_write_type_n", utc_bluetooth_bt_gatt_characteristic_get_write_type_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_characteristic_set_write_type_n", utc_bluetooth_bt_gatt_characteristic_set_write_type_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_characteristic_get_descriptor_n", utc_bluetooth_bt_gatt_characteristic_get_descriptor_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, diff --git a/src/utc/bluetooth/tct-bluetooth-core_mobile.h b/src/utc/bluetooth/tct-bluetooth-core_mobile.h index 4e6db7b..9dbdc2d 100644 --- a/src/utc/bluetooth/tct-bluetooth-core_mobile.h +++ b/src/utc/bluetooth/tct-bluetooth-core_mobile.h @@ -349,7 +349,6 @@ extern int utc_bluetooth_bt_gatt_service_get_included_service_n(void); extern int utc_bluetooth_bt_gatt_service_foreach_included_services_n(void); extern int utc_bluetooth_bt_gatt_characteristic_get_service_n(void); extern int utc_bluetooth_bt_gatt_characteristic_get_properties_n(void); -extern int utc_bluetooth_bt_gatt_characteristic_set_properties_n(void); extern int utc_bluetooth_bt_gatt_characteristic_get_write_type_n(void); extern int utc_bluetooth_bt_gatt_characteristic_set_write_type_n(void); extern int utc_bluetooth_bt_gatt_characteristic_get_descriptor_n(void); @@ -778,7 +777,6 @@ testcase tc_array[] = { {"utc_bluetooth_bt_gatt_service_foreach_included_services_n", utc_bluetooth_bt_gatt_service_foreach_included_services_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_characteristic_get_service_n", utc_bluetooth_bt_gatt_characteristic_get_service_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_characteristic_get_properties_n", utc_bluetooth_bt_gatt_characteristic_get_properties_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, - {"utc_bluetooth_bt_gatt_characteristic_set_properties_n", utc_bluetooth_bt_gatt_characteristic_set_properties_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_characteristic_get_write_type_n", utc_bluetooth_bt_gatt_characteristic_get_write_type_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_characteristic_set_write_type_n", utc_bluetooth_bt_gatt_characteristic_set_write_type_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_characteristic_get_descriptor_n", utc_bluetooth_bt_gatt_characteristic_get_descriptor_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, diff --git a/src/utc/bluetooth/tct-bluetooth-core_wearable.h b/src/utc/bluetooth/tct-bluetooth-core_wearable.h index 652df7c..e195f02 100644 --- a/src/utc/bluetooth/tct-bluetooth-core_wearable.h +++ b/src/utc/bluetooth/tct-bluetooth-core_wearable.h @@ -313,7 +313,6 @@ extern int utc_bluetooth_bt_gatt_service_get_included_service_n(void); extern int utc_bluetooth_bt_gatt_service_foreach_included_services_n(void); extern int utc_bluetooth_bt_gatt_characteristic_get_service_n(void); extern int utc_bluetooth_bt_gatt_characteristic_get_properties_n(void); -extern int utc_bluetooth_bt_gatt_characteristic_set_properties_n(void); extern int utc_bluetooth_bt_gatt_characteristic_get_write_type_n(void); extern int utc_bluetooth_bt_gatt_characteristic_set_write_type_n(void); extern int utc_bluetooth_bt_gatt_characteristic_get_descriptor_n(void); @@ -715,7 +714,6 @@ testcase tc_array[] = { {"utc_bluetooth_bt_gatt_service_foreach_included_services_n", utc_bluetooth_bt_gatt_service_foreach_included_services_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_characteristic_get_service_n", utc_bluetooth_bt_gatt_characteristic_get_service_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_characteristic_get_properties_n", utc_bluetooth_bt_gatt_characteristic_get_properties_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, - {"utc_bluetooth_bt_gatt_characteristic_set_properties_n", utc_bluetooth_bt_gatt_characteristic_set_properties_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_characteristic_get_write_type_n", utc_bluetooth_bt_gatt_characteristic_get_write_type_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_characteristic_set_write_type_n", utc_bluetooth_bt_gatt_characteristic_set_write_type_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, {"utc_bluetooth_bt_gatt_characteristic_get_descriptor_n", utc_bluetooth_bt_gatt_characteristic_get_descriptor_n, utc_bluetooth_gatt_negative_startup, utc_bluetooth_gatt_negative_cleanup}, diff --git a/src/utc/bluetooth/utc_bluetooth_audio_negative.c b/src/utc/bluetooth/utc_bluetooth_audio_negative.c index 21ba70e..d3d17aa 100755 --- a/src/utc/bluetooth/utc_bluetooth_audio_negative.c +++ b/src/utc/bluetooth/utc_bluetooth_audio_negative.c @@ -19,6 +19,10 @@ #include #include +#ifdef WEARABLE +#include +#endif + //& set: BluetoothAudioNegative static int startup_flag = BT_ERROR_NONE; @@ -874,7 +878,7 @@ int utc_bluetooth_bt_avrcp_unset_track_info_changed_cb_n(void) #endif -#if defined(MOBILE) || defined(COMMON_IOT) +#if defined(MOBILE) || defined(COMMON_IOT) || defined(WEARABLE) /** * @testcase utc_bluetooth_bt_ag_open_sco_n * @since_tizen 2.3 diff --git a/src/utc/bluetooth/utc_bluetooth_gatt_negative.c b/src/utc/bluetooth/utc_bluetooth_gatt_negative.c index 9a20a9c..5915522 100755 --- a/src/utc/bluetooth/utc_bluetooth_gatt_negative.c +++ b/src/utc/bluetooth/utc_bluetooth_gatt_negative.c @@ -1116,29 +1116,6 @@ int utc_bluetooth_bt_gatt_characteristic_get_properties_n(void) } /** - * @testcase utc_bluetooth_bt_gatt_characteristic_set_properties_n - * @since_tizen 2.3 - * @description - */ -int utc_bluetooth_bt_gatt_characteristic_set_properties_n(void) -{ - bt_gatt_h characteristic = NULL; - int properties = 0; - - if(le_supported) { - assert_eq(startup_flag, BT_ERROR_NONE); - - ret = bt_gatt_characteristic_set_properties(characteristic, properties); - assert_eq(ret, BT_ERROR_INVALID_PARAMETER); - } else { - ret = bt_gatt_characteristic_set_properties(characteristic, properties); - assert_eq(ret, BT_ERROR_NOT_SUPPORTED); - } - - return 0; -} - -/** * @testcase utc_bluetooth_bt_gatt_characteristic_get_write_type_n * @since_tizen 2.3 * @description if bluetooth LE is supported and startup_flag is asserted then get the attribute write type of the given -- 2.7.4