[UTC][location-manager][Non-ACR][Fix mock location]

Signed-off-by: kj7.sung <kj7.sung@samsung.com>
Change-Id: Ic786ef81f485ec9b97b6f88a89680885be7f86ad

diff --git a/src/utc/location-manager/tct-location-manager-core_mobile.h b/src/utc/location-manager/tct-location-manager-core_mobile.h
index 6475418..5f56d13 100755 (executable)
--- a/src/utc/location-manager/tct-location-manager-core_mobile.h
+++ b/src/utc/location-manager/tct-location-manager-core_mobile.h
@@ -124,7 +124,6 @@ extern int utc_location_manager_get_method_p3(void);
 extern int utc_location_manager_get_method_p4(void);
 extern int utc_location_manager_get_method_n(void);
 extern int utc_location_manager_get_position_p(void);
-extern int utc_location_manager_get_position_p2(void);
 extern int utc_location_manager_get_position_n(void);
 extern int utc_location_manager_get_velocity_p(void);
 extern int utc_location_manager_get_velocity_n(void);
@@ -265,7 +264,6 @@ testcase tc_array[] = {
     {"utc_location_manager_get_method_p4", utc_location_manager_get_method_p4, utc_location_manager_startup, utc_location_manager_cleanup},
     {"utc_location_manager_get_method_n", utc_location_manager_get_method_n, utc_location_manager_startup, utc_location_manager_cleanup},
     {"utc_location_manager_get_position_p", utc_location_manager_get_position_p, utc_location_manager_startup, utc_location_manager_cleanup},
-    {"utc_location_manager_get_position_p2", utc_location_manager_get_position_p2, utc_location_manager_startup, utc_location_manager_cleanup},
     {"utc_location_manager_get_position_n", utc_location_manager_get_position_n, utc_location_manager_startup, utc_location_manager_cleanup},
     {"utc_location_manager_get_velocity_p", utc_location_manager_get_velocity_p, utc_location_manager_startup, utc_location_manager_cleanup},
     {"utc_location_manager_get_velocity_n", utc_location_manager_get_velocity_n, utc_location_manager_startup, utc_location_manager_cleanup},

diff --git a/src/utc/location-manager/tct-location-manager-core_wearable.h b/src/utc/location-manager/tct-location-manager-core_wearable.h
index 6475418..5f56d13 100755 (executable)
--- a/src/utc/location-manager/tct-location-manager-core_wearable.h
+++ b/src/utc/location-manager/tct-location-manager-core_wearable.h
@@ -124,7 +124,6 @@ extern int utc_location_manager_get_method_p3(void);
 extern int utc_location_manager_get_method_p4(void);
 extern int utc_location_manager_get_method_n(void);
 extern int utc_location_manager_get_position_p(void);
-extern int utc_location_manager_get_position_p2(void);
 extern int utc_location_manager_get_position_n(void);
 extern int utc_location_manager_get_velocity_p(void);
 extern int utc_location_manager_get_velocity_n(void);
@@ -265,7 +264,6 @@ testcase tc_array[] = {
     {"utc_location_manager_get_method_p4", utc_location_manager_get_method_p4, utc_location_manager_startup, utc_location_manager_cleanup},
     {"utc_location_manager_get_method_n", utc_location_manager_get_method_n, utc_location_manager_startup, utc_location_manager_cleanup},
     {"utc_location_manager_get_position_p", utc_location_manager_get_position_p, utc_location_manager_startup, utc_location_manager_cleanup},
-    {"utc_location_manager_get_position_p2", utc_location_manager_get_position_p2, utc_location_manager_startup, utc_location_manager_cleanup},
     {"utc_location_manager_get_position_n", utc_location_manager_get_position_n, utc_location_manager_startup, utc_location_manager_cleanup},
     {"utc_location_manager_get_velocity_p", utc_location_manager_get_velocity_p, utc_location_manager_startup, utc_location_manager_cleanup},
     {"utc_location_manager_get_velocity_n", utc_location_manager_get_velocity_n, utc_location_manager_startup, utc_location_manager_cleanup},

diff --git a/src/utc/location-manager/utc-location-manager.c b/src/utc/location-manager/utc-location-manager.c
index 1ebf4f8..34d7313 100755 (executable)
--- a/src/utc/location-manager/utc-location-manager.c
+++ b/src/utc/location-manager/utc-location-manager.c
@@ -397,63 +397,6 @@ int utc_location_manager_get_position_p(void)
 }
 
 /**
- * @testcase           utc_location_manager_get_position_p2
- * @since_tizen                3.0
- * @description                Gets the current position information
- */
-int utc_location_manager_get_position_p2(void)
-{
-       double altitude = 0.0;
-       double latitude = 0.0;
-       double longitude = 0.0;
-       double speed = 0.0;
-       double direction = 0.0;
-       double accuracy = 0.0;
-       time_t timestamp = 0.0;
-       service_enabled = false;
-
-       if (is_location_supported) {
-               ret = location_manager_enable_mock_location(true);
-               assert_eq(ret, LOCATIONS_ERROR_NONE);
-
-               latitude = 10.0;
-               longitude = 10.0;
-               altitude = 10.0;
-               speed = 30.0;
-               direction = 45.0;
-               accuracy = 50;
-               ret = location_manager_set_mock_location(manager, latitude, longitude, altitude, speed, direction, accuracy);
-               assert_eq(ret, LOCATIONS_ERROR_NONE);
-
-               ret = location_manager_set_service_state_changed_cb(manager, __service_state_changed_cb, NULL);
-               assert_eq(ret, LOCATIONS_ERROR_NONE);
-
-               ret = location_manager_start(manager);
-               assert_eq(ret, LOCATIONS_ERROR_NONE);
-
-               wait_for_service();
-               assert(service_enabled);
-
-               ret = location_manager_get_position(manager, &altitude, &latitude, &longitude, &timestamp);
-               assert_eq(ret, LOCATIONS_ERROR_NONE);
-
-               ret = location_manager_stop(manager);
-               assert_eq(ret, LOCATIONS_ERROR_NONE);
-
-               ret = location_manager_clear_mock_location(manager);
-               assert_eq(ret, LOCATIONS_ERROR_NONE);
-
-               ret = location_manager_unset_service_state_changed_cb(manager);
-               assert_eq(ret, LOCATIONS_ERROR_NONE);
-       } else {
-               ret = location_manager_get_position(manager, &altitude, &latitude, &longitude, &timestamp);
-               assert_eq(ret, LOCATIONS_ERROR_NOT_SUPPORTED);
-       }
-
-       return 0;
-}
-
-/**
  * @testcase           utc_location_manager_get_position_n
  * @since_tizen                2.3
  * @description                Gets the current position information with invalid parameters
@@ -1317,6 +1260,8 @@ int utc_location_manager_set_mock_location_p(void)
        double speed = 4.0;
        double direction = 50.1;
        double accuracy = 6.0;
+       time_t timestamp = 0.0;
+       service_enabled = false;
 
        if (is_location_supported) {
 
@@ -1326,15 +1271,36 @@ int utc_location_manager_set_mock_location_p(void)
                        manager = NULL;
                }
 
-               ret = location_manager_enable_mock_location(true);
+               ret = location_manager_create(LOCATIONS_METHOD_MOCK, &manager2);
                assert_eq(ret, LOCATIONS_ERROR_NONE);
 
-               ret = location_manager_create(LOCATIONS_METHOD_MOCK, &manager2);
+               ret = location_manager_enable_mock_location(true);
                assert_eq(ret, LOCATIONS_ERROR_NONE);
 
                ret = location_manager_set_mock_location(manager2, latitude, longitude, altitude, speed, direction, accuracy);
                assert_eq(ret, LOCATIONS_ERROR_NONE);
 
+               ret = location_manager_set_service_state_changed_cb(manager2, __service_state_changed_cb, NULL);
+               assert_eq(ret, LOCATIONS_ERROR_NONE);
+
+               ret = location_manager_start(manager2);
+               assert_eq(ret, LOCATIONS_ERROR_NONE);
+
+               wait_for_service();
+               assert(service_enabled);
+
+               ret = location_manager_get_position(manager2, &altitude, &latitude, &longitude, &timestamp);
+               assert_eq(ret, LOCATIONS_ERROR_NONE);
+
+               ret = location_manager_stop(manager2);
+               assert_eq(ret, LOCATIONS_ERROR_NONE);
+
+               ret = location_manager_clear_mock_location(manager2);
+               assert_eq(ret, LOCATIONS_ERROR_NONE);
+
+               ret = location_manager_unset_service_state_changed_cb(manager2);
+               assert_eq(ret, LOCATIONS_ERROR_NONE);
+
                ret = location_manager_destroy(manager2);
                assert_eq(ret, LOCATIONS_ERROR_NONE);
                manager2 = NULL;