9_input: add a check for result of waitEvent() to ensure that event is received

Change-Id: Ib835c35d85ef1916a30c868b99fe81a229dfb4a6

diff --git a/src/testcase/0009_input.cpp b/src/testcase/0009_input.cpp
index 3c34e1d1217ea8faa3c2833096b5721c665deadb..a5d62da6bfd02c39a7476b8cf97b3a5d7ca00174 100644 (file)
--- a/src/testcase/0009_input.cpp
+++ b/src/testcase/0009_input.cpp
@@ -1086,8 +1086,7 @@ TEST_F(etTestInput, pointer_event_robustness)
 
    ret = inputgen_h->generatePointerMove(1, 50, 50);
    ASSERT_TRUE(ret);
-   ev_result = etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
-   ASSERT_NE(ev_result, nullptr);
+   ASSERT_EVENT(tw, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
 
    etRunner::get().ev.mouse.buttons = 1;
    etRunner::get().ev.mouse.x = 100;
@@ -1096,13 +1095,11 @@ TEST_F(etTestInput, pointer_event_robustness)
    inputgen_h->generatePointerMove(1, 100, 100);
    ret = inputgen_h->generatePointerDown(1, 100, 100);
    ASSERT_TRUE(ret);
-   ev_result = etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
-   ASSERT_NE(ev_result, nullptr);
+   ASSERT_EVENT(tw, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
 
    ret = inputgen_h->generatePointerUp(1, 100, 100);
    ASSERT_TRUE(ret);
-   ev_result = etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
-   ASSERT_NE(ev_result, nullptr);
+   ASSERT_EVENT(tw, E_TC_EVENT_TYPE_INPUT_ECORE_MOUSE);
    etRunner::get().ev.elm_win = NULL;
 
    ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
@@ -2049,6 +2046,7 @@ TEST_F(etTestInput, gesture_tap22)
    etRunner::get().generateTapGesture(inputgen_h);
    ev_result = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_GESTURE_TAP);
    ASSERT_NE(ev_result, nullptr);
+   ASSERT_TRUE(ev_result->result);
 
    etRunner::get().ev.gesture.tap.fingers = 0;
    etRunner::get().ev.gesture.tap.repeats = 0;
@@ -2084,6 +2082,7 @@ TEST_F(etTestInput, gesture_tap23)
    etRunner::get().generateTapGesture(inputgen_h);
    ev_result = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_GESTURE_TAP);
    ASSERT_NE(ev_result, nullptr);
+   ASSERT_TRUE(ev_result->result);
 
    etRunner::get().ev.gesture.tap.fingers = 0;
    etRunner::get().ev.gesture.tap.repeats = 0;
@@ -2123,6 +2122,7 @@ etTestInput::test_gesture_edge_swipe(int fingers, efl_util_gesture_edge_e edge,
    etRunner::get().generateEdgeSwipeGesture(inputgen_h);
    ev_result = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_GESTURE_EDGE_SWIPE);
    ASSERT_NE(ev_result, nullptr);
+   ASSERT_TRUE(ev_result->result);
 
    etRunner::get().ev.gesture.edge.fingers = 0;
    etRunner::get().ev.gesture.edge.edge = EFL_UTIL_GESTURE_EDGE_NONE;;
@@ -2194,28 +2194,28 @@ TEST_F(etTestInput, gesture_edge_swipe24)
    ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
-TEST_F(etTestInput, gesture_edge_swipe31)
+TEST_F(etTestInput, gesture_edge_swipe11_shared)
 {
    test_gesture_edge_swipe(1, EFL_UTIL_GESTURE_EDGE_TOP, true);
 
    ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
-TEST_F(etTestInput, gesture_edge_swipe32)
+TEST_F(etTestInput, gesture_edge_swipe12_shared)
 {
    test_gesture_edge_swipe(1, EFL_UTIL_GESTURE_EDGE_RIGHT, true);
 
    ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
-TEST_F(etTestInput, gesture_edge_swipe33)
+TEST_F(etTestInput, gesture_edge_swipe13_shared)
 {
    test_gesture_edge_swipe(1, EFL_UTIL_GESTURE_EDGE_BOTTOM, true);
 
    ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
-TEST_F(etTestInput, gesture_edge_swipe34)
+TEST_F(etTestInput, gesture_edge_swipe14_shared)
 {
    test_gesture_edge_swipe(1, EFL_UTIL_GESTURE_EDGE_LEFT, true);
 
@@ -2246,6 +2246,7 @@ etTestInput::test_gesture_edge_drag(int fingers, efl_util_gesture_edge_e edge, b
    etRunner::get().generateEdgeDragGesture(inputgen_h);
    ev_result = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_GESTURE_EDGE_DRAG);
    ASSERT_NE(ev_result, nullptr);
+   ASSERT_TRUE(ev_result->result);
 
    etRunner::get().ev.gesture.edge.fingers = 0;
    etRunner::get().ev.gesture.edge.edge = EFL_UTIL_GESTURE_EDGE_NONE;;
@@ -2315,28 +2316,28 @@ TEST_F(etTestInput, gesture_edge_drag24)
    ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
-TEST_F(etTestInput, gesture_edge_drag31)
+TEST_F(etTestInput, gesture_edge_drag11_shared)
 {
    test_gesture_edge_drag(1, EFL_UTIL_GESTURE_EDGE_TOP, true);
 
    ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
-TEST_F(etTestInput, gesture_edge_drag32)
+TEST_F(etTestInput, gesture_edge_drag12_shared)
 {
    test_gesture_edge_drag(1, EFL_UTIL_GESTURE_EDGE_RIGHT, true);
 
    ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
-TEST_F(etTestInput, gesture_edge_drag33)
+TEST_F(etTestInput, gesture_edge_drag13_shared)
 {
    test_gesture_edge_drag(1, EFL_UTIL_GESTURE_EDGE_BOTTOM, true);
 
    ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
-TEST_F(etTestInput, gesture_edge_drag34)
+TEST_F(etTestInput, gesture_edge_drag14_shared)
 {
    test_gesture_edge_drag(1, EFL_UTIL_GESTURE_EDGE_LEFT, true);