From: Junseok, Kim Date: Tue, 27 Apr 2021 13:07:55 +0000 (+0900) Subject: Tests: Use macro function for test events. X-Git-Tag: accepted/tizen/unified/20210428.092154~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=03e0eab5b5053b514ae7a013fe818df1f8c6955c;p=platform%2Fcore%2Fuifw%2Fe-tizen-testcase.git Tests: Use macro function for test events. Use macro function for test events. And fixed some wrong check events. Change-Id: I15c06f82194c8ad2f37c28d32fea85659a04c098 --- diff --git a/src/testcase/0002_base_operation.cpp b/src/testcase/0002_base_operation.cpp index c1dad73..c5dcd27 100644 --- a/src/testcase/0002_base_operation.cpp +++ b/src/testcase/0002_base_operation.cpp @@ -28,7 +28,7 @@ TEST_F(etTestBaseOperation, win_show) initTC(EINA_FALSE); ASSERT_TRUE(showTCWin(tw)) << "failed to show window"; - etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw); } TEST_F(etTestBaseOperation, win_stack) @@ -40,7 +40,7 @@ TEST_F(etTestBaseOperation, win_stack) initTC(EINA_FALSE); ASSERT_TRUE(showTCWin(tw)) << "failed to show window"; - etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw); list = etRunner::get().getWinInfoList(); ASSERT_TRUE(list != NULL); @@ -65,7 +65,7 @@ TEST_F(etTestBaseOperation, alpha_win_show) initTC(EINA_TRUE); ASSERT_TRUE(showTCWin(tw)) << "failed to show window"; - etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw); } TEST_F(etTestBaseOperation, alpha_win_stack) @@ -77,7 +77,7 @@ TEST_F(etTestBaseOperation, alpha_win_stack) initTC(EINA_TRUE); ASSERT_TRUE(showTCWin(tw)) << "failed to show window"; - etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw); list = etRunner::get().getWinInfoList(); ASSERT_TRUE(list != NULL); diff --git a/src/testcase/0003_base_operation_multi_wins.cpp b/src/testcase/0003_base_operation_multi_wins.cpp index 0abba70..4a59a58 100644 --- a/src/testcase/0003_base_operation_multi_wins.cpp +++ b/src/testcase/0003_base_operation_multi_wins.cpp @@ -23,7 +23,7 @@ etTestBaseMulti::initTC(Eina_Bool show_win, Eina_Bool usr_geom) if (show_win) { showTCWin(tw_red); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_VIS_ON(tw_red); } tw_green = initNormalWin("TCWin_Normal_green", usr_geom); @@ -31,7 +31,7 @@ etTestBaseMulti::initTC(Eina_Bool show_win, Eina_Bool usr_geom) if (show_win) { showTCWin(tw_green); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_VIS_ON(tw_green); } tw_blue = initNormalWin("TCWin_Normal_blue", usr_geom); @@ -39,7 +39,7 @@ etTestBaseMulti::initTC(Eina_Bool show_win, Eina_Bool usr_geom) if (show_win) { showTCWin(tw_blue); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_VIS_ON(tw_blue); } } @@ -100,17 +100,17 @@ TEST_F(etTestBaseMulti, multi_all_wins_show1) // show red res = showTCWin(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_red); // show blue res = showTCWin(tw_blue); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blue); // show green res = showTCWin(tw_green); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_green); // Expected stack res: // [Top] Green -> Blue -> Red [Bottom] @@ -160,17 +160,17 @@ TEST_F(etTestBaseMulti, multi_all_wins_show2) // show blue res = showTCWin(tw_blue); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blue); // show red res = showTCWin(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_red); // show green res = showTCWin(tw_green); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_green); // Expected stack res: // [Top] Green -> Red -> Blue [Bottom] @@ -220,17 +220,17 @@ TEST_F(etTestBaseMulti, multi_all_wins_show3) // show green res = showTCWin(tw_green); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_green); // show blue res = showTCWin(tw_blue); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blue); // show red res = showTCWin(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_red); // Expected stack res: // [Top] Red -> Blue -> Green [Bottom] @@ -278,8 +278,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_raise1) // Raise Red etRunner::get().setWinStack(tw_red, NULL, EINA_TRUE); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_STACK_RAISE); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_RAISE); // Expected stack res: // [Top] Red -> Blue -> Green [Bottom] @@ -327,7 +326,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_raise2) // Raise Green etRunner::get().setWinStack(tw_green, NULL, EINA_TRUE); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_green, E_TC_EVENT_TYPE_STACK_RAISE); // Expected stack res: // [Top] Green-> Blue -> Red [Bottom] @@ -375,7 +374,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_stack_above1) // Raise Red on the Green etRunner::get().setWinStack(tw_red, tw_green, EINA_TRUE); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_STACK_ABOVE); + ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_ABOVE); // Expected stack res: // [Top] Blue -> Red -> Green [Bottom] @@ -423,7 +422,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_stack_above2) // Raise Blue on the Red etRunner::get().setWinStack(tw_blue, tw_red, EINA_TRUE); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_STACK_ABOVE); + ASSERT_EVENT(tw_blue, E_TC_EVENT_TYPE_STACK_ABOVE); // Expected stack res: // [Top] Green-> Blue -> Red [Bottom] @@ -471,7 +470,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_stack_above3) // Raise Red on the Blue etRunner::get().setWinStack(tw_red, tw_blue, EINA_TRUE); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_STACK_ABOVE); + ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_ABOVE); // Expected stack res: // [Top] Green-> Blue -> Red [Bottom] @@ -519,7 +518,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_lower1) // Lower Blue etRunner::get().setWinStack(tw_blue, NULL, EINA_FALSE); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_STACK_LOWER); + ASSERT_EVENT(tw_blue, E_TC_EVENT_TYPE_STACK_LOWER); // Expected stack res: // [Top] Green -> Red -> ... -> Blue [Bottom] @@ -583,7 +582,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_lower2) // Lower Green etRunner::get().setWinStack(tw_green, NULL, EINA_FALSE); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_STACK_LOWER); + ASSERT_EVENT(tw_green, E_TC_EVENT_TYPE_STACK_LOWER); // Expected stack res: // [Top] Blue -> Red -> ... -> Green [Bottom] @@ -693,17 +692,17 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_show1) // show red res = showTCWin(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_red); // show blue res = showTCWin(tw_blue); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blue); // show green res = showTCWin(tw_green); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_green); // Expected stack res: // [Top] Green -> Blue -> Red [Bottom] @@ -753,17 +752,17 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_show2) // show blue res = showTCWin(tw_blue); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blue); // show red res = showTCWin(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_red); // show green res = showTCWin(tw_green); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_green); // Expected stack res: // [Top] Green -> Red -> Blue [Bottom] @@ -813,17 +812,17 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_show3) // show green res = showTCWin(tw_green); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_green); // show blue res = showTCWin(tw_blue); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blue); // show red res = showTCWin(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_red); // Expected stack res: // [Top] Red -> Blue -> Green [Bottom] @@ -871,7 +870,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_raise1) // Raise Red etRunner::get().setWinStack(tw_red, NULL, EINA_TRUE); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_RAISE); // Expected stack res: // [Top] Red -> Blue -> Green [Bottom] @@ -919,7 +918,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_raise2) // Raise Green etRunner::get().setWinStack(tw_green, NULL, EINA_TRUE); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_green, E_TC_EVENT_TYPE_STACK_RAISE); // Expected stack res: // [Top] Green-> Blue -> Red [Bottom] @@ -967,7 +966,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_stack_above1) // Raise Red on the Green etRunner::get().setWinStack(tw_red, tw_green, EINA_TRUE); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_STACK_ABOVE); + ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_ABOVE); // Expected stack res: // [Top] Blue -> Red -> Green [Bottom] @@ -1015,7 +1014,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_stack_above2) // Raise Blue on the Red etRunner::get().setWinStack(tw_blue, tw_red, EINA_TRUE); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_STACK_ABOVE); + ASSERT_EVENT(tw_blue, E_TC_EVENT_TYPE_STACK_ABOVE); // Expected stack res: // [Top] Green-> Blue -> Red [Bottom] @@ -1063,7 +1062,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_stack_above3) // Raise Red on the Blue etRunner::get().setWinStack(tw_red, tw_blue, EINA_TRUE); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_STACK_ABOVE); + ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_ABOVE); // Expected stack res: // [Top] Green-> Blue -> Red [Bottom] @@ -1111,7 +1110,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_lower1) // Lower Blue etRunner::get().setWinStack(tw_blue, NULL, EINA_FALSE); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_STACK_LOWER); + ASSERT_EVENT(tw_blue, E_TC_EVENT_TYPE_STACK_LOWER); // Expected stack res: // [Top] Green -> Red -> ... -> Blue [Bottom] @@ -1175,7 +1174,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_lower2) // Lower Green etRunner::get().setWinStack(tw_green, NULL, EINA_FALSE); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_STACK_LOWER); + ASSERT_EVENT(tw_green, E_TC_EVENT_TYPE_STACK_LOWER); // Expected stack res: // [Top] Blue -> Red -> ... -> Green [Bottom] @@ -1241,7 +1240,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_lower_activate) evas_object_lower(tw_blue->elm_win); // Activate Blue immediately etRunner::get().setWinActivate(tw_blue); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_STACK_RAISE); + etRunner::get().work(0.1); // wait for activate done. It does not change stack. // Expected stack res: // [Top] Blue -> Green -> Red [Bottom] @@ -1291,12 +1290,12 @@ TEST_F(etTestBaseMulti, multi_2wins_show1) // show green res = showTCWin(tw_green); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_green); // show red res = showTCWin(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_red); // Expected stack res: // [Top] Red -> Green [Bottom] @@ -1340,12 +1339,12 @@ TEST_F(etTestBaseMulti, multi_2wins_show2) // show blue res = showTCWin(tw_blue); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blue); // show green res = showTCWin(tw_green); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_green); // Expected stack res: // [Top] Green -> Blue [Bottom] @@ -1389,12 +1388,12 @@ TEST_F(etTestBaseMulti, multi_2wins_show3) // show red res = showTCWin(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_red); // show blue res = showTCWin(tw_blue); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blue); // Expected stack res: // [Top] Blue -> Red [Bottom] @@ -1438,12 +1437,12 @@ TEST_F(etTestBaseMulti, multi_full_2wins_show1) // show green res = showTCWin(tw_green); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_green); // show red res = showTCWin(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_red); // Expected stack res: // [Top] Red -> Green [Bottom] @@ -1487,12 +1486,12 @@ TEST_F(etTestBaseMulti, multi_full_2wins_show2) // show blue res = showTCWin(tw_blue); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blue); // show green res = showTCWin(tw_green); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_green); // Expected stack res: // [Top] Green -> Blue [Bottom] @@ -1536,12 +1535,12 @@ TEST_F(etTestBaseMulti, multi_full_2wins_show3) // show red res = showTCWin(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_red); // show blue res = showTCWin(tw_blue); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blue); // Expected stack res: // [Top] Blue -> Red [Bottom] diff --git a/src/testcase/0004_transient_for.cpp b/src/testcase/0004_transient_for.cpp index 2f6a8e9..ed44866 100644 --- a/src/testcase/0004_transient_for.cpp +++ b/src/testcase/0004_transient_for.cpp @@ -22,7 +22,7 @@ etTestTransientFor::initTC(Eina_Bool show_win, Eina_Bool usr_geom) if (show_win) { showTCWin(tw_parent); - etRunner::get().waitEvent(tw_parent, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_VIS_ON(tw_parent); } ASSERT_TRUE(tw_parent != NULL) << "failed to initiation window"; @@ -30,7 +30,7 @@ etTestTransientFor::initTC(Eina_Bool show_win, Eina_Bool usr_geom) if (show_win) { showTCWin(tw_child); - etRunner::get().waitEvent(tw_child, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_VIS_ON(tw_child); } ASSERT_TRUE(tw_child != NULL) << "failed to initiation window"; @@ -38,7 +38,7 @@ etTestTransientFor::initTC(Eina_Bool show_win, Eina_Bool usr_geom) if (show_win) { showTCWin(tw_base); - etRunner::get().waitEvent(tw_base, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_VIS_ON(tw_base); } ASSERT_TRUE(tw_base != NULL) << "failed to initiation window"; } @@ -56,7 +56,7 @@ TEST_F(etTestTransientFor, transient_for_basic) // set transient_for res = etRunner::get().setWinTransientFor(tw_child, tw_parent, EINA_TRUE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_child, E_TC_EVENT_TYPE_STACK_CHANGED); + etRunner::get().work(0.1); // wait for activate done. It does not change stack. // Expected stack res: // [Top] tw_base -> tw_child -> tw_parent [Bottom] @@ -105,12 +105,12 @@ TEST_F(etTestTransientFor, transient_for_raise) // set transient_for res = etRunner::get().setWinTransientFor(tw_child, tw_parent, EINA_TRUE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_parent, E_TC_EVENT_TYPE_STACK_CHANGED); + etRunner::get().work(0.1); // wait for activate done. It does not change stack. // tw_parent raise res = etRunner::get().setWinStack(tw_parent, NULL, EINA_TRUE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_parent, E_TC_EVENT_TYPE_STACK_CHANGED); + ASSERT_EVENT(tw_parent, E_TC_EVENT_TYPE_STACK_RAISE); // Expected stack res: // [Top] tw_child -> tw_parent -> tw_base [Bottom] @@ -160,17 +160,17 @@ TEST_F(etTestTransientFor, transient_for_lower) // set transient_for res = etRunner::get().setWinTransientFor(tw_child, tw_parent, EINA_TRUE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_parent, E_TC_EVENT_TYPE_STACK_RAISE); + etRunner::get().work(0.1); // wait for activate done. It does not change stack. // tw_parent raise for prepare lower res = etRunner::get().setWinStack(tw_parent, NULL, EINA_TRUE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_parent, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_parent, E_TC_EVENT_TYPE_STACK_RAISE); // tw_parent lower res = etRunner::get().setWinStack(tw_parent, NULL, EINA_FALSE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_parent, E_TC_EVENT_TYPE_STACK_LOWER); + ASSERT_EVENT(tw_parent, E_TC_EVENT_TYPE_STACK_LOWER); // Expected stack res: // [Top] tw_base -> ... -> tw_child -> tw_parent [Bottom] @@ -231,12 +231,12 @@ TEST_F(etTestTransientFor, transient_for_above) // set transient_for res = etRunner::get().setWinTransientFor(tw_child, tw_parent, EINA_TRUE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_child, E_TC_EVENT_TYPE_STACK_CHANGED); + etRunner::get().work(0.1); // wait for activate done. It does not change stack. // tw_parent raise for prepare lower res = etRunner::get().setWinStack(tw_parent, tw_base, EINA_TRUE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_parent, E_TC_EVENT_TYPE_STACK_CHANGED); + ASSERT_EVENT(tw_parent, E_TC_EVENT_TYPE_STACK_CHANGED); // Expected stack res: // [Top] tw_child -> tw_parent -> tw_base [Bottom] diff --git a/src/testcase/0005_notification.cpp b/src/testcase/0005_notification.cpp index cc41202..57e5e51 100644 --- a/src/testcase/0005_notification.cpp +++ b/src/testcase/0005_notification.cpp @@ -21,17 +21,17 @@ etTestNotification::initTC(Eina_Bool usr_geom) { tw_normal = initNormalWin("TCWin_Normal_normal", usr_geom); showTCWin(tw_normal); - etRunner::get().waitEvent(tw_normal, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_VIS_ON(tw_normal); ASSERT_TRUE(tw_normal != NULL) << "failed to initiation window"; tw_noti1 = initNotiWin("TCWin_Noti_1", usr_geom, EINA_FALSE); showTCWin(tw_noti1); - etRunner::get().waitEvent(tw_noti1, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_VIS_ON(tw_noti1); ASSERT_TRUE(tw_noti1 != NULL) << "failed to initiation window"; tw_noti2 = initNotiWin("TCWin_Noti_2", usr_geom, EINA_FALSE); showTCWin(tw_noti2); - etRunner::get().waitEvent(tw_noti2, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_VIS_ON(tw_noti2); ASSERT_TRUE(tw_noti2 != NULL) << "failed to initiation window"; } @@ -52,7 +52,7 @@ TEST_F(etTestNotification, notification_level_default) EXPECT_TRUE(res); // TODO:: add ev_wait for notification level - etRunner::get().waitEvent(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); level = etRunner::get().getWinNotiLevel(tw_noti1); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT, level); @@ -115,7 +115,7 @@ TEST_F(etTestNotification, notification_level_medium) EXPECT_TRUE(res); // TODO:: add ev_wait for notification level - etRunner::get().waitEvent(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); level = etRunner::get().getWinNotiLevel(tw_noti1); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_MEDIUM, level); @@ -178,7 +178,7 @@ TEST_F(etTestNotification, notification_level_high) EXPECT_TRUE(res); // TODO:: add ev_wait for notification level - etRunner::get().waitEvent(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); level = etRunner::get().getWinNotiLevel(tw_noti1); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_HIGH, level); @@ -241,7 +241,7 @@ TEST_F(etTestNotification, notification_level_top) EXPECT_TRUE(res); // TODO:: add ev_wait for notification level - etRunner::get().waitEvent(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); level = etRunner::get().getWinNotiLevel(tw_noti1); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_TOP, level); @@ -302,7 +302,8 @@ TEST_F(etTestNotification, notification_level_none) res = etRunner::get().setWinNotiLevel(tw_noti1, EFL_UTIL_NOTIFICATION_LEVEL_HIGH); EXPECT_TRUE(res); - etRunner::get().waitEvent(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); + level = etRunner::get().getWinNotiLevel(tw_noti1); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_HIGH, level); @@ -310,7 +311,8 @@ TEST_F(etTestNotification, notification_level_none) res = etRunner::get().setWinNotiLevel(tw_noti2, EFL_UTIL_NOTIFICATION_LEVEL_TOP); EXPECT_TRUE(res); - etRunner::get().waitEvent(tw_noti2, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_noti2, E_TC_EVENT_TYPE_STACK_RAISE); + level = etRunner::get().getWinNotiLevel(tw_noti2); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_TOP, level); @@ -361,7 +363,7 @@ TEST_F(etTestNotification, notification_level_none) EXPECT_TRUE(res); // TODO:: add ev_wait for notification level - etRunner::get().waitEvent(tw_noti2, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_noti2, E_TC_EVENT_TYPE_STACK_RAISE); level = etRunner::get().getWinNotiLevel(tw_noti2); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_NONE, level); @@ -420,7 +422,8 @@ TEST_F(etTestNotification, notification_level_change) res = etRunner::get().setWinNotiLevel(tw_noti1, EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT); EXPECT_TRUE(res); - etRunner::get().waitEvent(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); + level = etRunner::get().getWinNotiLevel(tw_noti1); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT, level); @@ -428,7 +431,8 @@ TEST_F(etTestNotification, notification_level_change) res = etRunner::get().setWinNotiLevel(tw_noti2, EFL_UTIL_NOTIFICATION_LEVEL_MEDIUM); EXPECT_TRUE(res); - etRunner::get().waitEvent(tw_noti2, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_noti2, E_TC_EVENT_TYPE_STACK_RAISE); + level = etRunner::get().getWinNotiLevel(tw_noti2); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_MEDIUM, level); @@ -477,7 +481,8 @@ TEST_F(etTestNotification, notification_level_change) res = etRunner::get().setWinNotiLevel(tw_noti1, EFL_UTIL_NOTIFICATION_LEVEL_HIGH); EXPECT_TRUE(res); - etRunner::get().waitEvent(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); + level = etRunner::get().getWinNotiLevel(tw_noti1); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_HIGH, level); @@ -526,7 +531,8 @@ TEST_F(etTestNotification, notification_level_change) res = etRunner::get().setWinNotiLevel(tw_noti2, EFL_UTIL_NOTIFICATION_LEVEL_TOP); EXPECT_TRUE(res); - etRunner::get().waitEvent(tw_noti2, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_noti2, E_TC_EVENT_TYPE_STACK_RAISE); + level = etRunner::get().getWinNotiLevel(tw_noti2); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_TOP, level); @@ -588,7 +594,7 @@ TEST_F(etTestNotification, notification_fullsize_level_default) EXPECT_TRUE(res); // TODO:: add ev_wait for notification level - etRunner::get().waitEvent(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); level = etRunner::get().getWinNotiLevel(tw_noti1); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT, level); @@ -651,7 +657,7 @@ TEST_F(etTestNotification, notification_fullsize_level_medium) EXPECT_TRUE(res); // TODO:: add ev_wait for notification level - etRunner::get().waitEvent(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); level = etRunner::get().getWinNotiLevel(tw_noti1); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_MEDIUM, level); @@ -714,7 +720,7 @@ TEST_F(etTestNotification, notification_fullsize_level_high) EXPECT_TRUE(res); // TODO:: add ev_wait for notification level - etRunner::get().waitEvent(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); level = etRunner::get().getWinNotiLevel(tw_noti1); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_HIGH, level); @@ -777,7 +783,7 @@ TEST_F(etTestNotification, notification_fullsize_level_top) EXPECT_TRUE(res); // TODO:: add ev_wait for notification level - etRunner::get().waitEvent(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); level = etRunner::get().getWinNotiLevel(tw_noti1); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_TOP, level); @@ -838,7 +844,8 @@ TEST_F(etTestNotification, notification_fullsize_level_none) res = etRunner::get().setWinNotiLevel(tw_noti1, EFL_UTIL_NOTIFICATION_LEVEL_HIGH); EXPECT_TRUE(res); - etRunner::get().waitEvent(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_noti1, E_TC_EVENT_TYPE_STACK_RAISE); + level = etRunner::get().getWinNotiLevel(tw_noti1); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_HIGH, level); @@ -846,7 +853,8 @@ TEST_F(etTestNotification, notification_fullsize_level_none) res = etRunner::get().setWinNotiLevel(tw_noti2, EFL_UTIL_NOTIFICATION_LEVEL_TOP); EXPECT_TRUE(res); - etRunner::get().waitEvent(tw_noti2, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_noti2, E_TC_EVENT_TYPE_STACK_RAISE); + level = etRunner::get().getWinNotiLevel(tw_noti2); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_TOP, level); @@ -897,7 +905,7 @@ TEST_F(etTestNotification, notification_fullsize_level_none) EXPECT_TRUE(res); // TODO:: add ev_wait for notification level - etRunner::get().waitEvent(tw_noti2, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_noti2, E_TC_EVENT_TYPE_STACK_RAISE); level = etRunner::get().getWinNotiLevel(tw_noti2); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_NONE, level); @@ -956,7 +964,8 @@ TEST_F(etTestNotification, notification_fullsize_level_change) res = etRunner::get().setWinNotiLevel(tw_noti1, EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT); EXPECT_TRUE(res); - etRunner::get().waitEvent(tw_noti1, E_TC_EVENT_TYPE_STACK_ABOVE); + ASSERT_EVENT(tw_noti1, E_TC_EVENT_TYPE_STACK_ABOVE); + level = etRunner::get().getWinNotiLevel(tw_noti1); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT, level); @@ -964,7 +973,8 @@ TEST_F(etTestNotification, notification_fullsize_level_change) res = etRunner::get().setWinNotiLevel(tw_noti2, EFL_UTIL_NOTIFICATION_LEVEL_MEDIUM); EXPECT_TRUE(res); - etRunner::get().waitEvent(tw_noti2, E_TC_EVENT_TYPE_STACK_ABOVE); + ASSERT_EVENT(tw_noti2, E_TC_EVENT_TYPE_STACK_ABOVE); + level = etRunner::get().getWinNotiLevel(tw_noti2); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_MEDIUM, level); @@ -1013,7 +1023,8 @@ TEST_F(etTestNotification, notification_fullsize_level_change) res = etRunner::get().setWinNotiLevel(tw_noti1, EFL_UTIL_NOTIFICATION_LEVEL_HIGH); EXPECT_TRUE(res); - etRunner::get().waitEvent(tw_noti1, E_TC_EVENT_TYPE_STACK_ABOVE); + ASSERT_EVENT(tw_noti1, E_TC_EVENT_TYPE_STACK_ABOVE); + level = etRunner::get().getWinNotiLevel(tw_noti1); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_HIGH, level); @@ -1062,7 +1073,8 @@ TEST_F(etTestNotification, notification_fullsize_level_change) res = etRunner::get().setWinNotiLevel(tw_noti2, EFL_UTIL_NOTIFICATION_LEVEL_TOP); EXPECT_TRUE(res); - etRunner::get().waitEvent(tw_noti2, E_TC_EVENT_TYPE_STACK_ABOVE); + ASSERT_EVENT(tw_noti2, E_TC_EVENT_TYPE_STACK_ABOVE); + level = etRunner::get().getWinNotiLevel(tw_noti2); ASSERT_EQ(EFL_UTIL_NOTIFICATION_LEVEL_TOP, level); diff --git a/src/testcase/0006_tzsh.cpp b/src/testcase/0006_tzsh.cpp index 9bbdcc2..2f295ea 100644 --- a/src/testcase/0006_tzsh.cpp +++ b/src/testcase/0006_tzsh.cpp @@ -123,7 +123,7 @@ TEST_F(etTestTzsh, scrsaver_basic) ASSERT_TRUE(tz_scrsaver != NULL); showTCWin(tw_base); - etRunner::get().waitEvent(tw_base, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_base); list = etRunner::get().getWinInfoList(); ASSERT_TRUE(list != NULL); diff --git a/src/testcase/0007_rotation.cpp b/src/testcase/0007_rotation.cpp index 282812e..470ce90 100644 --- a/src/testcase/0007_rotation.cpp +++ b/src/testcase/0007_rotation.cpp @@ -14,7 +14,7 @@ class etTestRotation : public ::etTCBase etWin *tw_base = NULL; void initTC(); - Eina_Bool testWinRotation(etWin *tw, int rot); + void testWinRotation(etWin *tw, int rot); }; void @@ -22,42 +22,25 @@ etTestRotation::initTC() { tw_base = initNormalWin("TCWin_Normal_Rotation", EINA_TRUE); showTCWin(tw_base); - etRunner::get().waitEvent(tw_base, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_VIS_ON(tw_base); ASSERT_TRUE(tw_base != NULL) << "failed to initiation window"; // available rotations elm_win_wm_rotation_available_rotations_set(tw_base->elm_win, rots, 4); } -Eina_Bool +void etTestRotation::testWinRotation(etWin *tw, int rot) { Eina_Bool res = EINA_FALSE; - std::shared_ptr ei = NULL; res = etRunner::get().setZoneRotation(rot); - if (!res) - { - ERR("Changing rotation is denied."); - return EINA_FALSE; - } + ASSERT_TRUE(res) << "Changing rotation is denied."; - ei = etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_WINDOW_ROTATION_CHANGE); - - if (!ei) - { - ERR("Failed waiting rotation change event"); - return EINA_FALSE; - } + ASSERT_ROTATION(tw, rot); res = etRunner::get().getWinInfo(tw); - if ((!res) || (tw->rot != rot)) - { - ERR("Failed to rotate res %d, pass %d, res %d", res, rot, tw->rot); - return EINA_FALSE; - } - - return EINA_TRUE; + ASSERT_TRUE((!res) || (tw->rot != rot)) << "Failed to rotate res " << res << ", pass " << rot << ", res " << tw->rot; } TEST_F(etTestRotation, available_rotations) @@ -79,7 +62,6 @@ TEST_F(etTestRotation, available_rotations) /* hard coded, reverse portrait(180) mode is disabled in mobile */ if (rot == 180) continue; - res = testWinRotation(tw_base, rot); - ASSERT_TRUE(res); + testWinRotation(tw_base, rot); } } diff --git a/src/testcase/0008_focus.cpp b/src/testcase/0008_focus.cpp index dfd3ed5..153266e 100644 --- a/src/testcase/0008_focus.cpp +++ b/src/testcase/0008_focus.cpp @@ -23,7 +23,7 @@ etTestFocus::initTC(Eina_Bool show_win, Eina_Bool usr_geom) if (show_win) { showTCWin(tw_red); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_FOCUS_IN(tw_red); } ASSERT_TRUE(tw_red != NULL) << "failed to initiation window"; @@ -31,7 +31,7 @@ etTestFocus::initTC(Eina_Bool show_win, Eina_Bool usr_geom) if (show_win) { showTCWin(tw_green); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_FOCUS_IN(tw_green); } ASSERT_TRUE(tw_green != NULL) << "failed to initiation window"; @@ -39,7 +39,7 @@ etTestFocus::initTC(Eina_Bool show_win, Eina_Bool usr_geom) if (show_win) { showTCWin(tw_blue); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_FOCUS_IN(tw_blue); } ASSERT_TRUE(tw_blue != NULL) << "failed to initiation window"; @@ -82,7 +82,7 @@ TEST_F(etTestFocus, focus_lower) // make tw_blue lower res = etRunner::get().setWinStack(tw_blue, NULL, EINA_FALSE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_FOCUS_IN(tw_green); // Expected focus res: // [Top] Green[focused] -> Red -> ... -> Blue [Bottom] @@ -110,8 +110,8 @@ TEST_F(etTestFocus, focus_lower2) // make tw_green lower res = etRunner::get().setWinStack(tw_green, NULL, EINA_FALSE); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_FOCUS_CHANGED); ASSERT_TRUE(res); + ASSERT_EVENT(tw_green, E_TC_EVENT_TYPE_STACK_LOWER); // Expected focus res: // [Top] Blue[focused] -> Red -> ... -> Green [Bottom] @@ -139,8 +139,8 @@ TEST_F(etTestFocus, focus_raise) // make tw_red raise res = etRunner::get().setWinStack(tw_red, NULL, EINA_TRUE); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_FOCUS_CHANGED); ASSERT_TRUE(res); + ASSERT_FOCUS_IN(tw_red); // Expected focus res: // [Top] Red[focused] -> Blue -> Green [Bottom] @@ -167,8 +167,8 @@ TEST_F(etTestFocus, focus_destroy) // delete tw_blue removeTCWin(tw_blue); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_OFF); tw_blue = NULL; + ASSERT_FOCUS_IN(tw_green); // Expected focus res: // [Top] Green[focused] -> Red [Bottom] @@ -197,7 +197,7 @@ TEST_F(etTestFocus, focus_activate1) // Activate tw_red res = etRunner::get().setWinActivate(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_RAISE); // Expected focus res: // [Top] Red[focused] -> Blue -> Green [Bottom] @@ -225,12 +225,12 @@ TEST_F(etTestFocus, focus_activate2) // show Blocker showTCWin(tw_blocker); - etRunner::get().waitEvent(tw_blocker, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_FOCUS_IN(tw_blocker); // Activate tw_red res = etRunner::get().setWinActivate(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_FOCUS_IN(tw_red); // Expected focus res: // [Top] Red[focused] -> Blocker -> Blue -> Green [Bottom] @@ -259,7 +259,7 @@ TEST_F(etTestFocus, focus_activate3) // make partial notification window etWin *tw_smallnoti = initNotiWin("TW_Temp_Noti", EINA_TRUE, EINA_TRUE); showTCWin(tw_smallnoti); - etRunner::get().waitEvent(tw_smallnoti, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_smallnoti); res = etRunner::get().setWinNotiLevel(tw_smallnoti, EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT); EXPECT_TRUE(res); @@ -267,7 +267,7 @@ TEST_F(etTestFocus, focus_activate3) // Activate tw_red res = etRunner::get().setWinActivate(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_RAISE); // Expected focus res: // [Top] smallnoti -> ... -> Red[focused] -> Blue -> Green [Bottom] @@ -297,12 +297,12 @@ TEST_F(etTestFocus, focus_show_activate) showTCWin(tw_small_blocker); etRunner::get().setWinNotiLevel(tw_small_blocker, EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT); - etRunner::get().waitEvent(tw_small_blocker, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_small_blocker); // Activate tw_red res = showActivateTCWin(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_FOCUS_IN(tw_red); // Expected focus res: // [Top] Red[focused] -> Blue -> Green [Bottom] @@ -333,12 +333,12 @@ TEST_F(etTestFocus, focus_obscured_activate) EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT); EXPECT_TRUE(res); showTCWin(tw_blocker); - etRunner::get().waitEvent(tw_blocker, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blocker); // Activate tw_red res = etRunner::get().setWinActivate(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_RAISE); // Expected focus res: // [Top] Blocker[focused] -> ... -> Red -> Blue -> Green [Bottom] @@ -369,18 +369,17 @@ TEST_F(etTestFocus, focus_obscured_activate_destroy) EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT); EXPECT_TRUE(res); showTCWin(tw_blocker); - etRunner::get().waitEvent(tw_blocker, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blocker); // Activate tw_red res = etRunner::get().setWinActivate(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_RAISE); // remove tw_blocker removeTCWin(tw_blocker); - etRunner::get().waitEvent(tw_blocker, E_TC_EVENT_TYPE_VIS_OFF); tw_blocker = NULL; - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_red); // Expected focus res: // [Top] Red[focused] -> Blue -> Green [Bottom] @@ -409,7 +408,7 @@ TEST_F(etTestFocus, focus_transient_for1) // set transient_for Blue(parent) & Red(child) res = etRunner::get().setWinTransientFor(tw_red, tw_blue, EINA_TRUE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_RAISE); // Expected focus res: // [Top] Red[focused] -> Blue -> Green [Bottom] @@ -438,7 +437,7 @@ TEST_F(etTestFocus, focus_transient_for2) // set transient_for Blue(parent) & Green(child) res = etRunner::get().setWinTransientFor(tw_green, tw_blue, EINA_TRUE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_STACK_RAISE); + ASSERT_EVENT(tw_green, E_TC_EVENT_TYPE_STACK_RAISE); // Expected focus res: // [Top] Green[focused] -> Blue -> Red [Bottom] @@ -467,7 +466,7 @@ TEST_F(etTestFocus, focus_transient_for3) // set transient_for Green(parent) & Blue(child) res = etRunner::get().setWinTransientFor(tw_blue, tw_green, EINA_TRUE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_STACK_RAISE); + etRunner::get().work(0.1); // wait for transient_for done. // Expected focus res: // [Top] Blue[focused] -> Green -> Red [Bottom] @@ -496,7 +495,7 @@ TEST_F(etTestFocus, focus_iconify1) // set iconify Blue res = etRunner::get().setWinIconic(tw_blue, EINA_TRUE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_OFF); + ASSERT_VIS_OFF(tw_blue); // Expected focus res: // [Top] Blue(iconified) -> Green[focused] -> Red [Bottom] @@ -525,7 +524,7 @@ TEST_F(etTestFocus, focus_iconify2) // set iconify Red res = etRunner::get().setWinIconic(tw_red, EINA_TRUE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_VIS_OFF); + ASSERT_VIS_OFF(tw_red); // Expected focus res: // [Top] Blue[focused] -> Green -> Red(iconified) [Bottom] @@ -554,13 +553,13 @@ TEST_F(etTestFocus, focus_uniconify) // set iconify Red res = etRunner::get().setWinIconic(tw_red, EINA_TRUE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_VIS_OFF); + ASSERT_VIS_OFF(tw_red); // set uniconify Red res = etRunner::get().setWinIconic(tw_red, EINA_FALSE); ASSERT_TRUE(res); etRunner::get().work(2.0); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_red); // Expected focus res: // [Top] Red[focused] -> Blue -> Green [Bottom] @@ -589,13 +588,13 @@ TEST_F(etTestFocus, focus_uniconify2) // set iconify Blue res = etRunner::get().setWinIconic(tw_blue, EINA_TRUE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_OFF); + ASSERT_VIS_OFF(tw_blue); // set uniconify Blue res = etRunner::get().setWinIconic(tw_blue, EINA_FALSE); ASSERT_TRUE(res); etRunner::get().work(2.0); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blue); // Expected focus res: // [Top] Blue[focused] -> Green -> Red [Bottom] @@ -626,12 +625,12 @@ TEST_F(etTestFocus, focus_visibility) EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT); EXPECT_TRUE(res); showTCWin(tw_blocker); - etRunner::get().waitEvent(tw_blocker, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_FOCUS_IN(tw_blocker); // hide blocker removeTCWin(tw_blocker); - etRunner::get().waitEvent(tw_blocker, E_TC_EVENT_TYPE_VIS_OFF); tw_blocker = NULL; + ASSERT_FOCUS_IN(tw_blue); // Expected focus res: // [Top] Blue[focused] -> Green -> Red [Bottom] @@ -658,7 +657,7 @@ TEST_F(etTestFocus, focus_move) // move tw_blue to out of screen tw_blue->move(2000, 2000); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_CHANGED); + ASSERT_VIS_OFF(tw_blue); // Expected focus res: // [Top] Blue -> Green[focused] -> Red [Bottom] @@ -685,11 +684,11 @@ TEST_F(etTestFocus, DISABLED_focus_move2) // move tw_blue to out of screen tw_blue->move(2000, 2000); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_OFF); + ASSERT_VIS_OFF(tw_blue); // move tw_blue into screen tw_blue->move(200, 200); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blue); // Expected focus res: // [Top] Blue -> Green[focused] -> Red [Bottom] @@ -717,7 +716,7 @@ TEST_F(etTestFocus, focus_touch_basic) // touch red win etRunner::get().generateMouseDown(50, 50); etRunner::get().generateMouseUp(50, 50); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_FOCUS_IN(tw_red); // Expected focus res: // [Top] Blue -> Green -> Red[focused] [Bottom] @@ -745,12 +744,12 @@ TEST_F(etTestFocus, focus_touch_history) // touch red win etRunner::get().generateMouseDown(50, 50); etRunner::get().generateMouseUp(50, 50); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_FOCUS_IN(tw_red); // touch blue win etRunner::get().generateMouseDown(250, 250); etRunner::get().generateMouseUp(250, 250); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_FOCUS_IN(tw_blue); // Expected focus res: // [Top] Blue[focused] -> Green -> Red [Bottom] @@ -768,10 +767,8 @@ TEST_F(etTestFocus, focus_touch_history) // remove blue win removeTCWin(tw_blue); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_OFF); tw_blue = NULL; - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_FOCUS_CHANGED); - + ASSERT_FOCUS_IN(tw_red); // Expected focus res: // [Top] Green -> Red[focused] [Bottom] @@ -789,9 +786,8 @@ TEST_F(etTestFocus, focus_touch_history) // remove red win removeTCWin(tw_red); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_VIS_OFF); tw_red = NULL; - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_FOCUS_IN(tw_green); // Expected focus res: // [Top] Green[focused] [Bottom] @@ -819,7 +815,7 @@ TEST_F(etTestFocus, focus_touch_history2) // touch green win etRunner::get().generateMouseDown(150, 150); etRunner::get().generateMouseUp(150, 150); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_FOCUS_IN(tw_green); // Expected focus res: // [Top] Red -> Green[focused] -> Blue [Bottom] @@ -837,7 +833,7 @@ TEST_F(etTestFocus, focus_touch_history2) // activate red win etRunner::get().setWinActivate(tw_red); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_STACK_ABOVE); + ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_ABOVE); // Expected focus res: // [Top] Red[focused] -> Blue -> Green [Bottom] @@ -855,7 +851,7 @@ TEST_F(etTestFocus, focus_touch_history2) // lower red win etRunner::get().setWinStack(tw_red, NULL, EINA_FALSE); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_LOWER); // Expected focus res: // [Top] Blue -> Green[focused] -> ... -> Red [Bottom] @@ -882,7 +878,7 @@ TEST_F(etTestFocus, focus_skip_set) // set focus_skip on tw_blue etRunner::get().setFocusSkip(tw_blue, EINA_TRUE); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_FOCUS_IN(tw_green); // Expected focus res: // [Top] Blue -> Green[focused] -> Red [Bottom] @@ -911,7 +907,7 @@ TEST_F(etTestFocus, focus_skip_unset) // set focus_skip on tw_blue etRunner::get().setFocusSkip(tw_blue, EINA_TRUE); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_FOCUS_IN(tw_green); // Expected focus res: // [Top] Blue -> Green[focused] -> Red [Bottom] @@ -1012,8 +1008,8 @@ TEST_F(etTestFocus, focus_fullsize_lower) // make tw_blue lower res = etRunner::get().setWinStack(tw_blue, NULL, EINA_FALSE); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_FOCUS_CHANGED); ASSERT_TRUE(res); + ASSERT_FOCUS_IN(tw_green); // Expected focus res: // [Top] Green[focused] -> Red -> ... -> Blue [Bottom] @@ -1041,8 +1037,8 @@ TEST_F(etTestFocus, focus_fullsize_lower2) // make tw_green lower res = etRunner::get().setWinStack(tw_green, NULL, EINA_FALSE); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_STACK_LOWER); ASSERT_TRUE(res); + ASSERT_EVENT(tw_green, E_TC_EVENT_TYPE_STACK_LOWER); // Expected focus res: // [Top] Blue[focused] -> Red -> ... -> Green [Bottom] @@ -1070,8 +1066,8 @@ TEST_F(etTestFocus, focus_fullsize_raise) // make tw_red raise res = etRunner::get().setWinStack(tw_red, NULL, EINA_TRUE); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_FOCUS_CHANGED); ASSERT_TRUE(res); + ASSERT_FOCUS_IN(tw_red); // Expected focus res: // [Top] Red[focused] -> Blue -> Green [Bottom] @@ -1098,9 +1094,8 @@ TEST_F(etTestFocus, focus_fullsize_destroy) // delete tw_blue removeTCWin(tw_blue); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_OFF); tw_blue = NULL; - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_FOCUS_IN(tw_green); // Expected focus res: // [Top] Green[focused] -> Red [Bottom] @@ -1128,8 +1123,8 @@ TEST_F(etTestFocus, focus_fullsize_activate) // Activate tw_red res = etRunner::get().setWinActivate(tw_red); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_FOCUS_CHANGED); ASSERT_TRUE(res); + ASSERT_FOCUS_IN(tw_red); // Expected focus res: // [Top] Red[focused] -> Blue -> Green [Bottom] @@ -1160,12 +1155,12 @@ TEST_F(etTestFocus, focus_fullsize_obscured_activate) EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT); EXPECT_TRUE(res); showTCWin(tw_blocker); - etRunner::get().waitEvent(tw_blocker, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blocker); // Activate tw_red res = etRunner::get().setWinActivate(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_STACK_ABOVE); + ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_ABOVE); // Expected focus res: // [Top] Blocker[focused] -> ... -> Red -> Blue -> Green [Bottom] @@ -1196,7 +1191,7 @@ TEST_F(etTestFocus, focus_fullsize_obscured_activate_check_event) EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT); EXPECT_TRUE(res); showTCWin(tw_blocker); - etRunner::get().waitEvent(tw_blocker, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blocker); // set event checkpoint etRunner::get().setEventCheckpoint(); @@ -1204,7 +1199,7 @@ TEST_F(etTestFocus, focus_fullsize_obscured_activate_check_event) // Activate tw_red res = etRunner::get().setWinActivate(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_STACK_ABOVE); + ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_ABOVE); // Expected focus res: // [Top] Blocker[focused] -> ... -> Red -> Blue -> Green [Bottom] @@ -1238,18 +1233,17 @@ TEST_F(etTestFocus, focus_fullsize_obscured_activate_destroy) EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT); EXPECT_TRUE(res); showTCWin(tw_blocker); - etRunner::get().waitEvent(tw_blocker, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blocker); // Activate tw_red res = etRunner::get().setWinActivate(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_STACK_ABOVE); + ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_ABOVE); // remove tw_blocker removeTCWin(tw_blocker); - etRunner::get().waitEvent(tw_blocker, E_TC_EVENT_TYPE_VIS_OFF); tw_blocker = NULL; - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_FOCUS_IN(tw_red); // Expected focus res: // [Top] Red[focused] -> Blue -> Green [Bottom] @@ -1278,12 +1272,12 @@ TEST_F(etTestFocus, focus_fullsize_show_activate_under_blocker) showTCWin(tw_blocker); etRunner::get().setWinNotiLevel(tw_blocker, EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT); - etRunner::get().waitEvent(tw_blocker, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blocker); // Activate tw_red res = showActivateTCWin(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_RAISE); // Expected focus res: // [Top] Blocker[focused] -> ... -> Red [Bottom] @@ -1312,7 +1306,7 @@ TEST_F(etTestFocus, focus_fullsize_show_activate_under_blocker_check_event) showTCWin(tw_blocker); etRunner::get().setWinNotiLevel(tw_blocker, EFL_UTIL_NOTIFICATION_LEVEL_DEFAULT); - etRunner::get().waitEvent(tw_blocker, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blocker); // set event checkpoint etRunner::get().setEventCheckpoint(); @@ -1320,7 +1314,7 @@ TEST_F(etTestFocus, focus_fullsize_show_activate_under_blocker_check_event) // Activate tw_red res = showActivateTCWin(tw_red); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_RAISE); // Expected focus res: // [Top] Blocker[focused] -> ... -> Red [Bottom] @@ -1352,7 +1346,7 @@ TEST_F(etTestFocus, focus_fullsize_transient_for) // set transient_for Blue(parent) & Red(child) res = etRunner::get().setWinTransientFor(tw_red, tw_blue, EINA_TRUE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_FOCUS_IN(tw_red); // Expected focus res: // [Top] Red[focused] -> Blue -> Green [Bottom] @@ -1381,7 +1375,7 @@ TEST_F(etTestFocus, focus_fullsize_iconify) // set iconify Blue res = etRunner::get().setWinIconic(tw_blue, EINA_TRUE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_OFF); + ASSERT_VIS_OFF(tw_blue); // Expected focus res: // [Top] Blue(iconified) -> Green[focused] -> Red [Bottom] @@ -1410,12 +1404,12 @@ TEST_F(etTestFocus, focus_fullsize_uniconify) // set iconify Red res = etRunner::get().setWinIconic(tw_red, EINA_TRUE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_VIS_OFF); + etRunner::get().work(0.1); // wait for iconify done // set uniconify Red res = etRunner::get().setWinIconic(tw_red, EINA_FALSE); ASSERT_TRUE(res); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_FOCUS_IN(tw_red); // Expected focus res: // [Top] Red[focused] -> Blue -> Green [Bottom] @@ -1442,7 +1436,7 @@ TEST_F(etTestFocus, focus_fullsize_skip_set) // set focus_skip on tw_blue etRunner::get().setFocusSkip(tw_blue, EINA_TRUE); - etRunner::get().work(0.1); // waiting for adjust focus skip set + ASSERT_FOCUS_OUT(tw_blue); // Expected focus res: // [Top] Blue -> Green -> Red [Bottom] @@ -1468,12 +1462,11 @@ TEST_F(etTestFocus, focus_fullsize_skip_unset) // Expected focus res: // [Top] Blue -> Green -> Red [Bottom] etRunner::get().setFocusSkip(tw_blue, EINA_TRUE); - etRunner::get().work(0.1); // waiting for adjust focus skip set + ASSERT_FOCUS_OUT(tw_blue); // unset focus_skip on tw_blue etRunner::get().setFocusSkip(tw_blue, EINA_FALSE); - etRunner::get().work(0.1); // waiting for adjust focus skip set - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_FOCUS_IN(tw_blue); // Expected focus res: // [Top] Blue[focused] -> Green -> Red [Bottom] @@ -1504,7 +1497,7 @@ TEST_F(etTestFocus, focus_fullsize_below_skip_above_remove) // remove tw_blue removeTCWin(tw_blue); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_green); // Expected focus res: // [Top] Blue -> Green -> Red [Bottom] @@ -1533,9 +1526,9 @@ TEST_F(etTestFocus, focus_fullsize_show_after_skip_set) etRunner::get().setFocusSkipEcoreWl2(tw_blue, EINA_TRUE); etRunner::get().work(0.1); // waiting for adjust focus skip set - // remove tw_blue + // show tw_blue showTCWin(tw_blue); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blue); // Expected focus res: // [Top] Blue -> Green -> Red [Bottom] @@ -1558,9 +1551,9 @@ TEST_F(etTestFocus, focus_fullsize_show_after_skip_set_and_transient_for) initTC(EINA_FALSE, EINA_FALSE); showTCWin(tw_red); - etRunner::get().waitEvent(tw_red, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_red); showTCWin(tw_green); - etRunner::get().waitEvent(tw_green, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_green); // set transient_for etRunner::get().setWinTransientFor(tw_green, tw_red, EINA_TRUE); @@ -1571,9 +1564,9 @@ TEST_F(etTestFocus, focus_fullsize_show_after_skip_set_and_transient_for) etRunner::get().setFocusSkipEcoreWl2(tw_blue, EINA_TRUE); etRunner::get().work(0.1); // waiting for adjust focus skip set - // remove tw_blue + // show tw_blue showTCWin(tw_blue); - etRunner::get().waitEvent(tw_blue, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_blue); // Expected focus res: // [Top] Blue -> Green[focused] -> Red [Bottom] diff --git a/src/testcase/0009_input.cpp b/src/testcase/0009_input.cpp index 5421694..5546531 100644 --- a/src/testcase/0009_input.cpp +++ b/src/testcase/0009_input.cpp @@ -17,6 +17,9 @@ public: key_name = NULL; }; + void test_gesture_edge_swipe(int fingers, efl_util_gesture_edge_e edge); + void test_gesture_edge_drag(int fingers, efl_util_gesture_edge_e edge); + protected: etWin *tw_shared = NULL; etWin *tw_topposition = NULL; @@ -29,14 +32,13 @@ protected: TEST_F(etTestInput, keygrab_nowin_shared) { - std::shared_ptr ei = NULL; Eina_Bool ret = EINA_FALSE; ret = ecore_wl2_window_keygrab_set(NULL, "XF86Menu", 0, 0, 0, ECORE_WL2_WINDOW_KEYGRAB_SHARED); ASSERT_TRUE(ret); etRunner::get().generateKeyEvent(key_name, 0.3); - ei = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_INPUT_ECORE_KEY); - ASSERT_TRUE(ei != NULL); + ev_result = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_INPUT_ECORE_KEY); + ASSERT_NE(ev_result, nullptr); ret = ecore_wl2_window_keygrab_unset(NULL, "XF86Menu", 0, 0); ASSERT_TRUE(ret); @@ -44,15 +46,14 @@ TEST_F(etTestInput, keygrab_nowin_shared) TEST_F(etTestInput, keygrab_nowin_orexcl) { - std::shared_ptr ei = NULL; Eina_Bool ret = EINA_FALSE; ret = ecore_wl2_window_keygrab_set(NULL, "XF86Menu", 0, 0, 0, ECORE_WL2_WINDOW_KEYGRAB_OVERRIDE_EXCLUSIVE); ASSERT_TRUE(ret); etRunner::get().generateKeyEvent(key_name, 0.3); - ei = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_INPUT_ECORE_KEY); - ASSERT_TRUE(ei != NULL); + ev_result = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_INPUT_ECORE_KEY); + ASSERT_NE(ev_result, nullptr); ret = ecore_wl2_window_keygrab_unset(NULL, "XF86Menu", 0, 0); ASSERT_TRUE(ret); @@ -60,15 +61,14 @@ TEST_F(etTestInput, keygrab_nowin_orexcl) TEST_F(etTestInput, keygrab_nowin_excl) { - std::shared_ptr ei = NULL; Eina_Bool ret = EINA_FALSE; ret = ecore_wl2_window_keygrab_set(NULL, "XF86Menu", 0, 0, 0, ECORE_WL2_WINDOW_KEYGRAB_EXCLUSIVE); ASSERT_TRUE(ret); etRunner::get().generateKeyEvent(key_name, 0.3); - ei = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_INPUT_ECORE_KEY); - ASSERT_TRUE(ei != NULL); + ev_result = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_INPUT_ECORE_KEY); + ASSERT_NE(ev_result, nullptr); ret = ecore_wl2_window_keygrab_unset(NULL, "XF86Menu", 0, 0); ASSERT_TRUE(ret); @@ -76,14 +76,13 @@ TEST_F(etTestInput, keygrab_nowin_excl) TEST_F(etTestInput, keygrab_win_shared) { - std::shared_ptr ei = NULL; Eina_Bool ret = EINA_FALSE; tw_shared = initNormalWin("TCWin_SharedGrab", EINA_FALSE); ASSERT_TRUE(tw_shared != NULL) << "failed to initiation window"; showTCWin(tw_shared); - etRunner::get().waitEvent(tw_shared, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_shared); ret = elm_win_keygrab_set(tw_shared->elm_win, "XF86Menu", 0, 0, 0, ELM_WIN_KEYGRAB_SHARED); ASSERT_TRUE(ret); @@ -93,12 +92,11 @@ TEST_F(etTestInput, keygrab_win_shared) etRunner::get().ev.elm_win = tw_shared->elm_win; etRunner::get().ev.native_win = tw_shared->native_win; ret = etRunner::get().setWinStack(tw_shared, NULL, EINA_FALSE); - etRunner::get().waitEvent(tw_shared, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_EVENT(tw_shared, E_TC_EVENT_TYPE_STACK_LOWER); ASSERT_TRUE(ret); etRunner::get().generateKeyEvent(key_name, 0.3); - ei = etRunner::get().waitEvent(tw_shared, E_TC_EVENT_TYPE_INPUT_EVAS_KEY); - ASSERT_TRUE(ei != NULL); + ASSERT_EVENT(tw_shared, E_TC_EVENT_TYPE_INPUT_EVAS_KEY); etRunner::get().ev.elm_win = NULL; etRunner::get().ev.native_win = 0; @@ -110,14 +108,13 @@ TEST_F(etTestInput, keygrab_win_shared) TEST_F(etTestInput, keygrab_win_orexcl) { - std::shared_ptr ei = NULL; Eina_Bool ret = EINA_FALSE; tw_orexcl = initNormalWin("TCWin_OrexclGrab", EINA_FALSE); ASSERT_TRUE(tw_orexcl != NULL) << "failed to initiation window"; showTCWin(tw_orexcl); - etRunner::get().waitEvent(tw_orexcl, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_orexcl); ret = elm_win_keygrab_set(tw_orexcl->elm_win, "XF86Menu", 0, 0, 0, ELM_WIN_KEYGRAB_OVERRIDE_EXCLUSIVE); ASSERT_TRUE(ret); @@ -127,12 +124,11 @@ TEST_F(etTestInput, keygrab_win_orexcl) etRunner::get().ev.elm_win = tw_orexcl->elm_win; etRunner::get().ev.native_win = tw_orexcl->native_win; ret = etRunner::get().setWinStack(tw_orexcl, NULL, EINA_FALSE); - etRunner::get().waitEvent(tw_orexcl, E_TC_EVENT_TYPE_FOCUS_CHANGED); ASSERT_TRUE(ret); + ASSERT_EVENT(tw_orexcl, E_TC_EVENT_TYPE_STACK_LOWER); etRunner::get().generateKeyEvent(key_name, 0.3); - ei = etRunner::get().waitEvent(tw_orexcl, E_TC_EVENT_TYPE_INPUT_EVAS_KEY); - ASSERT_TRUE(ei); + ASSERT_EVENT(tw_orexcl, E_TC_EVENT_TYPE_INPUT_EVAS_KEY); etRunner::get().ev.elm_win = NULL; etRunner::get().ev.native_win = 0; @@ -144,14 +140,13 @@ TEST_F(etTestInput, keygrab_win_orexcl) TEST_F(etTestInput, keygrab_win_excl) { - std::shared_ptr ei = NULL; Eina_Bool ret = EINA_FALSE; tw_excl = initNormalWin("TCWin_ExclGrab", EINA_FALSE); ASSERT_TRUE(tw_excl != NULL) << "failed to initiation window"; showTCWin(tw_excl); - etRunner::get().waitEvent(tw_excl, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_excl); ret = elm_win_keygrab_set(tw_excl->elm_win, "XF86Menu", 0, 0, 0, ELM_WIN_KEYGRAB_EXCLUSIVE); ASSERT_TRUE(ret); @@ -161,12 +156,11 @@ TEST_F(etTestInput, keygrab_win_excl) etRunner::get().ev.elm_win = tw_excl->elm_win; etRunner::get().ev.native_win = tw_excl->native_win; ret = etRunner::get().setWinStack(tw_excl, NULL, EINA_FALSE); - etRunner::get().waitEvent(tw_excl, E_TC_EVENT_TYPE_FOCUS_CHANGED); + ASSERT_EVENT(tw_excl, E_TC_EVENT_TYPE_STACK_LOWER); ASSERT_TRUE(ret); etRunner::get().generateKeyEvent(key_name, 0.3); - ei = etRunner::get().waitEvent(tw_excl, E_TC_EVENT_TYPE_INPUT_EVAS_KEY); - ASSERT_TRUE(ei); + ASSERT_EVENT(tw_excl, E_TC_EVENT_TYPE_INPUT_EVAS_KEY); etRunner::get().ev.elm_win = NULL; etRunner::get().ev.native_win = 0; @@ -178,14 +172,13 @@ TEST_F(etTestInput, keygrab_win_excl) TEST_F(etTestInput, keygrab_win_topposition) { - std::shared_ptr ei = NULL; Eina_Bool ret = EINA_FALSE; tw_topposition = initNormalWin("TCWin_ToppositionGrab", EINA_TRUE); ASSERT_TRUE(tw_topposition != NULL) << "failed to initiation window"; showTCWin(tw_topposition); - etRunner::get().waitEvent(tw_topposition, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_topposition); ecore_evas_focus_skip_set(ecore_evas_ecore_evas_get(evas_object_evas_get(tw_topposition->elm_win)), EINA_TRUE); @@ -198,8 +191,7 @@ TEST_F(etTestInput, keygrab_win_topposition) etRunner::get().ev.native_win = tw_topposition->native_win; etRunner::get().generateKeyEvent(key_name, 0.3); - ei = etRunner::get().waitEvent(tw_topposition, E_TC_EVENT_TYPE_INPUT_EVAS_KEY); - ASSERT_TRUE(ei); + ASSERT_EVENT(tw_topposition, E_TC_EVENT_TYPE_INPUT_EVAS_KEY); etRunner::get().ev.elm_win = NULL; etRunner::get().ev.native_win = 0; @@ -211,32 +203,31 @@ TEST_F(etTestInput, keygrab_win_topposition) TEST_F(etTestInput, keygrab_win) { - std::shared_ptr ei = NULL; Eina_Bool ret = EINA_FALSE; tw_shared = initNormalWin("TCWin_SharedGrab", EINA_FALSE); ASSERT_TRUE(tw_shared != NULL) << "failed to initiation window"; showTCWin(tw_shared); - etRunner::get().waitEvent(tw_shared, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_shared); tw_orexcl = initNormalWin("TCWin_OrexclGrab", EINA_FALSE); ASSERT_TRUE(tw_orexcl != NULL) << "failed to initiation window"; showTCWin(tw_orexcl); - etRunner::get().waitEvent(tw_orexcl, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_orexcl); tw_excl = initNormalWin("TCWin_ExclGrab", EINA_FALSE); ASSERT_TRUE(tw_excl != NULL) << "failed to initiation window"; showTCWin(tw_excl); - etRunner::get().waitEvent(tw_excl, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_excl); tw_topposition = initNormalWin("TCWin_ToppositionGrab", EINA_TRUE); ASSERT_TRUE(tw_topposition != NULL) << "failed to initiation window"; showTCWin(tw_topposition); - etRunner::get().waitEvent(tw_topposition, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw_topposition); ecore_evas_focus_skip_set(ecore_evas_ecore_evas_get(evas_object_evas_get(tw_topposition->elm_win)), EINA_TRUE); @@ -261,24 +252,23 @@ TEST_F(etTestInput, keygrab_win) ASSERT_TRUE(ret); ret = etRunner::get().setWinStack(tw_excl, NULL, EINA_FALSE); - etRunner::get().waitEvent(tw_excl, E_TC_EVENT_TYPE_FOCUS_CHANGED); ASSERT_TRUE(ret); + ASSERT_EVENT(tw_excl, E_TC_EVENT_TYPE_STACK_LOWER); ret = etRunner::get().setWinStack(tw_orexcl, NULL, EINA_FALSE); - etRunner::get().waitEvent(tw_orexcl, E_TC_EVENT_TYPE_FOCUS_CHANGED); ASSERT_TRUE(ret); + ASSERT_EVENT(tw_orexcl, E_TC_EVENT_TYPE_STACK_LOWER); ret = etRunner::get().setWinStack(tw_shared, NULL, EINA_FALSE); - etRunner::get().waitEvent(tw_shared, E_TC_EVENT_TYPE_FOCUS_CHANGED); ASSERT_TRUE(ret); + ASSERT_EVENT(tw_shared, E_TC_EVENT_TYPE_STACK_LOWER); // test exclusive grab etRunner::get().ev.elm_win = tw_excl->elm_win; etRunner::get().ev.native_win = tw_excl->native_win; etRunner::get().generateKeyEvent(key_name, 0.3); - ei = etRunner::get().waitEvent(tw_excl, E_TC_EVENT_TYPE_INPUT_EVAS_KEY); - ASSERT_TRUE(ei != NULL); + ASSERT_EVENT(tw_excl, E_TC_EVENT_TYPE_INPUT_EVAS_KEY); evas_object_key_ungrab(tw_excl->elm_win, "XF86Menu", 0, 0); ret = elm_win_keygrab_unset(tw_excl->elm_win, "XF86Menu", 0, 0); @@ -289,8 +279,7 @@ TEST_F(etTestInput, keygrab_win) etRunner::get().ev.native_win = tw_orexcl->native_win; etRunner::get().generateKeyEvent(key_name, 0.3); - ei = etRunner::get().waitEvent(tw_orexcl, E_TC_EVENT_TYPE_INPUT_EVAS_KEY); - ASSERT_TRUE(ei != NULL); + ASSERT_EVENT(tw_orexcl, E_TC_EVENT_TYPE_INPUT_EVAS_KEY); evas_object_key_ungrab(tw_orexcl->elm_win, "XF86Menu", 0, 0); ret = elm_win_keygrab_unset(tw_orexcl->elm_win, "XF86Menu", 0, 0); @@ -301,8 +290,7 @@ TEST_F(etTestInput, keygrab_win) etRunner::get().ev.native_win = tw_topposition->native_win; etRunner::get().generateKeyEvent(key_name, 0.3); - ei = etRunner::get().waitEvent(tw_topposition, E_TC_EVENT_TYPE_INPUT_EVAS_KEY); - ASSERT_TRUE(ei != NULL); + ASSERT_EVENT(tw_topposition, E_TC_EVENT_TYPE_INPUT_EVAS_KEY); evas_object_key_ungrab(tw_topposition->elm_win, "XF86Menu", 0, 0); ret = elm_win_keygrab_unset(tw_topposition->elm_win, "XF86Menu", 0, 0); @@ -313,8 +301,7 @@ TEST_F(etTestInput, keygrab_win) etRunner::get().ev.native_win = tw_shared->native_win; etRunner::get().generateKeyEvent(key_name, 0.3); - ei = etRunner::get().waitEvent(tw_shared, E_TC_EVENT_TYPE_INPUT_EVAS_KEY); - ASSERT_TRUE(ei != NULL); + ASSERT_EVENT(tw_shared, E_TC_EVENT_TYPE_INPUT_EVAS_KEY); evas_object_key_ungrab(tw_shared->elm_win, "XF86Menu", 0, 0); ret = elm_win_keygrab_unset(tw_shared->elm_win, "XF86Menu", 0, 0); @@ -326,7 +313,6 @@ TEST_F(etTestInput, keygrab_win) TEST_F(etTestInput, gesture_tap22) { - std::shared_ptr ei = NULL; int ret = EFL_UTIL_ERROR_NONE; efl_util_gesture_h gesture_h = etRunner::get().getGestureHandler(); efl_util_gesture_data tap_d; @@ -342,8 +328,8 @@ TEST_F(etTestInput, gesture_tap22) etRunner::get().ev.gesture.tap.repeats = 2; etRunner::get().generateTapGesture(); - ei = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_GESTURE_TAP); - ASSERT_TRUE(ei != NULL); + ev_result = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_GESTURE_TAP); + ASSERT_NE(ev_result, nullptr); etRunner::get().ev.gesture.tap.fingers = 0; etRunner::get().ev.gesture.tap.repeats = 0; @@ -355,7 +341,6 @@ TEST_F(etTestInput, gesture_tap22) TEST_F(etTestInput, gesture_tap23) { - std::shared_ptr ei = NULL; int ret = EFL_UTIL_ERROR_NONE; efl_util_gesture_h gesture_h = etRunner::get().getGestureHandler(); efl_util_gesture_data tap_d; @@ -371,8 +356,8 @@ TEST_F(etTestInput, gesture_tap23) etRunner::get().ev.gesture.tap.repeats = 3; etRunner::get().generateTapGesture(); - ei = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_GESTURE_TAP); - ASSERT_TRUE(ei != NULL); + ev_result = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_GESTURE_TAP); + ASSERT_NE(ev_result, nullptr); etRunner::get().ev.gesture.tap.fingers = 0; etRunner::get().ev.gesture.tap.repeats = 0; @@ -385,10 +370,9 @@ TEST_F(etTestInput, gesture_tap23) << EFL_UTIL_RETURN_TO_STRING(ret) << ")"; } -static void -_test_gesture_edge_swipe(int fingers, efl_util_gesture_edge_e edge) +void +etTestInput::test_gesture_edge_swipe(int fingers, efl_util_gesture_edge_e edge) { - std::shared_ptr ei = NULL; int ret = EFL_UTIL_ERROR_NONE; efl_util_gesture_h gesture_h = etRunner::get().getGestureHandler(); efl_util_gesture_data edge_swipe_d; @@ -404,8 +388,8 @@ _test_gesture_edge_swipe(int fingers, efl_util_gesture_edge_e edge) etRunner::get().ev.gesture.edge.edge = edge; etRunner::get().generateEdgeSwipeGesture(); - ei = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_GESTURE_EDGE_SWIPE); - ASSERT_TRUE(ei != NULL); + ev_result = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_GESTURE_EDGE_SWIPE); + ASSERT_NE(ev_result, nullptr); etRunner::get().ev.gesture.edge.fingers = 0; etRunner::get().ev.gesture.edge.edge = EFL_UTIL_GESTURE_EDGE_NONE;; @@ -421,48 +405,47 @@ _test_gesture_edge_swipe(int fingers, efl_util_gesture_edge_e edge) TEST_F(etTestInput, gesture_edge_swipe11) { - _test_gesture_edge_swipe(1, EFL_UTIL_GESTURE_EDGE_TOP); + test_gesture_edge_swipe(1, EFL_UTIL_GESTURE_EDGE_TOP); } TEST_F(etTestInput, gesture_edge_swipe12) { - _test_gesture_edge_swipe(1, EFL_UTIL_GESTURE_EDGE_RIGHT); + test_gesture_edge_swipe(1, EFL_UTIL_GESTURE_EDGE_RIGHT); } TEST_F(etTestInput, gesture_edge_swipe13) { - _test_gesture_edge_swipe(1, EFL_UTIL_GESTURE_EDGE_BOTTOM); + test_gesture_edge_swipe(1, EFL_UTIL_GESTURE_EDGE_BOTTOM); } TEST_F(etTestInput, gesture_edge_swipe14) { - _test_gesture_edge_swipe(1, EFL_UTIL_GESTURE_EDGE_LEFT); + test_gesture_edge_swipe(1, EFL_UTIL_GESTURE_EDGE_LEFT); } TEST_F(etTestInput, gesture_edge_swipe21) { - _test_gesture_edge_swipe(2, EFL_UTIL_GESTURE_EDGE_TOP); + test_gesture_edge_swipe(2, EFL_UTIL_GESTURE_EDGE_TOP); } TEST_F(etTestInput, gesture_edge_swipe22) { - _test_gesture_edge_swipe(2, EFL_UTIL_GESTURE_EDGE_RIGHT); + test_gesture_edge_swipe(2, EFL_UTIL_GESTURE_EDGE_RIGHT); } TEST_F(etTestInput, gesture_edge_swipe23) { - _test_gesture_edge_swipe(2, EFL_UTIL_GESTURE_EDGE_BOTTOM); + test_gesture_edge_swipe(2, EFL_UTIL_GESTURE_EDGE_BOTTOM); } TEST_F(etTestInput, gesture_edge_swipe24) { - _test_gesture_edge_swipe(2, EFL_UTIL_GESTURE_EDGE_LEFT); + test_gesture_edge_swipe(2, EFL_UTIL_GESTURE_EDGE_LEFT); } -static void -_test_gesture_edge_drag(int fingers, efl_util_gesture_edge_e edge) +void +etTestInput::test_gesture_edge_drag(int fingers, efl_util_gesture_edge_e edge) { - std::shared_ptr ei = NULL; int ret = EFL_UTIL_ERROR_NONE; efl_util_gesture_h gesture_h = etRunner::get().getGestureHandler(); efl_util_gesture_data edge_drag_d; @@ -478,8 +461,8 @@ _test_gesture_edge_drag(int fingers, efl_util_gesture_edge_e edge) etRunner::get().ev.gesture.edge.edge = edge; etRunner::get().generateEdgeDragGesture(); - ei = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_GESTURE_EDGE_DRAG); - ASSERT_TRUE(ei != NULL); + ev_result = etRunner::get().waitEvent(NULL, E_TC_EVENT_TYPE_GESTURE_EDGE_DRAG); + ASSERT_NE(ev_result, nullptr); etRunner::get().ev.gesture.edge.fingers = 0; etRunner::get().ev.gesture.edge.edge = EFL_UTIL_GESTURE_EDGE_NONE;; @@ -495,40 +478,40 @@ _test_gesture_edge_drag(int fingers, efl_util_gesture_edge_e edge) TEST_F(etTestInput, gesture_edge_drag11) { - _test_gesture_edge_drag(1, EFL_UTIL_GESTURE_EDGE_TOP); + test_gesture_edge_drag(1, EFL_UTIL_GESTURE_EDGE_TOP); } TEST_F(etTestInput, gesture_edge_drag12) { - _test_gesture_edge_drag(1, EFL_UTIL_GESTURE_EDGE_RIGHT); + test_gesture_edge_drag(1, EFL_UTIL_GESTURE_EDGE_RIGHT); } TEST_F(etTestInput, gesture_edge_drag13) { - _test_gesture_edge_drag(1, EFL_UTIL_GESTURE_EDGE_BOTTOM); + test_gesture_edge_drag(1, EFL_UTIL_GESTURE_EDGE_BOTTOM); } TEST_F(etTestInput, gesture_edge_drag14) { - _test_gesture_edge_drag(1, EFL_UTIL_GESTURE_EDGE_LEFT); + test_gesture_edge_drag(1, EFL_UTIL_GESTURE_EDGE_LEFT); } TEST_F(etTestInput, gesture_edge_drag21) { - _test_gesture_edge_drag(2, EFL_UTIL_GESTURE_EDGE_TOP); + test_gesture_edge_drag(2, EFL_UTIL_GESTURE_EDGE_TOP); } TEST_F(etTestInput, gesture_edge_drag22) { - _test_gesture_edge_drag(2, EFL_UTIL_GESTURE_EDGE_RIGHT); + test_gesture_edge_drag(2, EFL_UTIL_GESTURE_EDGE_RIGHT); } TEST_F(etTestInput, gesture_edge_drag23) { - _test_gesture_edge_drag(2, EFL_UTIL_GESTURE_EDGE_BOTTOM); + test_gesture_edge_drag(2, EFL_UTIL_GESTURE_EDGE_BOTTOM); } TEST_F(etTestInput, gesture_edge_drag24) { - _test_gesture_edge_drag(2, EFL_UTIL_GESTURE_EDGE_LEFT); + test_gesture_edge_drag(2, EFL_UTIL_GESTURE_EDGE_LEFT); } diff --git a/src/testcase/0010_splash.cpp b/src/testcase/0010_splash.cpp index 440c933..b2b7e56 100644 --- a/src/testcase/0010_splash.cpp +++ b/src/testcase/0010_splash.cpp @@ -39,7 +39,7 @@ TEST_F(etTestSplash, splash_edc) Eina_List *list = NULL, *l = NULL; initTC((char*)path_edc, SPLASH_TYPE_EDC); - etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw); // find Launchscreen from toplv windows list = etRunner::get().getWinInfoList(); @@ -63,7 +63,7 @@ TEST_F(etTestSplash, splash_img) Eina_List *list = NULL, *l = NULL; initTC((char*)path_img, SPLASH_TYPE_IMG); - etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw); // find Launchscreen from toplv windows list = etRunner::get().getWinInfoList(); @@ -88,7 +88,7 @@ TEST_F(etTestSplash, splash_disappear_after_real) initTC((char*)path_img, SPLASH_TYPE_IMG); showTCWin(tw); - etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw); // Expected focus res: list = etRunner::get().getWinInfoList(); @@ -113,14 +113,12 @@ TEST_F(etTestSplash, splash_evas_callback_after_real) { etWin *tw2 = NULL; Eina_List *list = NULL, *l = NULL; - std::shared_ptr ei = NULL; initTC((char*)path_img, SPLASH_TYPE_IMG); etRunner::get().setSplashOwner(); showTCWin(tw); - ei = etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_EFFECT_EVAS_CB); - ASSERT_TRUE(ei != NULL); + ASSERT_EVENT(tw, E_TC_EVENT_TYPE_EFFECT_EVAS_CB); // Expected focus res: list = etRunner::get().getWinInfoList(); diff --git a/src/testcase/0011_effect.cpp b/src/testcase/0011_effect.cpp index 9745664..cc23911 100644 --- a/src/testcase/0011_effect.cpp +++ b/src/testcase/0011_effect.cpp @@ -26,7 +26,6 @@ etTestEffect::initTC() TEST_F(etTestEffect, effect_show) { - std::shared_ptr ei = NULL; Eina_Bool res = EINA_FALSE; initTC(); @@ -35,16 +34,13 @@ TEST_F(etTestEffect, effect_show) ASSERT_TRUE(res); showTCWin(tw); - - ei = etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_EFFECT); - ASSERT_TRUE(ei != NULL); + ASSERT_EVENT(tw, E_TC_EVENT_TYPE_EFFECT); return; } TEST_F(etTestEffect, effect_show_evas_callback) { - std::shared_ptr ei = NULL; Eina_Bool res = EINA_FALSE; initTC(); @@ -53,67 +49,62 @@ TEST_F(etTestEffect, effect_show_evas_callback) ASSERT_TRUE(res); showTCWin(tw); - - ei = etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_EFFECT_EVAS_CB); - ASSERT_TRUE(ei != NULL); + ASSERT_EVENT(tw, E_TC_EVENT_TYPE_EFFECT_EVAS_CB); return; } TEST_F(etTestEffect, effect_hide_bylower) { - std::shared_ptr ei = NULL; Eina_Bool res = EINA_FALSE; initTC(); showTCWin(tw); - etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw); res = etRunner::get().setWinEffect(tw); ASSERT_TRUE(res); + elm_win_lower(tw->elm_win); - ei = etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_EFFECT); - ASSERT_TRUE(ei != NULL); + ASSERT_EVENT(tw, E_TC_EVENT_TYPE_EFFECT); return; } TEST_F(etTestEffect, effect_hide_byunmap) { - std::shared_ptr ei = NULL; Eina_Bool res = EINA_FALSE; initTC(); showTCWin(tw); - etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw); res = etRunner::get().setWinEffect(tw); ASSERT_TRUE(res); + tw->hide(); - ei = etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_EFFECT); - ASSERT_TRUE(ei != NULL); + ASSERT_EVENT(tw, E_TC_EVENT_TYPE_EFFECT); return; } TEST_F(etTestEffect, effect_bg) { - std::shared_ptr ei = NULL; Eina_Bool res = EINA_FALSE; initTC(); showTCWin(tw); - etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_VIS_ON); + ASSERT_VIS_ON(tw); res = etRunner::get().setWinEffect(tw); ASSERT_TRUE(res); + //show upper window showTCWin(tw_green); - ei = etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_EFFECT); - ASSERT_TRUE(ei != NULL); + ASSERT_EVENT(tw, E_TC_EVENT_TYPE_EFFECT); return; } diff --git a/src/testcase/0012_aux_hint.cpp b/src/testcase/0012_aux_hint.cpp index 0160710..b7dfc84 100644 --- a/src/testcase/0012_aux_hint.cpp +++ b/src/testcase/0012_aux_hint.cpp @@ -15,6 +15,8 @@ class etTestAuxHint : public ::etTCBase etRunner::get().delSupportedAuxHint("win.test.auxhint"); }; + void compareHint(std::shared_ptr data, int id, const char *hint, const char *val); + protected: etWin *tw = NULL; @@ -22,69 +24,73 @@ class etTestAuxHint : public ::etTCBase }; void +etTestAuxHint::compareHint(std::shared_ptr data, + int id, + const char *hint, + const char *val) +{ + ASSERT_NE(data, nullptr); + if (id >= 0) + { + ASSERT_TRUE(data->isSameID(id)) << "Result mismatch, ID: " << data->getID() << " vs " << id; + } + if (hint) + { + ASSERT_TRUE(data->isSameHint(std::string(hint))) << "Result mismatch, hint: " << data->getHint() << " vs " << hint; + } + if (val) + { + ASSERT_TRUE(data->isSameVal(std::string(val))) << "Result mismatch, hint: " << data->getVal() << " vs " << val; + } +} + +void etTestAuxHint::initTC() { tw = initNormalWin("TCWin_Normal", EINA_TRUE); ASSERT_TRUE(tw != NULL) << "failed to initiation window"; ASSERT_TRUE(showTCWin(tw)) << "failed to show window"; + ASSERT_FOCUS_IN(tw); // for consume default aux hint event } TEST_F(etTestAuxHint, add_hint) { - std::shared_ptr data = NULL; Eina_Bool ret = EINA_FALSE; initTC(); - etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_VIS_ON); ret = etRunner::get().addAuxHint(tw, test_hint_id, "win.test.auxhint", "test"); ASSERT_TRUE(ret); - data = std::static_pointer_cast(etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_AUX_HINT_CHANGED)); - ASSERT_TRUE(data != NULL); - ASSERT_TRUE(data->isSameHint(std::string("win.test.auxhint"))) << "Err: " << data->getHint(); - ASSERT_TRUE(data->isSameVal(std::string("test"))) << "Err: " << data->getVal(); + ASSERT_HINT(tw, test_hint_id, "win.test.auxhint", "test"); } TEST_F(etTestAuxHint, change_hint) { - std::shared_ptr data = NULL; Eina_Bool ret = EINA_FALSE; initTC(); - etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_VIS_ON); ret = etRunner::get().addAuxHint(tw, test_hint_id, "win.test.auxhint", "test"); ASSERT_TRUE(ret); - data = std::static_pointer_cast(etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_AUX_HINT_CHANGED)); - ASSERT_TRUE(data != NULL); - ASSERT_TRUE(data->isSameHint(std::string("win.test.auxhint"))) << "Err: " << data->getHint(); - ASSERT_TRUE(data->isSameVal(std::string("test"))) << "Err: " << data->getVal(); + ASSERT_HINT(tw, test_hint_id, "win.test.auxhint", "test"); ret = etRunner::get().changeAuxHint(tw, test_hint_id, "test2"); ASSERT_TRUE(ret); - data = std::static_pointer_cast(etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_AUX_HINT_CHANGED)); - ASSERT_TRUE(data != NULL); - ASSERT_TRUE(data->isSameHint(std::string("win.test.auxhint"))) << "Err: " << data->getHint(); - ASSERT_TRUE(data->isSameVal(std::string("test2"))) << "Err: " << data->getVal(); + ASSERT_HINT(tw, test_hint_id, "win.test.auxhint", "test2"); } TEST_F(etTestAuxHint, del_hint) { - std::shared_ptr data = NULL; Eina_Bool ret = EINA_FALSE; initTC(); - etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_VIS_ON); ret = etRunner::get().addAuxHint(tw, test_hint_id, "win.test.auxhint", "test"); ASSERT_TRUE(ret); - data = std::static_pointer_cast(etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_AUX_HINT_CHANGED)); - ASSERT_TRUE(data != NULL); - ASSERT_TRUE(data->isSameHint(std::string("win.test.auxhint"))) << "Err: " << data->getHint(); - ASSERT_TRUE(data->isSameVal(std::string("test"))) << "Err: " << data->getVal(); + ASSERT_HINT(tw, test_hint_id, "win.test.auxhint", "test"); ret = etRunner::get().delAuxHint(tw, test_hint_id); ASSERT_TRUE(ret); - etRunner::get().waitEvent(tw, E_TC_EVENT_TYPE_AUX_HINT_CHANGED); + ASSERT_HINT(tw, test_hint_id, "win.test.auxhint", "test"); }