From de7bd0b870aef0226039ab5e9d1916352640ce69 Mon Sep 17 00:00:00 2001 From: youngman Date: Fri, 2 Sep 2016 16:49:14 +0900 Subject: [PATCH] [UTC][IoTCon][ACR-762][modify APIs related to checking interval of remote resource] Change-Id: Ic5f6c250a380619c8cb97d26a92fd6e29a95a7f1 Signed-off-by: youngman --- src/utc/iotcon/tct-iotcon-core_common_iot.h | 16 +- src/utc/iotcon/tct-iotcon-core_mobile.h | 16 +- src/utc/iotcon/tct-iotcon-core_tv.h | 16 +- src/utc/iotcon/tct-iotcon-core_wearable.h | 16 +- src/utc/iotcon/utc-iotcon-remote-resource.c | 217 +++++++++++++++++++--------- 5 files changed, 183 insertions(+), 98 deletions(-) diff --git a/src/utc/iotcon/tct-iotcon-core_common_iot.h b/src/utc/iotcon/tct-iotcon-core_common_iot.h index 898e32b..9ac6f99 100755 --- a/src/utc/iotcon/tct-iotcon-core_common_iot.h +++ b/src/utc/iotcon/tct-iotcon-core_common_iot.h @@ -124,10 +124,10 @@ 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); -extern int utc_iotcon_remote_resource_get_time_interval_n(void); -extern int utc_iotcon_remote_resource_set_time_interval_p(void); -extern int utc_iotcon_remote_resource_set_time_interval_n(void); +extern int utc_iotcon_remote_resource_get_checking_interval_p(void); +extern int utc_iotcon_remote_resource_get_checking_interval_n(void); +extern int utc_iotcon_remote_resource_set_checking_interval_p(void); +extern int utc_iotcon_remote_resource_set_checking_interval_n(void); extern int utc_iotcon_representation_create_n(void); extern int utc_iotcon_representation_create_p(void); extern int utc_iotcon_representation_destroy_n(void); @@ -489,10 +489,10 @@ testcase tc_array[] = { {"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}, - {"utc_iotcon_remote_resource_get_time_interval_n", utc_iotcon_remote_resource_get_time_interval_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, - {"utc_iotcon_remote_resource_set_time_interval_p", utc_iotcon_remote_resource_set_time_interval_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, - {"utc_iotcon_remote_resource_set_time_interval_n", utc_iotcon_remote_resource_set_time_interval_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_checking_interval_p", utc_iotcon_remote_resource_get_checking_interval_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_checking_interval_n", utc_iotcon_remote_resource_get_checking_interval_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_set_checking_interval_p", utc_iotcon_remote_resource_set_checking_interval_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_set_checking_interval_n", utc_iotcon_remote_resource_set_checking_interval_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_representation_create_n", utc_iotcon_representation_create_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup}, {"utc_iotcon_representation_create_p", utc_iotcon_representation_create_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup}, {"utc_iotcon_representation_destroy_n", utc_iotcon_representation_destroy_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup}, diff --git a/src/utc/iotcon/tct-iotcon-core_mobile.h b/src/utc/iotcon/tct-iotcon-core_mobile.h index 898e32b..9ac6f99 100755 --- a/src/utc/iotcon/tct-iotcon-core_mobile.h +++ b/src/utc/iotcon/tct-iotcon-core_mobile.h @@ -124,10 +124,10 @@ 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); -extern int utc_iotcon_remote_resource_get_time_interval_n(void); -extern int utc_iotcon_remote_resource_set_time_interval_p(void); -extern int utc_iotcon_remote_resource_set_time_interval_n(void); +extern int utc_iotcon_remote_resource_get_checking_interval_p(void); +extern int utc_iotcon_remote_resource_get_checking_interval_n(void); +extern int utc_iotcon_remote_resource_set_checking_interval_p(void); +extern int utc_iotcon_remote_resource_set_checking_interval_n(void); extern int utc_iotcon_representation_create_n(void); extern int utc_iotcon_representation_create_p(void); extern int utc_iotcon_representation_destroy_n(void); @@ -489,10 +489,10 @@ testcase tc_array[] = { {"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}, - {"utc_iotcon_remote_resource_get_time_interval_n", utc_iotcon_remote_resource_get_time_interval_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, - {"utc_iotcon_remote_resource_set_time_interval_p", utc_iotcon_remote_resource_set_time_interval_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, - {"utc_iotcon_remote_resource_set_time_interval_n", utc_iotcon_remote_resource_set_time_interval_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_checking_interval_p", utc_iotcon_remote_resource_get_checking_interval_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_checking_interval_n", utc_iotcon_remote_resource_get_checking_interval_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_set_checking_interval_p", utc_iotcon_remote_resource_set_checking_interval_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_set_checking_interval_n", utc_iotcon_remote_resource_set_checking_interval_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_representation_create_n", utc_iotcon_representation_create_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup}, {"utc_iotcon_representation_create_p", utc_iotcon_representation_create_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup}, {"utc_iotcon_representation_destroy_n", utc_iotcon_representation_destroy_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup}, diff --git a/src/utc/iotcon/tct-iotcon-core_tv.h b/src/utc/iotcon/tct-iotcon-core_tv.h index 898e32b..9ac6f99 100755 --- a/src/utc/iotcon/tct-iotcon-core_tv.h +++ b/src/utc/iotcon/tct-iotcon-core_tv.h @@ -124,10 +124,10 @@ 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); -extern int utc_iotcon_remote_resource_get_time_interval_n(void); -extern int utc_iotcon_remote_resource_set_time_interval_p(void); -extern int utc_iotcon_remote_resource_set_time_interval_n(void); +extern int utc_iotcon_remote_resource_get_checking_interval_p(void); +extern int utc_iotcon_remote_resource_get_checking_interval_n(void); +extern int utc_iotcon_remote_resource_set_checking_interval_p(void); +extern int utc_iotcon_remote_resource_set_checking_interval_n(void); extern int utc_iotcon_representation_create_n(void); extern int utc_iotcon_representation_create_p(void); extern int utc_iotcon_representation_destroy_n(void); @@ -489,10 +489,10 @@ testcase tc_array[] = { {"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}, - {"utc_iotcon_remote_resource_get_time_interval_n", utc_iotcon_remote_resource_get_time_interval_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, - {"utc_iotcon_remote_resource_set_time_interval_p", utc_iotcon_remote_resource_set_time_interval_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, - {"utc_iotcon_remote_resource_set_time_interval_n", utc_iotcon_remote_resource_set_time_interval_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_checking_interval_p", utc_iotcon_remote_resource_get_checking_interval_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_checking_interval_n", utc_iotcon_remote_resource_get_checking_interval_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_set_checking_interval_p", utc_iotcon_remote_resource_set_checking_interval_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_set_checking_interval_n", utc_iotcon_remote_resource_set_checking_interval_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_representation_create_n", utc_iotcon_representation_create_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup}, {"utc_iotcon_representation_create_p", utc_iotcon_representation_create_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup}, {"utc_iotcon_representation_destroy_n", utc_iotcon_representation_destroy_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup}, diff --git a/src/utc/iotcon/tct-iotcon-core_wearable.h b/src/utc/iotcon/tct-iotcon-core_wearable.h index 898e32b..9ac6f99 100755 --- a/src/utc/iotcon/tct-iotcon-core_wearable.h +++ b/src/utc/iotcon/tct-iotcon-core_wearable.h @@ -124,10 +124,10 @@ 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); -extern int utc_iotcon_remote_resource_get_time_interval_n(void); -extern int utc_iotcon_remote_resource_set_time_interval_p(void); -extern int utc_iotcon_remote_resource_set_time_interval_n(void); +extern int utc_iotcon_remote_resource_get_checking_interval_p(void); +extern int utc_iotcon_remote_resource_get_checking_interval_n(void); +extern int utc_iotcon_remote_resource_set_checking_interval_p(void); +extern int utc_iotcon_remote_resource_set_checking_interval_n(void); extern int utc_iotcon_representation_create_n(void); extern int utc_iotcon_representation_create_p(void); extern int utc_iotcon_representation_destroy_n(void); @@ -489,10 +489,10 @@ testcase tc_array[] = { {"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}, - {"utc_iotcon_remote_resource_get_time_interval_n", utc_iotcon_remote_resource_get_time_interval_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, - {"utc_iotcon_remote_resource_set_time_interval_p", utc_iotcon_remote_resource_set_time_interval_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, - {"utc_iotcon_remote_resource_set_time_interval_n", utc_iotcon_remote_resource_set_time_interval_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_checking_interval_p", utc_iotcon_remote_resource_get_checking_interval_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_get_checking_interval_n", utc_iotcon_remote_resource_get_checking_interval_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_set_checking_interval_p", utc_iotcon_remote_resource_set_checking_interval_p, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, + {"utc_iotcon_remote_resource_set_checking_interval_n", utc_iotcon_remote_resource_set_checking_interval_n, utc_iotcon_remote_resource_startup, utc_iotcon_remote_resource_cleanup}, {"utc_iotcon_representation_create_n", utc_iotcon_representation_create_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup}, {"utc_iotcon_representation_create_p", utc_iotcon_representation_create_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup}, {"utc_iotcon_representation_destroy_n", utc_iotcon_representation_destroy_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup}, diff --git a/src/utc/iotcon/utc-iotcon-remote-resource.c b/src/utc/iotcon/utc-iotcon-remote-resource.c index 9286164..1a0ae7d 100755 --- a/src/utc/iotcon/utc-iotcon-remote-resource.c +++ b/src/utc/iotcon/utc-iotcon-remote-resource.c @@ -1337,6 +1337,63 @@ static int _remote_resource_lite_handle_async(int tc_index) return 1; } +static int _remote_resource_create(iotcon_remote_resource_h *resource) +{ + int ret; + iotcon_resource_types_h resource_types; + iotcon_resource_interfaces_h resource_interfaces; + iotcon_remote_resource_h remote_resource; + + ret = iotcon_resource_types_create(&resource_types); + if (IOTCON_ERROR_NONE != ret) { + ICUTC_ERR("iotcon_resource_types_create() Fail(%d)", ret); + return 1; + } + + ret = iotcon_resource_types_add(resource_types, LIGHT_RESOURCE_TYPE); + if (IOTCON_ERROR_NONE != ret) { + ICUTC_ERR("iotcon_resource_types_add() Fail(%d)", ret); + iotcon_resource_types_destroy(resource_types); + return 1; + } + + ret = iotcon_resource_interfaces_create(&resource_interfaces); + if (IOTCON_ERROR_NONE != ret) { + ICUTC_ERR("iotcon_resource_interfaces_create() Fail(%d)", ret); + iotcon_resource_types_destroy(resource_types); + return 1; + } + + ret = iotcon_resource_interfaces_add(resource_interfaces, IOTCON_INTERFACE_DEFAULT); + if (IOTCON_ERROR_NONE != ret) { + ICUTC_ERR("iotcon_resource_interfaces_add() Fail(%d)", ret); + iotcon_resource_interfaces_destroy(resource_interfaces); + iotcon_resource_types_destroy(resource_types); + return 1; + } + + ret = iotcon_remote_resource_create(LOCAL_HOST_ADDRESS, + IOTCON_CONNECTIVITY_IPV4, + LIGHT_RESOURCE_URI, + IOTCON_RESOURCE_DISCOVERABLE | IOTCON_RESOURCE_OBSERVABLE, + resource_types, + resource_interfaces, + &remote_resource); + if (IOTCON_ERROR_NONE != ret) { + ICUTC_ERR("iotcon_remote_resource_create() Fail(%d)", ret); + iotcon_resource_interfaces_destroy(resource_interfaces); + iotcon_resource_types_destroy(resource_types); + return 1; + } + + iotcon_resource_interfaces_destroy(resource_interfaces); + iotcon_resource_types_destroy(resource_types); + + *resource = remote_resource; + + return 0; +} + /* ##################################################### */ /** @@ -1527,8 +1584,8 @@ int utc_iotcon_remote_resource_create_n(void) int utc_iotcon_remote_resource_create_p(void) { int ret; - iotcon_resource_types_h resource_types; - iotcon_resource_interfaces_h resource_interfaces; + iotcon_resource_types_h resource_types = NULL; + iotcon_resource_interfaces_h resource_interfaces = NULL; iotcon_remote_resource_h remote_resource; if (false == g_feature) { @@ -1543,47 +1600,11 @@ int utc_iotcon_remote_resource_create_p(void) return 0; } - ret = iotcon_resource_types_create(&resource_types); - ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE); - - ret = iotcon_resource_types_add(resource_types, LIGHT_RESOURCE_TYPE); - if (IOTCON_ERROR_NONE != ret) { - ICUTC_ERR("iotcon_resource_types_add() Fail(%d)", ret); - iotcon_resource_types_destroy(resource_types); - return 1; - } - - ret = iotcon_resource_interfaces_create(&resource_interfaces); - if (IOTCON_ERROR_NONE != ret) { - ICUTC_ERR("iotcon_resource_interfaces_create() Fail(%d)", ret); - iotcon_resource_types_destroy(resource_types); - return 1; - } - - ret = iotcon_resource_interfaces_add(resource_interfaces, IOTCON_INTERFACE_DEFAULT); - if (IOTCON_ERROR_NONE != ret) { - ICUTC_ERR("iotcon_resource_interfaces_add() Fail(%d)", ret); - iotcon_resource_interfaces_destroy(resource_interfaces); - iotcon_resource_types_destroy(resource_types); - return 1; - } - - ret = iotcon_remote_resource_create(LOCAL_HOST_ADDRESS, - IOTCON_CONNECTIVITY_IPV4, - LIGHT_RESOURCE_URI, - IOTCON_RESOURCE_DISCOVERABLE | IOTCON_RESOURCE_OBSERVABLE, - resource_types, - resource_interfaces, - &remote_resource); - if (IOTCON_ERROR_NONE != ret) { - ICUTC_ERR("iotcon_remote_resource_create() Fail(%d)", ret); - iotcon_resource_interfaces_destroy(resource_interfaces); - iotcon_resource_types_destroy(resource_types); + ret = _remote_resource_create(&remote_resource); + if (0 != ret) { + ICUTC_ERR("_remote_resource_create() Fail(%d)", ret); return 1; } - - iotcon_resource_interfaces_destroy(resource_interfaces); - iotcon_resource_types_destroy(resource_types); iotcon_remote_resource_destroy(remote_resource); return 0; @@ -2533,90 +2554,154 @@ int utc_iotcon_remote_resource_set_options_p(void) } /** - * @testcase utc_iotcon_remote_resource_get_time_interval_p + * @testcase utc_iotcon_remote_resource_get_checking_interval_p * @since_tizen 3.0 - * @description Test getting time interval of remote resource. + * @description Test getting checking interval of remote resource. */ -int utc_iotcon_remote_resource_get_time_interval_p(void) +int utc_iotcon_remote_resource_get_checking_interval_p(void) { int ret; - int time_interval; + int checking_interval; + iotcon_remote_resource_h resource; if (false == g_feature) { - ret = iotcon_remote_resource_get_time_interval(&time_interval); + ret = iotcon_remote_resource_get_checking_interval(resource, &checking_interval); ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED); return 0; } - ret = iotcon_remote_resource_get_time_interval(&time_interval); - ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE); + ret = _remote_resource_create(&resource); + if (0 != ret) { + ICUTC_ERR("_remote_resource_create() Fail(%d)", ret); + return 1; + } + ret = iotcon_remote_resource_get_checking_interval(resource, &checking_interval); + if (IOTCON_ERROR_NONE != ret) { + ICUTC_ERR("iotcon_remote_resource_get_checking_interval() Fail(%d)", ret); + iotcon_remote_resource_destroy(resource); + return 1; + } + + iotcon_remote_resource_destroy(resource); return 0; } /** - * @testcase utc_iotcon_remote_resource_get_time_interval_n + * @testcase utc_iotcon_remote_resource_get_checking_interval_n * @since_tizen 3.0 - * @description Test fail getting time interval of remote resource. + * @description Test fail getting checking interval of remote resource. */ -int utc_iotcon_remote_resource_get_time_interval_n(void) +int utc_iotcon_remote_resource_get_checking_interval_n(void) { int ret; + int checking_interval; + iotcon_remote_resource_h resource; if (false == g_feature) { - ret = iotcon_remote_resource_get_time_interval(NULL); + ret = iotcon_remote_resource_get_checking_interval(NULL, NULL); ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED); return 0; } - ret = iotcon_remote_resource_get_time_interval(NULL); + ret = iotcon_remote_resource_get_checking_interval(NULL, &checking_interval); ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_INVALID_PARAMETER); + ret = _remote_resource_create(&resource); + if (0 != ret) { + ICUTC_ERR("_remote_resource_create() Fail(%d)", ret); + return 1; + } + + ret = iotcon_remote_resource_get_checking_interval(resource, NULL); + if (IOTCON_ERROR_INVALID_PARAMETER != ret) { + ICUTC_ERR("iotcon_remote_resource_get_checking_interval() Fail(%d)", ret); + iotcon_remote_resource_destroy(resource); + return 1; + } + + iotcon_remote_resource_destroy(resource); + return 0; } /** - * @testcase utc_iotcon_remote_resource_set_time_interval_p + * @testcase utc_iotcon_remote_resource_set_checking_interval_p * @since_tizen 3.0 - * @description Test setting time interval of remote resource. + * @description Test setting checking interval of remote resource. */ -int utc_iotcon_remote_resource_set_time_interval_p(void) +int utc_iotcon_remote_resource_set_checking_interval_p(void) { int ret; + iotcon_remote_resource_h resource; if (false == g_feature) { - ret = iotcon_remote_resource_set_time_interval(ICUTC_REMOTE_RESOURCE_TIME_INTERVAL_MAX); + ret = iotcon_remote_resource_set_checking_interval(resource, + ICUTC_REMOTE_RESOURCE_TIME_INTERVAL_MAX); ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED); return 0; } - ret = iotcon_remote_resource_set_time_interval(ICUTC_REMOTE_RESOURCE_TIME_INTERVAL_MAX); - ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE); + ret = _remote_resource_create(&resource); + if (0 != ret) { + ICUTC_ERR("_remote_resource_create() Fail(%d)", ret); + return 1; + } + + ret = iotcon_remote_resource_set_checking_interval(resource, + ICUTC_REMOTE_RESOURCE_TIME_INTERVAL_MAX); + if (IOTCON_ERROR_NONE != ret) { + ICUTC_ERR("iotcon_remote_resource_set_checking_interval() Fail(%d)", ret); + iotcon_remote_resource_destroy(resource); + return 1; + } + + iotcon_remote_resource_destroy(resource); return 0; } /** - * @testcase utc_iotcon_remote_resource_set_time_interval_n + * @testcase utc_iotcon_remote_resource_set_checking_interval_n * @since_tizen 3.0 - * @description Test fail setting time interval of remote resource. + * @description Test fail setting checking interval of remote resource. */ -int utc_iotcon_remote_resource_set_time_interval_n(void) +int utc_iotcon_remote_resource_set_checking_interval_n(void) { int ret; + iotcon_remote_resource_h resource; if (false == g_feature) { - ret = iotcon_remote_resource_set_time_interval(-1); + ret = iotcon_remote_resource_set_checking_interval(NULL, -1); ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED); return 0; } - ret = iotcon_remote_resource_set_time_interval(-1); + ret = iotcon_remote_resource_set_checking_interval(NULL, 10); ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_INVALID_PARAMETER); - ret = iotcon_remote_resource_set_time_interval(ICUTC_REMOTE_RESOURCE_TIME_INTERVAL_MAX + 1); - ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_INVALID_PARAMETER); + ret = _remote_resource_create(&resource); + if (0 != ret) { + ICUTC_ERR("_remote_resource_create() Fail(%d)", ret); + return 1; + } + + ret = iotcon_remote_resource_set_checking_interval(resource, -1); + if (IOTCON_ERROR_INVALID_PARAMETER != ret) { + ICUTC_ERR("iotcon_remote_resource_set_checking_interval() Fail(%d)", ret); + iotcon_remote_resource_destroy(resource); + return 1; + } + + ret = iotcon_remote_resource_set_checking_interval(resource, + ICUTC_REMOTE_RESOURCE_TIME_INTERVAL_MAX + 1); + if (IOTCON_ERROR_INVALID_PARAMETER != ret) { + ICUTC_ERR("iotcon_remote_resource_set_checking_interval() Fail(%d)", ret); + iotcon_remote_resource_destroy(resource); + return 1; + } + iotcon_remote_resource_destroy(resource); return 0; } -- 2.7.4