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

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

diff --git a/packaging/utc/core-capi-ui-sticker-tests.spec b/packaging/utc/core-capi-ui-sticker-tests.spec
index 773b59b459e0616a716b7fd81879018e2136478c..4d204b7ab39e116cc06b80e46f3f7b5e7ac70c2e 100644 (file)
--- a/packaging/utc/core-capi-ui-sticker-tests.spec
+++ b/packaging/utc/core-capi-ui-sticker-tests.spec
@@ -8,11 +8,10 @@ License:    Apache License, Version 2.0, Samsung Properietary
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  pkgconfig(bundle)
 BuildRequires:  cmake
-BuildRequires:  pkgconfig(capi-appfw-application)
+BuildRequires:  pkgconfig(capi-service-application)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(elementary)
 BuildRequires:  pkgconfig(capi-ui-sticker-consumer)
 BuildRequires:  pkgconfig(capi-ui-sticker-provider)
 %description

diff --git a/packaging/utc/core-capi-ui-sticker-tests.xml b/packaging/utc/core-capi-ui-sticker-tests.xml
index ed92058f2a048ea725ec5c606398066238dc9824..b2f759fc9ee0c9700f2937cc133a345abd243d65 100644 (file)
--- a/packaging/utc/core-capi-ui-sticker-tests.xml
+++ b/packaging/utc/core-capi-ui-sticker-tests.xml
@@ -3,14 +3,14 @@
     <label>CoreCapiUiStickerTest</label>
     <author email="test@tizen.org" href="www.tizen.org">test</author>
     <description>Core API test Application</description>
-    <ui-application appid="core.capi-ui-sticker-tests" exec="/usr/apps/core-capi-ui-sticker-tests/bin/tct-capi-ui-sticker-core" nodisplay="false" multiple="false" type="capp" taskmanage="true">
+    <service-application appid="core.capi-ui-sticker-tests" exec="/usr/apps/core-capi-ui-sticker-tests/bin/tct-capi-ui-sticker-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/mediastorage</privilege>
     </privileges>

diff --git a/src/utc/capi-ui-sticker/CMakeLists.txt b/src/utc/capi-ui-sticker/CMakeLists.txt
index b042e6515fbe7f519ce12b5ecdc65dbec82dab42..8f565cd82a5c8d7760a17e39a7843871f214c4d7 100644 (file)
--- a/src/utc/capi-ui-sticker/CMakeLists.txt
+++ b/src/utc/capi-ui-sticker/CMakeLists.txt
@@ -11,12 +11,11 @@ SET(TC_SOURCES
 )
 
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
-    capi-appfw-application
+    capi-appfw-service-application
     capi-system-info
     glib-2.0
     bundle
     dlog
-    elementary
     capi-ui-sticker-consumer
     capi-ui-sticker-provider
 )

diff --git a/src/utc/capi-ui-sticker/tct-capi-ui-sticker-core.c b/src/utc/capi-ui-sticker/tct-capi-ui-sticker-core.c
index ce2ab3020fd4f48e8235b11e69b89b4c7fc19bdf..2f7ebf7bd3740343c23b3a5ff9ec1b867c74eeaf 100644 (file)
--- a/src/utc/capi-ui-sticker/tct-capi-ui-sticker-core.c
+++ b/src/utc/capi-ui-sticker/tct-capi-ui-sticker-core.c
@@ -40,17 +40,9 @@
 #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)
 {
     return true;
@@ -114,9 +106,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;
@@ -126,11 +117,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;
     }