From: sung.goo.kim Date: Thu, 26 May 2016 08:42:44 +0000 (+0900) Subject: [UTC][IoTCon][ACR-646][Modify name from resource_properties to resource_policies] X-Git-Tag: Beta_RC10~128^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc2172debdc5d66186f60a24d3c322afca96d5b2;p=test%2Ftct%2Fnative%2Fapi.git [UTC][IoTCon][ACR-646][Modify name from resource_properties to resource_policies] Change-Id: I84e8f6ad34079379832500f037f58c9476efc45d Signed-off-by: sung.goo.kim --- diff --git a/src/utc/iotcon/tct-iotcon-core_common_iot.h b/src/utc/iotcon/tct-iotcon-core_common_iot.h index 9fd1171..9c7968b 100755 --- a/src/utc/iotcon/tct-iotcon-core_common_iot.h +++ b/src/utc/iotcon/tct-iotcon-core_common_iot.h @@ -118,8 +118,8 @@ extern int utc_iotcon_remote_resource_get_interfaces_n(void); extern int utc_iotcon_remote_resource_get_interfaces_p(void); extern int utc_iotcon_remote_resource_get_options_n(void); extern int utc_iotcon_remote_resource_get_options_p(void); -extern int utc_iotcon_remote_resource_get_properties_n(void); -extern int utc_iotcon_remote_resource_get_properties_p(void); +extern int utc_iotcon_remote_resource_get_policies_n(void); +extern int utc_iotcon_remote_resource_get_policies_p(void); extern int utc_iotcon_remote_resource_set_options_n(void); extern int utc_iotcon_remote_resource_set_options_p(void); extern int utc_iotcon_remote_resource_get_time_interval_p(void); @@ -282,8 +282,8 @@ extern int utc_iotcon_resource_get_types_n(void); extern int utc_iotcon_resource_get_types_p(void); extern int utc_iotcon_resource_get_interfaces_n(void); extern int utc_iotcon_resource_get_interfaces_p(void); -extern int utc_iotcon_resource_get_properties_n(void); -extern int utc_iotcon_resource_get_properties_p(void); +extern int utc_iotcon_resource_get_policies_n(void); +extern int utc_iotcon_resource_get_policies_p(void); extern int utc_iotcon_initialize_p(void); extern int utc_iotcon_deinitialize_p(void); extern int utc_iotcon_set_timeout_n(void); @@ -483,8 +483,8 @@ testcase tc_array[] = { {"utc_iotcon_remote_resource_get_interfaces_p", utc_iotcon_remote_resource_get_interfaces_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_options_n", utc_iotcon_remote_resource_get_options_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_options_p", utc_iotcon_remote_resource_get_options_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, - {"utc_iotcon_remote_resource_get_properties_n", utc_iotcon_remote_resource_get_properties_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, - {"utc_iotcon_remote_resource_get_properties_p", utc_iotcon_remote_resource_get_properties_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_policies_n", utc_iotcon_remote_resource_get_policies_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_policies_p", utc_iotcon_remote_resource_get_policies_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_set_options_n", utc_iotcon_remote_resource_set_options_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_set_options_p", utc_iotcon_remote_resource_set_options_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_time_interval_p", utc_iotcon_remote_resource_get_time_interval_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, @@ -647,8 +647,8 @@ testcase tc_array[] = { {"utc_iotcon_resource_get_types_p", utc_iotcon_resource_get_types_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, {"utc_iotcon_resource_get_interfaces_n", utc_iotcon_resource_get_interfaces_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, {"utc_iotcon_resource_get_interfaces_p", utc_iotcon_resource_get_interfaces_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, - {"utc_iotcon_resource_get_properties_n", utc_iotcon_resource_get_properties_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, - {"utc_iotcon_resource_get_properties_p", utc_iotcon_resource_get_properties_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, + {"utc_iotcon_resource_get_policies_n", utc_iotcon_resource_get_policies_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, + {"utc_iotcon_resource_get_policies_p", utc_iotcon_resource_get_policies_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, {"utc_iotcon_initialize_p", utc_iotcon_initialize_p, utc_iotcon_service_startup, utc_iotcon_service_cleanup}, {"utc_iotcon_deinitialize_p", utc_iotcon_deinitialize_p, utc_iotcon_service_startup, utc_iotcon_service_cleanup}, {"utc_iotcon_set_timeout_n", utc_iotcon_set_timeout_n, utc_iotcon_startup, utc_iotcon_cleanup}, diff --git a/src/utc/iotcon/tct-iotcon-core_mobile.h b/src/utc/iotcon/tct-iotcon-core_mobile.h index 9fd1171..9c7968b 100755 --- a/src/utc/iotcon/tct-iotcon-core_mobile.h +++ b/src/utc/iotcon/tct-iotcon-core_mobile.h @@ -118,8 +118,8 @@ extern int utc_iotcon_remote_resource_get_interfaces_n(void); extern int utc_iotcon_remote_resource_get_interfaces_p(void); extern int utc_iotcon_remote_resource_get_options_n(void); extern int utc_iotcon_remote_resource_get_options_p(void); -extern int utc_iotcon_remote_resource_get_properties_n(void); -extern int utc_iotcon_remote_resource_get_properties_p(void); +extern int utc_iotcon_remote_resource_get_policies_n(void); +extern int utc_iotcon_remote_resource_get_policies_p(void); extern int utc_iotcon_remote_resource_set_options_n(void); extern int utc_iotcon_remote_resource_set_options_p(void); extern int utc_iotcon_remote_resource_get_time_interval_p(void); @@ -282,8 +282,8 @@ extern int utc_iotcon_resource_get_types_n(void); extern int utc_iotcon_resource_get_types_p(void); extern int utc_iotcon_resource_get_interfaces_n(void); extern int utc_iotcon_resource_get_interfaces_p(void); -extern int utc_iotcon_resource_get_properties_n(void); -extern int utc_iotcon_resource_get_properties_p(void); +extern int utc_iotcon_resource_get_policies_n(void); +extern int utc_iotcon_resource_get_policies_p(void); extern int utc_iotcon_initialize_p(void); extern int utc_iotcon_deinitialize_p(void); extern int utc_iotcon_set_timeout_n(void); @@ -483,8 +483,8 @@ testcase tc_array[] = { {"utc_iotcon_remote_resource_get_interfaces_p", utc_iotcon_remote_resource_get_interfaces_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_options_n", utc_iotcon_remote_resource_get_options_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_options_p", utc_iotcon_remote_resource_get_options_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, - {"utc_iotcon_remote_resource_get_properties_n", utc_iotcon_remote_resource_get_properties_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, - {"utc_iotcon_remote_resource_get_properties_p", utc_iotcon_remote_resource_get_properties_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_policies_n", utc_iotcon_remote_resource_get_policies_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_policies_p", utc_iotcon_remote_resource_get_policies_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_set_options_n", utc_iotcon_remote_resource_set_options_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_set_options_p", utc_iotcon_remote_resource_set_options_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_time_interval_p", utc_iotcon_remote_resource_get_time_interval_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, @@ -647,8 +647,8 @@ testcase tc_array[] = { {"utc_iotcon_resource_get_types_p", utc_iotcon_resource_get_types_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, {"utc_iotcon_resource_get_interfaces_n", utc_iotcon_resource_get_interfaces_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, {"utc_iotcon_resource_get_interfaces_p", utc_iotcon_resource_get_interfaces_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, - {"utc_iotcon_resource_get_properties_n", utc_iotcon_resource_get_properties_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, - {"utc_iotcon_resource_get_properties_p", utc_iotcon_resource_get_properties_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, + {"utc_iotcon_resource_get_policies_n", utc_iotcon_resource_get_policies_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, + {"utc_iotcon_resource_get_policies_p", utc_iotcon_resource_get_policies_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, {"utc_iotcon_initialize_p", utc_iotcon_initialize_p, utc_iotcon_service_startup, utc_iotcon_service_cleanup}, {"utc_iotcon_deinitialize_p", utc_iotcon_deinitialize_p, utc_iotcon_service_startup, utc_iotcon_service_cleanup}, {"utc_iotcon_set_timeout_n", utc_iotcon_set_timeout_n, utc_iotcon_startup, utc_iotcon_cleanup}, diff --git a/src/utc/iotcon/tct-iotcon-core_tv.h b/src/utc/iotcon/tct-iotcon-core_tv.h index 9fd1171..9c7968b 100755 --- a/src/utc/iotcon/tct-iotcon-core_tv.h +++ b/src/utc/iotcon/tct-iotcon-core_tv.h @@ -118,8 +118,8 @@ extern int utc_iotcon_remote_resource_get_interfaces_n(void); extern int utc_iotcon_remote_resource_get_interfaces_p(void); extern int utc_iotcon_remote_resource_get_options_n(void); extern int utc_iotcon_remote_resource_get_options_p(void); -extern int utc_iotcon_remote_resource_get_properties_n(void); -extern int utc_iotcon_remote_resource_get_properties_p(void); +extern int utc_iotcon_remote_resource_get_policies_n(void); +extern int utc_iotcon_remote_resource_get_policies_p(void); extern int utc_iotcon_remote_resource_set_options_n(void); extern int utc_iotcon_remote_resource_set_options_p(void); extern int utc_iotcon_remote_resource_get_time_interval_p(void); @@ -282,8 +282,8 @@ extern int utc_iotcon_resource_get_types_n(void); extern int utc_iotcon_resource_get_types_p(void); extern int utc_iotcon_resource_get_interfaces_n(void); extern int utc_iotcon_resource_get_interfaces_p(void); -extern int utc_iotcon_resource_get_properties_n(void); -extern int utc_iotcon_resource_get_properties_p(void); +extern int utc_iotcon_resource_get_policies_n(void); +extern int utc_iotcon_resource_get_policies_p(void); extern int utc_iotcon_initialize_p(void); extern int utc_iotcon_deinitialize_p(void); extern int utc_iotcon_set_timeout_n(void); @@ -483,8 +483,8 @@ testcase tc_array[] = { {"utc_iotcon_remote_resource_get_interfaces_p", utc_iotcon_remote_resource_get_interfaces_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_options_n", utc_iotcon_remote_resource_get_options_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_options_p", utc_iotcon_remote_resource_get_options_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, - {"utc_iotcon_remote_resource_get_properties_n", utc_iotcon_remote_resource_get_properties_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, - {"utc_iotcon_remote_resource_get_properties_p", utc_iotcon_remote_resource_get_properties_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_policies_n", utc_iotcon_remote_resource_get_policies_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_policies_p", utc_iotcon_remote_resource_get_policies_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_set_options_n", utc_iotcon_remote_resource_set_options_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_set_options_p", utc_iotcon_remote_resource_set_options_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_time_interval_p", utc_iotcon_remote_resource_get_time_interval_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, @@ -647,8 +647,8 @@ testcase tc_array[] = { {"utc_iotcon_resource_get_types_p", utc_iotcon_resource_get_types_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, {"utc_iotcon_resource_get_interfaces_n", utc_iotcon_resource_get_interfaces_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, {"utc_iotcon_resource_get_interfaces_p", utc_iotcon_resource_get_interfaces_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, - {"utc_iotcon_resource_get_properties_n", utc_iotcon_resource_get_properties_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, - {"utc_iotcon_resource_get_properties_p", utc_iotcon_resource_get_properties_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, + {"utc_iotcon_resource_get_policies_n", utc_iotcon_resource_get_policies_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, + {"utc_iotcon_resource_get_policies_p", utc_iotcon_resource_get_policies_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, {"utc_iotcon_initialize_p", utc_iotcon_initialize_p, utc_iotcon_service_startup, utc_iotcon_service_cleanup}, {"utc_iotcon_deinitialize_p", utc_iotcon_deinitialize_p, utc_iotcon_service_startup, utc_iotcon_service_cleanup}, {"utc_iotcon_set_timeout_n", utc_iotcon_set_timeout_n, utc_iotcon_startup, utc_iotcon_cleanup}, diff --git a/src/utc/iotcon/tct-iotcon-core_wearable.h b/src/utc/iotcon/tct-iotcon-core_wearable.h index 9fd1171..9c7968b 100755 --- a/src/utc/iotcon/tct-iotcon-core_wearable.h +++ b/src/utc/iotcon/tct-iotcon-core_wearable.h @@ -118,8 +118,8 @@ extern int utc_iotcon_remote_resource_get_interfaces_n(void); extern int utc_iotcon_remote_resource_get_interfaces_p(void); extern int utc_iotcon_remote_resource_get_options_n(void); extern int utc_iotcon_remote_resource_get_options_p(void); -extern int utc_iotcon_remote_resource_get_properties_n(void); -extern int utc_iotcon_remote_resource_get_properties_p(void); +extern int utc_iotcon_remote_resource_get_policies_n(void); +extern int utc_iotcon_remote_resource_get_policies_p(void); extern int utc_iotcon_remote_resource_set_options_n(void); extern int utc_iotcon_remote_resource_set_options_p(void); extern int utc_iotcon_remote_resource_get_time_interval_p(void); @@ -282,8 +282,8 @@ extern int utc_iotcon_resource_get_types_n(void); extern int utc_iotcon_resource_get_types_p(void); extern int utc_iotcon_resource_get_interfaces_n(void); extern int utc_iotcon_resource_get_interfaces_p(void); -extern int utc_iotcon_resource_get_properties_n(void); -extern int utc_iotcon_resource_get_properties_p(void); +extern int utc_iotcon_resource_get_policies_n(void); +extern int utc_iotcon_resource_get_policies_p(void); extern int utc_iotcon_initialize_p(void); extern int utc_iotcon_deinitialize_p(void); extern int utc_iotcon_set_timeout_n(void); @@ -483,8 +483,8 @@ testcase tc_array[] = { {"utc_iotcon_remote_resource_get_interfaces_p", utc_iotcon_remote_resource_get_interfaces_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_options_n", utc_iotcon_remote_resource_get_options_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_options_p", utc_iotcon_remote_resource_get_options_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, - {"utc_iotcon_remote_resource_get_properties_n", utc_iotcon_remote_resource_get_properties_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, - {"utc_iotcon_remote_resource_get_properties_p", utc_iotcon_remote_resource_get_properties_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_policies_n", utc_iotcon_remote_resource_get_policies_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_policies_p", utc_iotcon_remote_resource_get_policies_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_set_options_n", utc_iotcon_remote_resource_set_options_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_set_options_p", utc_iotcon_remote_resource_set_options_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_remote_resource_get_time_interval_p", utc_iotcon_remote_resource_get_time_interval_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, @@ -647,8 +647,8 @@ testcase tc_array[] = { {"utc_iotcon_resource_get_types_p", utc_iotcon_resource_get_types_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, {"utc_iotcon_resource_get_interfaces_n", utc_iotcon_resource_get_interfaces_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, {"utc_iotcon_resource_get_interfaces_p", utc_iotcon_resource_get_interfaces_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, - {"utc_iotcon_resource_get_properties_n", utc_iotcon_resource_get_properties_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, - {"utc_iotcon_resource_get_properties_p", utc_iotcon_resource_get_properties_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, + {"utc_iotcon_resource_get_policies_n", utc_iotcon_resource_get_policies_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, + {"utc_iotcon_resource_get_policies_p", utc_iotcon_resource_get_policies_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup}, {"utc_iotcon_initialize_p", utc_iotcon_initialize_p, utc_iotcon_service_startup, utc_iotcon_service_cleanup}, {"utc_iotcon_deinitialize_p", utc_iotcon_deinitialize_p, utc_iotcon_service_startup, utc_iotcon_service_cleanup}, {"utc_iotcon_set_timeout_n", utc_iotcon_set_timeout_n, utc_iotcon_startup, utc_iotcon_cleanup}, diff --git a/src/utc/iotcon/utc-iotcon-remote-resource.c b/src/utc/iotcon/utc-iotcon-remote-resource.c index 832c1fc..9a6e523 100755 --- a/src/utc/iotcon/utc-iotcon-remote-resource.c +++ b/src/utc/iotcon/utc-iotcon-remote-resource.c @@ -463,26 +463,26 @@ static int _remote_resource_get_options_p(iotcon_remote_resource_h resource) return 0; } -static int _remote_resource_get_properties_n(iotcon_remote_resource_h resource) +static int _remote_resource_get_policies_n(iotcon_remote_resource_h resource) { int ret; - int properties; + uint8_t policies; - ret = iotcon_remote_resource_get_properties(NULL, &properties); + ret = iotcon_remote_resource_get_policies(NULL, &policies); ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_INVALID_PARAMETER); - ret = iotcon_remote_resource_get_properties(resource, NULL); + ret = iotcon_remote_resource_get_policies(resource, NULL); ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_INVALID_PARAMETER); return 0; } -static int _remote_resource_get_properties_p(iotcon_remote_resource_h resource) +static int _remote_resource_get_policies_p(iotcon_remote_resource_h resource) { int ret; - int properties; + uint8_t policies; - ret = iotcon_remote_resource_get_properties(resource, &properties); + ret = iotcon_remote_resource_get_policies(resource, &policies); ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE); return 0; @@ -1139,18 +1139,18 @@ static void _remote_resource_found_resource(iotcon_remote_resource_h resource, _remote_resource_main_loop_quit(true); return; case REMOTE_RESOURCE_GET_PROPERTIES_N: - ret = _remote_resource_get_properties_n(resource); + ret = _remote_resource_get_policies_n(resource); if (0 != ret) { - ICUTC_ERR("_remote_resource_get_properties_n() Fail(%d)", ret); + ICUTC_ERR("_remote_resource_get_policies_n() Fail(%d)", ret); _remote_resource_main_loop_quit(false); return; } _remote_resource_main_loop_quit(true); return; case REMOTE_RESOURCE_GET_PROPERTIES_P: - ret = _remote_resource_get_properties_p(resource); + ret = _remote_resource_get_policies_p(resource); if (0 != ret) { - ICUTC_ERR("_remote_resource_get_properties_p() Fail(%d)", ret); + ICUTC_ERR("_remote_resource_get_policies_p() Fail(%d)", ret); _remote_resource_main_loop_quit(false); return; } @@ -2309,17 +2309,17 @@ int utc_iotcon_remote_resource_get_options_p(void) /** - * @testcase utc_iotcon_remote_resource_get_properties_n + * @testcase utc_iotcon_remote_resource_get_policies_n * @since_tizen 3.0 - * @description Test fail getting properties from remote resource with invalid parameter. + * @description Test fail getting policies from remote resource with invalid parameter. */ -int utc_iotcon_remote_resource_get_properties_n(void) +int utc_iotcon_remote_resource_get_policies_n(void) { int ret; - int properties; + uint8_t policies; if (false == g_feature) { - ret = iotcon_remote_resource_get_properties(NULL, &properties); + ret = iotcon_remote_resource_get_policies(NULL, &policies); ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED); return 0; } @@ -2331,17 +2331,17 @@ int utc_iotcon_remote_resource_get_properties_n(void) /** - * @testcase utc_iotcon_remote_resource_get_properties_p + * @testcase utc_iotcon_remote_resource_get_policies_p * @since_tizen 3.0 - * @description Test getting properties from remote resource. + * @description Test getting policies from remote resource. */ -int utc_iotcon_remote_resource_get_properties_p(void) +int utc_iotcon_remote_resource_get_policies_p(void) { int ret; - int properties; + uint8_t policies; if (false == g_feature) { - ret = iotcon_remote_resource_get_properties(NULL, &properties); + ret = iotcon_remote_resource_get_policies(NULL, &policies); ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED); return 0; } diff --git a/src/utc/iotcon/utc-iotcon-resource.c b/src/utc/iotcon/utc-iotcon-resource.c index 34ddb9c..c994995 100755 --- a/src/utc/iotcon/utc-iotcon-resource.c +++ b/src/utc/iotcon/utc-iotcon-resource.c @@ -1508,14 +1508,14 @@ int utc_iotcon_resource_get_interfaces_n(void) ret = iotcon_resource_get_interfaces(NULL, &ifaces); if (IOTCON_ERROR_INVALID_PARAMETER != ret) { - ICUTC_ERR("iotcon_resource_get_properties() Fail(%d)", ret); + ICUTC_ERR("iotcon_resource_get_interfaces() Fail(%d)", ret); iotcon_resource_destroy(resource); return 1; } ret = iotcon_resource_get_interfaces(resource, NULL); if (IOTCON_ERROR_INVALID_PARAMETER != ret) { - ICUTC_ERR("iotcon_resource_get_properties() Fail(%d)", ret); + ICUTC_ERR("iotcon_resource_get_interfaces() Fail(%d)", ret); iotcon_resource_destroy(resource); return 1; } @@ -1557,18 +1557,18 @@ int utc_iotcon_resource_get_interfaces_p(void) } /** - * @testcase utc_iotcon_resource_get_properties_n + * @testcase utc_iotcon_resource_get_policies_n * @since_tizen 3.0 - * @description Test fail getting properties from resource with invalid parameter. + * @description Test fail getting policies from resource with invalid parameter. */ -int utc_iotcon_resource_get_properties_n(void) +int utc_iotcon_resource_get_policies_n(void) { int ret; - int properties; + uint8_t policies; iotcon_resource_h resource = NULL; if (false == g_feature) { - ret = iotcon_resource_get_properties(NULL, &properties); + ret = iotcon_resource_get_policies(NULL, &policies); ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED); return 0; } @@ -1576,16 +1576,16 @@ int utc_iotcon_resource_get_properties_n(void) ret = icutc_create_resource(LIGHT_RESOURCE_TYPE, LIGHT_RESOURCE_URI, &resource); ICUTC_ASSERT_EQ(ret, 0); - ret = iotcon_resource_get_properties(NULL, &properties); + ret = iotcon_resource_get_policies(NULL, &policies); if (IOTCON_ERROR_INVALID_PARAMETER != ret) { - ICUTC_ERR("iotcon_resource_get_properties() Fail(%d)", ret); + ICUTC_ERR("iotcon_resource_get_policies() Fail(%d)", ret); iotcon_resource_destroy(resource); return 1; } - ret = iotcon_resource_get_properties(resource, NULL); + ret = iotcon_resource_get_policies(resource, NULL); if (IOTCON_ERROR_INVALID_PARAMETER != ret) { - ICUTC_ERR("iotcon_resource_get_properties() Fail(%d)", ret); + ICUTC_ERR("iotcon_resource_get_policies() Fail(%d)", ret); iotcon_resource_destroy(resource); return 1; } @@ -1595,18 +1595,18 @@ int utc_iotcon_resource_get_properties_n(void) } /** - * @testcase utc_iotcon_resource_get_properties_p + * @testcase utc_iotcon_resource_get_policies_p * @since_tizen 3.0 - * @description Test getting properties from resource. + * @description Test getting policies from resource. */ -int utc_iotcon_resource_get_properties_p(void) +int utc_iotcon_resource_get_policies_p(void) { int ret; - int properties; + uint8_t policies; iotcon_resource_h resource = NULL; if (false == g_feature) { - ret = iotcon_resource_get_properties(NULL, &properties); + ret = iotcon_resource_get_policies(NULL, &policies); ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED); return 0; } @@ -1614,9 +1614,9 @@ int utc_iotcon_resource_get_properties_p(void) ret = icutc_create_resource(LIGHT_RESOURCE_TYPE, LIGHT_RESOURCE_URI, &resource); ICUTC_ASSERT_EQ(ret, 0); - ret = iotcon_resource_get_properties(resource, &properties); + ret = iotcon_resource_get_policies(resource, &policies); if (IOTCON_ERROR_NONE != ret) { - ICUTC_ERR("iotcon_resource_get_properties() Fail(%d)", ret); + ICUTC_ERR("iotcon_resource_get_policies() Fail(%d)", ret); iotcon_resource_destroy(resource); return 1; }