From: Junseok Kim Date: Tue, 18 Jun 2024 05:22:48 +0000 (+0900) Subject: testcases: return init result instead of ASSERT in initTC functions X-Git-Tag: accepted/tizen/unified/20240727.112808~38 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1dc42e77ed050da1397f627bf51527719969407b;p=platform%2Fcore%2Fuifw%2Fe-tizen-testcase.git testcases: return init result instead of ASSERT in initTC functions Change-Id: Ib27f1abe8ab53e5280c2009ab9040b0fee4fb942 --- diff --git a/src/testcase/0002_base_operation.cpp b/src/testcase/0002_base_operation.cpp index 0b36503..3248b55 100644 --- a/src/testcase/0002_base_operation.cpp +++ b/src/testcase/0002_base_operation.cpp @@ -12,27 +12,30 @@ class etTestBaseOperation : public ::etTCBase std::string testCaseName; std::string testName; - void initTC(Eina_Bool alpha_set); + etTCResult initTC(Eina_Bool alpha_set); }; -void +etTCResult etTestBaseOperation::initTC(Eina_Bool alpha_set) { 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"; + if (tw == NULL) return etTCResult(false, "failed to initiation tw window"); if (alpha_set) elm_win_alpha_set(tw->elm_win, alpha_set); testCaseName = test_info->test_case_name(); testName = test_info->name(); + + return etTCResult(true, "init succeed"); } TEST_F(etTestBaseOperation, win_show) { - initTC(EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); ASSERT_TRUE(showTCWin(tw)) << "failed to show window"; ASSERT_VIS_ON(tw); @@ -46,7 +49,8 @@ TEST_F(etTestBaseOperation, win_stack) Eina_Bool res = EINA_FALSE; Eina_List *list = NULL, *l = NULL; - initTC(EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); ASSERT_TRUE(showTCWin(tw)) << "failed to show window"; ASSERT_VIS_ON(tw); @@ -73,7 +77,8 @@ TEST_F(etTestBaseOperation, win_stack) TEST_F(etTestBaseOperation, alpha_win_show) { - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); ASSERT_TRUE(showTCWin(tw)) << "failed to show window"; ASSERT_VIS_ON(tw); @@ -87,7 +92,8 @@ TEST_F(etTestBaseOperation, alpha_win_stack) Eina_Bool res = EINA_FALSE; Eina_List *list = NULL, *l = NULL; - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); ASSERT_TRUE(showTCWin(tw)) << "failed to show window"; ASSERT_VIS_ON(tw); diff --git a/src/testcase/0003_base_operation_multi_wins.cpp b/src/testcase/0003_base_operation_multi_wins.cpp index 39dc7c8..51da60c 100644 --- a/src/testcase/0003_base_operation_multi_wins.cpp +++ b/src/testcase/0003_base_operation_multi_wins.cpp @@ -14,40 +14,42 @@ class etTestBaseMulti : public ::etTCBase std::string testCaseName; std::string testName; - void initTC(Eina_Bool show_win, Eina_Bool usr_geom); + etTCResult initTC(Eina_Bool show_win, Eina_Bool usr_geom); }; -void +etTCResult etTestBaseMulti::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); - ASSERT_TRUE(tw_red != NULL) << "failed to initiation window"; + if (tw_red == NULL) return etTCResult(false, "failed to initiation tw_red window"); if (show_win) { showTCWin(tw_red); - ASSERT_VIS_ON(tw_red); + RETURN_VIS_ON(tw_red); } tw_green = initNormalWin("TCWin_Normal_green", usr_geom); - ASSERT_TRUE(tw_green != NULL) << "failed to initiation window"; + if (tw_green == NULL) return etTCResult(false, "failed to initiation tw_green window"); if (show_win) { showTCWin(tw_green); - ASSERT_VIS_ON(tw_green); + RETURN_VIS_ON(tw_green); } tw_blue = initNormalWin("TCWin_Normal_blue", usr_geom); - ASSERT_TRUE(tw_blue != NULL) << "failed to initiation window"; + if (tw_blue == NULL) return etTCResult(false, "failed to initiation tw_blue window"); if (show_win) { showTCWin(tw_blue); - ASSERT_VIS_ON(tw_blue); + RETURN_VIS_ON(tw_blue); } testCaseName = test_info->test_case_name(); testName = test_info->name(); + + return etTCResult(true, "init succeed"); } TEST_F(etTestBaseMulti, multi_all_wins_basic) @@ -57,7 +59,8 @@ TEST_F(etTestBaseMulti, multi_all_wins_basic) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Expected stack res: // [Top] Blue -> Green -> Red [Bottom] @@ -104,7 +107,8 @@ TEST_F(etTestBaseMulti, multi_all_wins_show1) int pass_count = 0; // init TC window, show=false, geom=true - initTC(EINA_FALSE, EINA_TRUE); + etTCResult initRes = initTC(EINA_FALSE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show red res = showTCWin(tw_red); @@ -166,7 +170,8 @@ TEST_F(etTestBaseMulti, multi_all_wins_show2) int pass_count = 0; // init TC window, show=false, geom=true - initTC(EINA_FALSE, EINA_TRUE); + etTCResult initRes = initTC(EINA_FALSE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show blue res = showTCWin(tw_blue); @@ -228,7 +233,8 @@ TEST_F(etTestBaseMulti, multi_all_wins_show3) int pass_count = 0; // init TC window, show=false, geom=true - initTC(EINA_FALSE, EINA_TRUE); + etTCResult initRes = initTC(EINA_FALSE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show green res = showTCWin(tw_green); @@ -289,7 +295,8 @@ TEST_F(etTestBaseMulti, multi_all_wins_raise1) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Raise Red etRunner::get().setWinStack(tw_red, NULL, EINA_TRUE); @@ -339,7 +346,8 @@ TEST_F(etTestBaseMulti, multi_all_wins_raise2) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Raise Green etRunner::get().setWinStack(tw_green, NULL, EINA_TRUE); @@ -389,7 +397,8 @@ TEST_F(etTestBaseMulti, multi_all_wins_stack_above1) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Raise Red on the Green etRunner::get().setWinStack(tw_red, tw_green, EINA_TRUE); @@ -439,7 +448,8 @@ TEST_F(etTestBaseMulti, multi_all_wins_stack_above2) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Raise Blue on the Red etRunner::get().setWinStack(tw_blue, tw_red, EINA_TRUE); @@ -489,7 +499,8 @@ TEST_F(etTestBaseMulti, multi_all_wins_stack_above3) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Raise Red on the Blue etRunner::get().setWinStack(tw_red, tw_blue, EINA_TRUE); @@ -539,7 +550,8 @@ TEST_F(etTestBaseMulti, multi_all_wins_lower1) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Lower Blue etRunner::get().setWinStack(tw_blue, NULL, EINA_FALSE); @@ -605,7 +617,8 @@ TEST_F(etTestBaseMulti, multi_all_wins_lower2) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Lower Green etRunner::get().setWinStack(tw_green, NULL, EINA_FALSE); @@ -671,7 +684,8 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_basic) int pass_count = 0; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Expected stack res: // [Top] Blue -> Green -> Red [Bottom] @@ -718,7 +732,8 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_show1) int pass_count = 0; // init TC window, show=false, geom=false - initTC(EINA_FALSE, EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show red res = showTCWin(tw_red); @@ -780,7 +795,8 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_show2) int pass_count = 0; // init TC window, show=false, geom=false - initTC(EINA_FALSE, EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show blue res = showTCWin(tw_blue); @@ -842,7 +858,8 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_show3) int pass_count = 0; // init TC window, show=false, geom=false - initTC(EINA_FALSE, EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show green res = showTCWin(tw_green); @@ -903,7 +920,8 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_raise1) int pass_count = 0; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Raise Red etRunner::get().setWinStack(tw_red, NULL, EINA_TRUE); @@ -953,7 +971,8 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_raise2) int pass_count = 0; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Raise Green etRunner::get().setWinStack(tw_green, NULL, EINA_TRUE); @@ -1003,7 +1022,8 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_stack_above1) int pass_count = 0; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Raise Red on the Green etRunner::get().setWinStack(tw_red, tw_green, EINA_TRUE); @@ -1053,7 +1073,8 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_stack_above2) int pass_count = 0; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Raise Blue on the Red etRunner::get().setWinStack(tw_blue, tw_red, EINA_TRUE); @@ -1103,7 +1124,8 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_stack_above3) int pass_count = 0; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Raise Red on the Blue etRunner::get().setWinStack(tw_red, tw_blue, EINA_TRUE); @@ -1153,7 +1175,8 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_lower1) int pass_count = 0; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Lower Blue etRunner::get().setWinStack(tw_blue, NULL, EINA_FALSE); @@ -1219,7 +1242,8 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_lower2) int pass_count = 0; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Lower Green etRunner::get().setWinStack(tw_green, NULL, EINA_FALSE); @@ -1285,7 +1309,8 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_lower_activate) int pass_count = 0; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Lower Blue evas_object_lower(tw_blue->elm_win); @@ -1338,7 +1363,8 @@ TEST_F(etTestBaseMulti, multi_2wins_show1) int pass_count = 0; // init TC window, show=false, geom=true - initTC(EINA_FALSE, EINA_TRUE); + etTCResult initRes = initTC(EINA_FALSE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show green res = showTCWin(tw_green); @@ -1389,7 +1415,8 @@ TEST_F(etTestBaseMulti, multi_2wins_show2) int pass_count = 0; // init TC window, show=false, geom=true - initTC(EINA_FALSE, EINA_TRUE); + etTCResult initRes = initTC(EINA_FALSE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show blue res = showTCWin(tw_blue); @@ -1440,7 +1467,8 @@ TEST_F(etTestBaseMulti, multi_2wins_show3) int pass_count = 0; // init TC window, show=false, geom=true - initTC(EINA_FALSE, EINA_TRUE); + etTCResult initRes = initTC(EINA_FALSE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show red res = showTCWin(tw_red); @@ -1491,7 +1519,8 @@ TEST_F(etTestBaseMulti, multi_full_2wins_show1) int pass_count = 0; // init TC window, show=false, geom=false - initTC(EINA_FALSE, EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show green res = showTCWin(tw_green); @@ -1542,7 +1571,8 @@ TEST_F(etTestBaseMulti, multi_full_2wins_show2) int pass_count = 0; // init TC window, show=false, geom=false - initTC(EINA_FALSE, EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show blue res = showTCWin(tw_blue); @@ -1593,7 +1623,8 @@ TEST_F(etTestBaseMulti, multi_full_2wins_show3) int pass_count = 0; // init TC window, show=false, geom=false - initTC(EINA_FALSE, EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show red res = showTCWin(tw_red); diff --git a/src/testcase/0004_transient_for.cpp b/src/testcase/0004_transient_for.cpp index 5ea79c8..ff2c4fe 100644 --- a/src/testcase/0004_transient_for.cpp +++ b/src/testcase/0004_transient_for.cpp @@ -15,40 +15,42 @@ class etTestTransientFor : public ::etTCBase std::string testCaseName; std::string testName; - void initTC(Eina_Bool show_win, Eina_Bool usr_geom); + etTCResult initTC(Eina_Bool show_win, Eina_Bool usr_geom); }; -void +etTCResult etTestTransientFor::initTC(Eina_Bool show_win, Eina_Bool usr_geom) { const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info(); tw_parent = initNormalWin("TCWin_Normal_parent", usr_geom); + if (tw_parent == NULL) return etTCResult(false, "failed to initiation tw_parent window"); if (show_win) { showTCWin(tw_parent); - ASSERT_VIS_ON(tw_parent); + RETURN_VIS_ON(tw_parent); } - ASSERT_TRUE(tw_parent != NULL) << "failed to initiation window"; tw_child = initNormalWin("TCWin_Normal_child", usr_geom); + if (tw_child == NULL) return etTCResult(false, "failed to initiation tw_child window"); if (show_win) { showTCWin(tw_child); - ASSERT_VIS_ON(tw_child); + RETURN_VIS_ON(tw_child); } - ASSERT_TRUE(tw_child != NULL) << "failed to initiation window"; tw_base = initNormalWin("TCWin_Normal_normal", usr_geom); + if (tw_base == NULL) return etTCResult(false, "failed to initiation tw_base window"); if (show_win) { showTCWin(tw_base); - ASSERT_VIS_ON(tw_base); + RETURN_VIS_ON(tw_base); } - ASSERT_TRUE(tw_base != NULL) << "failed to initiation window"; testCaseName = test_info->test_case_name(); testName = test_info->name(); + + return etTCResult(true, "init succeed"); } TEST_F(etTestTransientFor, transient_for_basic) @@ -59,7 +61,8 @@ TEST_F(etTestTransientFor, transient_for_basic) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set transient_for res = etRunner::get().setWinTransientFor(tw_child, tw_parent, EINA_TRUE); @@ -110,7 +113,8 @@ TEST_F(etTestTransientFor, transient_for_basic2) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // raise tw_parent etRunner::get().setWinStack(tw_parent, NULL, EINA_TRUE); @@ -165,7 +169,8 @@ TEST_F(etTestTransientFor, transient_for_raise) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set transient_for res = etRunner::get().setWinTransientFor(tw_child, tw_parent, EINA_TRUE); @@ -222,7 +227,8 @@ TEST_F(etTestTransientFor, transient_for_lower) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set transient_for res = etRunner::get().setWinTransientFor(tw_child, tw_parent, EINA_TRUE); @@ -295,7 +301,8 @@ TEST_F(etTestTransientFor, transient_for_stack_above) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set transient_for res = etRunner::get().setWinTransientFor(tw_child, tw_parent, EINA_TRUE); @@ -351,7 +358,8 @@ TEST_F(etTestTransientFor, transient_for_stack_below) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // tw_parent raise for prepare stack below res = etRunner::get().setWinStack(tw_parent, NULL, EINA_TRUE); @@ -413,7 +421,8 @@ TEST_F(etTestTransientFor, transient_for_layer_change) etWin *tw_noti; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // init notification window tw_noti = initNotiWin("TCWin_Noti", EINA_TRUE, EINA_TRUE); @@ -481,7 +490,8 @@ TEST_F(etTestTransientFor, transient_for_layer_change2) etWin *tw_noti; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // init notification window tw_noti = initNotiWin("TCWin_Noti", EINA_TRUE, EINA_TRUE); @@ -553,7 +563,8 @@ TEST_F(etTestTransientFor, transient_for_layer_revert) etWin *tw_noti; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // init notification window tw_noti = initNotiWin("TCWin_Noti", EINA_TRUE, EINA_TRUE); @@ -675,7 +686,8 @@ TEST_F(etTestTransientFor, transient_for_layer_revert2) etWin *tw_noti; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // init notification window tw_noti = initNotiWin("TCWin_Noti", EINA_TRUE, EINA_TRUE); @@ -801,7 +813,8 @@ TEST_F(etTestTransientFor, transient_for_always_on_top_basic) etWin *tw_aot; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // window for always_on_top tw_aot = initNormalWin("TCWin_Always_Top", EINA_TRUE); @@ -870,7 +883,8 @@ TEST_F(etTestTransientFor, transient_for_always_on_top_basic2) etWin *tw_aot; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // window for always_on_top tw_aot = initNormalWin("TCWin_Always_Top", EINA_TRUE); @@ -938,7 +952,8 @@ TEST_F(etTestTransientFor, transient_for_multi_child_basic) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // raise tw_parent etRunner::get().setWinStack(tw_parent, NULL, EINA_TRUE); @@ -1010,7 +1025,8 @@ TEST_F(etTestTransientFor, transient_for_multi_child_re_apply) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // raise tw_parent etRunner::get().setWinStack(tw_parent, NULL, EINA_TRUE); @@ -1129,7 +1145,8 @@ TEST_F(etTestTransientFor, transient_for_multi_child_re_apply2) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // raise tw_parent etRunner::get().setWinStack(tw_parent, NULL, EINA_TRUE); @@ -1240,7 +1257,8 @@ TEST_F(etTestTransientFor, transient_for_multi_child_change_below) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // raise tw_parent etRunner::get().setWinStack(tw_parent, NULL, EINA_TRUE); @@ -1406,7 +1424,8 @@ TEST_F(etTestTransientFor, transient_for_child_chain) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // raise tw_parent etRunner::get().setWinStack(tw_parent, NULL, EINA_TRUE); @@ -1478,7 +1497,8 @@ TEST_F(etTestTransientFor, transient_for_child_chain_raise) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set transient_for res = etRunner::get().setWinTransientFor(tw_child, tw_parent, EINA_TRUE); @@ -1549,7 +1569,8 @@ TEST_F(etTestTransientFor, transient_for_child_chain_lower) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // raise tw_parent etRunner::get().setWinStack(tw_parent, NULL, EINA_TRUE); diff --git a/src/testcase/0005_notification.cpp b/src/testcase/0005_notification.cpp index 6f74867..2a25c01 100644 --- a/src/testcase/0005_notification.cpp +++ b/src/testcase/0005_notification.cpp @@ -15,31 +15,33 @@ class etTestNotification : public ::etTCBase std::string testCaseName; std::string testName; - void initTC(Eina_Bool usr_geom); + etTCResult initTC(Eina_Bool usr_geom); }; -void +etTCResult etTestNotification::initTC(Eina_Bool usr_geom) { const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info(); tw_normal = initNormalWin("TCWin_Normal_normal", usr_geom); + if (tw_normal == NULL) return etTCResult(false, "failed to initiation tw_normal window"); showTCWin(tw_normal); - ASSERT_VIS_ON(tw_normal); - ASSERT_TRUE(tw_normal != NULL) << "failed to initiation window"; + RETURN_VIS_ON(tw_normal); tw_noti1 = initNotiWin("TCWin_Noti_1", usr_geom, EINA_FALSE); + if (tw_noti1 == NULL) return etTCResult(false, "failed to initiation tw_noti1 window"); showTCWin(tw_noti1); - ASSERT_VIS_ON(tw_noti1); - ASSERT_TRUE(tw_noti1 != NULL) << "failed to initiation window"; + RETURN_VIS_ON(tw_noti1); tw_noti2 = initNotiWin("TCWin_Noti_2", usr_geom, EINA_FALSE); + if (tw_noti2 == NULL) return etTCResult(false, "failed to initiation tw_noti2 window"); showTCWin(tw_noti2); - ASSERT_VIS_ON(tw_noti2); - ASSERT_TRUE(tw_noti2 != NULL) << "failed to initiation window"; + RETURN_VIS_ON(tw_noti2); testCaseName = test_info->test_case_name(); testName = test_info->name(); + + return etTCResult(true, "init succeed"); } TEST_F(etTestNotification, notification_level_default) @@ -51,7 +53,8 @@ TEST_F(etTestNotification, notification_level_default) int pass_count = 0; // init TC window, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set tw_noti1 to notification layer res = etRunner::get().setWinNotiLevel(tw_noti1, @@ -116,7 +119,8 @@ TEST_F(etTestNotification, notification_level_medium) int pass_count = 0; // init TC window, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set tw_noti1 to notification layer res = etRunner::get().setWinNotiLevel(tw_noti1, @@ -181,7 +185,8 @@ TEST_F(etTestNotification, notification_level_high) int pass_count = 0; // init TC window, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set tw_noti1 to notification layer res = etRunner::get().setWinNotiLevel(tw_noti1, @@ -246,7 +251,8 @@ TEST_F(etTestNotification, notification_level_top) int pass_count = 0; // init TC window, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set tw_noti1 to notification layer res = etRunner::get().setWinNotiLevel(tw_noti1, @@ -311,7 +317,8 @@ TEST_F(etTestNotification, notification_level_none) int pass_count = 0; // init TC window, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set tw_noti1 to notification high res = etRunner::get().setWinNotiLevel(tw_noti1, @@ -433,7 +440,8 @@ TEST_F(etTestNotification, notification_level_change) int pass_count = 0; // init TC window, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set tw_noti1 to notification default res = etRunner::get().setWinNotiLevel(tw_noti1, @@ -605,7 +613,8 @@ TEST_F(etTestNotification, notification_fullsize_level_default) int pass_count = 0; // init TC window, geom=false - initTC(EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set tw_noti1 to notification layer res = etRunner::get().setWinNotiLevel(tw_noti1, @@ -670,7 +679,8 @@ TEST_F(etTestNotification, notification_fullsize_level_medium) int pass_count = 0; // init TC window, geom=false - initTC(EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set tw_noti1 to notification layer res = etRunner::get().setWinNotiLevel(tw_noti1, @@ -735,7 +745,8 @@ TEST_F(etTestNotification, notification_fullsize_level_high) int pass_count = 0; // init TC window, geom=false - initTC(EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set tw_noti1 to notification layer res = etRunner::get().setWinNotiLevel(tw_noti1, @@ -800,7 +811,8 @@ TEST_F(etTestNotification, notification_fullsize_level_top) int pass_count = 0; // init TC window, geom=false - initTC(EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set tw_noti1 to notification layer res = etRunner::get().setWinNotiLevel(tw_noti1, @@ -865,7 +877,8 @@ TEST_F(etTestNotification, notification_fullsize_level_none) int pass_count = 0; // init TC window, geom=false - initTC(EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set tw_noti1 to notification high res = etRunner::get().setWinNotiLevel(tw_noti1, @@ -987,7 +1000,8 @@ TEST_F(etTestNotification, notification_fullsize_level_change) int pass_count = 0; // init TC window, geom=false - initTC(EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set tw_noti1 to notification default res = etRunner::get().setWinNotiLevel(tw_noti1, diff --git a/src/testcase/0006_tzsh_screensaver.cpp b/src/testcase/0006_tzsh_screensaver.cpp index caa53a0..9f344a3 100644 --- a/src/testcase/0006_tzsh_screensaver.cpp +++ b/src/testcase/0006_tzsh_screensaver.cpp @@ -39,19 +39,21 @@ class etTestTzshScreenSaver : public ::etTCBase std::string testCaseName; std::string testName; - void initTC(); + etTCResult initTC(); }; -void +etTCResult etTestTzshScreenSaver::initTC() { const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info(); tw_base = initNormalWin("TCWin_Normal_base", EINA_FALSE); - ASSERT_TRUE(tw_base != NULL) << "failed to initiation window"; + if (tw_base == NULL) return etTCResult(false, "failed to initiation tw_base window"); testCaseName = test_info->test_case_name(); testName = test_info->name(); + + return etTCResult(true, "init succeed"); } /****************** @@ -118,7 +120,8 @@ TEST_F(etTestTzshScreenSaver, scrsaver_basic) Eina_List *list = NULL, *l = NULL; etWin *tw = NULL; - initTC(); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); tzsh = tzsh_create(TZSH_TOOLKIT_TYPE_EFL); ASSERT_TRUE(tzsh != NULL); @@ -180,7 +183,8 @@ TEST_F(etTestTzshScreenSaver, scrsaver_mng_basic) { Eina_Bool res = EINA_FALSE; - initTC(); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); tzsh = tzsh_create(TZSH_TOOLKIT_TYPE_EFL); ASSERT_TRUE(tzsh != NULL); diff --git a/src/testcase/0007_rotation.cpp b/src/testcase/0007_rotation.cpp index ee572f0..cb82166 100644 --- a/src/testcase/0007_rotation.cpp +++ b/src/testcase/0007_rotation.cpp @@ -14,25 +14,27 @@ class etTestRotation : public ::etTCBase std::string testCaseName; std::string testName; - void initTC(); + etTCResult initTC(); void testWinRotation(etWin *tw, int rot); }; -void +etTCResult etTestRotation::initTC() { const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info(); tw_base = initNormalWin("TCWin_Normal_Rotation", EINA_TRUE); + if (tw_base == NULL) return etTCResult(false, "failed to initiation tw_base window"); showTCWin(tw_base); - ASSERT_VIS_ON(tw_base); - ASSERT_TRUE(tw_base != NULL) << "failed to initiation window"; + RETURN_VIS_ON(tw_base); // available rotations elm_win_wm_rotation_available_rotations_set(tw_base->elm_win, rots, 4); testCaseName = test_info->test_case_name(); testName = test_info->name(); + + return etTCResult(true, "init succeed"); } void @@ -54,7 +56,8 @@ TEST_F(etTestRotation, available_rotations) Eina_Bool res = EINA_FALSE; int rot = 0; - initTC(); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); res = etRunner::get().getWinInfo(tw_base); ASSERT_TRUE(res); diff --git a/src/testcase/0008_focus.cpp b/src/testcase/0008_focus.cpp index f84146e..50531f6 100644 --- a/src/testcase/0008_focus.cpp +++ b/src/testcase/0008_focus.cpp @@ -16,43 +16,45 @@ class etTestFocus : public ::etTCBase std::string testCaseName; std::string testName; - void initTC(Eina_Bool show_win, Eina_Bool usr_geom); + etTCResult initTC(Eina_Bool show_win, Eina_Bool usr_geom); }; -void +etTCResult 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 (tw_red == NULL) return etTCResult(false, "failed to initiation tw_red window"); if (show_win) { showTCWin(tw_red); - ASSERT_FOCUS_IN(tw_red); + RETURN_FOCUS_IN(tw_red); } - ASSERT_TRUE(tw_red != NULL) << "failed to initiation window"; tw_green = initNormalWin("TCWin_Normal_green", usr_geom); + if (tw_green == NULL) return etTCResult(false, "failed to initiation tw_green window"); if (show_win) { showTCWin(tw_green); - ASSERT_FOCUS_IN(tw_green); + RETURN_FOCUS_IN(tw_green); } - ASSERT_TRUE(tw_green != NULL) << "failed to initiation window"; tw_blue = initNormalWin("TCWin_Normal_blue", usr_geom); + if (tw_blue == NULL) return etTCResult(false, "failed to initiation tw_blue window"); if (show_win) { showTCWin(tw_blue); - ASSERT_FOCUS_IN(tw_blue); + RETURN_FOCUS_IN(tw_blue); } - ASSERT_TRUE(tw_blue != NULL) << "failed to initiation window"; tw_blocker = initNotiWin("TCWin_Noti_Blocker", EINA_FALSE, EINA_FALSE); - ASSERT_TRUE(tw_blocker != NULL) << "failed to initiation window"; + if (tw_blocker == NULL) return etTCResult(false, "failed to initiation tw_blocker window"); testCaseName = test_info->test_case_name(); testName = test_info->name(); + + return etTCResult(true, "init succeed"); } TEST_F(etTestFocus, focus_basic) @@ -61,7 +63,8 @@ TEST_F(etTestFocus, focus_basic) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Expected focus res: // [Top] Blue[focused] -> Green -> Red [Bottom] @@ -87,7 +90,8 @@ TEST_F(etTestFocus, focus_lower) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // make tw_blue lower res = etRunner::get().setWinStack(tw_blue, NULL, EINA_FALSE); @@ -118,7 +122,8 @@ TEST_F(etTestFocus, focus_lower2) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // make tw_green lower res = etRunner::get().setWinStack(tw_green, NULL, EINA_FALSE); @@ -149,7 +154,8 @@ TEST_F(etTestFocus, focus_raise) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // make tw_red raise res = etRunner::get().setWinStack(tw_red, NULL, EINA_TRUE); @@ -179,7 +185,8 @@ TEST_F(etTestFocus, focus_destroy) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // delete tw_blue hideTCWin(tw_blue); @@ -210,7 +217,8 @@ TEST_F(etTestFocus, focus_activate1) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Activate tw_red res = etRunner::get().setWinActivate(tw_red); @@ -241,7 +249,8 @@ TEST_F(etTestFocus, focus_activate2) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show Blocker showTCWin(tw_blocker); @@ -276,7 +285,8 @@ TEST_F(etTestFocus, focus_activate3) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // make partial notification window etWin *tw_smallnoti = initNotiWin("TW_Temp_Noti", EINA_TRUE, EINA_TRUE); @@ -315,7 +325,8 @@ TEST_F(etTestFocus, focus_show_activate) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_FALSE, EINA_TRUE); + etTCResult initRes = initTC(EINA_FALSE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); etWin *tw_small_blocker = initNotiWin("TCWin_Noti_Small_Blocker", EINA_TRUE, EINA_TRUE); showTCWin(tw_small_blocker); @@ -352,7 +363,8 @@ TEST_F(etTestFocus, focus_create_show_activate) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); etWin *tw_small_blocker = initNotiWin("TCWin_Noti_Small_Blocker", EINA_TRUE, EINA_TRUE); showTCWin(tw_small_blocker); @@ -396,7 +408,8 @@ TEST_F(etTestFocus, focus_obscured_activate) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show blocker res = etRunner::get().setWinNotiLevel(tw_blocker, @@ -434,7 +447,8 @@ TEST_F(etTestFocus, DISABLED_focus_obscured_activate_destroy) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show blocker res = etRunner::get().setWinNotiLevel(tw_blocker, @@ -477,7 +491,8 @@ TEST_F(etTestFocus, focus_transient_for1) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set transient_for Blue(parent) & Red(child) res = etRunner::get().setWinTransientFor(tw_red, tw_blue, EINA_TRUE); @@ -508,7 +523,8 @@ TEST_F(etTestFocus, focus_transient_for2) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set transient_for Blue(parent) & Green(child) res = etRunner::get().setWinTransientFor(tw_green, tw_blue, EINA_TRUE); @@ -539,7 +555,8 @@ TEST_F(etTestFocus, focus_transient_for3) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set transient_for Green(parent) & Blue(child) res = etRunner::get().setWinTransientFor(tw_blue, tw_green, EINA_TRUE); @@ -570,7 +587,8 @@ TEST_F(etTestFocus, focus_iconify1) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set iconify Blue res = etRunner::get().setWinIconic(tw_blue, EINA_TRUE); @@ -601,7 +619,8 @@ TEST_F(etTestFocus, focus_iconify2) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set iconify Red res = etRunner::get().setWinIconic(tw_red, EINA_TRUE); @@ -632,7 +651,8 @@ TEST_F(etTestFocus, focus_uniconify) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set iconify Red res = etRunner::get().setWinIconic(tw_red, EINA_TRUE); @@ -669,7 +689,8 @@ TEST_F(etTestFocus, focus_uniconify2) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set iconify Blue res = etRunner::get().setWinIconic(tw_blue, EINA_TRUE); @@ -706,7 +727,8 @@ TEST_F(etTestFocus, focus_visibility) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show blocker res = etRunner::get().setWinNotiLevel(tw_blocker, @@ -743,7 +765,8 @@ TEST_F(etTestFocus, focus_move) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // move tw_blue to out of screen tw_blue->move(2000, 2000); @@ -772,7 +795,8 @@ TEST_F(etTestFocus, DISABLED_focus_move2) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // move tw_blue to out of screen tw_blue->move(2000, 2000); @@ -805,7 +829,8 @@ TEST_F(etTestFocus, focus_touch_basic) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // touch red win InputGenHandler inputgen_h = std::make_shared(EFL_UTIL_INPUT_DEVTYPE_TOUCHSCREEN); @@ -838,7 +863,8 @@ TEST_F(etTestFocus, focus_touch_history) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // touch red win InputGenHandler inputgen_h = std::make_shared(EFL_UTIL_INPUT_DEVTYPE_TOUCHSCREEN); @@ -914,7 +940,8 @@ TEST_F(etTestFocus, focus_touch_history2) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // touch green win InputGenHandler inputgen_h = std::make_shared(EFL_UTIL_INPUT_DEVTYPE_TOUCHSCREEN); @@ -983,7 +1010,8 @@ TEST_F(etTestFocus, focus_skip_set) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set focus_skip on tw_blue etRunner::get().setFocusSkip(tw_blue, EINA_TRUE); @@ -1014,7 +1042,8 @@ TEST_F(etTestFocus, focus_skip_unset) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set focus_skip on tw_blue etRunner::get().setFocusSkip(tw_blue, EINA_TRUE); @@ -1061,7 +1090,8 @@ TEST_F(etTestFocus, focus_touch_with_focus_skip) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set focus_skip on tw_red etRunner::get().setFocusSkip(tw_red, EINA_TRUE); @@ -1098,7 +1128,8 @@ TEST_F(etTestFocus, focus_fullsize_basic) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Expected focus res: // [Top] Blue[focused] -> Green -> Red [Bottom] @@ -1124,7 +1155,8 @@ TEST_F(etTestFocus, focus_fullsize_lower) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // make tw_blue lower res = etRunner::get().setWinStack(tw_blue, NULL, EINA_FALSE); @@ -1155,7 +1187,8 @@ TEST_F(etTestFocus, focus_fullsize_lower2) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // make tw_green lower res = etRunner::get().setWinStack(tw_green, NULL, EINA_FALSE); @@ -1186,7 +1219,8 @@ TEST_F(etTestFocus, focus_fullsize_raise) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // make tw_red raise res = etRunner::get().setWinStack(tw_red, NULL, EINA_TRUE); @@ -1216,7 +1250,8 @@ TEST_F(etTestFocus, focus_fullsize_destroy) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // delete tw_blue hideTCWin(tw_blue); @@ -1247,7 +1282,8 @@ TEST_F(etTestFocus, focus_fullsize_activate) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Activate tw_red res = etRunner::get().setWinActivate(tw_red); @@ -1278,7 +1314,8 @@ TEST_F(etTestFocus, focus_fullsize_obscured_activate) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show blocker res = etRunner::get().setWinNotiLevel(tw_blocker, @@ -1316,7 +1353,8 @@ TEST_F(etTestFocus, focus_fullsize_obscured_activate_check_event) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show blocker res = etRunner::get().setWinNotiLevel(tw_blocker, @@ -1360,7 +1398,8 @@ TEST_F(etTestFocus, focus_fullsize_obscured_activate_destroy) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show blocker res = etRunner::get().setWinNotiLevel(tw_blocker, @@ -1403,7 +1442,8 @@ TEST_F(etTestFocus, focus_fullsize_show_activate_under_blocker) Eina_List *list = NULL, *l = NULL; // init TC window, show=false, geom=false - initTC(EINA_FALSE, EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); showTCWin(tw_blocker); etRunner::get().setWinNotiLevel(tw_blocker, @@ -1439,7 +1479,8 @@ TEST_F(etTestFocus, focus_fullsize_show_activate_under_blocker_check_event) Eina_List *list = NULL, *l = NULL; // init TC window, show=false, geom=false - initTC(EINA_FALSE, EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); showTCWin(tw_blocker); etRunner::get().setWinNotiLevel(tw_blocker, @@ -1481,7 +1522,8 @@ TEST_F(etTestFocus, focus_fullsize_transient_for) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set transient_for Blue(parent) & Red(child) res = etRunner::get().setWinTransientFor(tw_red, tw_blue, EINA_TRUE); @@ -1512,7 +1554,8 @@ TEST_F(etTestFocus, focus_fullsize_iconify) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set iconify Blue res = etRunner::get().setWinIconic(tw_blue, EINA_TRUE); @@ -1543,7 +1586,8 @@ TEST_F(etTestFocus, focus_fullsize_uniconify) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set iconify Red res = etRunner::get().setWinIconic(tw_red, EINA_TRUE); @@ -1578,7 +1622,8 @@ TEST_F(etTestFocus, focus_fullsize_skip_set) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set focus_skip on tw_blue etRunner::get().setFocusSkip(tw_blue, EINA_TRUE); @@ -1610,7 +1655,8 @@ TEST_F(etTestFocus, focus_fullsize_skip_unset) Eina_Bool res; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set focus_skip on tw_blue // Expected focus res: @@ -1665,7 +1711,8 @@ TEST_F(etTestFocus, focus_fullsize_below_skip_above_remove) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set focus_skip on tw_green etRunner::get().setFocusSkip(tw_green, EINA_TRUE); @@ -1700,7 +1747,8 @@ TEST_F(etTestFocus, focus_fullsize_show_after_skip_set) Eina_List *list = NULL, *l = NULL; // init TC window, show=false, geom=false - initTC(EINA_FALSE, EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); showTCWin(tw_red); showTCWin(tw_green); @@ -1738,7 +1786,8 @@ TEST_F(etTestFocus, focus_fullsize_show_after_skip_set_and_transient_for) Eina_List *list = NULL, *l = NULL; // init TC window, show=false, geom=false - initTC(EINA_FALSE, EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); showTCWin(tw_red); ASSERT_VIS_ON(tw_red); @@ -1781,7 +1830,8 @@ TEST_F(etTestFocus, focus_fullsize_alpha_visible_by_above_lower) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // tw_green alpha set elm_win_alpha_set(tw_green->elm_win, EINA_TRUE); @@ -1814,7 +1864,8 @@ TEST_F(etTestFocus, focus_fullsize_create_show_activate) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); etWin *tw_small_blocker = initNotiWin("TCWin_Noti_Small_Blocker", EINA_TRUE, EINA_TRUE); showTCWin(tw_small_blocker); @@ -1857,7 +1908,8 @@ TEST_F(etTestFocus, focus_fullsize_alpha_visible_by_above_hide) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // tw_green alpha set elm_win_alpha_set(tw_green->elm_win, EINA_TRUE); @@ -1890,7 +1942,8 @@ TEST_F(etTestFocus, focus_fullsize_alpha_visible_by_above_del) Eina_List *list = NULL, *l = NULL; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // tw_green alpha set elm_win_alpha_set(tw_green->elm_win, EINA_TRUE); diff --git a/src/testcase/0010_splash.cpp b/src/testcase/0010_splash.cpp index 2b7833f..1b8ffbc 100644 --- a/src/testcase/0010_splash.cpp +++ b/src/testcase/0010_splash.cpp @@ -18,24 +18,26 @@ class etTestSplash : public ::etTCBase std::string testCaseName; std::string testName; - void initTC(char * path, int type); + etTCResult initTC(char * path, int type); }; -void +etTCResult etTestSplash::initTC(char * path, int type) { Eina_Bool ret = EINA_FALSE; const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info(); tw = initNormalWin("TCWin_Splash", EINA_FALSE); - ASSERT_TRUE(tw != NULL) << "failed to initiation window"; + if (tw == NULL) return etTCResult(false, "failed to initiation tw window"); ret = etRunner::get().setSplashLaunch(path, type); etRunner::get().setSplashOwner(); - ASSERT_TRUE(ret); + if (!ret) return etTCResult(false, "failed to get splash launch"); testCaseName = test_info->test_case_name(); testName = test_info->name(); + + return etTCResult(true, "init succeed"); } TEST_F(etTestSplash, splash_edc) @@ -44,7 +46,8 @@ TEST_F(etTestSplash, splash_edc) Eina_Bool res = EINA_FALSE; Eina_List *list = NULL, *l = NULL; - initTC((char*)path_edc, SPLASH_TYPE_EDC); + etTCResult initRes = initTC((char*)path_edc, SPLASH_TYPE_EDC); + ASSERT_TRUE(initRes.result()) << initRes.description(); ASSERT_VIS_ON(tw); // find Launchscreen from toplv windows @@ -70,7 +73,8 @@ TEST_F(etTestSplash, splash_img) Eina_Bool res = EINA_FALSE; Eina_List *list = NULL, *l = NULL; - initTC((char*)path_img, SPLASH_TYPE_IMG); + etTCResult initRes = initTC((char*)path_img, SPLASH_TYPE_IMG); + ASSERT_TRUE(initRes.result()) << initRes.description(); ASSERT_VIS_ON(tw); // find Launchscreen from toplv windows @@ -95,7 +99,8 @@ TEST_F(etTestSplash, splash_disappear_after_real) etWin *tw2 = NULL; Eina_List *list = NULL, *l = NULL; - initTC((char*)path_img, SPLASH_TYPE_IMG); + etTCResult initRes = initTC((char*)path_img, SPLASH_TYPE_IMG); + ASSERT_TRUE(initRes.result()) << initRes.description(); showTCWin(tw); ASSERT_VIS_ON(tw); @@ -126,7 +131,8 @@ TEST_F(etTestSplash, splash_evas_callback_after_real) etWin *tw2 = NULL; Eina_List *list = NULL, *l = NULL; - initTC((char*)path_img, SPLASH_TYPE_IMG); + etTCResult initRes = initTC((char*)path_img, SPLASH_TYPE_IMG); + ASSERT_TRUE(initRes.result()) << initRes.description(); etRunner::get().setSplashOwner(); showTCWin(tw); diff --git a/src/testcase/0011_effect.cpp b/src/testcase/0011_effect.cpp index bda69cb..64611d0 100644 --- a/src/testcase/0011_effect.cpp +++ b/src/testcase/0011_effect.cpp @@ -13,29 +13,32 @@ class etTestEffect : public ::etTCBase std::string testCaseName; std::string testName; - void initTC(); + etTCResult initTC(); }; -void +etTCResult etTestEffect::initTC() { const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info(); tw = initNormalWin("TCWin_Effect_Show1", EINA_FALSE); - ASSERT_TRUE(tw != NULL) << "failed to initiation window"; + if (tw == NULL) etTCResult(false, "failed to initiation tw window"); tw_green = initNormalWin("TCWin_Effect_GREEN", EINA_FALSE); - ASSERT_TRUE(tw_green != NULL) << "failed to initiation window"; + if (tw_green == NULL) return etTCResult(false, "failed to initiation tw_green window"); testCaseName = test_info->test_case_name(); testName = test_info->name(); + + return etTCResult(true, "init succeed"); } TEST_F(etTestEffect, effect_show) { Eina_Bool res = EINA_FALSE; - initTC(); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); res = etRunner::get().setWinEffect(tw); ASSERT_TRUE(res); @@ -52,7 +55,8 @@ TEST_F(etTestEffect, effect_show_evas_callback) { Eina_Bool res = EINA_FALSE; - initTC(); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); res = etRunner::get().setWinEffect(tw); ASSERT_TRUE(res); @@ -69,7 +73,8 @@ TEST_F(etTestEffect, effect_hide_bylower) { Eina_Bool res = EINA_FALSE; - initTC(); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); showTCWin(tw); ASSERT_VIS_ON(tw); @@ -89,7 +94,8 @@ TEST_F(etTestEffect, effect_bg) { Eina_Bool res = EINA_FALSE; - initTC(); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); showTCWin(tw); ASSERT_VIS_ON(tw); diff --git a/src/testcase/0012_aux_hint.cpp b/src/testcase/0012_aux_hint.cpp index 39eb209..708cb36 100644 --- a/src/testcase/0012_aux_hint.cpp +++ b/src/testcase/0012_aux_hint.cpp @@ -22,7 +22,7 @@ class etTestAuxHint : public ::etTCBase std::string testCaseName; std::string testName; - void initTC(); + etTCResult initTC(); }; void @@ -46,25 +46,28 @@ etTestAuxHint::compareHint(std::shared_ptr data, } } -void +etTCResult 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 + if (tw == NULL) return etTCResult(false, "failed to initiation tw window"); + if (!showTCWin(tw)) return etTCResult(false, "failed to show window"); + RETURN_FOCUS_IN(tw); // for consume default aux hint event testCaseName = test_info->test_case_name(); testName = test_info->name(); + + return etTCResult(true, "init succeed"); } TEST_F(etTestAuxHint, add_hint) { Eina_Bool ret = EINA_FALSE; - initTC(); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); ret = etRunner::get().addAuxHint(tw, test_hint_id, "win.test.auxhint", "test"); ASSERT_TRUE(ret); @@ -77,7 +80,8 @@ TEST_F(etTestAuxHint, add_hint2) { Eina_Bool ret = EINA_FALSE; - initTC(); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); ret = etRunner::get().addAuxHint(tw, test_hint_id, "win.test.auxhint", "test"); ASSERT_TRUE(ret); @@ -95,7 +99,8 @@ TEST_F(etTestAuxHint, change_hint) { Eina_Bool ret = EINA_FALSE; - initTC(); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); ret = etRunner::get().addAuxHint(tw, test_hint_id, "win.test.auxhint", "test"); ASSERT_TRUE(ret); @@ -112,7 +117,8 @@ TEST_F(etTestAuxHint, del_hint) { Eina_Bool ret = EINA_FALSE; - initTC(); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); ret = etRunner::get().addAuxHint(tw, test_hint_id, "win.test.auxhint", "test"); ASSERT_TRUE(ret); @@ -129,7 +135,8 @@ TEST_F(etTestAuxHint, revert_hint_using_add) { Eina_Bool ret = EINA_FALSE; - initTC(); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); // add hint with id:486 ret = etRunner::get().addAuxHint(tw, test_hint_id, "win.test.auxhint", "origin"); @@ -171,7 +178,8 @@ TEST_F(etTestAuxHint, generate_hint) { int hint_id = -1; - initTC(); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); // add hint with generate(2, "win.test.auxhint", "test") hint_id = etRunner::get().generateAuxHint(tw, "win.test.auxhint", "test"); @@ -186,7 +194,8 @@ TEST_F(etTestAuxHint, generate_duplicated_hint) Eina_Bool ret = EINA_FALSE; int hint_id = -1; - initTC(); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); // add hint (486, "win.test.auxhint", "test") ret = etRunner::get().addAuxHint(tw, test_hint_id, "win.test.auxhint", "test"); @@ -210,7 +219,9 @@ TEST_F(etTestAuxHint, delete_generated_hint) Eina_Bool ret = EINA_FALSE; int hint_id = -1, hint_id2 = -1; - initTC(); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); + etRunner::get().addSupportedAuxHint("win.test.auxhint.2"); // generate hint (2, "win.test.auxhint", "test") @@ -240,7 +251,9 @@ TEST_F(etTestAuxHint, generate_hint_id_robustness) // disable timeout etRunner::get().setTCTimeout(EINA_FALSE, 0); - initTC(); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); + etRunner::get().addSupportedAuxHint("win.test.auxhint.dup"); for (int i = 0 ; i < 11 ; i++) @@ -284,7 +297,10 @@ TEST_F(etTestAuxHint, aux_hint_id_val_get) // disable timeout etRunner::get().setTCTimeout(EINA_FALSE, 0); - initTC(); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); + + etRunner::get().addSupportedAuxHint("win.test.auxhint.dup"); for (int i = 0 ; i < 11 ; i++) diff --git a/src/testcase/0013_iconic_state.cpp b/src/testcase/0013_iconic_state.cpp index e9b287e..685d55a 100644 --- a/src/testcase/0013_iconic_state.cpp +++ b/src/testcase/0013_iconic_state.cpp @@ -14,44 +14,46 @@ class etTestIconicState : public ::etTCBase std::string testCaseName; std::string testName; - void initTC(Eina_Bool show_win, Eina_Bool usr_geom); + etTCResult initTC(Eina_Bool show_win, Eina_Bool usr_geom); }; -void +etTCResult etTestIconicState::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); - ASSERT_TRUE(tw_red != NULL) << "failed to initiation window"; + if (tw_red == NULL) return etTCResult(false, "failed to initiation tw_red window"); if (show_win) { showTCWin(tw_red); - ASSERT_VIS_ON(tw_red); + RETURN_VIS_ON(tw_red); } tw_green = initNormalWin("TCWin_Normal_green", usr_geom); - ASSERT_TRUE(tw_green != NULL) << "failed to initiation window"; + if (tw_green == NULL) return etTCResult(false, "failed to initiation tw_green window"); if (show_win) { showTCWin(tw_green); - ASSERT_VIS_ON(tw_green); + RETURN_VIS_ON(tw_green); if (!usr_geom) - ASSERT_ICONIFIED_BY_SERVER(tw_red); + RETURN_ICONIFIED_BY_SERVER(tw_red); } tw_blue = initNormalWin("TCWin_Normal_blue", usr_geom); - ASSERT_TRUE(tw_blue != NULL) << "failed to initiation window"; + if (tw_blue == NULL) return etTCResult(false, "failed to initiation tw_blue window"); if (show_win) { showTCWin(tw_blue); - ASSERT_VIS_ON(tw_blue); + RETURN_VIS_ON(tw_blue); if (!usr_geom) - ASSERT_ICONIFIED_BY_SERVER(tw_green); + RETURN_ICONIFIED_BY_SERVER(tw_green); } testCaseName = test_info->test_case_name(); testName = test_info->name(); + + return etTCResult(true, "init succeed"); } TEST_F(etTestIconicState, iconify_by_client_basic) @@ -62,7 +64,8 @@ TEST_F(etTestIconicState, iconify_by_client_basic) int pass_count = 0; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Iconify Blue res = etRunner::get().setWinIconic(tw_blue, EINA_TRUE); @@ -120,7 +123,8 @@ TEST_F(etTestIconicState, iconify_by_client_basic2) int pass_count = 0; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Iconify Green res = etRunner::get().setWinIconic(tw_green, EINA_TRUE); @@ -177,7 +181,8 @@ TEST_F(etTestIconicState, iconify_by_client_basic3) int pass_count = 0; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Iconify Green res = etRunner::get().setWinIconic(tw_green, EINA_TRUE); @@ -240,7 +245,8 @@ TEST_F(etTestIconicState, iconify_by_client_uniconify) int pass_count = 0; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Iconify Blue res = etRunner::get().setWinIconic(tw_blue, EINA_TRUE); @@ -305,7 +311,8 @@ TEST_F(etTestIconicState, iconify_by_client_uniconify2) int pass_count = 0; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Iconify Green res = etRunner::get().setWinIconic(tw_green, EINA_TRUE); @@ -367,7 +374,8 @@ TEST_F(etTestIconicState, iconify_by_client_uniconify3) int pass_count = 0; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // Uniconify Green res = etRunner::get().setWinIconic(tw_green, EINA_FALSE); @@ -424,7 +432,8 @@ TEST_F(etTestIconicState, uniconify_by_above_alpha) int pass_count = 0; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); etRunner::get().work(0.5); @@ -529,7 +538,8 @@ TEST_F(etTestIconicState, iconify_by_server_basic) int pass_count = 0; // init TC window, show=false, geom=false - initTC(EINA_FALSE, EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show tw_red res = showTCWin(tw_red); @@ -588,7 +598,8 @@ TEST_F(etTestIconicState, iconify_by_server_uniconify) int pass_count = 0; // init TC window, show=false, geom=false - initTC(EINA_FALSE, EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // show tw_red res = showTCWin(tw_red); @@ -652,7 +663,8 @@ TEST_F(etTestIconicState, iconify_by_server_uniconify2) int pass_count = 0; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // change all window to 32bit colored window elm_win_alpha_set(tw_blue->elm_win, EINA_TRUE); @@ -713,7 +725,8 @@ TEST_F(etTestIconicState, iconify_transient_for_basic) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set transient_for between tw_blue(parent) and tw_red(child) res = etRunner::get().setWinTransientFor(tw_red, tw_blue, EINA_TRUE); @@ -780,7 +793,8 @@ TEST_F(etTestIconicState, iconify_transient_for_uniconify_parent) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set transient_for between tw_blue(parent) and tw_red(child) res = etRunner::get().setWinTransientFor(tw_red, tw_blue, EINA_TRUE); @@ -904,7 +918,8 @@ TEST_F(etTestIconicState, iconify_transient_for_uniconify_child) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set transient_for between tw_blue(parent) and tw_red(child) res = etRunner::get().setWinTransientFor(tw_red, tw_blue, EINA_TRUE); @@ -1024,7 +1039,8 @@ TEST_F(etTestIconicState, iconify_transient_for_fully_obscured) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set transient_for between tw_blue(parent) and tw_red(child) res = etRunner::get().setWinTransientFor(tw_red, tw_blue, EINA_TRUE); @@ -1095,7 +1111,8 @@ TEST_F(etTestIconicState, iconify_transient_for_unobscured) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE, EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE, EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // set transient_for between tw_blue(parent) and tw_red(child) res = etRunner::get().setWinTransientFor(tw_red, tw_blue, EINA_TRUE); diff --git a/src/testcase/0014_transient_for_below.cpp b/src/testcase/0014_transient_for_below.cpp index 87e288a..c6284b8 100644 --- a/src/testcase/0014_transient_for_below.cpp +++ b/src/testcase/0014_transient_for_below.cpp @@ -13,11 +13,11 @@ class etTestTransientForBelow : public ::etTCBase std::string testCaseName; std::string testName; - void initTC(Eina_Bool show_win, Eina_Bool partial = EINA_TRUE); + etTCResult initTC(Eina_Bool show_win, Eina_Bool partial = EINA_TRUE); void makeTransientBelowChild(etWin **win, etWin *parent, int x, int y, int w, int h, E_TC_Win_Color color, const char *name, Eina_Bool partial = EINA_TRUE); }; -void +etTCResult etTestTransientForBelow::initTC(Eina_Bool show_win, Eina_Bool partial) { const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info(); @@ -26,26 +26,28 @@ etTestTransientForBelow::initTC(Eina_Bool show_win, Eina_Bool partial) tw_base = initNormalWin("TCWin_Normal_normal", 0, 0, 480, 800, E_TC_WIN_COLOR_BLACK); else tw_base = initNormalWin("TCWin_Normal_normal", EINA_FALSE, E_TC_WIN_COLOR_BLACK); + if (tw_base == NULL) return etTCResult(false, "failed to initiation tw_base window"); if (show_win) { showTCWin(tw_base); - ASSERT_VIS_ON(tw_base); + RETURN_VIS_ON(tw_base); } - ASSERT_TRUE(tw_base != NULL) << "failed to initiation window"; if (partial) tw_parent = initNormalWin("TCWin_Normal_parent", 50, 50, 300, 300, E_TC_WIN_COLOR_RED); else tw_parent = initNormalWin("TCWin_Normal_parent", EINA_FALSE, E_TC_WIN_COLOR_RED); + if (tw_parent == NULL) return etTCResult(false, "failed to initiation tw_parent window"); if (show_win) { showTCWin(tw_parent); - ASSERT_VIS_ON(tw_parent); + RETURN_VIS_ON(tw_parent); } - ASSERT_TRUE(tw_parent != NULL) << "failed to initiation window"; testCaseName = test_info->test_case_name(); testName = test_info->name(); + + return etTCResult(true, "init succeed"); } void @@ -79,7 +81,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_basic) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child"); @@ -126,7 +129,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_unset) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child"); @@ -215,7 +219,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_unset2) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child"); @@ -305,7 +310,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_basic2) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child"); makeTransientBelowChild(&tw_child2, tw_parent, 110, 110, 300, 300, E_TC_WIN_COLOR_GREEN, "TCWin_Normal_child2"); @@ -360,7 +366,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_raise) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child"); makeTransientBelowChild(&tw_child2, tw_parent, 110, 110, 300, 300, E_TC_WIN_COLOR_GREEN, "TCWin_Normal_child2"); @@ -422,7 +429,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_activate) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child"); makeTransientBelowChild(&tw_child2, tw_parent, 110, 110, 300, 300, E_TC_WIN_COLOR_GREEN, "TCWin_Normal_child2"); @@ -484,7 +492,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_lower) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child"); makeTransientBelowChild(&tw_child2, tw_parent, 110, 110, 300, 300, E_TC_WIN_COLOR_GREEN, "TCWin_Normal_child2"); @@ -545,7 +554,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_lower2) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child"); makeTransientBelowChild(&tw_child2, tw_parent, 110, 110, 300, 300, E_TC_WIN_COLOR_GREEN, "TCWin_Normal_child2"); @@ -607,7 +617,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_parent_change_alpha) int pass_count = 0; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // make below child : user_geo=false makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child", EINA_FALSE); @@ -728,7 +739,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_parent_change_alpha2) int pass_count = 0; // init TC window, show=true, geom=false - initTC(EINA_TRUE, EINA_FALSE); + etTCResult initRes = initTC(EINA_TRUE, EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); // make below child : user_geo=false makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child", EINA_FALSE); @@ -851,7 +863,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_parent_lower) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child"); makeTransientBelowChild(&tw_child2, tw_parent, 110, 110, 300, 300, E_TC_WIN_COLOR_GREEN, "TCWin_Normal_child2"); @@ -930,7 +943,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_multi_parent) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child"); makeTransientBelowChild(&tw_child2, tw_parent, 110, 110, 300, 300, E_TC_WIN_COLOR_GREEN, "TCWin_Normal_child2"); @@ -1027,7 +1041,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_multi_parent_raise_parent) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child"); makeTransientBelowChild(&tw_child2, tw_parent, 110, 110, 300, 300, E_TC_WIN_COLOR_GREEN, "TCWin_Normal_child2"); @@ -1135,7 +1150,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_multi_parent_lower_parent) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child"); makeTransientBelowChild(&tw_child2, tw_parent, 110, 110, 300, 300, E_TC_WIN_COLOR_GREEN, "TCWin_Normal_child2"); @@ -1257,7 +1273,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_multi_parent_raise_child) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child"); makeTransientBelowChild(&tw_child2, tw_parent, 110, 110, 300, 300, E_TC_WIN_COLOR_GREEN, "TCWin_Normal_child2"); @@ -1575,7 +1592,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_multi_parent_raise_child_and int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child"); makeTransientBelowChild(&tw_child2, tw_parent, 110, 110, 300, 300, E_TC_WIN_COLOR_GREEN, "TCWin_Normal_child2"); @@ -1743,7 +1761,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_above_set) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); /////////////////////////// // SET transient BELOW @@ -2006,7 +2025,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_activate_below_basic) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child"); @@ -2064,7 +2084,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_activate_above_basic) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child"); @@ -2126,7 +2147,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_activate_above_parent) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child"); makeTransientBelowChild(&tw_child2, tw_parent, 110, 110, 300, 300, E_TC_WIN_COLOR_GREEN, "TCWin_Normal_child2"); @@ -2219,7 +2241,8 @@ TEST_F(etTestTransientForBelow, transient_for_below_activate_above_parent2) int pass_count = 0; // init TC window, show=true, geom=true - initTC(EINA_TRUE); + etTCResult initRes = initTC(EINA_TRUE); + ASSERT_TRUE(initRes.result()) << initRes.description(); makeTransientBelowChild(&tw_child, tw_parent, 80, 80, 300, 300, E_TC_WIN_COLOR_BLUE, "TCWin_Normal_child"); makeTransientBelowChild(&tw_child2, tw_parent, 110, 110, 300, 300, E_TC_WIN_COLOR_GREEN, "TCWin_Normal_child2"); diff --git a/src/testcase/0015_tzsh_quickpanel.cpp b/src/testcase/0015_tzsh_quickpanel.cpp index e656e76..331cc53 100644 --- a/src/testcase/0015_tzsh_quickpanel.cpp +++ b/src/testcase/0015_tzsh_quickpanel.cpp @@ -77,13 +77,15 @@ class etTestTzshQuickpanel : public ::etTCBase std::string testCaseName; std::string testName; - void checkInitTC(); + etTCResult checkInitTC(); }; -void +etTCResult etTestTzshQuickpanel::checkInitTC() { - ASSERT_TRUE(tw_base != NULL) << "failed to Setup window"; + if (tw_base == NULL) return etTCResult(false, "failed to Setup window"); + + return etTCResult(true, "init succeed"); } /****************** @@ -106,7 +108,8 @@ TEST_F(etTestTzshQuickpanel, DISABLED_quickpanel_basic) etWin *tw = NULL; int pass_count = 0; - checkInitTC(); + etTCResult initRes = checkInitTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); tzsh = tzsh_create(TZSH_TOOLKIT_TYPE_EFL); ASSERT_TRUE(tzsh != NULL); @@ -152,7 +155,8 @@ TEST_F(etTestTzshQuickpanel, DISABLED_quickpanel_basic) TEST_F(etTestTzshQuickpanel, DISABLED_quickpanel_destroy) { - checkInitTC(); + etTCResult initRes = checkInitTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); tzsh = tzsh_create(TZSH_TOOLKIT_TYPE_EFL); ASSERT_TRUE(tzsh != NULL); @@ -174,7 +178,8 @@ TEST_F(etTestTzshQuickpanel, DISABLED_quickpanel_destroy) TEST_F(etTestTzshQuickpanel, DISABLED_quickpanel_show_hide) { - checkInitTC(); + etTCResult initRes = checkInitTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); tzsh = tzsh_create(TZSH_TOOLKIT_TYPE_EFL); ASSERT_TRUE(tzsh != NULL); @@ -213,7 +218,8 @@ TEST_F(etTestTzshQuickpanel, DISABLED_quickpanel_show_hide) TEST_F(etTestTzshQuickpanel, DISABLED_quickpanel_scrollable_state) { - checkInitTC(); + etTCResult initRes = checkInitTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); tzsh = tzsh_create(TZSH_TOOLKIT_TYPE_EFL); ASSERT_TRUE(tzsh != NULL); @@ -269,7 +275,8 @@ TEST_F(etTestTzshQuickpanel, DISABLED_quickpanel_scrollable_state) TEST_F(etTestTzshQuickpanel, DISABLED_quickpanel_scrollable_retain) { - checkInitTC(); + etTCResult initRes = checkInitTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); tzsh = tzsh_create(TZSH_TOOLKIT_TYPE_EFL); ASSERT_TRUE(tzsh != NULL); @@ -340,7 +347,8 @@ TEST_F(etTestTzshQuickpanel, DISABLED_quickpanel_scrollable_retain) TEST_F(etTestTzshQuickpanel, DISABLED_quickpanel_event_handler) { - checkInitTC(); + etTCResult initRes = checkInitTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); tzsh = tzsh_create(TZSH_TOOLKIT_TYPE_EFL); ASSERT_TRUE(tzsh != NULL); @@ -384,7 +392,8 @@ TEST_F(etTestTzshQuickpanel, DISABLED_quickpanel_event_handler) TEST_F(etTestTzshQuickpanel, DISABLED_quickpanel_default_and_apps_menu) { - checkInitTC(); + etTCResult initRes = checkInitTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); tzsh = tzsh_create(TZSH_TOOLKIT_TYPE_EFL); ASSERT_TRUE(tzsh != NULL); @@ -420,7 +429,8 @@ TEST_F(etTestTzshQuickpanel, DISABLED_quickpanel_default_and_apps_menu) TEST_F(etTestTzshQuickpanel, DISABLED_quickpanel_default_and_apps_menu_tzsh_destroy) { - checkInitTC(); + etTCResult initRes = checkInitTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); tzsh = tzsh_create(TZSH_TOOLKIT_TYPE_EFL); ASSERT_TRUE(tzsh != NULL); @@ -448,7 +458,8 @@ TEST_F(etTestTzshQuickpanel, DISABLED_quickpanel_default_and_apps_menu_tzsh_dest TEST_F(etTestTzshQuickpanel, DISABLED_quickpanel_all_panels_tzsh_destroy) { - checkInitTC(); + etTCResult initRes = checkInitTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); tzsh = tzsh_create(TZSH_TOOLKIT_TYPE_EFL); ASSERT_TRUE(tzsh != NULL); @@ -479,7 +490,8 @@ TEST_F(etTestTzshQuickpanel, DISABLED_quickpanel_all_panels_tzsh_destroy) TEST_F(etTestTzshQuickpanel, DISABLED_quickpanel_multi_wins_tzsh_destroy) { - checkInitTC(); + etTCResult initRes = checkInitTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); tzsh = tzsh_create(TZSH_TOOLKIT_TYPE_EFL); ASSERT_TRUE(tzsh != NULL); diff --git a/src/testcase/0016_background_state.cpp b/src/testcase/0016_background_state.cpp index 1f74043..1e80e81 100644 --- a/src/testcase/0016_background_state.cpp +++ b/src/testcase/0016_background_state.cpp @@ -12,26 +12,29 @@ class etTestBackgroundState : public ::etTCBase std::string testCaseName; std::string testName; - void initTC(Eina_Bool partial); + etTCResult initTC(Eina_Bool partial); }; -void +etTCResult etTestBackgroundState::initTC(Eina_Bool partial) { const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info(); tw = initNormalWin("Test Window", partial); - ASSERT_TRUE(tw != NULL) << "failed to initiation window"; + if (tw == NULL) return etTCResult(false, "failed to initiation tw window"); etRunner::get().setWinBgState(tw, EINA_TRUE); testCaseName = test_info->test_case_name(); testName = test_info->name(); + + return etTCResult(true, "init succeed"); } TEST_F(etTestBackgroundState, win_show) { - initTC(EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); ASSERT_TRUE(showTCWin(tw)) << "failed to show window"; ASSERT_IF_VIS_ON(tw); @@ -43,7 +46,8 @@ TEST_F(etTestBackgroundState, win_lower) int pass_count = 0; etWin *tw_temp = NULL; - initTC(EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); ASSERT_TRUE(showTCWin(tw)) << "failed to show window"; ASSERT_IF_VIS_ON(tw); @@ -80,7 +84,8 @@ TEST_F(etTestBackgroundState, win_lower2) etWin *tw2 = NULL; etWin *tw_temp = NULL; - initTC(EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); ASSERT_TRUE(showTCWin(tw)) << "failed to show window"; ASSERT_IF_VIS_ON(tw); @@ -132,7 +137,8 @@ TEST_F(etTestBackgroundState, win_lower2) TEST_F(etTestBackgroundState, win_iconify) { - initTC(EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); ASSERT_TRUE(showTCWin(tw)) << "failed to show window"; ASSERT_IF_VIS_ON(tw); @@ -143,7 +149,8 @@ TEST_F(etTestBackgroundState, win_iconify) TEST_F(etTestBackgroundState, win_uniconify) { - initTC(EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); ASSERT_TRUE(showTCWin(tw)) << "failed to show window"; ASSERT_IF_VIS_ON(tw); @@ -154,7 +161,8 @@ TEST_F(etTestBackgroundState, win_uniconify) TEST_F(etTestBackgroundState, unset_bg_state) { - initTC(EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); ASSERT_TRUE(showTCWin(tw)) << "failed to show window"; ASSERT_IF_VIS_ON(tw); @@ -165,7 +173,8 @@ TEST_F(etTestBackgroundState, unset_bg_state) TEST_F(etTestBackgroundState, unset_bg_state_after_lower) { - initTC(EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); ASSERT_TRUE(showTCWin(tw)) << "failed to show window"; ASSERT_IF_VIS_ON(tw); @@ -179,7 +188,8 @@ TEST_F(etTestBackgroundState, unset_bg_state_after_lower) TEST_F(etTestBackgroundState, unset_bg_state_after_iconify) { - initTC(EINA_FALSE); + etTCResult initRes = initTC(EINA_FALSE); + ASSERT_TRUE(initRes.result()) << initRes.description(); ASSERT_TRUE(showTCWin(tw)) << "failed to show window"; ASSERT_IF_VIS_ON(tw); diff --git a/src/testcase/0018_input_region.cpp b/src/testcase/0018_input_region.cpp index c75b79f..1ce38e3 100644 --- a/src/testcase/0018_input_region.cpp +++ b/src/testcase/0018_input_region.cpp @@ -28,26 +28,26 @@ protected: int prev_w = 0; int prev_h = 0; - void initTC(); + etTCResult initTC(); void moveTC(int x, int y); void resizeTC(int w, int h); void setInputRegion(); }; -void +etTCResult etTestInputRegion::initTC() { const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info(); tw_base = initNormalWin("TCWin_Base", 0, 0, INPUT_REGION_INIT_W + 1, INPUT_REGION_INIT_H + 1, E_TC_WIN_COLOR_GREEN); + if (tw_base == NULL) return etTCResult(false, "failed to initiation tw_base window"); showTCWin(tw_base); - ASSERT_FOCUS_IN(tw_base); - ASSERT_TRUE(tw_base != NULL) << "failed to initiation window"; + RETURN_FOCUS_IN(tw_base); tw_test = initNormalWin("TCWin_InputRegion", 0, 0, INPUT_REGION_INIT_W, INPUT_REGION_INIT_H, E_TC_WIN_COLOR_BLUE); + if (tw_test == NULL) return etTCResult(false, "failed to initiation tw_test window"); showTCWin(tw_test); - ASSERT_FOCUS_IN(tw_test); - ASSERT_TRUE(tw_test != NULL) << "failed to initiation window"; + RETURN_FOCUS_IN(tw_test); elm_win_autodel_set(tw_test->getElmWin(), EINA_TRUE); elm_win_conformant_set(tw_test->getElmWin(), EINA_TRUE); @@ -68,6 +68,8 @@ etTestInputRegion::initTC() prev_w = INPUT_REGION_INIT_W; prev_h = INPUT_REGION_INIT_H; + + return etTCResult(true, "init succeed"); } void @@ -116,7 +118,10 @@ TEST_F(etTestInputRegion, region_basic) { int x = INPUT_REGION_INIT_W / 10; int y = INPUT_REGION_INIT_H / 10; - initTC(); + + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); + setInputRegion(); InputGenHandler inputgen_h = std::make_shared(EFL_UTIL_INPUT_DEVTYPE_TOUCHSCREEN); @@ -163,7 +168,10 @@ TEST_F(etTestInputRegion, region_move) int y = INPUT_REGION_INIT_H / 10; int move_x = 20; int move_y = 20; - initTC(); + + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); + setInputRegion(); moveTC(move_x, move_y); @@ -209,7 +217,10 @@ TEST_F(etTestInputRegion, region_resize) { int x = INPUT_REGION_RESIZE_W / 10; int y = INPUT_REGION_RESIZE_H / 10; - initTC(); + + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); + setInputRegion(); resizeTC(INPUT_REGION_RESIZE_W, INPUT_REGION_RESIZE_H); setInputRegion(); diff --git a/src/testcase/0019_cnp.cpp b/src/testcase/0019_cnp.cpp index afb8820..3e48756 100644 --- a/src/testcase/0019_cnp.cpp +++ b/src/testcase/0019_cnp.cpp @@ -28,18 +28,18 @@ protected: Evas_Object *en_src = NULL; Evas_Object *en_dst = NULL; - void initTC(); + etTCResult initTC(); }; -void +etTCResult etTestCnP::initTC() { const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info(); Evas_Object *gd; tw_src = initNormalWin("TCWin_Source", 0, 0, CNP_INIT_W, CNP_INIT_H, E_TC_WIN_COLOR_YELLOW); + if (tw_src == NULL) return etTCResult(false, "failed to initiation tw_src window"); showTCWin(tw_src); - ASSERT_FOCUS_IN(tw_src); - ASSERT_TRUE(tw_src != NULL) << "failed to initiation window"; + RETURN_FOCUS_IN(tw_src); elm_win_autodel_set(tw_src->getElmWin(), EINA_TRUE); @@ -59,9 +59,9 @@ etTestCnP::initTC() en_src = en; tw_dst = initNormalWin("TCWin_Source", 0, CNP_INIT_H, CNP_INIT_W, CNP_INIT_H, E_TC_WIN_COLOR_GREEN); + if (tw_dst == NULL) return etTCResult(false, "failed to initiation tw_dst window"); showTCWin(tw_dst); - ASSERT_FOCUS_IN(tw_dst); - ASSERT_TRUE(tw_dst != NULL) << "failed to initiation window"; + RETURN_FOCUS_IN(tw_dst); elm_win_autodel_set(tw_dst->getElmWin(), EINA_TRUE); @@ -82,6 +82,8 @@ etTestCnP::initTC() testCaseName = test_info->test_case_name(); testName = test_info->name(); + + return etTCResult(true, "init succeed"); } static Eina_Bool @@ -111,10 +113,12 @@ _selection_get(void *data, Evas_Object *obj EINA_UNUSED, Elm_Selection_Data *ev) TEST_F(etTestCnP, copypaste_basic) { - initTC(); const char *src_txt = "CnP test src context."; const char *dst_txt; + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); + elm_object_text_set(en_src, src_txt); elm_cnp_selection_set(elm_object_parent_widget_get(en_src), ELM_SEL_TYPE_CLIPBOARD, ELM_SEL_FORMAT_TEXT, src_txt, strlen(src_txt)); @@ -135,11 +139,13 @@ TEST_F(etTestCnP, copypaste_basic) TEST_F(etTestCnP, copypaste_second) { - initTC(); const char *src_txt = "CnP test src context."; const char *src_txt2 = "Second CnP test src context."; const char *dst_txt; + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); + elm_object_text_set(en_src, src_txt); elm_cnp_selection_set(elm_object_parent_widget_get(en_src), ELM_SEL_TYPE_CLIPBOARD, ELM_SEL_FORMAT_TEXT, src_txt, strlen(src_txt)); @@ -167,7 +173,6 @@ TEST_F(etTestCnP, copypaste_second) TEST_F(etTestCnP, copypaste_heavy) { - initTC(); ifstream fs; int len = 0; char c; @@ -175,6 +180,8 @@ TEST_F(etTestCnP, copypaste_heavy) const char *ptr; const char *dst_txt; + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); fs.open("/usr/share/e_tizen_unittests/data/test.txt"); diff --git a/src/testcase/0020_dnd.cpp b/src/testcase/0020_dnd.cpp index aef881a..1f2a3b8 100644 --- a/src/testcase/0020_dnd.cpp +++ b/src/testcase/0020_dnd.cpp @@ -23,18 +23,18 @@ protected: Evas_Object *lb_src = NULL; Evas_Object *en_dst = NULL; - void initTC(); + etTCResult initTC(); }; -void +etTCResult etTestDnD::initTC() { const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info(); Evas_Object *gd; tw_src = initNormalWin("TCWin_Source", 0, 0, DND_INIT_W, DND_INIT_H, E_TC_WIN_COLOR_YELLOW); + if (tw_src == NULL) return etTCResult(false, "failed to initiation tw_src window"); showTCWin(tw_src); - ASSERT_FOCUS_IN(tw_src); - ASSERT_TRUE(tw_src != NULL) << "failed to initiation window"; + RETURN_FOCUS_IN(tw_src); elm_win_autodel_set(tw_src->getElmWin(), EINA_TRUE); @@ -52,9 +52,9 @@ etTestDnD::initTC() lb_src = lb; tw_dst = initNormalWin("TCWin_Source", 0, DND_INIT_H, DND_INIT_W, DND_INIT_H, E_TC_WIN_COLOR_GREEN); + if (tw_dst == NULL) return etTCResult(false, "failed to initiation tw_dst window"); showTCWin(tw_dst); - ASSERT_FOCUS_IN(tw_dst); - ASSERT_TRUE(tw_dst != NULL) << "failed to initiation window"; + RETURN_FOCUS_IN(tw_dst); elm_win_autodel_set(tw_dst->getElmWin(), EINA_TRUE); @@ -75,6 +75,8 @@ etTestDnD::initTC() testCaseName = test_info->test_case_name(); testName = test_info->name(); + + return etTCResult(true, "init succeed"); } static void @@ -151,11 +153,13 @@ _entry_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUS TEST_F(etTestDnD, dragdrop_basic) { - initTC(); const char *src_txt = "DnD test src context."; const char *dst_txt; InputGenHandler inputgen_h = std::make_shared(EFL_UTIL_INPUT_DEVTYPE_TOUCHSCREEN); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); + etRunner::get().work(1.0); // wait for touch device enabled elm_object_text_set(lb_src, src_txt); diff --git a/src/testcase/0021_output_resolution.cpp b/src/testcase/0021_output_resolution.cpp index d7c59c6..cc363f9 100644 --- a/src/testcase/0021_output_resolution.cpp +++ b/src/testcase/0021_output_resolution.cpp @@ -21,23 +21,26 @@ protected: std::string testName; etWin *tw_red = NULL; - void initTC(); + etTCResult initTC(); }; -void +etTCResult etTestOutputResolution::initTC() { const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info(); testCaseName = test_info->test_case_name(); testName = test_info->name(); + + return etTCResult(true, "init succeed"); } TEST_F(etTestOutputResolution, basic) { int res = 0; - initTC(); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); res = etRunner::get().setConfiguredOutputResolution(CONFIGURED_OUTPUT_RESOLUTION_W, CONFIGURED_OUTPUT_RESOLUTION_H); ASSERT_EQ(res, 1); @@ -57,7 +60,8 @@ TEST_F(etTestOutputResolution, base_output_resolution_basic) { int res = 0; - initTC(); + etTCResult initRes = initTC(); + ASSERT_TRUE(initRes.result()) << initRes.description(); res = etRunner::get().setConfiguredOutputResolution(CONFIGURED_OUTPUT_RESOLUTION_W, CONFIGURED_OUTPUT_RESOLUTION_H); ASSERT_EQ(res, 1);