Added VISIBILITY_CHANGED event type and A few correction

Change-Id: Ib6aa0afc64f30495c1d4d2c13c20a518c8f081c6
Signed-off-by: MinJeong Kim <minjjj.kim@samsung.com>

diff --git a/src/0200_transient_for.c b/src/0200_transient_for.c
index cb909e3..cf63636 100644 (file)
--- a/src/0200_transient_for.c
+++ b/src/0200_transient_for.c
@@ -49,7 +49,7 @@ _tc_pre_run(E_TC *tc)
    e_tc_win_geom_update(tc->data->tw_child);
    e_tc_win_show(tc->data->tw_child);
 
-   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_VIS_ON);
+   res = e_test_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_VIS_CHANGED);
    EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
 
    return EINA_TRUE;
@@ -144,7 +144,7 @@ tc_0201_transient_for_raise(E_TC *tc)
    res = _tc_pre_run(tc);
    EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
 
-   tw = tc->data->tw;
+   tw = tc->data->tw_parent;
 
    e_test_runner_req_win_stack_set(tc->runner, tw, NULL, EINA_TRUE);
 
@@ -182,7 +182,7 @@ tc_0202_transient_for_lower(E_TC *tc)
    res = _tc_pre_run(tc);
    EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
 
-   tw = tc->data->tw;
+   tw = tc->data->tw_parent;
 
    e_test_runner_req_win_stack_set(tc->runner, tw, NULL, EINA_FALSE);
 

diff --git a/src/e_test_runner.c b/src/e_test_runner.c
index 8d6124e..8059282 100644 (file)
--- a/src/e_test_runner.c
+++ b/src/e_test_runner.c
@@ -130,8 +130,9 @@ _cb_signal_vis_changed(void *data,
    EINA_SAFETY_ON_FALSE_GOTO(res, finish);
 
    /* TODO */
-   if (((E_TC_EVENT_TYPE_VIS_ON  == runner->ev.expect) && ( vis)) ||
-       ((E_TC_EVENT_TYPE_VIS_OFF == runner->ev.expect) && (!vis)))
+   if (((E_TC_EVENT_TYPE_VIS_ON  == runner->ev.expect) && (vis)) ||
+       ((E_TC_EVENT_TYPE_VIS_OFF == runner->ev.expect) && (!vis)) ||
+       (E_TC_EVENT_TYPE_VIS_CHANGED == runner->ev.expect))
      {
         runner->ev.response = runner->ev.expect;
         elm_exit();
@@ -253,9 +254,10 @@ e_test_runner_req_win_info_list_get(E_Test_Runner *runner)
 {
    Eldbus_Pending *p;
    Eina_List *list = NULL;
+   list = eina_list_append(list, NULL);
 
    p = eldbus_proxy_call(runner->dbus.proxy,
-                         "GetClients",
+                         "GetWindowInfo",
                          _cb_method_win_info_list_get,
                          list,
                          -1,
@@ -281,6 +283,7 @@ e_test_runner_ev_wait(E_Test_Runner *runner,
      {
       case E_TC_EVENT_TYPE_VIS_ON:
       case E_TC_EVENT_TYPE_VIS_OFF:
+      case E_TC_EVENT_TYPE_VIS_CHANGED:
          sh = eldbus_proxy_signal_handler_add(runner->dbus.proxy,
                                               "VisibilityChanged",
                                               _cb_signal_vis_changed,

diff --git a/src/e_test_runner.h b/src/e_test_runner.h
index ff2fcc7..c113a23 100644 (file)
--- a/src/e_test_runner.h
+++ b/src/e_test_runner.h
@@ -62,6 +62,7 @@ typedef enum _E_TC_Event_Type
    E_TC_EVENT_TYPE_TIMEOUT,
    E_TC_EVENT_TYPE_VIS_ON,
    E_TC_EVENT_TYPE_VIS_OFF,
+   E_TC_EVENT_TYPE_VIS_CHANGED,
    E_TC_EVENT_TYPE_STACK_RAISE,
    E_TC_EVENT_TYPE_STACK_LOWER,
    E_TC_EVENT_TYPE_STACK_ABOVE,