[ITC][capi-maps-srevice][Non-ACR][fixed wrong callback is called]

Change-Id: Ieebfc88df2a49e91745845eded824388b1d024e6
Signed-off-by: jomui <jongmun.woo@samsung.com>

diff --git a/src/itc/capi-maps-service/ITs-capi-maps-place-mapzen.c b/src/itc/capi-maps-service/ITs-capi-maps-place-mapzen.c
index d7e2db637ad7384ea46a2713b2e3932feb96905d..800ec7b02a8ef4a4e30cd5ea6f81c51011ca2860 100755 (executable)
--- a/src/itc/capi-maps-service/ITs-capi-maps-place-mapzen.c
+++ b/src/itc/capi-maps-service/ITs-capi-maps-place-mapzen.c
@@ -31,21 +31,6 @@ static bool MapsPlaceCategoriesCb(int index, int total, maps_place_category_h ca
        
        return true;
 }
-// Callback Function to get list of service providers
-bool MapsServiceProviderForeachCb(char* maps_provider, void* user_data)
-{
-       memset( g_szMapsProvider, '\0', sizeof(char)*BUFFER);
-       if(maps_provider != NULL)
-       {
-               strcpy(g_szMapsProvider, "MAPZEN");
-               FPRINTF("[Line : %d][%s] Provider list from maps_service_foreach_provider is = %s\\n", __LINE__, API_NAMESPACE, g_szMapsProvider);      
-       }
-       else
-               return false;
-       
-       g_nCheckCb = true;
-       return true;
-}
 
 /**
  * @function           ITs_maps_place_startup2

diff --git a/src/itc/capi-maps-service/ITs-capi-maps-service-mapzen.c b/src/itc/capi-maps-service/ITs-capi-maps-service-mapzen.c
index efd5653c30231c656736d25fc2c938428256940a..db2ffcaa41aa00da507bd24182294e80f9c4320b 100755 (executable)
--- a/src/itc/capi-maps-service/ITs-capi-maps-service-mapzen.c
+++ b/src/itc/capi-maps-service/ITs-capi-maps-service-mapzen.c
@@ -43,7 +43,7 @@ static bool MapServiceMultiRevGeocodeCb(maps_error_e result, int request_id, int
 }
 
 // Callback Function to get list of service providers
-static bool MapsServiceProviderForeachCb(char* maps_provider, void* user_data)
+static bool MapsServiceProviderForeachCb2(char* maps_provider, void* user_data)
 {
        memset( g_szMapsProvider, '\0', sizeof(char)*BUFFER);
        strcpy(g_szMapsProvider, "MAPZEN");
@@ -201,7 +201,7 @@ void ITs_maps_service_startup2(void)
                remove(ERR_LOG);
        }
     bool bMapsFeatureSupported = TCTCheckSystemInfoFeatureSupported(MAPS_FEATURE, API_NAMESPACE);
-       int nRet = maps_service_foreach_provider(MapsServiceProviderForeachCb, NULL);
+       int nRet = maps_service_foreach_provider(MapsServiceProviderForeachCb2, NULL);
        if ( nRet != MAPS_ERROR_NONE)
        {
                FPRINTF("[Line : %d][%s] maps_service_foreach_provider fail in startup error returned : %s \\n", __LINE__, API_NAMESPACE , MapServiceGetError(nRet));
@@ -504,7 +504,7 @@ int ITc_maps_service_foreach_provider_p2(void)
        
        g_nCheckCb = false;
 
-       int nRet = maps_service_foreach_provider(MapsServiceProviderForeachCb, NULL);
+       int nRet = maps_service_foreach_provider(MapsServiceProviderForeachCb2, NULL);
        PRINT_RESULT(MAPS_ERROR_NONE, nRet, "maps_service_foreach_provider", MapServiceGetError(nRet));
 
        if(g_nCheckCb != true)

diff --git a/src/itc/capi-maps-service/tct-capi-maps-service-native_mobile.h b/src/itc/capi-maps-service/tct-capi-maps-service-native_mobile.h
index ec415311081b09419e7885b160c17a35498aeb84..977a9005a90c5f495c41d2a291b1b80e6083b66a 100755 (executable)
--- a/src/itc/capi-maps-service/tct-capi-maps-service-native_mobile.h
+++ b/src/itc/capi-maps-service/tct-capi-maps-service-native_mobile.h
@@ -386,6 +386,7 @@ testcase tc_array[] = {
     {"ITc_maps_service_multi_reverse_geocode_p", ITc_maps_service_multi_reverse_geocode_p, ITs_maps_service_startup, ITs_maps_service_cleanup},
     {"ITc_maps_service_search_place_list_p", ITc_maps_service_search_place_list_p, ITs_maps_service_startup, ITs_maps_service_cleanup},
     {"ITc_maps_service_get_place_details_p", ITc_maps_service_get_place_details_p, ITs_maps_service_startup, ITs_maps_service_cleanup},
+    {"ITc_maps_service_request_user_consent_p", ITc_maps_service_request_user_consent_p, ITs_maps_service_startup, ITs_maps_service_cleanup},
     {"ITc_maps_service_create_destroy_p2", ITc_maps_service_create_destroy_p2, ITs_maps_service_startup2, ITs_maps_service_cleanup2},
     {"ITc_maps_service_set_get_preference_p2", ITc_maps_service_set_get_preference_p2, ITs_maps_service_startup2, ITs_maps_service_cleanup2},
     {"ITc_maps_service_set_get_provider_key_p2", ITc_maps_service_set_get_provider_key_p2, ITs_maps_service_startup2, ITs_maps_service_cleanup2},
@@ -562,7 +563,6 @@ testcase tc_array[] = {
        {"ITc_maps_view_object_overlay_set_get_coordinates_p", ITc_maps_view_object_overlay_set_get_coordinates_p, ITs_maps_view_object_startup, ITs_maps_view_object_cleanup},
        {"ITc_maps_view_object_overlay_set_get_min_zoom_level_p", ITc_maps_view_object_overlay_set_get_min_zoom_level_p, ITs_maps_view_object_startup, ITs_maps_view_object_cleanup},
        {"ITc_maps_view_object_overlay_set_get_max_zoom_level_p", ITc_maps_view_object_overlay_set_get_max_zoom_level_p, ITs_maps_view_object_startup, ITs_maps_view_object_cleanup},
-    {"ITc_maps_service_request_user_consent_p", ITc_maps_service_request_user_consent_p, ITs_maps_service_startup, ITs_maps_service_cleanup},
        {NULL, NULL}
 };
 

diff --git a/src/itc/capi-maps-service/tct-capi-maps-service-native_wearable.h b/src/itc/capi-maps-service/tct-capi-maps-service-native_wearable.h
index 8c2fd44e0bab84e7946afe5ebd5e96d588553b10..093219797de1d759c0e4e6873c72cbbd4ebfb366 100755 (executable)
--- a/src/itc/capi-maps-service/tct-capi-maps-service-native_wearable.h
+++ b/src/itc/capi-maps-service/tct-capi-maps-service-native_wearable.h
@@ -384,6 +384,7 @@ testcase tc_array[] = {
     {"ITc_maps_service_multi_reverse_geocode_p", ITc_maps_service_multi_reverse_geocode_p, ITs_maps_service_startup, ITs_maps_service_cleanup},
     {"ITc_maps_service_search_place_list_p", ITc_maps_service_search_place_list_p, ITs_maps_service_startup, ITs_maps_service_cleanup},
     {"ITc_maps_service_get_place_details_p", ITc_maps_service_get_place_details_p, ITs_maps_service_startup, ITs_maps_service_cleanup},
+    {"ITc_maps_service_request_user_consent_p", ITc_maps_service_request_user_consent_p, ITs_maps_service_startup, ITs_maps_service_cleanup},
     {"ITc_maps_service_create_destroy_p2", ITc_maps_service_create_destroy_p2, ITs_maps_service_startup2, ITs_maps_service_cleanup2},
     {"ITc_maps_service_set_get_preference_p2", ITc_maps_service_set_get_preference_p2, ITs_maps_service_startup2, ITs_maps_service_cleanup2},
     {"ITc_maps_service_set_get_provider_key_p2", ITc_maps_service_set_get_provider_key_p2, ITs_maps_service_startup2, ITs_maps_service_cleanup2},
@@ -558,7 +559,6 @@ testcase tc_array[] = {
        {"ITc_maps_view_object_overlay_set_get_coordinates_p", ITc_maps_view_object_overlay_set_get_coordinates_p, ITs_maps_view_object_startup, ITs_maps_view_object_cleanup},
        {"ITc_maps_view_object_overlay_set_get_min_zoom_level_p", ITc_maps_view_object_overlay_set_get_min_zoom_level_p, ITs_maps_view_object_startup, ITs_maps_view_object_cleanup},
        {"ITc_maps_view_object_overlay_set_get_max_zoom_level_p", ITc_maps_view_object_overlay_set_get_max_zoom_level_p, ITs_maps_view_object_startup, ITs_maps_view_object_cleanup},
-    {"ITc_maps_service_request_user_consent_p", ITc_maps_service_request_user_consent_p, ITs_maps_service_startup, ITs_maps_service_cleanup},
        {NULL, NULL}
 };