From: Junkyeong Kim Date: Thu, 6 May 2021 11:09:30 +0000 (+0900) Subject: Apply etRunner::verifyTC to input, focus and auxhint test X-Git-Tag: accepted/tizen/unified/20210602.122431~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa561b24b7e095ecf1adf2b837e6de87094872c8;p=platform%2Fcore%2Fuifw%2Fe-tizen-testcase.git Apply etRunner::verifyTC to input, focus and auxhint test Change-Id: Ibfd4d9de49290716aa266919be580f52fac32a64 Signed-off-by: Junkyeong Kim --- diff --git a/data/img/etTestAuxHint/add_hint.png b/data/img/etTestAuxHint/add_hint.png new file mode 100644 index 0000000..94cc9df Binary files /dev/null and b/data/img/etTestAuxHint/add_hint.png differ diff --git a/data/img/etTestAuxHint/add_hint2.png b/data/img/etTestAuxHint/add_hint2.png new file mode 100644 index 0000000..94cc9df Binary files /dev/null and b/data/img/etTestAuxHint/add_hint2.png differ diff --git a/data/img/etTestAuxHint/change_hint.png b/data/img/etTestAuxHint/change_hint.png new file mode 100644 index 0000000..94cc9df Binary files /dev/null and b/data/img/etTestAuxHint/change_hint.png differ diff --git a/data/img/etTestAuxHint/del_hint.png b/data/img/etTestAuxHint/del_hint.png new file mode 100644 index 0000000..94cc9df Binary files /dev/null and b/data/img/etTestAuxHint/del_hint.png differ diff --git a/data/img/etTestAuxHint/revert_hint_using_add.png b/data/img/etTestAuxHint/revert_hint_using_add.png new file mode 100644 index 0000000..94cc9df Binary files /dev/null and b/data/img/etTestAuxHint/revert_hint_using_add.png differ diff --git a/data/img/etTestFocus/focus_activate1.png b/data/img/etTestFocus/focus_activate1.png new file mode 100644 index 0000000..a07beac Binary files /dev/null and b/data/img/etTestFocus/focus_activate1.png differ diff --git a/data/img/etTestFocus/focus_activate2.png b/data/img/etTestFocus/focus_activate2.png new file mode 100644 index 0000000..3e64d02 Binary files /dev/null and b/data/img/etTestFocus/focus_activate2.png differ diff --git a/data/img/etTestFocus/focus_activate3.png b/data/img/etTestFocus/focus_activate3.png new file mode 100644 index 0000000..481d6f3 Binary files /dev/null and b/data/img/etTestFocus/focus_activate3.png differ diff --git a/data/img/etTestFocus/focus_basic.png b/data/img/etTestFocus/focus_basic.png new file mode 100644 index 0000000..674b12d Binary files /dev/null and b/data/img/etTestFocus/focus_basic.png differ diff --git a/data/img/etTestFocus/focus_destroy.png b/data/img/etTestFocus/focus_destroy.png new file mode 100644 index 0000000..f191cd3 Binary files /dev/null and b/data/img/etTestFocus/focus_destroy.png differ diff --git a/data/img/etTestFocus/focus_fullsize_activate.png b/data/img/etTestFocus/focus_fullsize_activate.png new file mode 100644 index 0000000..2a479ac Binary files /dev/null and b/data/img/etTestFocus/focus_fullsize_activate.png differ diff --git a/data/img/etTestFocus/focus_fullsize_basic.png b/data/img/etTestFocus/focus_fullsize_basic.png new file mode 100644 index 0000000..4d73786 Binary files /dev/null and b/data/img/etTestFocus/focus_fullsize_basic.png differ diff --git a/data/img/etTestFocus/focus_fullsize_below_skip_above_remove.png b/data/img/etTestFocus/focus_fullsize_below_skip_above_remove.png new file mode 100644 index 0000000..375e688 Binary files /dev/null and b/data/img/etTestFocus/focus_fullsize_below_skip_above_remove.png differ diff --git a/data/img/etTestFocus/focus_fullsize_destroy.png b/data/img/etTestFocus/focus_fullsize_destroy.png new file mode 100644 index 0000000..375e688 Binary files /dev/null and b/data/img/etTestFocus/focus_fullsize_destroy.png differ diff --git a/data/img/etTestFocus/focus_fullsize_iconify.png b/data/img/etTestFocus/focus_fullsize_iconify.png new file mode 100644 index 0000000..375e688 Binary files /dev/null and b/data/img/etTestFocus/focus_fullsize_iconify.png differ diff --git a/data/img/etTestFocus/focus_fullsize_lower.png b/data/img/etTestFocus/focus_fullsize_lower.png new file mode 100644 index 0000000..375e688 Binary files /dev/null and b/data/img/etTestFocus/focus_fullsize_lower.png differ diff --git a/data/img/etTestFocus/focus_fullsize_lower2.png b/data/img/etTestFocus/focus_fullsize_lower2.png new file mode 100644 index 0000000..4d73786 Binary files /dev/null and b/data/img/etTestFocus/focus_fullsize_lower2.png differ diff --git a/data/img/etTestFocus/focus_fullsize_obscured_activate.png b/data/img/etTestFocus/focus_fullsize_obscured_activate.png new file mode 100644 index 0000000..ce95a72 Binary files /dev/null and b/data/img/etTestFocus/focus_fullsize_obscured_activate.png differ diff --git a/data/img/etTestFocus/focus_fullsize_obscured_activate_check_event.png b/data/img/etTestFocus/focus_fullsize_obscured_activate_check_event.png new file mode 100644 index 0000000..ce95a72 Binary files /dev/null and b/data/img/etTestFocus/focus_fullsize_obscured_activate_check_event.png differ diff --git a/data/img/etTestFocus/focus_fullsize_obscured_activate_destroy.png b/data/img/etTestFocus/focus_fullsize_obscured_activate_destroy.png new file mode 100644 index 0000000..2a479ac Binary files /dev/null and b/data/img/etTestFocus/focus_fullsize_obscured_activate_destroy.png differ diff --git a/data/img/etTestFocus/focus_fullsize_raise.png b/data/img/etTestFocus/focus_fullsize_raise.png new file mode 100644 index 0000000..2a479ac Binary files /dev/null and b/data/img/etTestFocus/focus_fullsize_raise.png differ diff --git a/data/img/etTestFocus/focus_fullsize_show_activate_under_blocker.png b/data/img/etTestFocus/focus_fullsize_show_activate_under_blocker.png new file mode 100644 index 0000000..ce95a72 Binary files /dev/null and b/data/img/etTestFocus/focus_fullsize_show_activate_under_blocker.png differ diff --git a/data/img/etTestFocus/focus_fullsize_show_activate_under_blocker_check_event.png b/data/img/etTestFocus/focus_fullsize_show_activate_under_blocker_check_event.png new file mode 100644 index 0000000..ce95a72 Binary files /dev/null and b/data/img/etTestFocus/focus_fullsize_show_activate_under_blocker_check_event.png differ diff --git a/data/img/etTestFocus/focus_fullsize_show_after_skip_set.png b/data/img/etTestFocus/focus_fullsize_show_after_skip_set.png new file mode 100644 index 0000000..4d73786 Binary files /dev/null and b/data/img/etTestFocus/focus_fullsize_show_after_skip_set.png differ diff --git a/data/img/etTestFocus/focus_fullsize_show_after_skip_set_and_transient_for.png b/data/img/etTestFocus/focus_fullsize_show_after_skip_set_and_transient_for.png new file mode 100644 index 0000000..4d73786 Binary files /dev/null and b/data/img/etTestFocus/focus_fullsize_show_after_skip_set_and_transient_for.png differ diff --git a/data/img/etTestFocus/focus_fullsize_skip_set.png b/data/img/etTestFocus/focus_fullsize_skip_set.png new file mode 100644 index 0000000..4d73786 Binary files /dev/null and b/data/img/etTestFocus/focus_fullsize_skip_set.png differ diff --git a/data/img/etTestFocus/focus_fullsize_skip_unset.png b/data/img/etTestFocus/focus_fullsize_skip_unset.png new file mode 100644 index 0000000..4d73786 Binary files /dev/null and b/data/img/etTestFocus/focus_fullsize_skip_unset.png differ diff --git a/data/img/etTestFocus/focus_fullsize_transient_for.png b/data/img/etTestFocus/focus_fullsize_transient_for.png new file mode 100644 index 0000000..2a479ac Binary files /dev/null and b/data/img/etTestFocus/focus_fullsize_transient_for.png differ diff --git a/data/img/etTestFocus/focus_fullsize_uniconify.png b/data/img/etTestFocus/focus_fullsize_uniconify.png new file mode 100644 index 0000000..2a479ac Binary files /dev/null and b/data/img/etTestFocus/focus_fullsize_uniconify.png differ diff --git a/data/img/etTestFocus/focus_iconify1.png b/data/img/etTestFocus/focus_iconify1.png new file mode 100644 index 0000000..f191cd3 Binary files /dev/null and b/data/img/etTestFocus/focus_iconify1.png differ diff --git a/data/img/etTestFocus/focus_iconify2.png b/data/img/etTestFocus/focus_iconify2.png new file mode 100644 index 0000000..5e3ccd3 Binary files /dev/null and b/data/img/etTestFocus/focus_iconify2.png differ diff --git a/data/img/etTestFocus/focus_lower.png b/data/img/etTestFocus/focus_lower.png new file mode 100644 index 0000000..f191cd3 Binary files /dev/null and b/data/img/etTestFocus/focus_lower.png differ diff --git a/data/img/etTestFocus/focus_lower2.png b/data/img/etTestFocus/focus_lower2.png new file mode 100644 index 0000000..44fea34 Binary files /dev/null and b/data/img/etTestFocus/focus_lower2.png differ diff --git a/data/img/etTestFocus/focus_move.png b/data/img/etTestFocus/focus_move.png new file mode 100644 index 0000000..f191cd3 Binary files /dev/null and b/data/img/etTestFocus/focus_move.png differ diff --git a/data/img/etTestFocus/focus_obscured_activate.png b/data/img/etTestFocus/focus_obscured_activate.png new file mode 100644 index 0000000..ce95a72 Binary files /dev/null and b/data/img/etTestFocus/focus_obscured_activate.png differ diff --git a/data/img/etTestFocus/focus_obscured_activate_destroy.png b/data/img/etTestFocus/focus_obscured_activate_destroy.png new file mode 100644 index 0000000..2a479ac Binary files /dev/null and b/data/img/etTestFocus/focus_obscured_activate_destroy.png differ diff --git a/data/img/etTestFocus/focus_raise.png b/data/img/etTestFocus/focus_raise.png new file mode 100644 index 0000000..a07beac Binary files /dev/null and b/data/img/etTestFocus/focus_raise.png differ diff --git a/data/img/etTestFocus/focus_show_activate.png b/data/img/etTestFocus/focus_show_activate.png new file mode 100644 index 0000000..81cfa98 Binary files /dev/null and b/data/img/etTestFocus/focus_show_activate.png differ diff --git a/data/img/etTestFocus/focus_skip_set.png b/data/img/etTestFocus/focus_skip_set.png new file mode 100644 index 0000000..674b12d Binary files /dev/null and b/data/img/etTestFocus/focus_skip_set.png differ diff --git a/data/img/etTestFocus/focus_skip_unset.png b/data/img/etTestFocus/focus_skip_unset.png new file mode 100644 index 0000000..674b12d Binary files /dev/null and b/data/img/etTestFocus/focus_skip_unset.png differ diff --git a/data/img/etTestFocus/focus_touch_basic.png b/data/img/etTestFocus/focus_touch_basic.png new file mode 100644 index 0000000..674b12d Binary files /dev/null and b/data/img/etTestFocus/focus_touch_basic.png differ diff --git a/data/img/etTestFocus/focus_touch_history.png b/data/img/etTestFocus/focus_touch_history.png new file mode 100644 index 0000000..803f491 Binary files /dev/null and b/data/img/etTestFocus/focus_touch_history.png differ diff --git a/data/img/etTestFocus/focus_touch_history2.png b/data/img/etTestFocus/focus_touch_history2.png new file mode 100644 index 0000000..5e3ccd3 Binary files /dev/null and b/data/img/etTestFocus/focus_touch_history2.png differ diff --git a/data/img/etTestFocus/focus_touch_with_focus_skip.png b/data/img/etTestFocus/focus_touch_with_focus_skip.png new file mode 100644 index 0000000..674b12d Binary files /dev/null and b/data/img/etTestFocus/focus_touch_with_focus_skip.png differ diff --git a/data/img/etTestFocus/focus_transient_for1.png b/data/img/etTestFocus/focus_transient_for1.png new file mode 100644 index 0000000..a07beac Binary files /dev/null and b/data/img/etTestFocus/focus_transient_for1.png differ diff --git a/data/img/etTestFocus/focus_transient_for2.png b/data/img/etTestFocus/focus_transient_for2.png new file mode 100644 index 0000000..6d685ea Binary files /dev/null and b/data/img/etTestFocus/focus_transient_for2.png differ diff --git a/data/img/etTestFocus/focus_transient_for3.png b/data/img/etTestFocus/focus_transient_for3.png new file mode 100644 index 0000000..674b12d Binary files /dev/null and b/data/img/etTestFocus/focus_transient_for3.png differ diff --git a/data/img/etTestFocus/focus_uniconify.png b/data/img/etTestFocus/focus_uniconify.png new file mode 100644 index 0000000..5e3ccd3 Binary files /dev/null and b/data/img/etTestFocus/focus_uniconify.png differ diff --git a/data/img/etTestFocus/focus_uniconify2.png b/data/img/etTestFocus/focus_uniconify2.png new file mode 100644 index 0000000..f191cd3 Binary files /dev/null and b/data/img/etTestFocus/focus_uniconify2.png differ diff --git a/data/img/etTestFocus/focus_visibility.png b/data/img/etTestFocus/focus_visibility.png new file mode 100644 index 0000000..674b12d Binary files /dev/null and b/data/img/etTestFocus/focus_visibility.png differ diff --git a/data/img/etTestInput/gesture_edge_drag11.png b/data/img/etTestInput/gesture_edge_drag11.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/gesture_edge_drag11.png differ diff --git a/data/img/etTestInput/gesture_edge_drag12.png b/data/img/etTestInput/gesture_edge_drag12.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/gesture_edge_drag12.png differ diff --git a/data/img/etTestInput/gesture_edge_drag13.png b/data/img/etTestInput/gesture_edge_drag13.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/gesture_edge_drag13.png differ diff --git a/data/img/etTestInput/gesture_edge_drag14.png b/data/img/etTestInput/gesture_edge_drag14.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/gesture_edge_drag14.png differ diff --git a/data/img/etTestInput/gesture_edge_drag21.png b/data/img/etTestInput/gesture_edge_drag21.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/gesture_edge_drag21.png differ diff --git a/data/img/etTestInput/gesture_edge_drag22.png b/data/img/etTestInput/gesture_edge_drag22.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/gesture_edge_drag22.png differ diff --git a/data/img/etTestInput/gesture_edge_drag23.png b/data/img/etTestInput/gesture_edge_drag23.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/gesture_edge_drag23.png differ diff --git a/data/img/etTestInput/gesture_edge_drag24.png b/data/img/etTestInput/gesture_edge_drag24.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/gesture_edge_drag24.png differ diff --git a/data/img/etTestInput/gesture_edge_swipe11.png b/data/img/etTestInput/gesture_edge_swipe11.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/gesture_edge_swipe11.png differ diff --git a/data/img/etTestInput/gesture_edge_swipe12.png b/data/img/etTestInput/gesture_edge_swipe12.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/gesture_edge_swipe12.png differ diff --git a/data/img/etTestInput/gesture_edge_swipe13.png b/data/img/etTestInput/gesture_edge_swipe13.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/gesture_edge_swipe13.png differ diff --git a/data/img/etTestInput/gesture_edge_swipe14.png b/data/img/etTestInput/gesture_edge_swipe14.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/gesture_edge_swipe14.png differ diff --git a/data/img/etTestInput/gesture_edge_swipe21.png b/data/img/etTestInput/gesture_edge_swipe21.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/gesture_edge_swipe21.png differ diff --git a/data/img/etTestInput/gesture_edge_swipe22.png b/data/img/etTestInput/gesture_edge_swipe22.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/gesture_edge_swipe22.png differ diff --git a/data/img/etTestInput/gesture_edge_swipe23.png b/data/img/etTestInput/gesture_edge_swipe23.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/gesture_edge_swipe23.png differ diff --git a/data/img/etTestInput/gesture_edge_swipe24.png b/data/img/etTestInput/gesture_edge_swipe24.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/gesture_edge_swipe24.png differ diff --git a/data/img/etTestInput/gesture_tap22.png b/data/img/etTestInput/gesture_tap22.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/gesture_tap22.png differ diff --git a/data/img/etTestInput/gesture_tap23.png b/data/img/etTestInput/gesture_tap23.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/gesture_tap23.png differ diff --git a/data/img/etTestInput/keygrab_nowin_excl.png b/data/img/etTestInput/keygrab_nowin_excl.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/keygrab_nowin_excl.png differ diff --git a/data/img/etTestInput/keygrab_nowin_orexcl.png b/data/img/etTestInput/keygrab_nowin_orexcl.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/keygrab_nowin_orexcl.png differ diff --git a/data/img/etTestInput/keygrab_nowin_shared.png b/data/img/etTestInput/keygrab_nowin_shared.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/keygrab_nowin_shared.png differ diff --git a/data/img/etTestInput/keygrab_win.png b/data/img/etTestInput/keygrab_win.png new file mode 100644 index 0000000..455beb8 Binary files /dev/null and b/data/img/etTestInput/keygrab_win.png differ diff --git a/data/img/etTestInput/keygrab_win_excl.png b/data/img/etTestInput/keygrab_win_excl.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/keygrab_win_excl.png differ diff --git a/data/img/etTestInput/keygrab_win_orexcl.png b/data/img/etTestInput/keygrab_win_orexcl.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/keygrab_win_orexcl.png differ diff --git a/data/img/etTestInput/keygrab_win_shared.png b/data/img/etTestInput/keygrab_win_shared.png new file mode 100644 index 0000000..8f3152d Binary files /dev/null and b/data/img/etTestInput/keygrab_win_shared.png differ diff --git a/data/img/etTestInput/keygrab_win_topposition.png b/data/img/etTestInput/keygrab_win_topposition.png new file mode 100644 index 0000000..94cc9df Binary files /dev/null and b/data/img/etTestInput/keygrab_win_topposition.png differ diff --git a/packaging/e-tizen-unittests.spec b/packaging/e-tizen-unittests.spec index 1ee6db4..a3ac7a1 100644 --- a/packaging/e-tizen-unittests.spec +++ b/packaging/e-tizen-unittests.spec @@ -65,6 +65,12 @@ rm -rf %{buildroot} %__cp -afr data/img/etTestTransientFor/*.png %{buildroot}/usr/share/e_tizen_unittests/data/etTestTransientFor/ %__mkdir_p %{buildroot}/usr/share/e_tizen_unittests/data/etTestTzsh/ %__cp -afr data/img/etTestTzsh/*.png %{buildroot}/usr/share/e_tizen_unittests/data/etTestTzsh/ +%__mkdir_p %{buildroot}/usr/share/e_tizen_unittests/data/etTestInput/ +%__cp -afr data/img/etTestInput/*.png %{buildroot}/usr/share/e_tizen_unittests/data/etTestInput/ +%__mkdir_p %{buildroot}/usr/share/e_tizen_unittests/data/etTestFocus/ +%__cp -afr data/img/etTestFocus/*.png %{buildroot}/usr/share/e_tizen_unittests/data/etTestFocus/ +%__mkdir_p %{buildroot}/usr/share/e_tizen_unittests/data/etTestAuxHint/ +%__cp -afr data/img/etTestAuxHint/*.png %{buildroot}/usr/share/e_tizen_unittests/data/etTestAuxHint/ # install make install DESTDIR=%{buildroot} diff --git a/src/testcase/0008_focus.cpp b/src/testcase/0008_focus.cpp index 153266e..c2d5be6 100644 --- a/src/testcase/0008_focus.cpp +++ b/src/testcase/0008_focus.cpp @@ -12,6 +12,8 @@ class etTestFocus : public ::etTCBase etWin *tw_green = NULL; etWin *tw_blue = NULL; etWin *tw_blocker = NULL; + std::string testCaseName; + std::string testName; void initTC(Eina_Bool show_win, Eina_Bool usr_geom); }; @@ -19,6 +21,8 @@ class etTestFocus : public ::etTCBase void etTestFocus::initTC(Eina_Bool show_win, Eina_Bool usr_geom) { + const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info(); + tw_red = initNormalWin("TCWin_Normal_red", usr_geom); if (show_win) { @@ -45,6 +49,9 @@ etTestFocus::initTC(Eina_Bool show_win, Eina_Bool usr_geom) tw_blocker = initNotiWin("TCWin_Noti_Blocker", EINA_FALSE, EINA_FALSE); ASSERT_TRUE(tw_blocker != NULL) << "failed to initiation window"; + + testCaseName = test_info->test_case_name(); + testName = test_info->name(); } TEST_F(etTestFocus, focus_basic) @@ -68,6 +75,8 @@ TEST_F(etTestFocus, focus_basic) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_lower) @@ -97,6 +106,8 @@ TEST_F(etTestFocus, focus_lower) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_lower2) @@ -126,6 +137,8 @@ TEST_F(etTestFocus, focus_lower2) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_raise) @@ -155,6 +168,8 @@ TEST_F(etTestFocus, focus_raise) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_destroy) @@ -183,6 +198,8 @@ TEST_F(etTestFocus, focus_destroy) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_activate1) @@ -212,6 +229,8 @@ TEST_F(etTestFocus, focus_activate1) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_activate2) @@ -245,6 +264,8 @@ TEST_F(etTestFocus, focus_activate2) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_activate3) @@ -282,6 +303,8 @@ TEST_F(etTestFocus, focus_activate3) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_show_activate) @@ -317,6 +340,8 @@ TEST_F(etTestFocus, focus_show_activate) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_obscured_activate) @@ -353,6 +378,8 @@ TEST_F(etTestFocus, focus_obscured_activate) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_obscured_activate_destroy) @@ -394,6 +421,8 @@ TEST_F(etTestFocus, focus_obscured_activate_destroy) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_transient_for1) @@ -423,6 +452,8 @@ TEST_F(etTestFocus, focus_transient_for1) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_transient_for2) @@ -452,6 +483,8 @@ TEST_F(etTestFocus, focus_transient_for2) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_transient_for3) @@ -481,6 +514,8 @@ TEST_F(etTestFocus, focus_transient_for3) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_iconify1) @@ -510,6 +545,8 @@ TEST_F(etTestFocus, focus_iconify1) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_iconify2) @@ -539,6 +576,8 @@ TEST_F(etTestFocus, focus_iconify2) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_uniconify) @@ -574,6 +613,8 @@ TEST_F(etTestFocus, focus_uniconify) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_uniconify2) @@ -609,6 +650,8 @@ TEST_F(etTestFocus, focus_uniconify2) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_visibility) @@ -645,6 +688,8 @@ TEST_F(etTestFocus, focus_visibility) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_move) @@ -672,6 +717,8 @@ TEST_F(etTestFocus, focus_move) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, DISABLED_focus_move2) @@ -703,6 +750,8 @@ TEST_F(etTestFocus, DISABLED_focus_move2) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_touch_basic) @@ -731,6 +780,8 @@ TEST_F(etTestFocus, focus_touch_basic) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_touch_history) @@ -802,6 +853,8 @@ TEST_F(etTestFocus, focus_touch_history) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_touch_history2) @@ -866,6 +919,8 @@ TEST_F(etTestFocus, focus_touch_history2) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_skip_set) @@ -895,6 +950,8 @@ TEST_F(etTestFocus, focus_skip_set) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_skip_unset) @@ -940,6 +997,8 @@ TEST_F(etTestFocus, focus_skip_unset) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_touch_with_focus_skip) @@ -972,6 +1031,8 @@ TEST_F(etTestFocus, focus_touch_with_focus_skip) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_fullsize_basic) @@ -995,6 +1056,8 @@ TEST_F(etTestFocus, focus_fullsize_basic) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_fullsize_lower) @@ -1024,6 +1087,8 @@ TEST_F(etTestFocus, focus_fullsize_lower) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_fullsize_lower2) @@ -1053,6 +1118,8 @@ TEST_F(etTestFocus, focus_fullsize_lower2) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_fullsize_raise) @@ -1082,6 +1149,8 @@ TEST_F(etTestFocus, focus_fullsize_raise) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_fullsize_destroy) @@ -1110,6 +1179,8 @@ TEST_F(etTestFocus, focus_fullsize_destroy) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_fullsize_activate) @@ -1139,6 +1210,8 @@ TEST_F(etTestFocus, focus_fullsize_activate) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_fullsize_obscured_activate) @@ -1175,6 +1248,8 @@ TEST_F(etTestFocus, focus_fullsize_obscured_activate) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_fullsize_obscured_activate_check_event) @@ -1217,6 +1292,8 @@ TEST_F(etTestFocus, focus_fullsize_obscured_activate_check_event) // check event of tw_red ASSERT_FALSE(etRunner::get().isEventOccuredAfterCheckpoint(tw_red, E_TC_EVENT_TYPE_FOCUS_CHANGED)); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_fullsize_obscured_activate_destroy) @@ -1258,6 +1335,8 @@ TEST_F(etTestFocus, focus_fullsize_obscured_activate_destroy) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_fullsize_show_activate_under_blocker) @@ -1292,6 +1371,8 @@ TEST_F(etTestFocus, focus_fullsize_show_activate_under_blocker) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_fullsize_show_activate_under_blocker_check_event) @@ -1332,6 +1413,8 @@ TEST_F(etTestFocus, focus_fullsize_show_activate_under_blocker_check_event) // check event of tw_red ASSERT_FALSE(etRunner::get().isEventOccuredAfterCheckpoint(tw_red, E_TC_EVENT_TYPE_FOCUS_CHANGED)); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_fullsize_transient_for) @@ -1361,6 +1444,8 @@ TEST_F(etTestFocus, focus_fullsize_transient_for) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_fullsize_iconify) @@ -1390,6 +1475,8 @@ TEST_F(etTestFocus, focus_fullsize_iconify) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_fullsize_uniconify) @@ -1424,6 +1511,8 @@ TEST_F(etTestFocus, focus_fullsize_uniconify) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_fullsize_skip_set) @@ -1448,6 +1537,8 @@ TEST_F(etTestFocus, focus_fullsize_skip_set) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_fullsize_skip_unset) @@ -1481,6 +1572,8 @@ TEST_F(etTestFocus, focus_fullsize_skip_unset) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_fullsize_below_skip_above_remove) @@ -1509,6 +1602,8 @@ TEST_F(etTestFocus, focus_fullsize_below_skip_above_remove) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_fullsize_show_after_skip_set) @@ -1540,6 +1635,8 @@ TEST_F(etTestFocus, focus_fullsize_show_after_skip_set) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestFocus, focus_fullsize_show_after_skip_set_and_transient_for) @@ -1581,4 +1678,6 @@ TEST_F(etTestFocus, focus_fullsize_show_after_skip_set_and_transient_for) ASSERT_FALSE(tw->Focus.obj); } etRunner::get().freeWinInfoList(list); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } diff --git a/src/testcase/0009_input.cpp b/src/testcase/0009_input.cpp index 5546531..870dd27 100644 --- a/src/testcase/0009_input.cpp +++ b/src/testcase/0009_input.cpp @@ -9,6 +9,9 @@ public: { key_name = eina_stringshare_add("XF86Menu"); etRunner::get().ev.key.name = eina_stringshare_add("XF86Menu"); + const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info(); + testCaseName = test_info->test_case_name(); + testName = test_info->name(); }; ~etTestInput() { @@ -26,6 +29,8 @@ protected: etWin *tw_orexcl = NULL; etWin *tw_excl = NULL; etWin *tw_gesture = NULL; + std::string testCaseName; + std::string testName; Eina_Stringshare *key_name = NULL; }; @@ -42,6 +47,8 @@ TEST_F(etTestInput, keygrab_nowin_shared) ret = ecore_wl2_window_keygrab_unset(NULL, "XF86Menu", 0, 0); ASSERT_TRUE(ret); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, keygrab_nowin_orexcl) @@ -57,6 +64,8 @@ TEST_F(etTestInput, keygrab_nowin_orexcl) ret = ecore_wl2_window_keygrab_unset(NULL, "XF86Menu", 0, 0); ASSERT_TRUE(ret); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, keygrab_nowin_excl) @@ -72,6 +81,8 @@ TEST_F(etTestInput, keygrab_nowin_excl) ret = ecore_wl2_window_keygrab_unset(NULL, "XF86Menu", 0, 0); ASSERT_TRUE(ret); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, keygrab_win_shared) @@ -104,6 +115,8 @@ TEST_F(etTestInput, keygrab_win_shared) evas_object_key_ungrab(tw_shared->elm_win, "XF86Menu", 0, 0); ret = elm_win_keygrab_unset(tw_shared->elm_win, "XF86Menu", 0, 0); ASSERT_TRUE(ret); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, keygrab_win_orexcl) @@ -136,6 +149,8 @@ TEST_F(etTestInput, keygrab_win_orexcl) evas_object_key_ungrab(tw_orexcl->elm_win, "XF86Menu", 0, 0); ret = elm_win_keygrab_unset(tw_orexcl->elm_win, "XF86Menu", 0, 0); ASSERT_TRUE(ret); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, keygrab_win_excl) @@ -168,6 +183,8 @@ TEST_F(etTestInput, keygrab_win_excl) evas_object_key_ungrab(tw_excl->elm_win, "XF86Menu", 0, 0); ret = elm_win_keygrab_unset(tw_excl->elm_win, "XF86Menu", 0, 0); ASSERT_TRUE(ret); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, keygrab_win_topposition) @@ -199,6 +216,8 @@ TEST_F(etTestInput, keygrab_win_topposition) evas_object_key_ungrab(tw_topposition->elm_win, "XF86Menu", 0, 0); ret = elm_win_keygrab_unset(tw_topposition->elm_win, "XF86Menu", 0, 0); ASSERT_TRUE(ret); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, keygrab_win) @@ -309,6 +328,8 @@ TEST_F(etTestInput, keygrab_win) etRunner::get().ev.key.name = NULL; etRunner::get().ev.elm_win = NULL; + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, gesture_tap22) @@ -337,6 +358,8 @@ TEST_F(etTestInput, gesture_tap22) ret = efl_util_gesture_ungrab(gesture_h, tap_d); ASSERT_TRUE(ret == EFL_UTIL_ERROR_NONE) << "failed to ungrab tap gesture: (ret: " << EFL_UTIL_RETURN_TO_STRING(ret) << ")"; + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, gesture_tap23) @@ -368,6 +391,8 @@ TEST_F(etTestInput, gesture_tap23) efl_util_gesture_tap_free(gesture_h, tap_d); ASSERT_TRUE(ret == EFL_UTIL_ERROR_NONE) << "failed to free tap grab data: (ret: " << EFL_UTIL_RETURN_TO_STRING(ret) << ")"; + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } void @@ -401,46 +426,64 @@ etTestInput::test_gesture_edge_swipe(int fingers, efl_util_gesture_edge_e edge) ret = efl_util_gesture_edge_swipe_free(gesture_h, edge_swipe_d); ASSERT_TRUE(ret == EFL_UTIL_ERROR_NONE) << "failed to free tap grab data: (ret: " << EFL_UTIL_RETURN_TO_STRING(ret) << ")"; + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, gesture_edge_swipe11) { test_gesture_edge_swipe(1, EFL_UTIL_GESTURE_EDGE_TOP); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, gesture_edge_swipe12) { test_gesture_edge_swipe(1, EFL_UTIL_GESTURE_EDGE_RIGHT); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, gesture_edge_swipe13) { test_gesture_edge_swipe(1, EFL_UTIL_GESTURE_EDGE_BOTTOM); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, gesture_edge_swipe14) { test_gesture_edge_swipe(1, EFL_UTIL_GESTURE_EDGE_LEFT); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, gesture_edge_swipe21) { test_gesture_edge_swipe(2, EFL_UTIL_GESTURE_EDGE_TOP); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, gesture_edge_swipe22) { test_gesture_edge_swipe(2, EFL_UTIL_GESTURE_EDGE_RIGHT); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, gesture_edge_swipe23) { test_gesture_edge_swipe(2, EFL_UTIL_GESTURE_EDGE_BOTTOM); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, gesture_edge_swipe24) { test_gesture_edge_swipe(2, EFL_UTIL_GESTURE_EDGE_LEFT); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } void @@ -479,39 +522,55 @@ etTestInput::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); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, gesture_edge_drag12) { test_gesture_edge_drag(1, EFL_UTIL_GESTURE_EDGE_RIGHT); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, gesture_edge_drag13) { test_gesture_edge_drag(1, EFL_UTIL_GESTURE_EDGE_BOTTOM); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, gesture_edge_drag14) { test_gesture_edge_drag(1, EFL_UTIL_GESTURE_EDGE_LEFT); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, gesture_edge_drag21) { test_gesture_edge_drag(2, EFL_UTIL_GESTURE_EDGE_TOP); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, gesture_edge_drag22) { test_gesture_edge_drag(2, EFL_UTIL_GESTURE_EDGE_RIGHT); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, gesture_edge_drag23) { test_gesture_edge_drag(2, EFL_UTIL_GESTURE_EDGE_BOTTOM); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestInput, gesture_edge_drag24) { test_gesture_edge_drag(2, EFL_UTIL_GESTURE_EDGE_LEFT); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } diff --git a/src/testcase/0012_aux_hint.cpp b/src/testcase/0012_aux_hint.cpp index 315dbae..f7dfb2c 100644 --- a/src/testcase/0012_aux_hint.cpp +++ b/src/testcase/0012_aux_hint.cpp @@ -19,6 +19,8 @@ class etTestAuxHint : public ::etTCBase protected: etWin *tw = NULL; + std::string testCaseName; + std::string testName; void initTC(); }; @@ -47,10 +49,15 @@ etTestAuxHint::compareHint(std::shared_ptr data, void etTestAuxHint::initTC() { + const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info(); + 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 + + testCaseName = test_info->test_case_name(); + testName = test_info->name(); } TEST_F(etTestAuxHint, add_hint) @@ -62,6 +69,8 @@ TEST_F(etTestAuxHint, add_hint) ret = etRunner::get().addAuxHint(tw, test_hint_id, "win.test.auxhint", "test"); ASSERT_TRUE(ret); ASSERT_HINT(tw, test_hint_id, "win.test.auxhint", "test"); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestAuxHint, add_hint2) @@ -78,6 +87,8 @@ TEST_F(etTestAuxHint, add_hint2) ret = etRunner::get().addAuxHint(tw, test_hint_id, "win.test.auxhint", "test2"); ASSERT_TRUE(ret); ASSERT_HINT(tw, test_hint_id, "win.test.auxhint", "test2"); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestAuxHint, change_hint) @@ -93,6 +104,8 @@ TEST_F(etTestAuxHint, change_hint) ret = etRunner::get().changeAuxHint(tw, test_hint_id, "test2"); ASSERT_TRUE(ret); ASSERT_HINT(tw, test_hint_id, "win.test.auxhint", "test2"); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestAuxHint, del_hint) @@ -108,6 +121,8 @@ TEST_F(etTestAuxHint, del_hint) ret = etRunner::get().delAuxHint(tw, test_hint_id); ASSERT_TRUE(ret); ASSERT_HINT(tw, test_hint_id, "win.test.auxhint", "test"); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); } TEST_F(etTestAuxHint, revert_hint_using_add) @@ -148,5 +163,7 @@ TEST_F(etTestAuxHint, revert_hint_using_add) // verify server's aux hint of "win.test.auxhint" // "origin" ev_result_hint = etRunner::get().getAuxHint(tw, "win.test.auxhint"); compareHint(ev_result_hint, test_hint_id, "win.test.auxhint", "origin"); + + ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE); }