[ITC][iotcon][ACR-762][Fixed build error due to api name change as per ACR and fixed...

Change-Id: Idfcc68459595229cc399eb959a8dc350bb5988f5
Signed-off-by: Shobhit Verma <shobhit.v@samsung.com>

diff --git a/src/itc/iotcon/ITs-iotcon-device.c b/src/itc/iotcon/ITs-iotcon-device.c
index e6fb17f..8ff5adc 100755 (executable)
--- a/src/itc/iotcon/ITs-iotcon-device.c
+++ b/src/itc/iotcon/ITs-iotcon-device.c
@@ -16,6 +16,7 @@
 
 #include "ITs-iotcon-common.h"
 
+bool g_Error;
 //& set: Iotcon
 
 /**
@@ -30,10 +31,10 @@ static bool IotconGetDeviceInfoCB(iotcon_device_info_h info, iotcon_error_e resu
        {
                FPRINTF("[Line : %d][%s] Callback invoked ,info is NULL \\n", __LINE__, API_NAMESPACE);
        }
-
-#if DEBUG
-       FPRINTF("[Line : %d][%s] IotconGetDeviceInfoCB callback called\\n", __LINE__, API_NAMESPACE);
-#endif
+       else
+       {
+               FPRINTF("[Line : %d][%s] Callback invoked\\n", __LINE__, API_NAMESPACE);
+       }
 
        g_bCheckCb = true;
        if ( g_pMainLoop )
@@ -55,11 +56,12 @@ static bool IotconGetPlatformInfoCB(iotcon_platform_info_h info,iotcon_error_e r
 {
        if ( info == NULL )
        {
-               FPRINTF("[Line : %d][%s] Callback invoked for get platform info \\n", __LINE__, API_NAMESPACE);
+               FPRINTF("[Line : %d][%s] Callback invoked for get platform info. info is NULL \\n", __LINE__, API_NAMESPACE);
+       }
+       else
+       {
+               FPRINTF("[Line : %d][%s] Callback invoked for get platform info\\n", __LINE__, API_NAMESPACE);
        }
-#if DEBUG
-       FPRINTF("[Line : %d][%s] IotconGetPlatformInfoCB callback called\\n", __LINE__, API_NAMESPACE);
-#endif
 
        g_bCheckCb = true;
        if ( g_pMainLoop )
@@ -81,9 +83,13 @@ static bool IotconDeviceInfoGetPropertyCB(iotcon_device_info_h info, iotcon_erro
 {
        if ( info == NULL )
        {
-               FPRINTF("[Line : %d][%s] Callback invoked for device_info_get_property \\n", __LINE__, API_NAMESPACE);
+               FPRINTF("[Line : %d][%s] Callback invoked for device_info_get_property. info is NULL \\n", __LINE__, API_NAMESPACE);
        }
-
+       else
+       {
+               FPRINTF("[Line : %d][%s] Callback invoked. \\n", __LINE__, API_NAMESPACE);
+       }
+       
        g_bCheckCb = true;
 
        char *pszValue = NULL;
@@ -103,9 +109,18 @@ static bool IotconDeviceInfoGetPropertyCB(iotcon_device_info_h info, iotcon_erro
        for(nEnumStartCount = 0 ; nEnumStartCount < nGetPropertyOptionCount ; nEnumStartCount++ )
        {
                nRet = iotcon_device_info_get_property(info, nGetPropertyOption[nEnumStartCount],&pszValue);
-               PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_device_info_get_property", IotConGetError(nRet));
+               if (IOTCON_ERROR_NONE != nRet)
+               {
+                       g_Error = true;
+                       FPRINTF("[Line : %d][%s] iotcon_device_info_get_property failed for enum: %d Error: %s\\n", __LINE__, API_NAMESPACE, nEnumStartCount, IotConGetError(nRet));
+                       if ( g_pMainLoop )
+                       {
+                               g_main_loop_quit(g_pMainLoop);
+                               g_pMainLoop = NULL;
+                       }
+                       return false;
+               }
                FPRINTF(" property  =  [EnumVal : %d][ Value  : %s]  \\n", nEnumStartCount, pszValue);
-               return false;
        }
 
        if ( g_pMainLoop )
@@ -127,40 +142,51 @@ static bool IotconPlatformInfoGetPropertyCB(iotcon_platform_info_h info, iotcon_
 {
        if ( info == NULL )
        {
-               FPRINTF("[Line : %d][%s] Callback invoked for device_info_get_property \\n", __LINE__, API_NAMESPACE);
+               FPRINTF("[Line : %d][%s] Callback invoked for device_info_get_property. Info is NULL \\n", __LINE__, API_NAMESPACE);
+       }
+       else
+       {
+               FPRINTF("[Line : %d][%s] Callback invoked. \\n", __LINE__, API_NAMESPACE);
        }
        g_bCheckCb = true;
 
-
        char *pszValue = NULL;
 
-int nGetPropertyOption[] = {
-               IOTCON_PLATFORM_INFO_ID ,
-               IOTCON_PLATFORM_INFO_MANUF_NAME,
-               IOTCON_PLATFORM_INFO_MANUF_URL,
-               IOTCON_PLATFORM_INFO_MODEL_NUMBER,
-               IOTCON_PLATFORM_INFO_DATE_OF_MANUF ,
-               IOTCON_PLATFORM_INFO_PLATFORM_VER,
-               IOTCON_PLATFORM_INFO_OS_VER,
-               IOTCON_PLATFORM_INFO_HARDWARE_VER,
-               IOTCON_PLATFORM_INFO_FIRMWARE_VER,
-               IOTCON_PLATFORM_INFO_SUPPORT_URL,
-               IOTCON_PLATFORM_INFO_SYSTEM_TIME,
-
-};
-               int nRet = -1;
-               int nEnumStartCount = 0 ;
-
-               int nGetPropertyOptionCount = sizeof(nGetPropertyOption) / sizeof(nGetPropertyOption[0]);
-
-               for(nEnumStartCount = 0 ; nEnumStartCount < nGetPropertyOptionCount ; nEnumStartCount++ )
+       int nGetPropertyOption[] = {
+                       IOTCON_PLATFORM_INFO_ID ,
+                       IOTCON_PLATFORM_INFO_MANUF_NAME,
+                       IOTCON_PLATFORM_INFO_MANUF_URL,
+                       IOTCON_PLATFORM_INFO_MODEL_NUMBER,
+                       IOTCON_PLATFORM_INFO_DATE_OF_MANUF ,
+                       IOTCON_PLATFORM_INFO_PLATFORM_VER,
+                       IOTCON_PLATFORM_INFO_OS_VER,
+                       IOTCON_PLATFORM_INFO_HARDWARE_VER,
+                       IOTCON_PLATFORM_INFO_FIRMWARE_VER,
+                       IOTCON_PLATFORM_INFO_SUPPORT_URL,
+                       IOTCON_PLATFORM_INFO_SYSTEM_TIME,
+
+       };
+       int nRet = -1;
+       int nEnumStartCount = 0 ;
+
+       int nGetPropertyOptionCount = sizeof(nGetPropertyOption) / sizeof(nGetPropertyOption[0]);
+
+       for(nEnumStartCount = 0 ; nEnumStartCount < nGetPropertyOptionCount ; nEnumStartCount++ )
+       {
+               nRet = iotcon_platform_info_get_property(info, nGetPropertyOption[nEnumStartCount],&pszValue);
+               if (IOTCON_ERROR_NONE != nRet)
                {
-                       nRet = iotcon_platform_info_get_property(info, nGetPropertyOption[nEnumStartCount],&pszValue);
-                       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_device_info_get_property", IotConGetError(nRet));
-                       FPRINTF(" property  =  [EnumVal : %d][ Value  : %s]  \\n",nEnumStartCount, pszValue);
+                       g_Error = true;
+                       FPRINTF("[Line : %d][%s] iotcon_platform_info_get_property failed for enum: %d Error: %s\\n", __LINE__, API_NAMESPACE, nEnumStartCount, IotConGetError(nRet));
+                       if ( g_pMainLoop )
+                       {
+                               g_main_loop_quit(g_pMainLoop);
+                               g_pMainLoop = NULL;
+                       }
                        return false;
                }
-
+               FPRINTF(" property  =  [EnumVal : %d][ Value  : %s]  \\n",nEnumStartCount, pszValue);
+       }
 
        if ( g_pMainLoop )
        {
@@ -188,7 +214,8 @@ void ITs_iotcon_device_startup(void)
        }
        g_bIotconConnect = true;
        g_bFeatureUnsupported = false;
-
+       g_Error = false;
+       
        ic_get_svr_db_path(&svr_db_path);
    int nRet = iotcon_initialize(svr_db_path);
    free(svr_db_path);
@@ -257,30 +284,18 @@ int ITc_iotcon_find_device_info_p(void)
        START_TEST;
        int nIotconTimeoutId = 0;
     g_bCheckCb = false;
-       iotcon_query_h hQuery = NULL;
-       
-       int nRet = iotcon_query_create(&hQuery);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_query_create", IotConGetError(nRet));
-       CHECK_HANDLE(hQuery,"iotcon_query_create");
        
-       nRet = iotcon_query_set_resource_type(hQuery, LIGHT_RESOURCE_TYPE);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_query_set_resource_type", IotConGetError(nRet), iotcon_query_destroy(hQuery));
-       
-       nRet = iotcon_find_device_info(IOTCON_MULTICAST_ADDRESS, IOTCON_CONNECTIVITY_IPV4, hQuery, IotconGetDeviceInfoCB, NULL);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_find_device_info", IotConGetError(nRet),iotcon_query_destroy(hQuery));
+       int nRet = iotcon_find_device_info(IOTCON_MULTICAST_ADDRESS, IOTCON_CONNECTIVITY_IPV4, NULL, IotconGetDeviceInfoCB, NULL);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_find_device_info", IotConGetError(nRet));
 
        RUN_POLLING_LOOP;
 
        if(g_bCheckCb != true)
        {
                FPRINTF("[Line : %d][%s] callback not invoked : \\n", __LINE__, API_NAMESPACE );
-               iotcon_query_destroy(hQuery);
                return 1;
        }
 
-       nRet = iotcon_query_destroy(hQuery);
-       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_query_destroy", IotConGetError(nRet));
-       
        return 0;
 }
 
@@ -306,29 +321,23 @@ int ITc_iotcon_device_info_get_property_p(void)
        START_TEST;
        int nIotconTimeoutId = 0;
     g_bCheckCb = false;
-       iotcon_query_h hQuery = NULL;
-       
-       int nRet = iotcon_query_create(&hQuery);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_query_create", IotConGetError(nRet));
-       CHECK_HANDLE(hQuery,"iotcon_query_create");
+       g_Error = false;
        
-       nRet = iotcon_query_set_resource_type(hQuery, LIGHT_RESOURCE_TYPE);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_query_set_resource_type", IotConGetError(nRet), iotcon_query_destroy(hQuery));
-       
-       nRet = iotcon_find_device_info(IOTCON_MULTICAST_ADDRESS, IOTCON_CONNECTIVITY_IPV4, hQuery, IotconDeviceInfoGetPropertyCB, NULL);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_find_device_info", IotConGetError(nRet),iotcon_query_destroy(hQuery));
+       int nRet = iotcon_find_device_info(IOTCON_MULTICAST_ADDRESS, IOTCON_CONNECTIVITY_IPV4, NULL, IotconDeviceInfoGetPropertyCB, NULL);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_find_device_info", IotConGetError(nRet));
 
        RUN_POLLING_LOOP;
 
        if(g_bCheckCb != true)
        {
                FPRINTF("[Line : %d][%s] callback not invoked : \\n", __LINE__, API_NAMESPACE );
-               iotcon_query_destroy(hQuery);
                return 1;
        }
-       
-       nRet = iotcon_query_destroy(hQuery);
-       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_query_destroy", IotConGetError(nRet));
+       if(g_Error == true)
+       {
+               FPRINTF("[Line : %d][%s] iotcon_device_info_get_property failed : \\n", __LINE__, API_NAMESPACE );
+               return 1;
+       }
        
     return 0;
 }
@@ -343,7 +352,7 @@ int ITc_iotcon_device_info_get_property_p(void)
 * @since_tizen                         3.0
 * @description                 To extract representative colour from an image buffer.
 * @scenario                            connect device \n
-*                                              iotcon_find_device_info \n
+*                                              iotcon_find_platform_info \n
 * @apicovered                  iotcon_initialize, iotcon_find_platform_info
 * @passcase                            If iotcon_find_platform_info passes.
 * @failcase                            If iotcon_find_platform_info fails.
@@ -355,30 +364,18 @@ int ITc_iotcon_find_platform_info_p(void)
        START_TEST;
        int nIotconTimeoutId = 0;
        g_bCheckCb = false;
-       iotcon_query_h hQuery = NULL;
        
-       int nRet = iotcon_query_create(&hQuery);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_query_create", IotConGetError(nRet));
-       CHECK_HANDLE(hQuery,"iotcon_query_create");
-       
-       nRet = iotcon_query_set_resource_type(hQuery, LIGHT_RESOURCE_TYPE);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_query_set_resource_type", IotConGetError(nRet), iotcon_query_destroy(hQuery));
-       
-       nRet = iotcon_find_platform_info(IOTCON_MULTICAST_ADDRESS, IOTCON_CONNECTIVITY_IPV4, hQuery, IotconGetPlatformInfoCB, NULL);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_find_platform_info", IotConGetError(nRet),iotcon_query_destroy(hQuery));
+       int nRet = iotcon_find_platform_info(IOTCON_MULTICAST_ADDRESS, IOTCON_CONNECTIVITY_IPV4, NULL, IotconGetPlatformInfoCB, NULL);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_find_platform_info", IotConGetError(nRet));
 
        RUN_POLLING_LOOP;
 
        if(g_bCheckCb != true)
        {
                FPRINTF("[Line : %d][%s] callback not invoked : \\n", __LINE__, API_NAMESPACE );
-               iotcon_query_destroy(hQuery);
                return 1;
        }
 
-       nRet = iotcon_query_destroy(hQuery);
-       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_query_destroy", IotConGetError(nRet));
-       
        return 0;
 }
 
@@ -404,34 +401,26 @@ int ITc_iotcon_platform_info_get_property_p(void)
        START_TEST;
        int nIotconTimeoutId = 0;
        g_bCheckCb = false;
-       iotcon_query_h hQuery = NULL;
+       g_Error = false;
        
-       int nRet = iotcon_query_create(&hQuery);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_query_create", IotConGetError(nRet));
-       CHECK_HANDLE(hQuery,"iotcon_query_create");
-       
-       nRet = iotcon_query_set_resource_type(hQuery, LIGHT_RESOURCE_TYPE);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_query_set_resource_type", IotConGetError(nRet), iotcon_query_destroy(hQuery));
-       
-       nRet = iotcon_find_platform_info(IOTCON_MULTICAST_ADDRESS, IOTCON_CONNECTIVITY_IPV4, hQuery, IotconPlatformInfoGetPropertyCB, NULL);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_find_platform_info", IotConGetError(nRet),iotcon_query_destroy(hQuery));
+       int nRet = iotcon_find_platform_info(IOTCON_MULTICAST_ADDRESS, IOTCON_CONNECTIVITY_IPV4, NULL, IotconPlatformInfoGetPropertyCB, NULL);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_find_platform_info", IotConGetError(nRet));
 
        RUN_POLLING_LOOP;
 
        if(g_bCheckCb == false)
        {
                FPRINTF("[Line : %d][%s] callback not invoked : \\n", __LINE__, API_NAMESPACE );
-               iotcon_query_destroy(hQuery);
+               return 1;
+       }
+       if(g_Error == true)
+       {
+               FPRINTF("[Line : %d][%s] iotcon_platform_info_get_property failed : \\n", __LINE__, API_NAMESPACE );
                return 1;
        }
 
-       nRet = iotcon_query_destroy(hQuery);
-       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_query_destroy", IotConGetError(nRet));
-       
        return 0;
 }
 
 /** @} */
-/** @} */
-
-
+/** @} */
\ No newline at end of file

diff --git a/src/itc/iotcon/ITs-iotcon-remote-resource.c b/src/itc/iotcon/ITs-iotcon-remote-resource.c
index cff85a4..78828fc 100755 (executable)
--- a/src/itc/iotcon/ITs-iotcon-remote-resource.c
+++ b/src/itc/iotcon/ITs-iotcon-remote-resource.c
@@ -1608,7 +1608,7 @@ int ITc_iotcon_remote_resource_get_host_address_p(void)
 
        if (0 != strcmp(REMOTE_IP, host))
        {
-               FPRINTF("[Line : %d][%s] iotcon_remote_resource_get_host_address failed host address does not match \"%s\" \\n", __LINE__, API_NAMESPACE, REMOTE_IP);
+               FPRINTF("[Line : %d][%s] iotcon_remote_resource_get_host_address failed host address does not match. Remote Address: \"%s\" and Get received: %s\\n", __LINE__, API_NAMESPACE, REMOTE_IP, host);
                IotconDestroyRemoteResource();
                return 1;
        }
@@ -1932,7 +1932,7 @@ int ITc_iotcon_remote_resource_get_cached_representation_p(void)
 //& purpose: Creates a new query handle.
 //& type: auto
 /**
-* @testcase                    ITc_iotcon_remote_resource_set_get_time_interval_p
+* @testcase                    ITc_iotcon_remote_resource_set_get_checking_interval_p
 * @since_tizen                 3.0
 * @author              SRID(manu.tiwari)
 * @reviewer            SRID(parshant.v)
@@ -1945,22 +1945,28 @@ int ITc_iotcon_remote_resource_get_cached_representation_p(void)
 * @precondition                        NA
 * @postcondition               NA
 */
-int ITc_iotcon_remote_resource_set_get_time_interval_p(void)
+int ITc_iotcon_remote_resource_set_get_checking_interval_p(void)
 {
        START_TEST;
 
        int SetTimeInterval = 250;
        int GetTimeInterval = 0;
+       int nRet = IotconCreateRemoteResource();
+    if (IOTCON_ERROR_NONE != nRet)
+       {
+               FPRINTF("[Line : %d][%s] IotconCreateRemoteResource failed : %s\\n", __LINE__, API_NAMESPACE,IotConGetError(nRet));
+               return 1;
+       }
+       
+       nRet = iotcon_remote_resource_set_checking_interval(g_hClient, SetTimeInterval);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_remote_resource_set_checking_interval", IotConGetError(nRet));
 
-       int nRet = iotcon_remote_resource_set_time_interval(SetTimeInterval);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_remote_resource_set_time_interval", IotConGetError(nRet));
-
-       nRet = iotcon_remote_resource_get_time_interval(&GetTimeInterval);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_remote_resource_get_time_interval", IotConGetError(nRet));
+       nRet = iotcon_remote_resource_get_checking_interval(g_hClient, &GetTimeInterval);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_remote_resource_get_checking_interval", IotConGetError(nRet));
 
        if (SetTimeInterval != GetTimeInterval)
        {
-               FPRINTF("[Line : %d][%s] iotcon_remote_resource_set_time_interval and iotcon_remote_resource_get_time_interval does not match\\n", __LINE__, API_NAMESPACE);
+               FPRINTF("[Line : %d][%s] iotcon_remote_resource_set_checking_interval and iotcon_remote_resource_get_checking_interval does not match\\n", __LINE__, API_NAMESPACE);
                return 1;
        }
        return 0;

diff --git a/src/itc/iotcon/tct-iotcon-native_common_iot.h b/src/itc/iotcon/tct-iotcon-native_common_iot.h
index 6eed2d4..f0c9ea3 100755 (executable)
--- a/src/itc/iotcon/tct-iotcon-native_common_iot.h
+++ b/src/itc/iotcon/tct-iotcon-native_common_iot.h
@@ -113,7 +113,7 @@ extern int ITc_iotcon_remote_resource_get_interfaces_p(void);
 extern int ITc_iotcon_remote_resource_get_policies_p(void);
 extern int ITc_iotcon_remote_resource_set_get_options_p(void);
 extern int ITc_iotcon_remote_resource_get_cached_representation_p(void);
-extern int ITc_iotcon_remote_resource_set_get_time_interval_p(void);
+extern int ITc_iotcon_remote_resource_set_get_checking_interval_p(void);
 extern int ITc_iotcon_representation_create_destroy_p(void);
 extern int ITc_iotcon_representation_clone_p(void);
 extern int ITc_iotcon_representation_set_get_uri_path_p(void);
@@ -239,7 +239,7 @@ testcase tc_array[] = {
     {"ITc_iotcon_remote_resource_get_policies_p", ITc_iotcon_remote_resource_get_policies_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_set_get_options_p", ITc_iotcon_remote_resource_set_get_options_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_get_cached_representation_p", ITc_iotcon_remote_resource_get_cached_representation_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
-       {"ITc_iotcon_remote_resource_set_get_time_interval_p", ITc_iotcon_remote_resource_set_get_time_interval_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
+       {"ITc_iotcon_remote_resource_set_get_checking_interval_p", ITc_iotcon_remote_resource_set_get_checking_interval_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_representation_create_destroy_p", ITc_iotcon_representation_create_destroy_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_clone_p", ITc_iotcon_representation_clone_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_set_get_uri_path_p", ITc_iotcon_representation_set_get_uri_path_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},

diff --git a/src/itc/iotcon/tct-iotcon-native_mobile.h b/src/itc/iotcon/tct-iotcon-native_mobile.h
index 47c8cfe..d0e3de7 100755 (executable)
--- a/src/itc/iotcon/tct-iotcon-native_mobile.h
+++ b/src/itc/iotcon/tct-iotcon-native_mobile.h
@@ -113,7 +113,7 @@ extern int ITc_iotcon_remote_resource_get_interfaces_p(void);
 extern int ITc_iotcon_remote_resource_get_policies_p(void);
 extern int ITc_iotcon_remote_resource_set_get_options_p(void);
 extern int ITc_iotcon_remote_resource_get_cached_representation_p(void);
-extern int ITc_iotcon_remote_resource_set_get_time_interval_p(void);
+extern int ITc_iotcon_remote_resource_set_get_checking_interval_p(void);
 extern int ITc_iotcon_representation_create_destroy_p(void);
 extern int ITc_iotcon_representation_clone_p(void);
 extern int ITc_iotcon_representation_set_get_uri_path_p(void);
@@ -239,7 +239,7 @@ testcase tc_array[] = {
     {"ITc_iotcon_remote_resource_get_policies_p", ITc_iotcon_remote_resource_get_policies_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_set_get_options_p", ITc_iotcon_remote_resource_set_get_options_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_get_cached_representation_p", ITc_iotcon_remote_resource_get_cached_representation_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
-       {"ITc_iotcon_remote_resource_set_get_time_interval_p", ITc_iotcon_remote_resource_set_get_time_interval_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
+       {"ITc_iotcon_remote_resource_set_get_checking_interval_p", ITc_iotcon_remote_resource_set_get_checking_interval_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_representation_create_destroy_p", ITc_iotcon_representation_create_destroy_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_clone_p", ITc_iotcon_representation_clone_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_set_get_uri_path_p", ITc_iotcon_representation_set_get_uri_path_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},

diff --git a/src/itc/iotcon/tct-iotcon-native_tv.h b/src/itc/iotcon/tct-iotcon-native_tv.h
index 47c8cfe..d0e3de7 100755 (executable)
--- a/src/itc/iotcon/tct-iotcon-native_tv.h
+++ b/src/itc/iotcon/tct-iotcon-native_tv.h
@@ -113,7 +113,7 @@ extern int ITc_iotcon_remote_resource_get_interfaces_p(void);
 extern int ITc_iotcon_remote_resource_get_policies_p(void);
 extern int ITc_iotcon_remote_resource_set_get_options_p(void);
 extern int ITc_iotcon_remote_resource_get_cached_representation_p(void);
-extern int ITc_iotcon_remote_resource_set_get_time_interval_p(void);
+extern int ITc_iotcon_remote_resource_set_get_checking_interval_p(void);
 extern int ITc_iotcon_representation_create_destroy_p(void);
 extern int ITc_iotcon_representation_clone_p(void);
 extern int ITc_iotcon_representation_set_get_uri_path_p(void);
@@ -239,7 +239,7 @@ testcase tc_array[] = {
     {"ITc_iotcon_remote_resource_get_policies_p", ITc_iotcon_remote_resource_get_policies_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_set_get_options_p", ITc_iotcon_remote_resource_set_get_options_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_get_cached_representation_p", ITc_iotcon_remote_resource_get_cached_representation_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
-       {"ITc_iotcon_remote_resource_set_get_time_interval_p", ITc_iotcon_remote_resource_set_get_time_interval_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
+       {"ITc_iotcon_remote_resource_set_get_checking_interval_p", ITc_iotcon_remote_resource_set_get_checking_interval_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_representation_create_destroy_p", ITc_iotcon_representation_create_destroy_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_clone_p", ITc_iotcon_representation_clone_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_set_get_uri_path_p", ITc_iotcon_representation_set_get_uri_path_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},

diff --git a/src/itc/iotcon/tct-iotcon-native_wearable.h b/src/itc/iotcon/tct-iotcon-native_wearable.h
index 47c8cfe..d0e3de7 100755 (executable)
--- a/src/itc/iotcon/tct-iotcon-native_wearable.h
+++ b/src/itc/iotcon/tct-iotcon-native_wearable.h
@@ -113,7 +113,7 @@ extern int ITc_iotcon_remote_resource_get_interfaces_p(void);
 extern int ITc_iotcon_remote_resource_get_policies_p(void);
 extern int ITc_iotcon_remote_resource_set_get_options_p(void);
 extern int ITc_iotcon_remote_resource_get_cached_representation_p(void);
-extern int ITc_iotcon_remote_resource_set_get_time_interval_p(void);
+extern int ITc_iotcon_remote_resource_set_get_checking_interval_p(void);
 extern int ITc_iotcon_representation_create_destroy_p(void);
 extern int ITc_iotcon_representation_clone_p(void);
 extern int ITc_iotcon_representation_set_get_uri_path_p(void);
@@ -239,7 +239,7 @@ testcase tc_array[] = {
     {"ITc_iotcon_remote_resource_get_policies_p", ITc_iotcon_remote_resource_get_policies_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_set_get_options_p", ITc_iotcon_remote_resource_set_get_options_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_get_cached_representation_p", ITc_iotcon_remote_resource_get_cached_representation_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
-       {"ITc_iotcon_remote_resource_set_get_time_interval_p", ITc_iotcon_remote_resource_set_get_time_interval_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
+       {"ITc_iotcon_remote_resource_set_get_checking_interval_p", ITc_iotcon_remote_resource_set_get_checking_interval_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_representation_create_destroy_p", ITc_iotcon_representation_create_destroy_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_clone_p", ITc_iotcon_representation_clone_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_set_get_uri_path_p", ITc_iotcon_representation_set_get_uri_path_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},