Fix invalid operations

Change-Id: I123ef2ec10d34a5ab5b9874ba7b1fdd054098aee

diff --git a/src/0000_easy.c b/src/0000_easy.c
index b03151b5d33102c9b9174d16d60f6eedb042e265..8192bd32de9197fbafb63ed8133c9e4c2a028886 100644 (file)
--- a/src/0000_easy.c
+++ b/src/0000_easy.c
@@ -10,7 +10,7 @@ _cb_introspect(void *data,
    Eina_Bool res;
 
    res = eldbus_message_error_get(msg, &name, &text);
-   EINA_SAFETY_ON_FALSE_GOTO(res, finish);
+   EINA_SAFETY_ON_TRUE_GOTO(res, finish);
 
    res = eldbus_message_arguments_get(msg, "s", &arg);
    EINA_SAFETY_ON_FALSE_GOTO(res, finish);
@@ -51,7 +51,7 @@ _cb_prop_registrant(void *data,
    tc->passed = EINA_FALSE;
 
    res = eldbus_message_error_get(msg, &name, &text);
-   EINA_SAFETY_ON_FALSE_GOTO(res, finish);
+   EINA_SAFETY_ON_TRUE_GOTO(res, finish);
 
    res = eldbus_message_arguments_get(msg, "v", &variant);
    EINA_SAFETY_ON_FALSE_GOTO(res, finish);

diff --git a/src/0100_base_operation.c b/src/0100_base_operation.c
index 78a3ed584df3b9f6b96f8d4fc0382ba070c4179d..937fdad4dfe763455a6da8f56520fe649b2fadbb 100644 (file)
--- a/src/0100_base_operation.c
+++ b/src/0100_base_operation.c
@@ -26,6 +26,9 @@ _tc_pre_run(E_TC *tc, Eina_Bool alpha)
    res = e_tc_runner_req_win_register(tc->runner, tc->data->tw);
    EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
 
+   e_tc_win_geom_update(tc->data->tw);
+   e_tc_win_show(tc->data->tw);
+
    res = e_tc_runner_ev_wait(tc->runner, E_TC_EVENT_TYPE_VIS_ON);
    EINA_SAFETY_ON_FALSE_GOTO(res, cleanup);
 

diff --git a/src/e_tc_main.c b/src/e_tc_main.c
index 9de7ae424c74ee396bbda28f496b352f1f04d499..41ddfd2f75da14f9f182d6d69de5f04c5826e4bc 100644 (file)
--- a/src/e_tc_main.c
+++ b/src/e_tc_main.c
@@ -14,7 +14,7 @@ _cb_method_win_info_list_get(void *data,
    Eina_Bool res;
 
    res = eldbus_message_error_get(msg, &name, &text);
-   EINA_SAFETY_ON_FALSE_GOTO(res, finish);
+   EINA_SAFETY_ON_TRUE_GOTO(res, finish);
 
    res = eldbus_message_arguments_get(msg, "ua(usiiiiibb)", &target_win, &array);
    EINA_SAFETY_ON_FALSE_GOTO(res, finish);
@@ -64,20 +64,18 @@ _cb_method_window_register(void *data,
                            const Eldbus_Message *msg,
                            Eldbus_Pending *p EINA_UNUSED)
 {
-   E_TC *tc = (E_TC *)data;
    const char *name = NULL, *text = NULL;
    Eina_Bool res;
    Eina_Bool *accepted = data;
 
-   EINA_SAFETY_ON_NULL_GOTO(tc, finish);
-
    *accepted = EINA_FALSE;
 
    res = eldbus_message_error_get(msg, &name, &text);
-   EINA_SAFETY_ON_FALSE_GOTO(res, finish);
+   EINA_SAFETY_ON_TRUE_GOTO(res, finish);
 
    res = eldbus_message_arguments_get(msg, "b", accepted);
    EINA_SAFETY_ON_FALSE_GOTO(res, finish);
+   EINA_SAFETY_ON_FALSE_GOTO(*accepted, finish);
 
 finish:
    if ((name) || (text))
@@ -100,10 +98,11 @@ _cb_method_window_deregister(void *data,
    *allowed = EINA_FALSE;
 
    res = eldbus_message_error_get(msg, &name, &text);
-   EINA_SAFETY_ON_FALSE_GOTO(res, finish);
+   EINA_SAFETY_ON_TRUE_GOTO(res, finish);
 
-   res = eldbus_message_arguments_get(msg, "b", &allowed);
+   res = eldbus_message_arguments_get(msg, "b", allowed);
    EINA_SAFETY_ON_FALSE_GOTO(res, finish);
+   EINA_SAFETY_ON_FALSE_GOTO(*allowed, finish);
 
 finish:
    if ((name) || (text))
@@ -125,7 +124,7 @@ _cb_signal_vis_changed(void *data,
    Ecore_Window id;
 
    res = eldbus_message_error_get(msg, &name, &text);
-   EINA_SAFETY_ON_FALSE_GOTO(res, finish);
+   EINA_SAFETY_ON_TRUE_GOTO(res, finish);
 
    res = eldbus_message_arguments_get(msg, "ub", &id, &vis);
    EINA_SAFETY_ON_FALSE_GOTO(res, finish);
@@ -154,7 +153,7 @@ _cb_signal_stack_changed(void *data,
    Eina_Bool res;
 
    res = eldbus_message_error_get(msg, &name, &text);
-   EINA_SAFETY_ON_FALSE_GOTO(res, finish);
+   EINA_SAFETY_ON_TRUE_GOTO(res, finish);
 
    /* TODO */
    if ((E_TC_EVENT_TYPE_STACK_RAISE <= runner->ev.expect) &&
@@ -179,6 +178,8 @@ _ev_wait_timeout(void *data)
    runner->ev.expire_timer = NULL;
    runner->ev.response = E_TC_EVENT_TYPE_TIMEOUT;
 
+   ERR("ev:%d\n", runner->ev.expect);
+
    elm_exit();
 
    return ECORE_CALLBACK_DONE;
@@ -252,8 +253,8 @@ e_tc_runner_ev_wait(E_TC_Runner *runner,
    Eldbus_Signal_Handler *sh;
    Eina_Bool res = EINA_FALSE;
 
-   runner->ev.expect = ev;
-   runner->ev.response = E_TC_EVENT_TYPE_NONE;
+   EINA_SAFETY_ON_FALSE_RETURN_VAL((E_TC_EVENT_TYPE_NONE < ev), res);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL((E_TC_EVENT_TYPE_MAX > ev), res);
 
    switch (ev)
      {
@@ -271,7 +272,7 @@ e_tc_runner_ev_wait(E_TC_Runner *runner,
       case E_TC_EVENT_TYPE_STACK_ABOVE:
       case E_TC_EVENT_TYPE_STACK_BELOW:
          sh = eldbus_proxy_signal_handler_add(runner->dbus.proxy,
-                                              "Restack",
+                                              "ChangeStack",
                                               _cb_signal_stack_changed,
                                               runner);
          EINA_SAFETY_ON_NULL_GOTO(sh, finish);
@@ -282,6 +283,11 @@ e_tc_runner_ev_wait(E_TC_Runner *runner,
          break;
      }
 
+   if (runner->ev.expire_timer)
+     ecore_timer_del(runner->ev.expire_timer);
+
+   runner->ev.expect = ev;
+   runner->ev.response = E_TC_EVENT_TYPE_NONE;
    runner->ev.expire_timer = ecore_timer_add(2.0, _ev_wait_timeout, runner);
 
    elm_run();
@@ -295,6 +301,7 @@ e_tc_runner_ev_wait(E_TC_Runner *runner,
    eldbus_signal_handler_del(sh);
 
    res = (runner->ev.response == runner->ev.expect);
+   EINA_SAFETY_ON_FALSE_GOTO(res, finish);
 
 finish:
    runner->ev.expect = E_TC_EVENT_TYPE_NONE;
@@ -316,7 +323,7 @@ e_tc_win_add(E_TC_Win *parent,
    Evas_Object *elm_win = NULL, *bg = NULL;
    Evas_Object *p_elm_win = NULL;
 
-   if (parent) p_elm_win = tw->elm_win;
+   if (parent) p_elm_win = parent->elm_win;
 
    elm_win = elm_win_add(p_elm_win, name, ELM_WIN_BASIC);
    EINA_SAFETY_ON_NULL_GOTO(elm_win, err);
@@ -544,23 +551,20 @@ _e_tc_runner_result(E_TC_Runner *runner)
 
    EINA_LIST_FOREACH(runner->tc_list, l, tc)
      {
-        eina_strbuf_append_printf(buf, "[%04d] TEST \"%-25.25s\" : %s\n",
-                                  tc->num, tc->name, tc->passed ? "PASS" : "FAIL");
+        eina_strbuf_append_printf(buf,
+                                  "[%04d] TEST \"%-30.30s\" : %s\n",
+                                  tc->num,
+                                  tc->name,
+                                  tc->passed ? "PASS" : "FAIL");
 
         total++;
-        tc->passed? pass_case++ : fail_case++;
-
-        if (!tc->passed)
-          {
-             eina_strbuf_append_printf(buf, "\n!!Test Case failed at \"%s\"\n", tc->name);
-             break;
-          }
+        tc->passed ? pass_case++ : fail_case++;
      }
 
    eina_strbuf_append(buf, "==============================================\n");
-   eina_strbuf_append_printf(buf, "TOTAL: %4d Case\n", total);
-   eina_strbuf_append_printf(buf, "PASS : %4d Case\n", pass_case);
-   eina_strbuf_append_printf(buf, "FAIL : %4d Case\n", fail_case);
+   eina_strbuf_append_printf(buf, "TOTAL: %4d Cases\n", total);
+   eina_strbuf_append_printf(buf, "PASS : %4d Cases\n", pass_case);
+   eina_strbuf_append_printf(buf, "FAIL : %4d Cases\n", fail_case);
    eina_strbuf_append(buf, "==============================================\n");
 
    printf("%s", eina_strbuf_string_get(buf));

diff --git a/src/e_tc_main.h b/src/e_tc_main.h
index 552189c3198acf17fa175317e8f793e0cfcf7ac7..158335b75c4038e2b7ae59060c5da89fb733d0b0 100644 (file)
--- a/src/e_tc_main.h
+++ b/src/e_tc_main.h
@@ -57,14 +57,15 @@ extern int _log_dom;
 
 typedef enum _E_TC_Event_Type
 {
-   E_TC_EVENT_TYPE_NONE,
+   E_TC_EVENT_TYPE_NONE = 0,
    E_TC_EVENT_TYPE_TIMEOUT,
    E_TC_EVENT_TYPE_VIS_ON,
    E_TC_EVENT_TYPE_VIS_OFF,
    E_TC_EVENT_TYPE_STACK_RAISE,
    E_TC_EVENT_TYPE_STACK_LOWER,
    E_TC_EVENT_TYPE_STACK_ABOVE,
-   E_TC_EVENT_TYPE_STACK_BELOW
+   E_TC_EVENT_TYPE_STACK_BELOW,
+   E_TC_EVENT_TYPE_MAX
 } E_TC_Event_Type;
 
 typedef struct _E_TC_Runner E_TC_Runner;