Fixed bug that is related to TIVI-974

Change-Id: I90736d4af70ad07e9f972a49351fc57d28d350a4
Signed-off-by: Nakamura Hayato <hayato.nakamura@mail.toyota-td.jp>

diff --git a/packaging/ico-uxf-device-input-controller.changes b/packaging/ico-uxf-device-input-controller.changes
index cc621a5..ff0eabd 100644 (file)
--- a/packaging/ico-uxf-device-input-controller.changes
+++ b/packaging/ico-uxf-device-input-controller.changes
@@ -1,3 +1,9 @@
+* Fri May 24 2013 Shibata Makoto <shibata@mac.tec.toyota.co.jp> accepted/2.0alpha-wayland/20130520.093314@de73166
+- 0.5.03 release
+- fixed Because there is a problem same as a bug appointed in TIVI-974([WLD]Failed to execute Ico-uxf-weston-plugin test script with error "No testlog directory")
+  Create testlog directory in an examination script.
+  - Appoint that more than ico-uxf-weston-plugin-0.5.03 are necessary for spec file.
+
 * Wed May 22 2013 Shibata Makoto <shibata@mac.tec.toyota.co.jp> accepted/2.0alpha-wayland/20130520.093314@6b69154
 - 0.5.02 release
 - Fix for TIVI-831 - [WLD] Touch event always acted on previous location

diff --git a/packaging/ico-uxf-device-input-controller.spec b/packaging/ico-uxf-device-input-controller.spec
index cdd2c19..4ce0560 100644 (file)
--- a/packaging/ico-uxf-device-input-controller.spec
+++ b/packaging/ico-uxf-device-input-controller.spec
@@ -1,6 +1,6 @@
 Name:       ico-uxf-device-input-controller
 Summary:    Device Input Controller
-Version:    0.5.02
+Version:    0.5.03
 Release:    1.1
 Group:      System/GUI
 License:    Apache License, Version 2.0
@@ -12,9 +12,9 @@ BuildRequires: pkgconfig(wayland-egl)
 BuildRequires: pkgconfig(egl)
 BuildRequires: pkgconfig(glesv2)
 BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: ico-uxf-weston-plugin-devel >= 0.5.0
+BuildRequires: ico-uxf-weston-plugin-devel >= 0.5.03
 Requires: weston >= 1.0
-Requires: ico-uxf-weston-plugin >= 0.5.0
+Requires: ico-uxf-weston-plugin >= 0.5.03
 
 %description
 Device Input Controller for ico-uxf-weston-plugin(Multi Input Manager)

diff --git a/tests/input-controller-test b/tests/input-controller-test
index 218335c..02f745e 100755 (executable)
--- a/tests/input-controller-test
+++ b/tests/input-controller-test
@@ -5,7 +5,8 @@
 #        Remark: This examination premises that Weston does not run.
 
 # 1 Delete log file
-rm -fr ../tests/testlog/*
+rm -fr ../tests/testlog
+mkdir ../tests/testlog
 
 # 2 Start Pseudo event device (for Touch Panel and Jyostick)
 ../tests/test-send_event -device=ico_test_touch -d -mq=55551 2> ../tests/testlog/event_log_touch.log &

diff --git a/tests/test-homescreen.c b/tests/test-homescreen.c
index 9b7fc68..8754ac4 100644 (file)
--- a/tests/test-homescreen.c
+++ b/tests/test-homescreen.c
@@ -1016,28 +1016,26 @@ raise_surface(struct display *display, char *buf, const int raise)
 }
 
 static void
-transition_surface(struct display *display, char *buf)
+animation_surface(struct display *display, char *buf)
 {
     char    *args[10];
     int     narg;
     int     surfaceid;
-    int     transition;
 
     narg = pars_command(buf, args, 10);
     if (narg >= 2)  {
         surfaceid = search_surface(display, args[0]);
-        transition = strtol(args[1], (char **)0, 0);
-        if ((surfaceid >= 0) && (transition >=0))   {
-            print_log("HOMESCREEN: transition(%s,%08x,%d)", args[0], surfaceid, transition);
-            ico_window_mgr_set_transition(display->ico_window_mgr, surfaceid, transition);
+        if (surfaceid >= 0) {
+            print_log("HOMESCREEN: animation(%s,%08x,%s)", args[0], surfaceid, args[1]);
+            ico_window_mgr_set_animation(display->ico_window_mgr, surfaceid, args[1]);
         }
         else    {
-            print_log("HOMESCREEN: Unknown surface(%s) at transition command", args[0]);
+            print_log("HOMESCREEN: Unknown surface(%s) at animation command", args[0]);
         }
     }
     else    {
-        print_log("HOMESCREEN: transition command"
-                  "[transition appid transition] has no argument");
+        print_log("HOMESCREEN: animation command"
+                  "[animation appid animation] has no argument");
     }
 }
 
@@ -1406,9 +1404,9 @@ int main(int argc, char *argv[])
             /* Raise/Lower surface window   */
             raise_surface(display, &buf[5], 0);
         }
-        else if (strncasecmp(buf, "transition", 10) == 0) {
-            /* Set transition surface window*/
-            transition_surface(display, &buf[10]);
+        else if (strncasecmp(buf, "animation", 9) == 0) {
+            /* Set animation surface window*/
+            animation_surface(display, &buf[10]);
         }
         else if (strncasecmp(buf, "input_add", 9) == 0) {
             /* Set input switch to application */