0009_input: Subdivide the type of mouse event

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

diff --git a/src/e_test_event.cpp b/src/e_test_event.cpp
index 7cb5aa37d948e0e87bd03febcd5ed8f78cfdd7ac..2df28873f8eab243fb8d1d6a3697f2f204f8c714 100644 (file)
--- a/src/e_test_event.cpp
+++ b/src/e_test_event.cpp
@@ -1468,7 +1468,9 @@ etRunner::waitEvent(etWin *win, E_TC_Event_Type ev_type)
 
    // pre-waiting events
    if ((ev_type == E_TC_EVENT_TYPE_INPUT_ECORE_KEY) ||
-       (ev_type == E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE) ||
+       (ev_type == E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_DOWN) ||
+       (ev_type == E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_UP) ||
+       (ev_type == E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_MOVE) ||
        (ev_type == E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_RELATIVE_MOVE))
      {
         Ecore_Window ew = elm_win_window_id_get(win?win->elm_win:0);
@@ -1510,7 +1512,9 @@ etRunner::waitEvent(etWin *win, E_TC_Event_Type ev_type)
              return recv_item;
           }
         else if ((ev_type == E_TC_EVENT_TYPE_INPUT_ECORE_KEY) ||
-                 (ev_type == E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE) ||
+                 (ev_type == E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_DOWN) ||
+                 (ev_type == E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_UP) ||
+                 (ev_type == E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_MOVE) ||
                  (ev_type == E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_RELATIVE_MOVE))
           {
              Ecore_Window ew = elm_win_window_id_get(win?win->elm_win:0);
@@ -2620,7 +2624,7 @@ _cb_ecore_mouse_button_down(void *data, int type, void *event)
               {
                  DBG("Mouse button DOWN cb. insert event ev->window:%d", ev->window);
                  runner->ev.mouse.ecore_state = EINA_TRUE;
-                 runner->insertEventQueue(ev->window, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
+                 runner->insertEventQueue(ev->window, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_DOWN);
               }
             else
               ERR("[Error] Ecore Mouse button DOWN cb. device info is empty");
@@ -2651,7 +2655,7 @@ _cb_ecore_mouse_button_up(void *data, int type, void *event)
                {
                   DBG("Mouse button UP cb. insert event ev->window:%d", ev->window);
                   runner->ev.mouse.ecore_state = EINA_FALSE;
-                  runner->insertEventQueue(ev->window, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
+                  runner->insertEventQueue(ev->window, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_UP);
                }
              else
                ERR("[Error] Ecore Mouse button UP cb. device info is empty");
@@ -2676,7 +2680,7 @@ _cb_ecore_mouse_move(void *data, int type, void *event)
              if (checkEcoreDeviceInfo(ev->dev))
                {
                   DBG("Mouse MOVE cb. insert event ev->window:%d", ev->window);
-                  runner->insertEventQueue(ev->window, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
+                  runner->insertEventQueue(ev->window, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_MOVE);
                }
              else
                ERR("[Error] Ecore Mouse MOVE cb. device info is empty");

diff --git a/src/e_test_util.h b/src/e_test_util.h
index 5a9a636793140b716de9698dba66da56a8c480ea..41ca9efd4ac550ceefaa88fa6853b6b41bfe6be4 100644 (file)
--- a/src/e_test_util.h
+++ b/src/e_test_util.h
@@ -87,7 +87,9 @@ typedef enum _E_TC_Event_Type
    E_TC_EVENT_TYPE_WINDOW_ROTATION_CHANGE,
    E_TC_EVENT_TYPE_FOCUS_CHANGED,
    E_TC_EVENT_TYPE_INPUT_ECORE_KEY,
-   E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE,
+   E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_DOWN,
+   E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_UP,
+   E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_MOVE,
    E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_RELATIVE_MOVE,
    E_TC_EVENT_TYPE_INPUT_EVAS_KEY,
    E_TC_EVENT_TYPE_INPUT_EVAS_MOUSE_IN,

diff --git a/src/testcase/0009_input.cpp b/src/testcase/0009_input.cpp
index a5d62da6bfd02c39a7476b8cf97b3a5d7ca00174..f508676507c37f3415ab018da3af45cf599728c6 100644 (file)
--- a/src/testcase/0009_input.cpp
+++ b/src/testcase/0009_input.cpp
@@ -1086,7 +1086,7 @@ TEST_F(etTestInput, pointer_event_robustness)
 
    ret = inputgen_h->generatePointerMove(1, 50, 50);
    ASSERT_TRUE(ret);
-   ASSERT_EVENT(tw, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
+   ASSERT_EVENT(tw, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_MOVE);
 
    etRunner::get().ev.mouse.buttons = 1;
    etRunner::get().ev.mouse.x = 100;
@@ -1095,11 +1095,11 @@ TEST_F(etTestInput, pointer_event_robustness)
    inputgen_h->generatePointerMove(1, 100, 100);
    ret = inputgen_h->generatePointerDown(1, 100, 100);
    ASSERT_TRUE(ret);
-   ASSERT_EVENT(tw, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
+   ASSERT_EVENT(tw, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_DOWN);
 
    ret = inputgen_h->generatePointerUp(1, 100, 100);
    ASSERT_TRUE(ret);
-   ASSERT_EVENT(tw, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
+   ASSERT_EVENT(tw, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_UP);
    etRunner::get().ev.elm_win = NULL;
 
    ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
@@ -1230,7 +1230,7 @@ TEST_F(etTestInput, pointer_constraints_lock_pointer)
    etRunner::get().feedLowLevelMouseMove(1, 1);
 
    // After unlocking pointer, mouse event should be processed as normal mouse move.
-   ev_result = etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
+   ev_result = etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_MOVE);
    ASSERT_NE(ev_result, nullptr);
 
    ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
@@ -1916,7 +1916,7 @@ TEST_F(etTestInput, pointer_down_and_move)
 
    ret = inputgen_h->generatePointerDown(1, 50, 50);
    ASSERT_TRUE(ret);
-   ASSERT_EVENT(tw_small, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
+   ASSERT_EVENT(tw_small, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_DOWN);
 
    etRunner::get().ev.mouse.buttons = 1;
    etRunner::get().ev.mouse.x = 400;
@@ -1928,7 +1928,7 @@ TEST_F(etTestInput, pointer_down_and_move)
    ASSERT_TRUE(ret);
    // Even if mouse up position is on the tw_big window, an event occurs on the tw_small window
    // because mouse events are grabbed to tw_small window after mouse down position is on it.
-   ASSERT_EVENT(tw_small, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
+   ASSERT_EVENT(tw_small, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_UP);
 
    etRunner::get().ev.elm_win = NULL;
 
@@ -1958,7 +1958,7 @@ TEST_F(etTestInput, touch_down_and_move)
 
    ret = inputgen_h->generateTouchDown(0, 50, 50);
    ASSERT_TRUE(ret);
-   ASSERT_EVENT(tw_small, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
+   ASSERT_EVENT(tw_small, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_DOWN);
 
    etRunner::get().ev.mouse.buttons = 1;
    etRunner::get().ev.mouse.x = 400;
@@ -1970,7 +1970,7 @@ TEST_F(etTestInput, touch_down_and_move)
    ASSERT_TRUE(ret);
    // Even if mouse up position is on the tw_big window, an event occurs on the tw_small window
    // because mouse events are grabbed to tw_small window after mouse down position is on it.
-   ASSERT_EVENT(tw_small, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
+   ASSERT_EVENT(tw_small, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_UP);
 
    etRunner::get().ev.elm_win = NULL;
 
@@ -2000,7 +2000,7 @@ TEST_F(etTestInput, touch_multi_down)
 
    ret = inputgen_h->generateTouchDown(0, 50, 50);
    ASSERT_TRUE(ret);
-   ASSERT_EVENT(tw_small, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
+   ASSERT_EVENT(tw_small, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_DOWN);
 
    etRunner::get().ev.mouse.multi_device = 1;
    etRunner::get().ev.mouse.x = 200;
@@ -2010,18 +2010,18 @@ TEST_F(etTestInput, touch_multi_down)
    // because mouse events are grabbed to tw_small window after the first mouse down position is on it.
    ret = inputgen_h->generateTouchDown(1, 200, 200);
    ASSERT_TRUE(ret);
-   ASSERT_EVENT(tw_small, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
+   ASSERT_EVENT(tw_small, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_DOWN);
 
    ret = inputgen_h->generateTouchUp(1, 200, 200);
    ASSERT_TRUE(ret);
-   ASSERT_EVENT(tw_small, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
+   ASSERT_EVENT(tw_small, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_UP);
 
    etRunner::get().ev.mouse.multi_device = 0;
    etRunner::get().ev.mouse.x = 50;
    etRunner::get().ev.mouse.y = 50;
    ret = inputgen_h->generateTouchUp(0, 50, 50);
    ASSERT_TRUE(ret);
-   ASSERT_EVENT(tw_small, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
+   ASSERT_EVENT(tw_small, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_UP);
 
    ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }

diff --git a/src/testcase/0021_output_resolution.cpp b/src/testcase/0021_output_resolution.cpp
index 897a3cffde096da2d3c99c67522105dccced3a83..ac57c835515cfe7fc8a12ac98e889b678637028f 100644 (file)
--- a/src/testcase/0021_output_resolution.cpp
+++ b/src/testcase/0021_output_resolution.cpp
@@ -167,7 +167,7 @@ TEST_F(etTestOutputResolution, basic_robustness)
 
    ret = inputgen_h->generatePointerMove(1, pos_x, pos_y);
    ASSERT_TRUE(ret);
-   ev_result = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
+   ev_result = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_MOVE);
    ASSERT_NE(ev_result, nullptr);
 
    res = etRunner::get().unsetConfiguredOutputResolution();
@@ -215,7 +215,7 @@ TEST_F(etTestOutputResolution, base_output_resolution_basic_robustness)
 
    ret = inputgen_h->generatePointerMove(1, pos_x, pos_y);
    ASSERT_TRUE(ret);
-   ev_result = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
+   ev_result = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE_MOVE);
    ASSERT_NE(ev_result, nullptr);
 
    res = etRunner::get().unsetBaseOutputResolution(getpid());