summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinjune Kim <sena06.kim@samsung.com>2012-08-21 18:12:29 +0900
committerMinjune Kim <sena06.kim@samsung.com>2012-08-21 18:12:29 +0900
commite1b776d6d74d51e8aaa608b9d7fb34e11ce17fcf (patch)
treee9c3bb70bfdbd700cf482865b75d375676101e4e
parent140858710b2f71b790fb2212882c8aca3a76dc4a (diff)
downloadgeocoder-e1b776d6d74d51e8aaa608b9d7fb34e11ce17fcf.tar.gz
geocoder-e1b776d6d74d51e8aaa608b9d7fb34e11ce17fcf.tar.bz2
geocoder-e1b776d6d74d51e8aaa608b9d7fb34e11ce17fcf.zip
-rwxr-xr-xTC/_export_env.sh8
-rwxr-xr-xTC/_export_target_env.sh7
-rwxr-xr-xTC/build.sh16
-rwxr-xr-xTC/clean.sh11
-rw-r--r--TC/config2
-rwxr-xr-xTC/execute.sh15
-rwxr-xr-xTC/testcase/Makefile25
-rw-r--r--TC/testcase/tslist1
-rwxr-xr-xTC/testcase/utc_location_geocoder.c447
-rwxr-xr-xTC/tet_scen7
-rw-r--r--TC/tetbuild.cfg5
-rw-r--r--TC/tetclean.cfg5
-rw-r--r--TC/tetexec.cfg5
-rw-r--r--debian/changelog113
-rw-r--r--include/geocoder_private.h3
-rw-r--r--packaging/capi-location-geocoder.spec1
-rw-r--r--src/geocoder.c10
-rwxr-xr-x[-rw-r--r--]test/geocoder_test.c2
18 files changed, 665 insertions, 18 deletions
diff --git a/TC/_export_env.sh b/TC/_export_env.sh
new file mode 100755
index 0000000..72a11ec
--- /dev/null
+++ b/TC/_export_env.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+. ./config
+export TET_INSTALL_PATH=$TET_INSTALL_HOST_PATH # tetware root path
+export TET_TARGET_PATH=$TET_INSTALL_PATH/tetware-target # tetware target path
+export PATH=$TET_TARGET_PATH/bin:$PATH
+export LD_LIBRARY_PATH=$TET_TARGET_PATH/lib/tet3:$LD_LIBRARY_PATH
+export TET_ROOT=$TET_TARGET_PATH
diff --git a/TC/_export_target_env.sh b/TC/_export_target_env.sh
new file mode 100755
index 0000000..5ddaa53
--- /dev/null
+++ b/TC/_export_target_env.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+. ./config
+export TET_INSTALL_PATH=$TET_INSTALL_TARGET_PATH # path to path
+export TET_TARGET_PATH=$TET_INSTALL_PATH/tetware-target
+export PATH=$TET_TARGET_PATH/bin:$PATH
+export LD_LIBRARY_PATH=$TET_TARGET_PATH/lib/tet3:$LD_LIBRARY_PATH
+export TET_ROOT=$TET_TARGET_PATH
diff --git a/TC/build.sh b/TC/build.sh
new file mode 100755
index 0000000..72aad6c
--- /dev/null
+++ b/TC/build.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+. ./_export_env.sh # setting environment variables
+
+export TET_SUITE_ROOT=`pwd`
+FILE_NAME_EXTENSION=`date +%s`
+
+RESULT_DIR=results
+HTML_RESULT=$RESULT_DIR/build-tar-result-$FILE_NAME_EXTENSION.html
+JOURNAL_RESULT=$RESULT_DIR/build-tar-result-$FILE_NAME_EXTENSION.journal
+
+mkdir -p $RESULT_DIR
+
+tcc -c -p ./
+tcc -b -j $JOURNAL_RESULT -p ./
+grw -c 7 -f chtml -o $HTML_RESULT $JOURNAL_RESULT
diff --git a/TC/clean.sh b/TC/clean.sh
new file mode 100755
index 0000000..29743e0
--- /dev/null
+++ b/TC/clean.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+. ./_export_env.sh # setting environment variables
+
+export TET_SUITE_ROOT=`pwd`
+RESULT_DIR=results
+
+tcc -c -p ./ # executing tcc, with clean option (-c)
+rm -r $RESULT_DIR
+rm -r tet_tmp_dir
+rm testcase/tet_captured
diff --git a/TC/config b/TC/config
new file mode 100644
index 0000000..04684f0
--- /dev/null
+++ b/TC/config
@@ -0,0 +1,2 @@
+TET_INSTALL_HOST_PATH=/home/rookiejava/dts_tool/TETware
+TET_INSTALL_TARGET_PATH=/mnt/nfs/dts_tool/TETware
diff --git a/TC/execute.sh b/TC/execute.sh
new file mode 100755
index 0000000..a4f6095
--- /dev/null
+++ b/TC/execute.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+. ./_export_target_env.sh # setting environment variables
+
+export TET_SUITE_ROOT=`pwd`
+FILE_NAME_EXTENSION=`date +%s`
+
+RESULT_DIR=results
+HTML_RESULT=$RESULT_DIR/exec-tar-result-$FILE_NAME_EXTENSION.html
+JOURNAL_RESULT=$RESULT_DIR/exec-tar-result-$FILE_NAME_EXTENSION.journal
+
+mkdir -p $RESULT_DIR
+
+tcc -e -j $JOURNAL_RESULT -p ./
+grw -c 3 -f chtml -o $HTML_RESULT $JOURNAL_RESULT
diff --git a/TC/testcase/Makefile b/TC/testcase/Makefile
new file mode 100755
index 0000000..ffecbf7
--- /dev/null
+++ b/TC/testcase/Makefile
@@ -0,0 +1,25 @@
+CC ?= gcc
+
+C_FILES = $(shell ls *.c)
+
+PKGS = capi-location-geocoder dlog glib-2.0 gthread-2.0
+
+LDFLAGS = `pkg-config --libs $(PKGS)`
+LDFLAGS += $(TET_ROOT)/lib/tet3/tcm_s.o
+LDFLAGS += -L$(TET_ROOT)/lib/tet3 -ltcm_s
+LDFLAGS += -L$(TET_ROOT)/lib/tet3 -lapi_s
+
+CFLAGS = -I. `pkg-config --cflags $(PKGS)`
+CFLAGS += -I$(TET_ROOT)/inc/tet3
+CFLAGS += -Wall
+
+#TARGETS = $(C_FILES:%.c=tc-%)
+TCS := $(shell ls -1 *.c | cut -d. -f1)
+
+all: $(TCS)
+
+%: %.c
+ $(CC) -o $@ $< $(CFLAGS) $(LDFLAGS)
+
+clean:
+ rm -f $(TCS)
diff --git a/TC/testcase/tslist b/TC/testcase/tslist
new file mode 100644
index 0000000..dbe8885
--- /dev/null
+++ b/TC/testcase/tslist
@@ -0,0 +1 @@
+/testcase/utc_location_geocoder
diff --git a/TC/testcase/utc_location_geocoder.c b/TC/testcase/utc_location_geocoder.c
new file mode 100755
index 0000000..9aa0efb
--- /dev/null
+++ b/TC/testcase/utc_location_geocoder.c
@@ -0,0 +1,447 @@
+/*
+* Copyright (c) 2011 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 <tet_api.h>
+#include <location/geocoder.h>
+#include <glib.h>
+
+
+enum {
+ POSITIVE_TC_IDX = 0x01,
+ NEGATIVE_TC_IDX,
+};
+
+static void startup(void);
+static void cleanup(void);
+
+void (*tet_startup)(void) = startup;
+void (*tet_cleanup)(void) = cleanup;
+
+static void utc_location_geocoder_create_p(void);
+static void utc_location_geocoder_create_n(void);
+static void utc_location_geocoder_destroy_p(void);
+static void utc_location_geocoder_destroy_n(void);
+static void utc_location_geocoder_destroy_n_02(void);
+static void utc_location_geocoder_get_address_from_position_p(void);
+static void utc_location_geocoder_get_address_from_position_n(void);
+static void utc_location_geocoder_get_address_from_position_n_02(void);
+static void utc_location_geocoder_get_address_from_position_n_03(void);
+static void utc_location_geocoder_get_address_from_position_n_04(void);
+static void utc_location_geocoder_get_address_from_position_n_05(void);
+static void utc_location_geocoder_get_address_from_position_n_06(void);
+static void utc_location_geocoder_foreach_positions_from_address_p(void);
+static void utc_location_geocoder_foreach_positions_from_address_n(void);
+static void utc_location_geocoder_foreach_positions_from_address_n_02(void);
+static void utc_location_geocoder_foreach_positions_from_address_n_03(void);
+static void utc_location_geocoder_foreach_positions_from_address_n_04(void);
+
+
+
+struct tet_testlist tet_testlist[] = {
+ { utc_location_geocoder_create_p, POSITIVE_TC_IDX },
+ { utc_location_geocoder_create_n, NEGATIVE_TC_IDX },
+ { utc_location_geocoder_destroy_p, POSITIVE_TC_IDX },
+ { utc_location_geocoder_destroy_n, NEGATIVE_TC_IDX },
+ { utc_location_geocoder_destroy_n_02, NEGATIVE_TC_IDX },
+ { utc_location_geocoder_get_address_from_position_p, POSITIVE_TC_IDX },
+ { utc_location_geocoder_get_address_from_position_n, NEGATIVE_TC_IDX },
+ { utc_location_geocoder_get_address_from_position_n_02, NEGATIVE_TC_IDX },
+ { utc_location_geocoder_get_address_from_position_n_03, NEGATIVE_TC_IDX },
+ { utc_location_geocoder_get_address_from_position_n_04, NEGATIVE_TC_IDX },
+ { utc_location_geocoder_get_address_from_position_n_05, NEGATIVE_TC_IDX },
+ { utc_location_geocoder_get_address_from_position_n_06, NEGATIVE_TC_IDX },
+ { utc_location_geocoder_foreach_positions_from_address_p, POSITIVE_TC_IDX },
+ { utc_location_geocoder_foreach_positions_from_address_n, NEGATIVE_TC_IDX },
+ { utc_location_geocoder_foreach_positions_from_address_n_02, NEGATIVE_TC_IDX },
+ { utc_location_geocoder_foreach_positions_from_address_n_03, NEGATIVE_TC_IDX },
+ { utc_location_geocoder_foreach_positions_from_address_n_04, NEGATIVE_TC_IDX },
+ { NULL, 0 },
+};
+
+static GMainLoop *g_mainloop = NULL;
+static GThread *event_thread;
+
+gpointer GmainThread(gpointer data){
+ g_mainloop = g_main_loop_new (NULL, 0);
+ g_main_loop_run (g_mainloop);
+
+ return NULL;
+}
+
+static void startup(void)
+{
+ g_setenv("PKG_NAME", "org.tizen.capi-location-geocoder-test", 1);
+ g_setenv("LOCATION_TEST_ENABLE", "1", 1);
+
+#if !GLIB_CHECK_VERSION (2, 31, 0)
+ if( !g_thread_supported() )
+ {
+ g_thread_init(NULL);
+ }
+#endif
+
+ GError *gerr = NULL;
+ event_thread = g_thread_create(GmainThread, NULL, 1, &gerr);
+}
+
+static void cleanup(void)
+{
+ g_main_loop_quit (g_mainloop);
+ g_thread_join(event_thread);
+}
+
+/**
+ * @brief Positive test case of player_create()
+ */
+static void utc_location_geocoder_create_p(void)
+{
+ char* api_name = "geocoder_create";
+ int ret;
+ geocoder_h geocoder;
+ if ((ret =geocoder_create(&geocoder)) == GEOCODER_ERROR_NONE)
+ {
+ geocoder_destroy(geocoder);
+ dts_pass(api_name);
+ }
+ dts_message(api_name, "Call log: %d", ret);
+ dts_fail(api_name);
+}
+
+static void utc_location_geocoder_create_n(void)
+{
+ char* api_name = "geocoder_create";
+ int ret;
+ geocoder_h geocoder;
+ if ((ret =geocoder_create(NULL)) != GEOCODER_ERROR_NONE)
+ {
+ dts_pass(api_name);
+ }
+ dts_message(api_name, "Call log: %d", ret);
+ dts_fail(api_name);
+}
+
+static void utc_location_geocoder_destroy_p(void)
+{
+ char* api_name = "geocoder_destroy";
+ int ret;
+ geocoder_h geocoder;
+ if ((ret =geocoder_create(&geocoder)) == GEOCODER_ERROR_NONE)
+ {
+ if ((ret =geocoder_destroy(geocoder)) == GEOCODER_ERROR_NONE)
+ {
+ dts_pass(api_name);
+ }
+ }
+ dts_message(api_name, "Call log: %d", ret);
+ dts_fail(api_name);
+}
+
+static void utc_location_geocoder_destroy_n(void)
+{
+ char* api_name = "geocoder_destroy";
+ int ret;
+ if ((ret = geocoder_destroy(NULL)) != GEOCODER_ERROR_NONE)
+ {
+ dts_pass(api_name);
+ }
+ dts_message(api_name, "Call log: %d", ret);
+ dts_fail(api_name);
+}
+
+static void utc_location_geocoder_destroy_n_02(void)
+{
+ char* api_name = "geocoder_destroy";
+ int ret;
+ geocoder_h geocoder;
+ if ((ret = geocoder_destroy(geocoder)) != GEOCODER_ERROR_NONE)
+ {
+ dts_pass(api_name);
+ }
+ dts_message(api_name, "Call log: %d", ret);
+ dts_fail(api_name);
+}
+
+static void get_address_cb(geocoder_error_e result, const char *building_number, const char *postal_code, const char *street, const char *city, const char *district, const char *state, const char *country_code, void *user_data)
+{
+ char* api_name = "geocoder_get_address_from_position";
+ dts_message(api_name,"building number: %s, postal code: %s, street: %s, city: %s, district: %s, state: %s, country code: %s\n", building_number,postal_code,street,city,district,state,country_code);
+}
+
+static void utc_location_geocoder_get_address_from_position_p(void)
+{
+ char* api_name = "geocoder_get_address_from_position";
+ int ret;
+ geocoder_h geocoder;
+ if ((ret =geocoder_create(&geocoder)) == GEOCODER_ERROR_NONE)
+ {
+ ret = geocoder_get_address_from_position(geocoder,37.258,127.056,get_address_cb,(void*)geocoder);
+ if(ret == GEOCODER_ERROR_NONE)
+ {
+ geocoder_destroy(geocoder);
+ dts_pass(api_name);
+ }
+ dts_message(api_name, "Ret : %d", ret);
+ }
+ dts_message(api_name, "Call log: %d", ret);
+ geocoder_destroy(geocoder);
+ dts_fail(api_name);
+}
+
+static void utc_location_geocoder_get_address_from_position_n(void)
+{
+ char* api_name = "geocoder_get_address_from_position";
+ int ret;
+ geocoder_h geocoder;
+ if ((ret =geocoder_create(&geocoder)) == GEOCODER_ERROR_NONE)
+ {
+ ret = geocoder_get_address_from_position(NULL,37.258,127.056,get_address_cb,(void*)geocoder);
+ if(ret != GEOCODER_ERROR_NONE)
+ {
+ geocoder_destroy(geocoder);
+ dts_pass(api_name);
+ }
+ }
+ dts_message(api_name, "Call log: %d", ret);
+ geocoder_destroy(geocoder);
+ dts_fail(api_name);
+}
+
+static void utc_location_geocoder_get_address_from_position_n_02(void)
+{
+ char* api_name = "geocoder_get_address_from_position";
+ int ret;
+ geocoder_h geocoder;
+ geocoder_h geocoder_02 = NULL;
+ if ((ret =geocoder_create(&geocoder)) == GEOCODER_ERROR_NONE)
+ {
+ ret = geocoder_get_address_from_position(geocoder_02, 37.258, 127.056, get_address_cb, (void*)geocoder);
+ if(ret != GEOCODER_ERROR_NONE)
+ {
+ geocoder_destroy(geocoder);
+ dts_pass(api_name);
+ }
+ }
+ dts_message(api_name, "Call log: %d", ret);
+ geocoder_destroy(geocoder);
+ dts_fail(api_name);
+}
+
+static void utc_location_geocoder_get_address_from_position_n_03(void)
+{
+ char* api_name = "geocoder_get_address_from_position";
+ int ret;
+ geocoder_h geocoder;
+ if ((ret =geocoder_create(&geocoder)) == GEOCODER_ERROR_NONE)
+ {
+ ret = geocoder_get_address_from_position(geocoder, -91, -181, get_address_cb, (void*)geocoder);
+ if(ret != GEOCODER_ERROR_NONE)
+ {
+ geocoder_destroy(geocoder);
+ dts_pass(api_name);
+ }
+ }
+ dts_message(api_name, "Call log: %d", ret);
+ geocoder_destroy(geocoder);
+ dts_fail(api_name);
+}
+
+static void utc_location_geocoder_get_address_from_position_n_04(void)
+{
+ char* api_name = "geocoder_get_address_from_position";
+ int ret;
+ geocoder_h geocoder;
+ if ((ret =geocoder_create(&geocoder)) == GEOCODER_ERROR_NONE)
+ {
+ ret = geocoder_get_address_from_position(geocoder, 37.258, 127.056, NULL,(void*)geocoder);
+ if(ret != GEOCODER_ERROR_NONE)
+ {
+ geocoder_destroy(geocoder);
+ dts_pass(api_name);
+ }
+ }
+ dts_message(api_name, "Call log: %d", ret);
+ geocoder_destroy(geocoder);
+ dts_fail(api_name);
+}
+
+static void utc_location_geocoder_get_address_from_position_n_05(void)
+{
+ char* api_name = "geocoder_get_address_from_position";
+ int ret;
+ geocoder_h geocoder;
+ if ((ret =geocoder_create(&geocoder)) == GEOCODER_ERROR_NONE)
+ {
+ ret = geocoder_get_address_from_position(geocoder, -91, 127.056, get_address_cb, (void*)geocoder);
+ if(ret != GEOCODER_ERROR_NONE)
+ {
+ geocoder_destroy(geocoder);
+ dts_pass(api_name);
+ }
+ }
+ dts_message(api_name, "Call log: %d", ret);
+ geocoder_destroy(geocoder);
+ dts_fail(api_name);
+}
+
+static void utc_location_geocoder_get_address_from_position_n_06(void)
+{
+ char* api_name = "geocoder_get_address_from_position";
+ int ret;
+ geocoder_h geocoder;
+ if ((ret =geocoder_create(&geocoder)) == GEOCODER_ERROR_NONE)
+ {
+ ret = geocoder_get_address_from_position(geocoder, 37.258, -181, get_address_cb, (void*)geocoder);
+ if(ret != GEOCODER_ERROR_NONE)
+ {
+ geocoder_destroy(geocoder);
+ dts_pass(api_name);
+ }
+ }
+ dts_message(api_name, "Call log: %d", ret);
+ geocoder_destroy(geocoder);
+ dts_fail(api_name);
+}
+
+
+static bool get_position_cb(geocoder_error_e result, double latitude, double longitude, void *user_data)
+{
+ geocoder_h geocoder = (geocoder_h) user_data;
+
+ char* api_name = "geocoder_foreach_positions_from_address";
+ dts_message(api_name,"latitude:%ld, state:%s, longitude:%ld\n",latitude, longitude);
+ geocoder_destroy(geocoder);
+// dts_pass(api_name);
+ return FALSE;
+}
+
+static gboolean _destroy_if_timeout (gpointer user_data)
+{
+ char* api_name = "_destroy_if_timeout";
+ geocoder_h _geocoder = (geocoder_h) user_data;
+
+ dts_message(api_name, "Timeout");
+ geocoder_destroy(_geocoder);
+
+ return FALSE;
+}
+
+// TODO : Fail
+static void utc_location_geocoder_foreach_positions_from_address_p(void)
+{
+ char* api_name = "geocoder_foreach_positions_from_address";
+ int ret;
+ geocoder_h geocoder;
+ if ((ret = geocoder_create(&geocoder)) == GEOCODER_ERROR_NONE)
+ {
+ char *address="suwon";
+ ret = geocoder_foreach_positions_from_address(geocoder,address, get_position_cb,(void*)geocoder);
+ if(ret == GEOCODER_ERROR_NONE)
+ {
+ g_timeout_add_seconds(60, _destroy_if_timeout, geocoder);
+ dts_pass(api_name);
+
+ }
+ }
+
+ dts_message(api_name, "Call log: %d", ret);
+ geocoder_destroy(geocoder);
+ dts_fail(api_name);
+}
+
+static void utc_location_geocoder_foreach_positions_from_address_n(void)
+{
+ char* api_name = "geocoder_foreach_positions_from_address";
+ int ret;
+ geocoder_h geocoder;
+ if ((ret =geocoder_create(&geocoder)) == GEOCODER_ERROR_NONE)
+ {
+ char *address="suwon";
+ ret = geocoder_foreach_positions_from_address(NULL, address, get_position_cb,(void*)geocoder);
+ if(ret != GEOCODER_ERROR_NONE)
+ {
+ geocoder_destroy(geocoder);
+ dts_pass(api_name);
+ }
+ }
+ dts_message(api_name, "Call log: %d", ret);
+ geocoder_destroy(geocoder);
+ dts_fail(api_name);
+}
+
+static void utc_location_geocoder_foreach_positions_from_address_n_02(void)
+{
+ char* api_name = "geocoder_foreach_positions_from_address";
+ int ret;
+ geocoder_h geocoder;
+ geocoder_h geocoder_02 = NULL;
+ if ((ret =geocoder_create(&geocoder)) == GEOCODER_ERROR_NONE)
+ {
+ char *address="suwon";
+ ret = geocoder_foreach_positions_from_address(geocoder_02, address, get_position_cb, (void*)geocoder);
+ if(ret != GEOCODER_ERROR_NONE)
+ {
+ geocoder_destroy(geocoder);
+ dts_pass(api_name);
+ }
+ }
+ dts_message(api_name, "Call log: %d", ret);
+ geocoder_destroy(geocoder);
+ dts_fail(api_name);
+}
+
+static void utc_location_geocoder_foreach_positions_from_address_n_03(void)
+{
+ char* api_name = "geocoder_foreach_positions_from_address";
+ int ret;
+ geocoder_h geocoder;
+ if ((ret =geocoder_create(&geocoder)) == GEOCODER_ERROR_NONE)
+ {
+ ret = geocoder_foreach_positions_from_address(geocoder, NULL, get_position_cb, (void*)geocoder);
+ if(ret != GEOCODER_ERROR_NONE)
+ {
+ geocoder_destroy(geocoder);
+ dts_pass(api_name);
+ }
+ }
+ dts_message(api_name, "Call log: %d", ret);
+ geocoder_destroy(geocoder);
+ dts_fail(api_name);
+}
+
+static void utc_location_geocoder_foreach_positions_from_address_n_04(void)
+{
+ char* api_name = "geocoder_foreach_positions_from_address";
+ int ret;
+ geocoder_h geocoder;
+ if ((ret =geocoder_create(&geocoder)) == GEOCODER_ERROR_NONE)
+ {
+ char *address="suwon";
+ ret = geocoder_foreach_positions_from_address(geocoder, address, NULL, (void*)geocoder);
+ if(ret != GEOCODER_ERROR_NONE)
+ {
+ geocoder_destroy(geocoder);
+ dts_pass(api_name);
+ }
+ }
+ dts_message(api_name, "Call log: %d", ret);
+ geocoder_destroy(geocoder);
+ dts_fail(api_name);
+}
+
+
+
+
+
diff --git a/TC/tet_scen b/TC/tet_scen
new file mode 100755
index 0000000..03f029a
--- /dev/null
+++ b/TC/tet_scen
@@ -0,0 +1,7 @@
+all
+ ^TEST
+##### Scenarios for TEST #####
+
+# Test scenario
+TEST
+ :include:/testcase/tslist
diff --git a/TC/tetbuild.cfg b/TC/tetbuild.cfg
new file mode 100644
index 0000000..f7eda55
--- /dev/null
+++ b/TC/tetbuild.cfg
@@ -0,0 +1,5 @@
+TET_OUTPUT_CAPTURE=True # capture option for build operation checking
+TET_BUILD_TOOL=make # build with using make command
+TET_BUILD_FILE=-f Makefile # execution file (Makefile) for build
+TET_API_COMPLIANT=True # use TET API in Test Case ?
+TET_PASS_TC_NAME=True # report passed TC name in Journal file?
diff --git a/TC/tetclean.cfg b/TC/tetclean.cfg
new file mode 100644
index 0000000..02d7030
--- /dev/null
+++ b/TC/tetclean.cfg
@@ -0,0 +1,5 @@
+TET_OUTPUT_CAPTURE=True # capture option
+TET_CLEAN_TOOL= make clean # clean tool
+TET_CLEAN_FILE= Makefile # file for clean
+TET_API_COMPLIANT=True # TET API useage
+TET_PASS_TC_NAME=True # showing name , passed TC
diff --git a/TC/tetexec.cfg b/TC/tetexec.cfg
new file mode 100644
index 0000000..ef3e452
--- /dev/null
+++ b/TC/tetexec.cfg
@@ -0,0 +1,5 @@
+TET_OUTPUT_CAPTURE=True # capturing execution or not
+TET_EXEC_TOOL= # ex) exec : execution tool set up/ Optional
+TET_EXEC_FILE= # ex) exectool : execution file/ Optional
+TET_API_COMPLIANT=True # Test case or Tool usesTET API?
+TET_PASS_TC_NAME=True # showing Passed TC name ?
diff --git a/debian/changelog b/debian/changelog
index 40dd8ef..5c6f0a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,41 +1,132 @@
+capi-location-geocoder (0.1.0-16) unstable; urgency=low
+
+ * Seperate map service from location service
+ * Tag: capi-location-geocoder_0.1.0-16
+
+ -- Minjune Kim <sena06.kim@samsung.com> Fri, 27 Jul 2012 20:10:01 +0900
+
+capi-location-geocoder (0.1.0-15) unstable; urgency=low
+
+ * Fix the missing statement(break)
+ * Tag: capi-location-geocoder_0.1.0-15
+
+ -- Minjune Kim <sena06.kim@samsung.com> Thu, 19 Jul 2012 19:45:11 +0900
+
capi-location-geocoder (0.1.0-14) unstable; urgency=low
+ * Fix the missing statement(break)
+ * Tag: capi-location-geocoder_0.1.0-14
+
+ -- Kangho Hur <kangho.hur@samsung.com> Wed, 04 Apr 2012 14:35:13 +0900
+
+capi-location-geocoder (0.1.0-13) unstable; urgency=low
+
* Add the not found error code
+ * Tag: capi-location-geocoder_0.1.0-13
- -- Kangho Hur <kangho.hur@samsung.com> Wed, 04 Apr 2012 13:26:23 +0900
+ -- Kangho Hur <kangho.hur@samsung.com> Wed, 04 Apr 2012 13:06:40 +0900
capi-location-geocoder (0.1.0-12) unstable; urgency=low
- * Fix the callback issue
+ * Fix callback issue
+ * Tag: capi-location-geocoder_0.1.0-12
- -- Kangho Hur <kangho.hur@samsung.com> Wed, 28 Mar 2012 18:39:58 +0900
+ -- Kangho Hur <kangho.hur@samsung.com> Wed, 28 Mar 2012 18:11:01 +0900
capi-location-geocoder (0.1.0-11) unstable; urgency=low
* Add the result code for request(geocode/reverse geocode). Remove the sync function.
+ * Tag: capi-location-geocoder_0.1.0-11
- -- Kangho Hur <kangho.hur@samsung.com> Mon, 26 Mar 2012 21:45:09 +0900
+ -- Kangho Hur <kangho.hur@samsung.com> Mon, 26 Mar 2012 21:13:22 +0900
+
+capi-location-geocoder (0.1.0-10) unstable; urgency=low
+
+ * Fix the failed cases on TC
+ * Tag: capi-location-geocoder_0.1.0-10
+
+ -- Minjune Kim <sena06.kim@samsung.com> Tue, 20 Mar 2012 21:31:38 +0900
capi-location-geocoder (0.1.0-9) unstable; urgency=low
- * Use 'static' to local function which is limited to the current source file.
+ * Use 'static' to local function which is limited to the current source file.
+ * Tag: capi-location-geocoder_0.1.0-9
- -- Kangho Hur <kangho.hur@samsung.com> Tue, 21 Feb 2012 10:21:01 +0900
+ -- Kangho Hur <kangho.hur@samsung.com> Tue, 21 Feb 2012 10:12:33 +0900
capi-location-geocoder (0.1.0-8) unstable; urgency=low
- * Apply the SOVERSION
+ * Apply the SOVERSION
+ * Tag: capi-location-geocoder_0.1.0-8
- -- Kangho Hur <kangho.hur@samsung.com> Tue, 14 Feb 2012 18:22:56 +0900
+ -- Kangho Hur <kangho.hur@samsung.com> Tue, 14 Feb 2012 17:55:34 +0900
capi-location-geocoder (0.1.0-7) unstable; urgency=low
* Support to multiple geocoding result
+ * Tag: capi-location-geocoder_0.1.0-7
+
+ -- Kangho Hur <kangho.hur@samsung.com> Thu, 09 Feb 2012 21:16:23 +0900
+
+capi-location-geocoder (0.1.0-6) unstable; urgency=low
- -- Kangho Hur <kangho.hur@samsung.com> Fri, 10 Feb 2012 15:36:17 +0900
+ * support to the LOCATION_ERROR_NETWORK_NOT_CONNECTED
+ * Tag: capi-location-geocoder_0.1.0-6
+
+ -- Kangho Hur <kangho.hur@samsung.com> Thu, 26 Jan 2012 20:21:43 +0900
capi-location-geocoder (0.1.0-5) unstable; urgency=low
- * Initial release.
+ * Changes the value of ERROR_NONE
+ * Tag: capi-location-geocoder_0.1.0-5
+
+ -- Kangho Hur <kangho.hur@samsung.com> Mon, 05 Dec 2011 11:20:49 +0900
+
+capi-location-geocoder (0.1.0-4) unstable; urgency=low
+
+ * Apply the Tizen
+ * Tag: capi-location-geocoder_0.1.0-4
+
+ -- Kangho Hur <kangho.hur@samsung.com> Wed, 23 Nov 2011 15:22:07 +0900
+
+capi-location-geocoder (0.1.0-3) unstable; urgency=low
+
+ * Repackage for SDK
+ * Tag: capi-location-geocoder_0.1.0-3
+
+ -- Kangho Hur <kangho.hur@samsung.com> Mon, 07 Nov 2011 21:47:01 +0900
+
+capi-location-geocoder (0.1.0-2) unstable; urgency=low
+
+ * Apply the error messages
+ * Tag: capi-location-geocoder_0.1.0-2
+
+ -- Kangho Hur <kangho.hur@samsung.com> Fri, 07 Oct 2011 16:48:32 +0900
+
+capi-location-geocoder (0.1.0-1) unstable; urgency=low
+
+ * Alpha Release
+ * Tag: capi-location-geocoder_0.1.0-1
+
+ -- Kangho Hur <kangho.hur@samsung.com> Tue, 27 Sep 2011 20:05:15 +0900
+
+capi-location-geocoder (0.0.1-3) unstable; urgency=low
+
+ * Change address parameter order
+ * Tag: capi-location-geocoder_0.0.1-3
+
+ -- Kangho Hur <kangho.hur@samsung.com> Tue, 20 Sep 2011 14:51:08 +0900
+
+capi-location-geocoder (0.0.1-2) unstable; urgency=low
+
+ * Update API Description
+ * Tag: capi-location-geocoder_0.0.1-2
+
+ -- Kangho Hur <kangho.hur@samsung.com> Mon, 19 Sep 2011 17:26:44 +0900
+
+capi-location-geocoder (0.0.1-1) unstable; urgency=low
+
+ * Initial Upload
+ * Tag: capi-location-geocoder_0.0.1-1
- -- Kangho Hur <kangho.hur@samsung.com> Wed, 07 Dec 2011 12:48:38 +0900
+ -- Kangho Hur <kangho.hur@samsung.com> Thu, 04 Aug 2011 17:06:44 +0900
diff --git a/include/geocoder_private.h b/include/geocoder_private.h
index be31108..d20090b 100644
--- a/include/geocoder_private.h
+++ b/include/geocoder_private.h
@@ -18,6 +18,7 @@
#define __TIZEN_LOCATION_GEOCODER_PRIVATE_H__
#include <location/location.h>
+#include <location/location-map-service.h>
#include <geocoder.h>
#ifdef __cplusplus
@@ -32,7 +33,7 @@ typedef enum {
}_geocoder_cb_e;
typedef struct _geocoder_s{
- LocationObject* object;
+ LocationMapObject* object;
} geocoder_s;
#ifdef __cplusplus
diff --git a/packaging/capi-location-geocoder.spec b/packaging/capi-location-geocoder.spec
index 800a8fb..e29cbd5 100644
--- a/packaging/capi-location-geocoder.spec
+++ b/packaging/capi-location-geocoder.spec
@@ -1,3 +1,4 @@
+#sbs-git:slp/api/geocoder capi-location-geocoder 0.1.0 3888c8ac0e5ed129802b25ccb9d272a00546f976
Name: capi-location-geocoder
Summary: A Geocoder library in Tizen Native API
Version: 0.1.0
diff --git a/src/geocoder.c b/src/geocoder.c
index cfcaa6c..8e448b2 100644
--- a/src/geocoder.c
+++ b/src/geocoder.c
@@ -155,11 +155,11 @@ int geocoder_create(geocoder_h* geocoder)
memset(handle, 0 , sizeof(geocoder_s));
- handle->object = location_new(LOCATION_METHOD_HYBRID);
+ handle->object = location_map_new(NULL);
if(handle->object == NULL)
{
free(handle);
- LOGE("[%s] GEOCODER_ERROR_SERVICE_NOT_AVAILABLE(0x%08x) : fail to location_new", __FUNCTION__, GEOCODER_ERROR_SERVICE_NOT_AVAILABLE);
+ LOGE("[%s] GEOCODER_ERROR_SERVICE_NOT_AVAILABLE(0x%08x) : fail to location_map_new", __FUNCTION__, GEOCODER_ERROR_SERVICE_NOT_AVAILABLE);
return GEOCODER_ERROR_SERVICE_NOT_AVAILABLE;
}
@@ -172,7 +172,7 @@ int geocoder_destroy(geocoder_h geocoder)
GEOCODER_NULL_ARG_CHECK(geocoder);
geocoder_s *handle = (geocoder_s*)geocoder;
- int ret = location_free(handle->object);
+ int ret = location_map_free(handle->object);
if(ret!=GEOCODER_ERROR_NONE)
{
return __convert_error_code(ret,(char*)__FUNCTION__);
@@ -202,7 +202,7 @@ int geocoder_get_address_from_position(geocoder_h geocoder, double latitude, dou
calldata->callback = callback;
calldata->data = user_data;
- ret = location_get_address_from_position_async(handle->object, pos, __cb_address_from_position, calldata);
+ ret = location_map_get_address_from_position_async(handle->object, pos, __cb_address_from_position, calldata);
location_position_free(pos);
if( ret != LOCATION_ERROR_NONE)
{
@@ -231,7 +231,7 @@ int geocoder_foreach_positions_from_address(geocoder_h geocoder,const char* add
calldata->data = user_data;
int ret;
- ret = location_get_position_from_freeformed_address_async(handle->object, addr_str,__cb_position_from_address, calldata);
+ ret = location_map_get_position_from_freeformed_address_async(handle->object, addr_str,__cb_position_from_address, calldata);
g_free(addr_str);
if( ret != LOCATION_ERROR_NONE)
{
diff --git a/test/geocoder_test.c b/test/geocoder_test.c
index f976896..12c21a6 100644..100755
--- a/test/geocoder_test.c
+++ b/test/geocoder_test.c
@@ -88,7 +88,7 @@ static gboolean exit_program (gpointer data)
int main(int argc, char ** argv)
{
loop =g_main_loop_new (NULL, TRUE);
- g_setenv("PKG_NAME", "com.samsung.capi-location-geocoder-test", 1);
+ g_setenv("PKG_NAME", "org.tizen.capi-location-geocoder-test", 1);
geocoder_test();
reverse_geocoder_test();