[UTC][capi-ui-inputmethod-manager][non-ACR] Remove unused elementary dependency

Change-Id: I07f3c9f84857b0034c0c989e69486313d9848500
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/packaging/utc/core-capi-ui-inputmethod-manager-tests.spec b/packaging/utc/core-capi-ui-inputmethod-manager-tests.spec
index 1eec9add9acee3997999fa57fe382557474b8de1..110209498b2b86dae1adc2842989085fa3107bdc 100755 (executable)
--- a/packaging/utc/core-capi-ui-inputmethod-manager-tests.spec
+++ b/packaging/utc/core-capi-ui-inputmethod-manager-tests.spec
@@ -10,9 +10,8 @@ Source0:    %{name}-%{version}.tar.gz
 BuildRequires: pkgconfig(%{MODULE_LIBNAME})
 BuildRequires: pkgconfig(bundle)
 BuildRequires: cmake
-BuildRequires: pkgconfig(capi-appfw-application)
+BuildRequires: pkgconfig(capi-service-application)
 BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(capi-system-info)
 BuildRequires: pkgconfig(glib-2.0)
 %description

diff --git a/packaging/utc/core-capi-ui-inputmethod-manager-tests.xml b/packaging/utc/core-capi-ui-inputmethod-manager-tests.xml
index 7cdb82809705adaa572da0ddf30f1bf5d5110f7b..dedaf46c19c71558b502a74fb7c309266ac7fa6d 100755 (executable)
--- a/packaging/utc/core-capi-ui-inputmethod-manager-tests.xml
+++ b/packaging/utc/core-capi-ui-inputmethod-manager-tests.xml
@@ -3,14 +3,14 @@
     <label>CoreCapiUiInputmethodTest</label>
     <author email="test@tizen.org" href="www.tizen.org">test</author>
     <description>Core API test Application</description>
-    <ui-application appid="core.capi-ui-inputmethod-manager-tests" exec="/usr/apps/core-capi-ui-inputmethod-manager-tests/bin/tct-capi-ui-inputmethod-manager-core" nodisplay="false" multiple="false" type="capp" taskmanage="true">
+    <service-application appid="core.capi-ui-inputmethod-manager-tests" exec="/usr/apps/core-capi-ui-inputmethod-manager-tests/bin/tct-capi-ui-inputmethod-manager-core" nodisplay="false" multiple="false" type="capp" taskmanage="true">
     <background-category value="background-network"/>
        <background-category value="download"/>
        <background-category value="iot-communication"/>
        <background-category value="location"/>
        <background-category value="media"/>
        <background-category value="sensor"/>
-    </ui-application>
+    </service-application>
     <privileges>
         <privilege>http://tizen.org/privilege/imemanager</privilege>
     </privileges>

diff --git a/src/utc/capi-ui-inputmethod-manager/CMakeLists.txt b/src/utc/capi-ui-inputmethod-manager/CMakeLists.txt
index 2f543393ca8026e131789290b2a9987362b9b7d3..822d3eb4351061beb057e9e5451209f10fb9cec8 100755 (executable)
--- a/src/utc/capi-ui-inputmethod-manager/CMakeLists.txt
+++ b/src/utc/capi-ui-inputmethod-manager/CMakeLists.txt
@@ -11,10 +11,10 @@ SET(TC_SOURCES
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
     ${CAPI_LIB}
        glib-2.0
-       capi-appfw-application
+       capi-appfw-service-application
        capi-system-info
     bundle
-    dlog elementary
+    dlog
 )
 
 INCLUDE_DIRECTORIES(

diff --git a/src/utc/capi-ui-inputmethod-manager/tct-capi-ui-inputmethod-manager-core.c b/src/utc/capi-ui-inputmethod-manager/tct-capi-ui-inputmethod-manager-core.c
index d82b7af8b352d8328d6ec0ea6ee1602cf6214535..3507f3d87e59a3cfce3ecbe3450a6a2a8c524f84 100755 (executable)
--- a/src/utc/capi-ui-inputmethod-manager/tct-capi-ui-inputmethod-manager-core.c
+++ b/src/utc/capi-ui-inputmethod-manager/tct-capi-ui-inputmethod-manager-core.c
@@ -31,7 +31,7 @@
 #include "tct-capi-ui-inputmethod-manager-core_tv.h"
 #endif
 
-#ifdef TIZENIOT    
+#ifdef TIZENIOT
 #include "tct-capi-ui-inputmethod-manager-core_tizeniot.h"
 #endif //TIZENIOT
 
@@ -42,15 +42,11 @@
 #include <sys/wait.h>
 #include <glib.h>
 #include <stdbool.h>
-#include <app.h>
+#include <service_app.h>
 #include <dlog.h>
 
-#include <Elementary.h>
-
 typedef struct appdata {
-       Evas_Object *win;
-       Evas_Object *conform;
-       Evas_Object *label;
+
 } appdata_s;
 
 static bool app_create(void *data)
@@ -119,9 +115,8 @@ static void app_terminate(void *data)
 int main(int argc, char *argv[])
 {
        int ret = 0;
-       appdata_s ad = {0,};
 
-       ui_app_lifecycle_callback_s event_callback = {0,};
+       service_app_lifecycle_callback_s event_callback = {0,};
        event_callback.create = app_create;
        event_callback.terminate = app_terminate;
        event_callback.app_control = app_control;
@@ -131,11 +126,11 @@ int main(int argc, char *argv[])
        dlog_print(DLOG_INFO, "NativeTCT", "[%s:%d] Coverage *.gcda File location set to /tmp/home/abuild/rpmbuild/BUILD/ ", __FUNCTION__, __LINE__);
 
        dlog_print(DLOG_INFO, "NativeTCT", "[%s:%d] Application Main Function is Invoked", __FUNCTION__, __LINE__);
-       ret = ui_app_main(argc, argv, &event_callback, &ad);
+       ret = service_app_main(argc, argv, &event_callback, NULL);
        if (ret != APP_ERROR_NONE)
        {
-               dlog_print(DLOG_ERROR, "NativeTCT", "Application ui_app_main call gets failed. err = %d", ret);
-               PRINT_UTC_LOG("\\n[%s][Line : %d]Application ui_app_main call gets failed. err = %d\\n", __FILE__, __LINE__, ret);
+               dlog_print(DLOG_ERROR, "NativeTCT", "Application service_app_main call gets failed. err = %d", ret);
+               PRINT_UTC_LOG("\\n[%s][Line : %d]Application service_app_main call gets failed. err = %d\\n", __FILE__, __LINE__, ret);
                PRINT_TC_RESULT("%d",1);
                return ret;
        }

diff --git a/src/utc/capi-ui-inputmethod-manager/utc-capi-ui-inputmethod-manager.c b/src/utc/capi-ui-inputmethod-manager/utc-capi-ui-inputmethod-manager.c
index 1e22a4f4191db9c7597bc19f54b97db24abdb22b..5dc5df004df27f06802b5e853fddb91ef0fb06a7 100755 (executable)
--- a/src/utc/capi-ui-inputmethod-manager/utc-capi-ui-inputmethod-manager.c
+++ b/src/utc/capi-ui-inputmethod-manager/utc-capi-ui-inputmethod-manager.c
@@ -178,7 +178,6 @@ int utc_ime_manager_is_ime_enabled_n2(void)
 int utc_ime_manager_is_ime_enabled_n3(void)
 {
     char *appid = NULL;
-    bool enabled;
     int ret = ime_manager_get_active_ime(&appid);
     assert_eq(ret, IME_MANAGER_ERROR_NONE);
     assert(appid);