Merge the code from tizen_2.4submit/tizen_wearable/20160113.070410submit/tizen_tv/20160113.070350submit/tizen_mobile/20160113.070328

Change-Id: I5ddd2c87bfc135bc010accf8ee34ab2d1f2f8cf6
Signed-off-by: Taejin Woo <tt.woo@samsung.com>

1 files changed, 43 insertions, 3 deletions

diff --git a/test/bt_unit_test.h b/test/bt_unit_test.h
index c6ebe28..6718701 100755
--- a/test/bt_unit_test.h
+++ b/test/bt_unit_test.h
@@ -41,8 +41,11 @@ typedef enum
 	BT_UNIT_TEST_TABLE_AUDIO,
 	BT_UNIT_TEST_TABLE_PAN,
 	BT_UNIT_TEST_TABLE_GATT,
+	BT_UNIT_TEST_TABLE_HPS,
 	BT_UNIT_TEST_TABLE_AVRCP,
 	BT_UNIT_TEST_TABLE_HID,
+	BT_UNIT_TEST_TABLE_IPSP,
+	BT_UNIT_TEST_TABLE_HDP,
 #ifdef TIZEN_WEARABLE
 	BT_UNIT_TEST_TABLE_HF,
 	BT_UNIT_TEST_TABLE_PBAP_CLIENT,
@@ -87,13 +90,18 @@ typedef enum
 	BT_UNIT_TEST_FUNCTION_ADAPTER_SET_MANUFACTURER_DATA_CHANGED_CB,
 	BT_UNIT_TEST_FUNCTION_ADAPTER_UNSET_MANUFACTURER_DATA_CHANGED_CB,
 	BT_UNIT_TEST_FUNCTION_ADAPTER_SET_MANUFACTURER_DATA,
+	BT_UNIT_TEST_FUNCTION_ADAPTER_SET_AUTHENTICATION_REQUSET_CB,
+	BT_UNIT_TEST_FUNCTION_ADAPTER_UNSET_AUTHENTICATION_REQUSET_CB,
+	BT_UNIT_TEST_FUNCTION_ADAPTER_PASSKEY_REPLY_ACCEPT,
+	BT_UNIT_TEST_FUNCTION_ADAPTER_PASSKEY_REPLY_CANCEL,
+	BT_UNIT_TEST_FUNCTION_ADAPTER_PASSKEY_CONFIRMATION_REPLY_ACCEPT,
+	BT_UNIT_TEST_FUNCTION_ADAPTER_PASSKEY_CONFIRMATION_REPLY_REJECT,
 	BT_UNIT_TEST_FUNCTION_ADAPTER_LE_GET_STATE = 1,
 	BT_UNIT_TEST_FUNCTION_ADAPTER_LE_ENABLE,
 	BT_UNIT_TEST_FUNCTION_ADAPTER_LE_DISABLE,
 	BT_UNIT_TEST_FUNCTION_ADAPTER_LE_SET_SCAN_MODE,
 	BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_SCAN,
 	BT_UNIT_TEST_FUNCTION_ADAPTER_LE_STOP_SCAN,
-	BT_UNIT_TEST_FUNCTION_ADAPTER_LE_IS_SCANNING,
 #ifndef TIZEN_WEARABLE
 	BT_UNIT_TEST_FUNCTION_ADAPTER_LE_START_DEVICE_DISCOVERY,
 	BT_UNIT_TEST_FUNCTION_ADAPTER_LE_STOP_DEVICE_DISCOVERY,
@@ -124,6 +132,8 @@ typedef enum
 	BT_UNIT_TEST_FUNCTION_ADAPTER_LE_READ_MAXIMUM_DATA_LENGTH,
 	BT_UNIT_TEST_FUNCTION_ADAPTER_LE_WRITE_HOST_SUGGESTED_DEFAULT_DATA_LENGTH,
 	BT_UNIT_TEST_FUNCTION_ADAPTER_LE_READ_HOST_SUGGESTED_DEFAULT_DATA_LENGTH,
+	BT_UNIT_TEST_FUNCTION_LE_DEVICE_SET_DATA_LENGTH,
+	BT_UNIT_TEST_FUNCTION_LE_DEVICE_DATA_LENGTH_CHANGED_CB,
 	BT_UNIT_TEST_FUNCTION_DEVICE_SET_AUTHORIZATION_TRUE = 1,
 	BT_UNIT_TEST_FUNCTION_DEVICE_SET_AUTHORIZATION_FALSE,
 	BT_UNIT_TEST_FUNCTION_DEVICE_SET_AUTHORIZATION_CHANGED_CB,
@@ -137,8 +147,6 @@ typedef enum
 	BT_UNIT_TEST_FUNCTION_DEVICE_CREATE_BOND,
 	BT_UNIT_TEST_FUNCTION_DEVICE_CREATE_BOND_BY_TYPE,
 	BT_UNIT_TEST_FUNCTION_DEVICE_DESTROY_BOND,
-	BT_UNIT_TEST_FUNCTION_LE_DEVICE_SET_DATA_LENGTH,
-	BT_UNIT_TEST_FUNCTION_LE_DEVICE_DATA_LENGTH_CHANGED_CB,
 	BT_UNIT_TEST_FUNCTION_DEVICE_ENABLE_RSSI_MONITOR,
 	BT_UNIT_TEST_FUNCTION_DEVICE_DISABLE_RSSI_MONITOR,
 	BT_UNIT_TEST_FUNCTION_DEVICE_GET_RSSI_STRENGTH,
@@ -254,6 +262,20 @@ typedef enum
 	BT_UNIT_TEST_FUNCTION_GATT_WATCH_CHARACTERISTIC_CHANGES,
 	BT_UNIT_TEST_FUNCTION_GATT_UNWATCH_CHARACTERISTIC_CHANGES,
 #endif
+	BT_UNIT_TEST_FUNCTION_HPS_CLIENT_CREATE = 1,
+	BT_UNIT_TEST_FUNCTION_HPS_CLIENT_DESTROY,
+	BT_UNIT_TEST_FUNCTION_HPS_CLIENT_PRINT_ALL,
+	BT_UNIT_TEST_FUNCTION_HPS_CLIENT_READ_VALUE,
+	BT_UNIT_TEST_FUNCTION_HPS_CLIENT_SET_URI,
+	BT_UNIT_TEST_FUNCTION_HPS_CLIENT_SET_HDR,
+	BT_UNIT_TEST_FUNCTION_HPS_CLIENT_SET_ENTITY,
+	BT_UNIT_TEST_FUNCTION_HPS_CLIENT_SET_CP,
+	BT_UNIT_TEST_FUNCTION_HPS_CLIENT_GET_URI,
+	BT_UNIT_TEST_FUNCTION_HPS_CLIENT_GET_HDR,
+	BT_UNIT_TEST_FUNCTION_HPS_CLIENT_GET_ENTITY,
+	BT_UNIT_TEST_FUNCTION_HPS_CLIENT_GET_SECURITY,
+	BT_UNIT_TEST_FUNCTION_HPS_CLIENT_SET_STATUS_NOTIFICATION,
+	BT_UNIT_TEST_FUNCTION_HPS_CLIENT_UNSET_STATUS_NOTIFICATION,
 	BT_UNIT_TEST_FUNCTION_AVRCP_TARGET_INITIALIZE = 1,
 	BT_UNIT_TEST_FUNCTION_AVRCP_TARGET_DEINITIALIZE,
 	BT_UNIT_TEST_FUNCTION_AVRCP_SET_EQUALIZER_STATE_CHANGED_CB,
@@ -300,6 +322,24 @@ typedef enum
 	BT_UNIT_TEST_FUNCTION_HID_DEVICE_SEND_KEY_EVENT,
 	BT_UNIT_TEST_FUNCTION_HID_DEVICE_SET_DATA_RECEIVED_CB,
 	BT_UNIT_TEST_FUNCTION_HID_DEVICE_UNSET_DATA_RECEIVED_CB,
+	BT_UNIT_TEST_FUNCTION_IPSP_REGISTER = 1,
+	BT_UNIT_TEST_FUNCTION_IPSP_UNREGISTER,
+	BT_UNIT_TEST_FUNCTION_IPSP_INITIALIZE,
+	BT_UNIT_TEST_FUNCTION_IPSP_DEINITIALIZE,
+	BT_UNIT_TEST_FUNCTION_IPSP_CONNECT,
+	BT_UNIT_TEST_FUNCTION_IPSP_DISCONNECT,
+	BT_UNIT_TEST_FUNCTION_IPSP_START_ADVERTISING,
+	BT_UNIT_TEST_FUNCTION_IPSP_SET_CONNECTION_STATE_CHANGED_CB,
+	BT_UNIT_TEST_FUNCTION_IPSP_UNSET_CONNECTION_STATE_CHANGED_CB,
+	BT_UNIT_TEST_FUNCTION_HDP_REGISTER_SINK_APP = 1,
+	BT_UNIT_TEST_FUNCTION_HDP_UNREGISTER_SINK_APP,
+	BT_UNIT_TEST_FUNCTION_HDP_CONNECT_TO_SOURCE,
+	BT_UNIT_TEST_FUNCTION_HDP_DISCONNECT,
+	BT_UNIT_TEST_FUNCTION_HDP_SEND_DATA,
+	BT_UNIT_TEST_FUNCTION_HDP_SET_CONNECTION_CB,
+	BT_UNIT_TEST_FUNCTION_HDP_UNSET_CONNECTION_CB,
+	BT_UNIT_TEST_FUNCTION_HDP_SET_DATA_RECEIVED_CB,
+	BT_UNIT_TEST_FUNCTION_HDP_UNSET_DATA_RECEIVED_CB,
 #ifdef TIZEN_WEARABLE
 	BT_UNIT_TEST_FUNCTION_HF_INITIALIZE = 1,
 	BT_UNIT_TEST_FUNCTION_HF_DEINITIALIZE,