iu: Fix unittest fail issue

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

diff --git a/tests/iu/mmi_iu_feed_input_event_unittests.cpp b/tests/iu/mmi_iu_feed_input_event_unittests.cpp
index 8a23b74..42d9905 100644 (file)
--- a/tests/iu/mmi_iu_feed_input_event_unittests.cpp
+++ b/tests/iu/mmi_iu_feed_input_event_unittests.cpp
@@ -31,6 +31,7 @@
 #include <glib.h>
 #include <string>
 #include <json-glib/json-glib.h>
+#include <Ecore.h>
 
 using namespace std;
 
@@ -82,6 +83,13 @@ cleanup:
 class IUClientFeedInputEventTest : public testing::Test {
     public:
         virtual void SetUp() {
+            ecore_init();
+
+            MMI_PROVIDER_EVENT_KEY = ecore_event_type_new();
+            MMI_PROVIDER_EVENT_GESTURE = ecore_event_type_new();
+            MMI_PROVIDER_EVENT_VOICE = ecore_event_type_new();
+            MMI_PROVIDER_EVENT_VISION = ecore_event_type_new();
+
             int ret = mmi_iu_init();
             EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
 
@@ -92,6 +100,13 @@ class IUClientFeedInputEventTest : public testing::Test {
         }
         virtual void TearDown() {
             mmi_iu_shutdown();
+
+            MMI_PROVIDER_EVENT_KEY = -1;
+            MMI_PROVIDER_EVENT_GESTURE = -1;
+            MMI_PROVIDER_EVENT_VOICE = -1;
+            MMI_PROVIDER_EVENT_VISION = -1;
+
+            ecore_shutdown();
         }
     private:
 
@@ -110,23 +125,12 @@ int feed_input_event_test(mmi_state app_state, int type, void *event)
     return ret;
 }
 
-TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_input_event_keyinput_press_mic_button)
-{
-    mmi_provider_event_key key_event;
-    key_event.type = MMI_EVENT_KEY_TYPE_DOWN;
-    key_event.keycode = MMI_EVENT_KEYEVENT_MIC;
-
-    int ret = feed_input_event_test(MMI_STATE_INITIATION, MMI_PROVIDER_EVENT_KEY, &key_event);
-    EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
-
-    EXPECT_STREQ(output_action.c_str(), "WakeUp");
-}
-
 TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_key_input_press_up)
 {
     mmi_provider_event_key key_event;
-    key_event.type = MMI_EVENT_KEY_TYPE_DOWN;
+    key_event.type = MMI_PROVIDER_EVENT_KEY;
     key_event.keycode = XKB_KEY_Up;
+    key_event.keyname = (char *)"UP";
 
     int ret = feed_input_event_test(MMI_STATE_EXPLORATION, MMI_PROVIDER_EVENT_KEY, &key_event);
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
@@ -137,8 +141,9 @@ TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_key_input_press_up)
 TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_key_input_press_down)
 {
     mmi_provider_event_key key_event;
-    key_event.type = MMI_EVENT_KEY_TYPE_DOWN;
+    key_event.type = MMI_PROVIDER_EVENT_KEY;
     key_event.keycode = XKB_KEY_Down;
+    key_event.keyname = (char *)"DOWN";
 
     int ret = feed_input_event_test(MMI_STATE_EXPLORATION, MMI_PROVIDER_EVENT_KEY, &key_event);
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
@@ -149,8 +154,9 @@ TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_key_input_press_down)
 TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_key_input_press_right)
 {
     mmi_provider_event_key key_event;
-    key_event.type = MMI_EVENT_KEY_TYPE_DOWN;
+    key_event.type = MMI_PROVIDER_EVENT_KEY;
     key_event.keycode = XKB_KEY_Right;
+    key_event.keyname = (char *)"RIGHT";
 
     int ret = feed_input_event_test(MMI_STATE_EXPLORATION, MMI_PROVIDER_EVENT_KEY, &key_event);
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
@@ -161,8 +167,9 @@ TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_key_input_press_right)
 TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_key_input_press_left)
 {
     mmi_provider_event_key key_event;
-    key_event.type = MMI_EVENT_KEY_TYPE_DOWN;
+    key_event.type = MMI_PROVIDER_EVENT_KEY;
     key_event.keycode = XKB_KEY_Left;
+    key_event.keyname = (char *)"LEFT";
 
     int ret = feed_input_event_test(MMI_STATE_EXPLORATION, MMI_PROVIDER_EVENT_KEY, &key_event);
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
@@ -261,8 +268,9 @@ TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_gesture_hand_left)
 TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_key_press_ok)
 {
     mmi_provider_event_key key_event;
-    key_event.type = MMI_EVENT_KEY_TYPE_DOWN;
+    key_event.type = MMI_PROVIDER_EVENT_KEY;
     key_event.keycode = XKB_KEY_Return;
+    key_event.keyname = (char *)"RETURN";
 
     int ret = feed_input_event_test(MMI_STATE_EXECUTION, MMI_PROVIDER_EVENT_KEY, &key_event);
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
@@ -317,8 +325,9 @@ TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_gesture_hand_push)
 TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_key_back_button)
 {
     mmi_provider_event_key key_event;
-    key_event.type = MMI_EVENT_KEY_TYPE_DOWN;
+    key_event.type = MMI_PROVIDER_EVENT_KEY;
     key_event.keycode = XKB_KEY_XF86Back;
+    key_event.keyname = (char *)"XF86Back";
 
     int ret = feed_input_event_test(MMI_STATE_FEEDBACK, MMI_PROVIDER_EVENT_KEY, &key_event);
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
@@ -373,8 +382,9 @@ TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_vision_outofvision)
 TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_intent_key_back_terminate)
 {
     mmi_provider_event_key key_event;
-    key_event.type = MMI_EVENT_KEY_TYPE_DOWN;
+    key_event.type = MMI_PROVIDER_EVENT_KEY;
     key_event.keycode = XKB_KEY_XF86Back;
+    key_event.keyname = (char *)"XF86Back";
 
     int ret = feed_input_event_test(MMI_STATE_TERMINATION, MMI_PROVIDER_EVENT_KEY, &key_event);
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);

diff --git a/tests/iu/mmi_iu_noinit_unittests.cpp b/tests/iu/mmi_iu_noinit_unittests.cpp
index 24dfa7b..95be8b9 100644 (file)
--- a/tests/iu/mmi_iu_noinit_unittests.cpp
+++ b/tests/iu/mmi_iu_noinit_unittests.cpp
@@ -80,10 +80,10 @@ TEST_F(IUClientNoInitTest, utc_mmi_iu_feed_intent_no_init)
 TEST_F(IUClientNoInitTest, utc_mmi_iu_feed_input_event_no_init)
 {
     mmi_provider_event_key key_event;
-    key_event.type = MMI_EVENT_KEY_TYPE_DOWN;
+    key_event.type = MMI_PROVIDER_EVENT_KEY;
     key_event.keycode = MMI_EVENT_KEYEVENT_MIC;
 
-    int ret = mmi_iu_feed_input_event(TEST_APP_ID, MMI_EVENT_KEY_TYPE_DOWN, &key_event);
+    int ret = mmi_iu_feed_input_event(TEST_APP_ID, MMI_PROVIDER_EVENT_KEY, &key_event);
     EXPECT_EQ(ret, MMI_IU_ERROR_NOT_INITIALIZED);
 }