Revert "[UTC][ua][ACR-1646] Add new TC for location"

This reverts commit 6281c8cfd7a87e97cc79cc274e18df6136c9718d.

Change-Id: Iea9fe5a9fd52f677a48934156dba3f7fbbadc1c2

diff --git a/src/utc/ua/CMakeLists.txt b/src/utc/ua/CMakeLists.txt
index b234288caa7b13de65af970e263797c37dca32cf..509d7c745566d82ea126629e3c0626b38398d4f3 100755 (executable)
--- a/src/utc/ua/CMakeLists.txt
+++ b/src/utc/ua/CMakeLists.txt
@@ -12,7 +12,6 @@ SET(TC_SOURCES
        utc-ua-user.c
        utc-ua-device.c
        utc-ua-sensor.c
-       utc-ua-location.c
 )
 
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED

diff --git a/src/utc/ua/tct-ua-core_mobile.h b/src/utc/ua/tct-ua-core_mobile.h
index c45840e318f1ecb87e5eb9f82a60e91cae809039..56d532d191a5557d73fa965e258305cdc0606c96 100755 (executable)
--- a/src/utc/ua/tct-ua-core_mobile.h
+++ b/src/utc/ua/tct-ua-core_mobile.h
@@ -139,14 +139,6 @@ extern int utc_ua_sensor_get_status_n(void);
 extern int utc_ua_sensor_get_timestamp_n(void);
 extern int utc_ua_sensor_get_type_n(void);
 
-/* User Awareness Location APIs */
-extern int utc_ua_monitor_set_location_period_p(void);
-extern int utc_ua_monitor_set_location_period_n(void);
-extern int utc_ua_location_get_distance_n(void);
-extern int utc_ua_location_get_position_n(void);
-extern int utc_ua_monitor_start_location_detection_n(void);
-extern int utc_ua_monitor_stop_location_detection_n(void);
-
 testcase tc_array[] = {
        /* User Awareness Common APIs */
        {"utc_ua_foreach_service_p", utc_ua_foreach_service_p, utc_ua_startup, utc_ua_cleanup},
@@ -257,13 +249,6 @@ testcase tc_array[] = {
        {"utc_ua_sensor_get_status_n", utc_ua_sensor_get_status_n, utc_ua_startup, utc_ua_cleanup},
        {"utc_ua_sensor_get_timestamp_n", utc_ua_sensor_get_timestamp_n, utc_ua_startup, utc_ua_cleanup},
        {"utc_ua_sensor_get_type_n", utc_ua_sensor_get_type_n, utc_ua_startup, utc_ua_cleanup},
-       /* User Awareness Location APIs */
-       {"utc_ua_monitor_set_location_period_p", utc_ua_monitor_set_location_period_p, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_monitor_set_location_period_n", utc_ua_monitor_set_location_period_n, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_location_get_distance_n", utc_ua_location_get_distance_n, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_location_get_position_n", utc_ua_location_get_position_n, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_monitor_start_location_detection_n", utc_ua_monitor_start_location_detection_n, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_monitor_stop_location_detection_n", utc_ua_monitor_stop_location_detection_n, utc_ua_startup, utc_ua_cleanup},
 
        {NULL, NULL}
 };

diff --git a/src/utc/ua/tct-ua-core_tizeniot.h b/src/utc/ua/tct-ua-core_tizeniot.h
index c45840e318f1ecb87e5eb9f82a60e91cae809039..56d532d191a5557d73fa965e258305cdc0606c96 100755 (executable)
--- a/src/utc/ua/tct-ua-core_tizeniot.h
+++ b/src/utc/ua/tct-ua-core_tizeniot.h
@@ -139,14 +139,6 @@ extern int utc_ua_sensor_get_status_n(void);
 extern int utc_ua_sensor_get_timestamp_n(void);
 extern int utc_ua_sensor_get_type_n(void);
 
-/* User Awareness Location APIs */
-extern int utc_ua_monitor_set_location_period_p(void);
-extern int utc_ua_monitor_set_location_period_n(void);
-extern int utc_ua_location_get_distance_n(void);
-extern int utc_ua_location_get_position_n(void);
-extern int utc_ua_monitor_start_location_detection_n(void);
-extern int utc_ua_monitor_stop_location_detection_n(void);
-
 testcase tc_array[] = {
        /* User Awareness Common APIs */
        {"utc_ua_foreach_service_p", utc_ua_foreach_service_p, utc_ua_startup, utc_ua_cleanup},
@@ -257,13 +249,6 @@ testcase tc_array[] = {
        {"utc_ua_sensor_get_status_n", utc_ua_sensor_get_status_n, utc_ua_startup, utc_ua_cleanup},
        {"utc_ua_sensor_get_timestamp_n", utc_ua_sensor_get_timestamp_n, utc_ua_startup, utc_ua_cleanup},
        {"utc_ua_sensor_get_type_n", utc_ua_sensor_get_type_n, utc_ua_startup, utc_ua_cleanup},
-       /* User Awareness Location APIs */
-       {"utc_ua_monitor_set_location_period_p", utc_ua_monitor_set_location_period_p, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_monitor_set_location_period_n", utc_ua_monitor_set_location_period_n, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_location_get_distance_n", utc_ua_location_get_distance_n, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_location_get_position_n", utc_ua_location_get_position_n, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_monitor_start_location_detection_n", utc_ua_monitor_start_location_detection_n, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_monitor_stop_location_detection_n", utc_ua_monitor_stop_location_detection_n, utc_ua_startup, utc_ua_cleanup},
 
        {NULL, NULL}
 };

diff --git a/src/utc/ua/tct-ua-core_tv.h b/src/utc/ua/tct-ua-core_tv.h
index c45840e318f1ecb87e5eb9f82a60e91cae809039..56d532d191a5557d73fa965e258305cdc0606c96 100755 (executable)
--- a/src/utc/ua/tct-ua-core_tv.h
+++ b/src/utc/ua/tct-ua-core_tv.h
@@ -139,14 +139,6 @@ extern int utc_ua_sensor_get_status_n(void);
 extern int utc_ua_sensor_get_timestamp_n(void);
 extern int utc_ua_sensor_get_type_n(void);
 
-/* User Awareness Location APIs */
-extern int utc_ua_monitor_set_location_period_p(void);
-extern int utc_ua_monitor_set_location_period_n(void);
-extern int utc_ua_location_get_distance_n(void);
-extern int utc_ua_location_get_position_n(void);
-extern int utc_ua_monitor_start_location_detection_n(void);
-extern int utc_ua_monitor_stop_location_detection_n(void);
-
 testcase tc_array[] = {
        /* User Awareness Common APIs */
        {"utc_ua_foreach_service_p", utc_ua_foreach_service_p, utc_ua_startup, utc_ua_cleanup},
@@ -257,13 +249,6 @@ testcase tc_array[] = {
        {"utc_ua_sensor_get_status_n", utc_ua_sensor_get_status_n, utc_ua_startup, utc_ua_cleanup},
        {"utc_ua_sensor_get_timestamp_n", utc_ua_sensor_get_timestamp_n, utc_ua_startup, utc_ua_cleanup},
        {"utc_ua_sensor_get_type_n", utc_ua_sensor_get_type_n, utc_ua_startup, utc_ua_cleanup},
-       /* User Awareness Location APIs */
-       {"utc_ua_monitor_set_location_period_p", utc_ua_monitor_set_location_period_p, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_monitor_set_location_period_n", utc_ua_monitor_set_location_period_n, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_location_get_distance_n", utc_ua_location_get_distance_n, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_location_get_position_n", utc_ua_location_get_position_n, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_monitor_start_location_detection_n", utc_ua_monitor_start_location_detection_n, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_monitor_stop_location_detection_n", utc_ua_monitor_stop_location_detection_n, utc_ua_startup, utc_ua_cleanup},
 
        {NULL, NULL}
 };

diff --git a/src/utc/ua/tct-ua-core_wearable.h b/src/utc/ua/tct-ua-core_wearable.h
index c45840e318f1ecb87e5eb9f82a60e91cae809039..56d532d191a5557d73fa965e258305cdc0606c96 100755 (executable)
--- a/src/utc/ua/tct-ua-core_wearable.h
+++ b/src/utc/ua/tct-ua-core_wearable.h
@@ -139,14 +139,6 @@ extern int utc_ua_sensor_get_status_n(void);
 extern int utc_ua_sensor_get_timestamp_n(void);
 extern int utc_ua_sensor_get_type_n(void);
 
-/* User Awareness Location APIs */
-extern int utc_ua_monitor_set_location_period_p(void);
-extern int utc_ua_monitor_set_location_period_n(void);
-extern int utc_ua_location_get_distance_n(void);
-extern int utc_ua_location_get_position_n(void);
-extern int utc_ua_monitor_start_location_detection_n(void);
-extern int utc_ua_monitor_stop_location_detection_n(void);
-
 testcase tc_array[] = {
        /* User Awareness Common APIs */
        {"utc_ua_foreach_service_p", utc_ua_foreach_service_p, utc_ua_startup, utc_ua_cleanup},
@@ -257,13 +249,6 @@ testcase tc_array[] = {
        {"utc_ua_sensor_get_status_n", utc_ua_sensor_get_status_n, utc_ua_startup, utc_ua_cleanup},
        {"utc_ua_sensor_get_timestamp_n", utc_ua_sensor_get_timestamp_n, utc_ua_startup, utc_ua_cleanup},
        {"utc_ua_sensor_get_type_n", utc_ua_sensor_get_type_n, utc_ua_startup, utc_ua_cleanup},
-       /* User Awareness Location APIs */
-       {"utc_ua_monitor_set_location_period_p", utc_ua_monitor_set_location_period_p, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_monitor_set_location_period_n", utc_ua_monitor_set_location_period_n, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_location_get_distance_n", utc_ua_location_get_distance_n, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_location_get_position_n", utc_ua_location_get_position_n, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_monitor_start_location_detection_n", utc_ua_monitor_start_location_detection_n, utc_ua_startup, utc_ua_cleanup},
-       {"utc_ua_monitor_stop_location_detection_n", utc_ua_monitor_stop_location_detection_n, utc_ua_startup, utc_ua_cleanup},
 
        {NULL, NULL}
 };

diff --git a/src/utc/ua/utc-ua-location.c b/src/utc/ua/utc-ua-location.c
deleted file mode 100755 (executable)
index 6141362..0000000
--- a/src/utc/ua/utc-ua-location.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <system_info.h>
-#include <glib.h>
-#include <dlog.h>
-#include <user-awareness.h>
-
-#include "utc-ua-common.h"
-
-int utc_ua_monitor_set_location_period_p(void)
-{
-       int ret = UA_ERROR_NONE;
-       ua_monitor_h ua_mon_h = NULL;
-
-       if (!ua_is_feature_supported()) {
-               ret = ua_monitor_set_location_period(NULL, NULL);
-               CHECK_RETURN("ua_monitor_set_location_period", ret, UA_ERROR_NOT_SUPPORTED);
-               return 0;
-       }
-
-       ret = ua_monitor_create(&ua_mon_h);
-       CHECK_RETURN("ua_monitor_create", ret, UA_ERROR_NONE);
-
-       ret = ua_monitor_set_location_period(ua_mon_h, 500);
-       CHECK_RETURN("ua_monitor_set_location_period", ret, UA_ERROR_NONE);
-
-       ret = ua_monitor_destroy(ua_mon_h);
-       CHECK_RETURN("ua_monitor_destroy", ret, UA_ERROR_NONE);
-
-       return 0;
-}
-
-int utc_ua_monitor_set_location_period_n(void)
-{
-       int ret = UA_ERROR_NONE;
-
-       ret = ua_monitor_set_location_period(NULL, NULL);
-       if (!ua_is_feature_supported()) {
-               CHECK_RETURN("ua_monitor_set_location_period", ret, UA_ERROR_NOT_SUPPORTED);
-       } else {
-               CHECK_RETURN("ua_monitor_set_location_period", ret, UA_ERROR_INVALID_PARAMETER);
-       }
-
-       return 0;
-}
-
-int utc_ua_location_get_distance_n(void)
-{
-       int ret = UA_ERROR_NONE;
-
-       ret = ua_location_get_distance(NULL, NULL);
-       if (!ua_is_feature_supported()) {
-               CHECK_RETURN("ua_location_get_distance", ret, UA_ERROR_NOT_SUPPORTED);
-       } else {
-               CHECK_RETURN("ua_location_get_distance", ret, UA_ERROR_INVALID_PARAMETER);
-       }
-
-       return 0;
-}
-
-int utc_ua_location_get_position_n(void)
-{
-       int ret = UA_ERROR_NONE;
-
-       ret = ua_location_get_position(NULL, NULL, NULL, NULL);
-       if (!ua_is_feature_supported()) {
-               CHECK_RETURN("ua_location_get_position", ret, UA_ERROR_NOT_SUPPORTED);
-       } else {
-               CHECK_RETURN("ua_location_get_position", ret, UA_ERROR_INVALID_PARAMETER);
-       }
-
-       return 0;
-}
-
-int utc_ua_monitor_start_location_detection_n(void)
-{
-       int ret = UA_ERROR_NONE;
-
-       ret = ua_monitor_start_location_detection(NULL, NULL, NULL, NULL);
-       if (!ua_is_feature_supported()) {
-               CHECK_RETURN("ua_monitor_start_location_detection", ret, UA_ERROR_NOT_SUPPORTED);
-       } else {
-               CHECK_RETURN("ua_monitor_start_location_detection", ret, UA_ERROR_INVALID_PARAMETER);
-       }
-
-       return 0;
-}
-
-int utc_ua_monitor_stop_location_detection_n(void)
-{
-       int ret = UA_ERROR_NONE;
-
-       ret = ua_monitor_stop_location_detection(NULL);
-       if (!ua_is_feature_supported()) {
-               CHECK_RETURN("ua_monitor_stop_location_detection", ret, UA_ERROR_NOT_SUPPORTED);
-       } else {
-               CHECK_RETURN("ua_monitor_stop_location_detection", ret, UA_ERROR_INVALID_PARAMETER);
-       }
-
-       return 0;
-}