projects / platform / core / uifw / e-tizen-testcase.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f55b1b6)
modified code to run the TC when the timeout is occured 05/80205/1
authorDoyoun Kang <doyoun.kang@samsung.com>
Fri, 15 Jul 2016 07:49:44 +0000 (16:49 +0900)
committerDoyoun Kang <doyoun.kang@samsung.com>
Fri, 15 Jul 2016 07:49:44 +0000 (16:49 +0900)
Change-Id: Id3012855574344c7bbc5666e3a04422ff839f0ae

src/0100_base_operation.c patch | blob | history
src/0150_base_operation_multi_wins.c patch | blob | history
src/0200_transient_for.c patch | blob | history
src/0300_notification.c patch | blob | history

diff --git a/src/0100_base_operation.c b/src/0100_base_operation.c
index 53d6ffb..f80349b 100644 (file)
--- a/src/0100_base_operation.c
+++ b/src/0100_base_operation.c
@@ -29,8 +29,7 @@ _tc_pre_run(E_TC *tc, Eina_Bool alpha)
    e_tc_win_geom_update(tc->data->tw);
    e_tc_win_show(tc->data->tw);
 
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_VIS_ON);
-   EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_VIS_ON);
 
    e_test_runner_work();
 
diff --git a/src/0150_base_operation_multi_wins.c b/src/0150_base_operation_multi_wins.c
index e1ce6a8..73f5c7d 100644 (file)
--- a/src/0150_base_operation_multi_wins.c
+++ b/src/0150_base_operation_multi_wins.c
@@ -53,8 +53,6 @@ _tc_win_unregister(E_TC *tc)
 static Eina_Bool
 _tc_multi_wins_pre_run(E_TC *tc, Eina_Bool show_win)
 {
-   Eina_Bool res;
-
    tc->data = E_NEW(E_TC_Data, 1);
    EINA_SAFETY_ON_NULL_RETURN_VAL(tc->data, EINA_FALSE);
 
@@ -94,9 +92,7 @@ _tc_multi_wins_pre_run(E_TC *tc, Eina_Bool show_win)
 
         e_tc_win_geom_update(tc->data->tw_blue);
         e_tc_win_show(tc->data->tw_blue);
-
-        res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_VIS_ON);
-        EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
+        e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_VIS_ON);
      }
 
    e_test_runner_work();
@@ -141,9 +137,7 @@ _tc_win_show(E_TC *tc, E_TC_Win *tw)
 
    e_tc_win_geom_update(tw);
    e_tc_win_show(tw);
-
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_VIS_ON);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EINA_FALSE);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_VIS_ON);
 
    return EINA_TRUE;
 }
@@ -451,9 +445,7 @@ tc_0154_multi_all_wins_raise1(E_TC *tc)
 
    // Raise Red
    e_test_runner_req_win_stack_set(tc->runner, tw_red, NULL, EINA_TRUE);
-
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
-   EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
 
    // Expected stack result:
    // [Top] Red -> Blue -> Green [Bottom]
@@ -521,9 +513,7 @@ tc_0155_multi_all_wins_raise2(E_TC *tc)
 
    // Raise Green
    e_test_runner_req_win_stack_set(tc->runner, tw_green, NULL, EINA_TRUE);
-
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
-   EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
 
    // Expected stack result:
    // [Top] Green -> Blue -> Red [Bottom]
@@ -591,9 +581,7 @@ tc_0156_multi_all_wins_stack_above1(E_TC *tc)
 
    // Raise Red on the Green
    e_test_runner_req_win_stack_set(tc->runner, tw_red, tw_green, EINA_TRUE);
-
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
-   EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
 
    // Expected stack result:
    // [Top] Blue -> Red -> Green [Bottom]
@@ -662,9 +650,7 @@ tc_0157_multi_all_wins_stack_above2(E_TC *tc)
 
    // Raise Blue on the Red
    e_test_runner_req_win_stack_set(tc->runner, tw_blue, tw_red, EINA_TRUE);
-
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
-   EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
 
    // Expected stack result:
    // [Top] Green -> Blue -> Red [Bottom]
@@ -732,9 +718,7 @@ tc_0158_multi_all_wins_stack_above3(E_TC *tc)
 
    // Raise Red on the Blue
    e_test_runner_req_win_stack_set(tc->runner, tw_red, tw_blue, EINA_TRUE);
-
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
-   EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
 
    // Expected stack result:
    // [Top] Red -> Blue -> Green [Bottom]
@@ -802,9 +786,7 @@ tc_0159_multi_all_wins_lower1(E_TC *tc)
 
    // Lower Blue
    e_test_runner_req_win_stack_set(tc->runner, tw_blue, NULL, EINA_FALSE);
-
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
-   EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
 
    // Expected stack result:
    // [Top] Green -> Red -> ... -> Blue  [Bottom]
@@ -891,9 +873,7 @@ tc_0160_multi_all_wins_lower2(E_TC *tc)
 
    // Lower Green
    e_test_runner_req_win_stack_set(tc->runner, tw_green, NULL, EINA_FALSE);
-
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
-   EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
 
    // Expected stack result:
    // [Top] Blue -> Red -> ... -> Green [Bottom]
@@ -986,8 +966,7 @@ tc_0180_multi_2wins_show1(E_TC *tc)
    e_tc_win_show(tc->data->tw_red);
 
    // wait for showing register_win
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_VIS_ON);
-   EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_VIS_ON);
 
    // Expected stack result:
    // [Top] Red -> Green [Bottom]
@@ -1057,8 +1036,7 @@ tc_0181_multi_2wins_show2(E_TC *tc)
    e_tc_win_show(tc->data->tw_green);
 
    // wait for showing register_win
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_VIS_ON);
-   EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_VIS_ON);
 
    // Expected stack result:
    // [Top] Green -> Blue [Bottom]
@@ -1128,8 +1106,7 @@ tc_0182_multi_2wins_show3(E_TC *tc)
    e_tc_win_show(tc->data->tw_blue);
 
    // wait for showing register_win
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_VIS_ON);
-   EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_VIS_ON);
 
    // Expected stack result:
    // [Top] Blue -> Red [Bottom]
diff --git a/src/0200_transient_for.c b/src/0200_transient_for.c
index a6a3639..5fdd926 100644 (file)
--- a/src/0200_transient_for.c
+++ b/src/0200_transient_for.c
@@ -59,9 +59,7 @@ _tc_win_show(E_TC *tc, E_TC_Win *tw)
 
    e_tc_win_geom_update(tw);
    e_tc_win_show(tw);
-
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_VIS_ON);
-   EINA_SAFETY_ON_FALSE_RETURN_VAL(res, EINA_FALSE);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_VIS_ON);
 
    return EINA_TRUE;
 }
@@ -112,8 +110,7 @@ _tc_transient_for_pre_run(E_TC *tc)
                                     EINA_TRUE);
    EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
 
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
-   EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
 
    e_test_runner_work();
 
@@ -229,13 +226,11 @@ tc_0201_transient_for_raise(E_TC *tc)
    EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
 
    e_test_runner_req_win_stack_set(tc->runner, tw_parent, NULL, EINA_TRUE);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
 
    // Expected stack result:
    // [Top] tw_child -> tw_parent -> tw_main [Bottom]
 
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
-   EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
-
    list = e_test_runner_req_win_info_list_get(tc->runner);
    EINA_SAFETY_ON_NULL_GOTO(list, cleanup);
 
@@ -300,18 +295,15 @@ tc_0202_transient_for_lower(E_TC *tc)
 
    // Raise Transient_for Parent window
    e_test_runner_req_win_stack_set(tc->runner, tw_parent, NULL, EINA_TRUE);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
 
    // Expected stack result:
    // [Top] tw_child -> tw_parent -> tw_main [Bottom]
 
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
-   EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
 
    // lower tw_parent
    e_test_runner_req_win_stack_set(tc->runner, tw_parent, NULL, EINA_FALSE);
-
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_LOWER);
-   EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_LOWER);
 
    // Expected stack result:
    // [Top] tw_main -> ... -> tw_child -> tw_parent [Bottom]
@@ -397,9 +389,7 @@ tc_0203_transient_for_stack_above(E_TC *tc)
    EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
 
    e_test_runner_req_win_stack_set(tc->runner, tw_parent, tw_main, EINA_TRUE);
-
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_ABOVE);
-   EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_ABOVE);
 
    // Expected stack result:
    // [Top] tw_child -> tw_parent -> tw_main [Bottom]
@@ -467,17 +457,13 @@ tc_0204_transient_for_stack_below(E_TC *tc)
 
    // raise tw_parent
    e_test_runner_req_win_stack_set(tc->runner, tw_parent, NULL, EINA_TRUE);
-
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
-   EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_RAISE);
 
    // Expected stack result:
    // [Top] tw_child -> tw_parent -> tw_main [Bottom]
 
    e_test_runner_req_win_stack_set(tc->runner, tw_parent, tw_main, EINA_FALSE);
-
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_BELOW);
-   EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_STACK_BELOW);
 
    // Expected stack result:
    // [Top] tw_main -> tw_child -> tw_parent  [Bottom]
diff --git a/src/0300_notification.c b/src/0300_notification.c
index 027e628..a7f9fcf 100644 (file)
--- a/src/0300_notification.c
+++ b/src/0300_notification.c
@@ -76,8 +76,7 @@ _tc_pre_run(E_TC *tc)
    e_tc_win_show(data->tw_noti1);
    e_tc_win_show(data->tw_noti2);
 
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_VIS_CHANGED);
-   EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
+   e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_VIS_CHANGED);
 
    e_test_runner_work();
 
Domain: Graphics System / Display Server;