From 6d67b9226ebcad1a744cf9ce8aa4a012fd07755a Mon Sep 17 00:00:00 2001 From: youngman Date: Mon, 23 May 2016 10:16:07 +0900 Subject: [PATCH] [UTC][IoTCon][ACR-632] Add APIs related to device name Change-Id: Ie33f50bf303ae0ca3482ac242efec0514ca8b3ab Signed-off-by: youngman --- src/utc/iotcon/tct-iotcon-core_common_iot.h | 8 +++ src/utc/iotcon/tct-iotcon-core_mobile.h | 8 +++ src/utc/iotcon/tct-iotcon-core_tv.h | 8 +++ src/utc/iotcon/tct-iotcon-core_wearable.h | 8 +++ src/utc/iotcon/utc-iotcon-remote-resource.c | 89 +++++++++++++++++++++++++++++ src/utc/iotcon/utc-iotcon.c | 42 ++++++++++++++ 6 files changed, 163 insertions(+) diff --git a/src/utc/iotcon/tct-iotcon-core_common_iot.h b/src/utc/iotcon/tct-iotcon-core_common_iot.h index 9fd1171..54a3ae9 100755 --- a/src/utc/iotcon/tct-iotcon-core_common_iot.h +++ b/src/utc/iotcon/tct-iotcon-core_common_iot.h @@ -112,6 +112,8 @@ extern int utc_iotcon_remote_resource_get_connectivity_type_n(void); extern int utc_iotcon_remote_resource_get_connectivity_type_p(void); extern int utc_iotcon_remote_resource_get_device_id_n(void); extern int utc_iotcon_remote_resource_get_device_id_p(void); +extern int utc_iotcon_remote_resource_get_device_name_n(void); +extern int utc_iotcon_remote_resource_get_device_name_p(void); extern int utc_iotcon_remote_resource_get_types_n(void); extern int utc_iotcon_remote_resource_get_types_p(void); extern int utc_iotcon_remote_resource_get_interfaces_n(void); @@ -298,6 +300,8 @@ extern int utc_iotcon_polling_set_interval_n(void); extern int utc_iotcon_polling_set_interval_p(void); extern int utc_iotcon_polling_invoke_n(void); extern int utc_iotcon_polling_invoke_p(void); +extern int utc_iotcon_set_device_name_n(void); +extern int utc_iotcon_set_device_name_p(void); extern int utc_iotcon_options_create_n(void); extern int utc_iotcon_options_create_p(void); extern int utc_iotcon_options_destroy_n(void); @@ -477,6 +481,8 @@ testcase tc_array[] = { {"utc_iotcon_remote_resource_get_connectivity_type_p", utc_iotcon_remote_resource_get_connectivity_type_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_device_id_n", utc_iotcon_remote_resource_get_device_id_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_device_id_p", utc_iotcon_remote_resource_get_device_id_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_device_name_n", utc_iotcon_remote_resource_get_device_name_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_device_name_p", utc_iotcon_remote_resource_get_device_name_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_types_n", utc_iotcon_remote_resource_get_types_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_types_p", utc_iotcon_remote_resource_get_types_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_interfaces_n", utc_iotcon_remote_resource_get_interfaces_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, @@ -663,6 +669,8 @@ testcase tc_array[] = { {"utc_iotcon_polling_set_interval_p", utc_iotcon_polling_set_interval_p, utc_iotcon_startup, utc_iotcon_cleanup}, {"utc_iotcon_polling_invoke_n", utc_iotcon_polling_invoke_n, utc_iotcon_startup, utc_iotcon_cleanup}, {"utc_iotcon_polling_invoke_p", utc_iotcon_polling_invoke_p, utc_iotcon_startup, utc_iotcon_cleanup}, + {"utc_iotcon_set_device_name_n", utc_iotcon_set_device_name_n, utc_iotcon_startup, utc_iotcon_cleanup}, + {"utc_iotcon_set_device_name_p", utc_iotcon_set_device_name_p, utc_iotcon_startup, utc_iotcon_cleanup}, {"utc_iotcon_options_create_n", utc_iotcon_options_create_n, utc_iotcon_struct_startup, utc_iotcon_struct_cleanup}, {"utc_iotcon_options_create_p", utc_iotcon_options_create_p, utc_iotcon_struct_startup, utc_iotcon_struct_cleanup}, {"utc_iotcon_options_destroy_n", utc_iotcon_options_destroy_n, utc_iotcon_struct_startup, utc_iotcon_struct_cleanup}, diff --git a/src/utc/iotcon/tct-iotcon-core_mobile.h b/src/utc/iotcon/tct-iotcon-core_mobile.h index 9fd1171..54a3ae9 100755 --- a/src/utc/iotcon/tct-iotcon-core_mobile.h +++ b/src/utc/iotcon/tct-iotcon-core_mobile.h @@ -112,6 +112,8 @@ extern int utc_iotcon_remote_resource_get_connectivity_type_n(void); extern int utc_iotcon_remote_resource_get_connectivity_type_p(void); extern int utc_iotcon_remote_resource_get_device_id_n(void); extern int utc_iotcon_remote_resource_get_device_id_p(void); +extern int utc_iotcon_remote_resource_get_device_name_n(void); +extern int utc_iotcon_remote_resource_get_device_name_p(void); extern int utc_iotcon_remote_resource_get_types_n(void); extern int utc_iotcon_remote_resource_get_types_p(void); extern int utc_iotcon_remote_resource_get_interfaces_n(void); @@ -298,6 +300,8 @@ extern int utc_iotcon_polling_set_interval_n(void); extern int utc_iotcon_polling_set_interval_p(void); extern int utc_iotcon_polling_invoke_n(void); extern int utc_iotcon_polling_invoke_p(void); +extern int utc_iotcon_set_device_name_n(void); +extern int utc_iotcon_set_device_name_p(void); extern int utc_iotcon_options_create_n(void); extern int utc_iotcon_options_create_p(void); extern int utc_iotcon_options_destroy_n(void); @@ -477,6 +481,8 @@ testcase tc_array[] = { {"utc_iotcon_remote_resource_get_connectivity_type_p", utc_iotcon_remote_resource_get_connectivity_type_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_device_id_n", utc_iotcon_remote_resource_get_device_id_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_device_id_p", utc_iotcon_remote_resource_get_device_id_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_device_name_n", utc_iotcon_remote_resource_get_device_name_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_device_name_p", utc_iotcon_remote_resource_get_device_name_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_types_n", utc_iotcon_remote_resource_get_types_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_types_p", utc_iotcon_remote_resource_get_types_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_interfaces_n", utc_iotcon_remote_resource_get_interfaces_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, @@ -663,6 +669,8 @@ testcase tc_array[] = { {"utc_iotcon_polling_set_interval_p", utc_iotcon_polling_set_interval_p, utc_iotcon_startup, utc_iotcon_cleanup}, {"utc_iotcon_polling_invoke_n", utc_iotcon_polling_invoke_n, utc_iotcon_startup, utc_iotcon_cleanup}, {"utc_iotcon_polling_invoke_p", utc_iotcon_polling_invoke_p, utc_iotcon_startup, utc_iotcon_cleanup}, + {"utc_iotcon_set_device_name_n", utc_iotcon_set_device_name_n, utc_iotcon_startup, utc_iotcon_cleanup}, + {"utc_iotcon_set_device_name_p", utc_iotcon_set_device_name_p, utc_iotcon_startup, utc_iotcon_cleanup}, {"utc_iotcon_options_create_n", utc_iotcon_options_create_n, utc_iotcon_struct_startup, utc_iotcon_struct_cleanup}, {"utc_iotcon_options_create_p", utc_iotcon_options_create_p, utc_iotcon_struct_startup, utc_iotcon_struct_cleanup}, {"utc_iotcon_options_destroy_n", utc_iotcon_options_destroy_n, utc_iotcon_struct_startup, utc_iotcon_struct_cleanup}, diff --git a/src/utc/iotcon/tct-iotcon-core_tv.h b/src/utc/iotcon/tct-iotcon-core_tv.h index 9fd1171..54a3ae9 100755 --- a/src/utc/iotcon/tct-iotcon-core_tv.h +++ b/src/utc/iotcon/tct-iotcon-core_tv.h @@ -112,6 +112,8 @@ extern int utc_iotcon_remote_resource_get_connectivity_type_n(void); extern int utc_iotcon_remote_resource_get_connectivity_type_p(void); extern int utc_iotcon_remote_resource_get_device_id_n(void); extern int utc_iotcon_remote_resource_get_device_id_p(void); +extern int utc_iotcon_remote_resource_get_device_name_n(void); +extern int utc_iotcon_remote_resource_get_device_name_p(void); extern int utc_iotcon_remote_resource_get_types_n(void); extern int utc_iotcon_remote_resource_get_types_p(void); extern int utc_iotcon_remote_resource_get_interfaces_n(void); @@ -298,6 +300,8 @@ extern int utc_iotcon_polling_set_interval_n(void); extern int utc_iotcon_polling_set_interval_p(void); extern int utc_iotcon_polling_invoke_n(void); extern int utc_iotcon_polling_invoke_p(void); +extern int utc_iotcon_set_device_name_n(void); +extern int utc_iotcon_set_device_name_p(void); extern int utc_iotcon_options_create_n(void); extern int utc_iotcon_options_create_p(void); extern int utc_iotcon_options_destroy_n(void); @@ -477,6 +481,8 @@ testcase tc_array[] = { {"utc_iotcon_remote_resource_get_connectivity_type_p", utc_iotcon_remote_resource_get_connectivity_type_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_device_id_n", utc_iotcon_remote_resource_get_device_id_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_device_id_p", utc_iotcon_remote_resource_get_device_id_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_device_name_n", utc_iotcon_remote_resource_get_device_name_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_device_name_p", utc_iotcon_remote_resource_get_device_name_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_types_n", utc_iotcon_remote_resource_get_types_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_types_p", utc_iotcon_remote_resource_get_types_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_interfaces_n", utc_iotcon_remote_resource_get_interfaces_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, @@ -663,6 +669,8 @@ testcase tc_array[] = { {"utc_iotcon_polling_set_interval_p", utc_iotcon_polling_set_interval_p, utc_iotcon_startup, utc_iotcon_cleanup}, {"utc_iotcon_polling_invoke_n", utc_iotcon_polling_invoke_n, utc_iotcon_startup, utc_iotcon_cleanup}, {"utc_iotcon_polling_invoke_p", utc_iotcon_polling_invoke_p, utc_iotcon_startup, utc_iotcon_cleanup}, + {"utc_iotcon_set_device_name_n", utc_iotcon_set_device_name_n, utc_iotcon_startup, utc_iotcon_cleanup}, + {"utc_iotcon_set_device_name_p", utc_iotcon_set_device_name_p, utc_iotcon_startup, utc_iotcon_cleanup}, {"utc_iotcon_options_create_n", utc_iotcon_options_create_n, utc_iotcon_struct_startup, utc_iotcon_struct_cleanup}, {"utc_iotcon_options_create_p", utc_iotcon_options_create_p, utc_iotcon_struct_startup, utc_iotcon_struct_cleanup}, {"utc_iotcon_options_destroy_n", utc_iotcon_options_destroy_n, utc_iotcon_struct_startup, utc_iotcon_struct_cleanup}, diff --git a/src/utc/iotcon/tct-iotcon-core_wearable.h b/src/utc/iotcon/tct-iotcon-core_wearable.h index 9fd1171..54a3ae9 100755 --- a/src/utc/iotcon/tct-iotcon-core_wearable.h +++ b/src/utc/iotcon/tct-iotcon-core_wearable.h @@ -112,6 +112,8 @@ extern int utc_iotcon_remote_resource_get_connectivity_type_n(void); extern int utc_iotcon_remote_resource_get_connectivity_type_p(void); extern int utc_iotcon_remote_resource_get_device_id_n(void); extern int utc_iotcon_remote_resource_get_device_id_p(void); +extern int utc_iotcon_remote_resource_get_device_name_n(void); +extern int utc_iotcon_remote_resource_get_device_name_p(void); extern int utc_iotcon_remote_resource_get_types_n(void); extern int utc_iotcon_remote_resource_get_types_p(void); extern int utc_iotcon_remote_resource_get_interfaces_n(void); @@ -298,6 +300,8 @@ extern int utc_iotcon_polling_set_interval_n(void); extern int utc_iotcon_polling_set_interval_p(void); extern int utc_iotcon_polling_invoke_n(void); extern int utc_iotcon_polling_invoke_p(void); +extern int utc_iotcon_set_device_name_n(void); +extern int utc_iotcon_set_device_name_p(void); extern int utc_iotcon_options_create_n(void); extern int utc_iotcon_options_create_p(void); extern int utc_iotcon_options_destroy_n(void); @@ -477,6 +481,8 @@ testcase tc_array[] = { {"utc_iotcon_remote_resource_get_connectivity_type_p", utc_iotcon_remote_resource_get_connectivity_type_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_device_id_n", utc_iotcon_remote_resource_get_device_id_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_device_id_p", utc_iotcon_remote_resource_get_device_id_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_device_name_n", utc_iotcon_remote_resource_get_device_name_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_device_name_p", utc_iotcon_remote_resource_get_device_name_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_types_n", utc_iotcon_remote_resource_get_types_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_types_p", utc_iotcon_remote_resource_get_types_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_interfaces_n", utc_iotcon_remote_resource_get_interfaces_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, @@ -663,6 +669,8 @@ testcase tc_array[] = { {"utc_iotcon_polling_set_interval_p", utc_iotcon_polling_set_interval_p, utc_iotcon_startup, utc_iotcon_cleanup}, {"utc_iotcon_polling_invoke_n", utc_iotcon_polling_invoke_n, utc_iotcon_startup, utc_iotcon_cleanup}, {"utc_iotcon_polling_invoke_p", utc_iotcon_polling_invoke_p, utc_iotcon_startup, utc_iotcon_cleanup}, + {"utc_iotcon_set_device_name_n", utc_iotcon_set_device_name_n, utc_iotcon_startup, utc_iotcon_cleanup}, + {"utc_iotcon_set_device_name_p", utc_iotcon_set_device_name_p, utc_iotcon_startup, utc_iotcon_cleanup}, {"utc_iotcon_options_create_n", utc_iotcon_options_create_n, utc_iotcon_struct_startup, utc_iotcon_struct_cleanup}, {"utc_iotcon_options_create_p", utc_iotcon_options_create_p, utc_iotcon_struct_startup, utc_iotcon_struct_cleanup}, {"utc_iotcon_options_destroy_n", utc_iotcon_options_destroy_n, utc_iotcon_struct_startup, utc_iotcon_struct_cleanup}, diff --git a/src/utc/iotcon/utc-iotcon-remote-resource.c b/src/utc/iotcon/utc-iotcon-remote-resource.c index 832c1fc..d7a321f 100755 --- a/src/utc/iotcon/utc-iotcon-remote-resource.c +++ b/src/utc/iotcon/utc-iotcon-remote-resource.c @@ -35,6 +35,8 @@ enum { REMOTE_RESOURCE_GET_CONNECTIVITY_TYPE_N, REMOTE_RESOURCE_GET_DEVICE_ID_P, REMOTE_RESOURCE_GET_DEVICE_ID_N, + REMOTE_RESOURCE_GET_DEVICE_NAME_P, + REMOTE_RESOURCE_GET_DEVICE_NAME_N, REMOTE_RESOURCE_GET_HOST_ADDRESS_P, REMOTE_RESOURCE_GET_HOST_ADDRESS_N, REMOTE_RESOURCE_GET_INTERFACES_P, @@ -388,6 +390,31 @@ static int _remote_resource_get_device_id_p(iotcon_remote_resource_h resource) return 0; } +static int _remote_resource_get_device_name_n(iotcon_remote_resource_h resource) +{ + int ret; + char *device_name; + + ret = iotcon_remote_resource_get_device_name(NULL, &device_name); + ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_INVALID_PARAMETER); + + ret = iotcon_remote_resource_get_device_name(resource, NULL); + ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_INVALID_PARAMETER); + + return 0; +} + +static int _remote_resource_get_device_name_p(iotcon_remote_resource_h resource) +{ + int ret; + char *device_name; + + ret = iotcon_remote_resource_get_device_name(resource, &device_name); + ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE); + + return 0; +} + static int _remote_resource_get_types_n(iotcon_remote_resource_h resource) { int ret; @@ -1084,6 +1111,24 @@ static void _remote_resource_found_resource(iotcon_remote_resource_h resource, } _remote_resource_main_loop_quit(true); return; + case REMOTE_RESOURCE_GET_DEVICE_NAME_N: + ret = _remote_resource_get_device_name_n(resource); + if (0 != ret) { + ICUTC_ERR("_remote_resource_get_device_name_n() Fail(%d)", ret); + _remote_resource_main_loop_quit(false); + return; + } + _remote_resource_main_loop_quit(true); + return; + case REMOTE_RESOURCE_GET_DEVICE_NAME_P: + ret = _remote_resource_get_device_name_p(resource); + if (0 != ret) { + ICUTC_ERR("_remote_resource_get_device_name_p() Fail(%d)", ret); + _remote_resource_main_loop_quit(false); + return; + } + _remote_resource_main_loop_quit(true); + return; case REMOTE_RESOURCE_GET_TYPES_N: ret = _remote_resource_get_types_n(resource); if (0 != ret) { @@ -2180,6 +2225,50 @@ int utc_iotcon_remote_resource_get_device_id_p(void) return 0; } + +/** + * @testcase utc_iotcon_remote_resource_get_device_name_n + * @since_tizen 3.0 + * @description Test fail getting device name from remote resource with invalid parameter. + */ +int utc_iotcon_remote_resource_get_device_name_n(void) +{ + int ret; + char *device_name; + + if (false == g_feature) { + ret = iotcon_remote_resource_get_device_name(NULL, &device_name); + ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED); + return 0; + } + + ret = _remote_resource_handle_async(REMOTE_RESOURCE_GET_DEVICE_NAME_N); + ICUTC_ASSERT_EQ(ret, 0); + return 0; +} + +/** + * @testcase utc_iotcon_remote_resource_get_device_name_p + * @since_tizen 3.0 + * @description Test getting device name from remote resource. + */ +int utc_iotcon_remote_resource_get_device_name_p(void) +{ + int ret; + char *device_name; + + if (false == g_feature) { + ret = iotcon_remote_resource_get_device_name(NULL, &device_name); + ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED); + return 0; + } + + ret = _remote_resource_handle_async(REMOTE_RESOURCE_GET_DEVICE_NAME_P); + ICUTC_ASSERT_EQ(ret, 0); + return 0; +} + + /** * @testcase utc_iotcon_remote_resource_get_types_n * @since_tizen 3.0 diff --git a/src/utc/iotcon/utc-iotcon.c b/src/utc/iotcon/utc-iotcon.c index 0b3be18..f09cbb7 100755 --- a/src/utc/iotcon/utc-iotcon.c +++ b/src/utc/iotcon/utc-iotcon.c @@ -518,3 +518,45 @@ int utc_iotcon_polling_invoke_n(void) return 0; } +/** + * @testcase utc_iotcon_set_device_name_n + * @since_tizen 3.0 + * @description Test fail setting device name. + */ +int utc_iotcon_set_device_name_n(void) +{ + int ret; + + if (false == g_feature) { + ret = iotcon_set_device_name("device_name"); + ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED); + return 0; + } + + ret = iotcon_set_device_name(NULL); + ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_INVALID_PARAMETER); + + return 0; +} + +/** + * @testcase utc_iotcon_set_device_name_p + * @since_tizen 3.0 + * @description Test setting device name. + */ +int utc_iotcon_set_device_name_p(void) +{ + int ret; + + if (false == g_feature) { + ret = iotcon_set_device_name("device_name"); + ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED); + return 0; + } + + ret = iotcon_set_device_name("device_name"); + ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE); + + return 0; +} + -- 2.7.4