e_test_event: move win, so public ev struct to have

Change-Id: Idd59ba84ca2ed43efa0cc4013ae4a3c8255e4bec

diff --git a/src/e_test_event.cpp b/src/e_test_event.cpp
index ae7ea00..5d11c8b 100644 (file)
--- a/src/e_test_event.cpp
+++ b/src/e_test_event.cpp
@@ -851,15 +851,15 @@ etRunner::waitEvent(E_TC_Event_Type ev_type)
          eh = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, _cb_ecore_key, this);
          EINA_SAFETY_ON_NULL_GOTO(eh, finish);
          eh2 = ecore_event_handler_add(ECORE_EVENT_KEY_UP, _cb_ecore_key, this);
-         EINA_SAFETY_ON_NULL_GOTO(eh, finish);
+         EINA_SAFETY_ON_NULL_GOTO(eh2, finish);
 
          this->ev.key.state = EINA_FALSE;
          this->generateKeyEvent(this->ev.key.name, 1.0);
          break;
 
       case E_TC_EVENT_TYPE_INPUT_EVAS_KEY:
-         evas_object_event_callback_add(this->ev.key.win, EVAS_CALLBACK_KEY_DOWN, _cb_evas_key_down, this);
-         evas_object_event_callback_add(this->ev.key.win, EVAS_CALLBACK_KEY_UP, _cb_evas_key_up, this);
+         evas_object_event_callback_add(this->ev.win, EVAS_CALLBACK_KEY_DOWN, _cb_evas_key_down, this);
+         evas_object_event_callback_add(this->ev.win, EVAS_CALLBACK_KEY_UP, _cb_evas_key_up, this);
 
          this->ev.key.state = EINA_FALSE;
          this->generateKeyEvent(this->ev.key.name, 1.0);
@@ -888,8 +888,8 @@ etRunner::waitEvent(E_TC_Event_Type ev_type)
    if (sh) eldbus_signal_handler_del(sh);
    if (eh) ecore_event_handler_del(eh);
    if (eh2) ecore_event_handler_del(eh2);
-   evas_object_event_callback_del(this->ev.key.win, EVAS_CALLBACK_KEY_DOWN, _cb_evas_key_down);
-   evas_object_event_callback_del(this->ev.key.win, EVAS_CALLBACK_KEY_UP, _cb_evas_key_up);
+   evas_object_event_callback_del(this->ev.win, EVAS_CALLBACK_KEY_DOWN, _cb_evas_key_down);
+   evas_object_event_callback_del(this->ev.win, EVAS_CALLBACK_KEY_UP, _cb_evas_key_up);
 
    res = (ev.response == ev.request);
    EINA_SAFETY_ON_FALSE_GOTO(res, finish);
@@ -1385,7 +1385,7 @@ _cb_evas_key_down(void *data, Evas * evas, Evas_Object * obj, void * event_info)
    if (!strncmp(runner->ev.key.name, ev->keyname, strlen(ev->keyname)))
      {
         if (runner->ev.key.state == EINA_FALSE &&
-            runner->ev.key.win == obj)
+            runner->ev.win == obj)
           {
              runner->ev.key.state = EINA_TRUE;
           }
@@ -1403,11 +1403,11 @@ _cb_evas_key_up(void * data, Evas * evas, Evas_Object * obj, void * event_info)
    if (!strncmp(runner->ev.key.name, ev->keyname, strlen(ev->keyname)))
      {
         if (runner->ev.key.state == EINA_TRUE &&
-            runner->ev.key.win == obj)
+            runner->ev.win == obj)
           {
              runner->ev.response = runner->ev.request;
              runner->ev.key.state = EINA_FALSE;
-             runner->ev.key.win = NULL;
+             runner->ev.win = NULL;
              elm_exit();
           }
      }

diff --git a/src/e_test_event.h b/src/e_test_event.h
index a5a0526..40150d5 100644 (file)
--- a/src/e_test_event.h
+++ b/src/e_test_event.h
@@ -64,11 +64,11 @@ public: /* TODO: make it hidden */
         Ecore_Timer *expire_timer;
         E_TC_Event_Type request;
         E_TC_Event_Type response;
+        Evas_Object *win;
         struct
           {
              Eina_Stringshare *name;
              Eina_Bool state;
-             Evas_Object *win;
              Ecore_Timer *timer;
           } key;
      } ev;

diff --git a/src/testcase/0009_input.cpp b/src/testcase/0009_input.cpp
index 86029ff..07d5b97 100644 (file)
--- a/src/testcase/0009_input.cpp
+++ b/src/testcase/0009_input.cpp
@@ -78,7 +78,7 @@ TEST_F(etTestInput, keygrab_win_shared)
    ret = evas_object_key_grab(tw_shared->elm_win, "XF86Menu", 0, 0, EINA_FALSE);
    ASSERT_TRUE(ret);
 
-   etRunner::get().ev.key.win = tw_shared->elm_win;
+   etRunner::get().ev.win = tw_shared->elm_win;
    etRunner::get().ev.key.name = eina_stringshare_add("XF86Menu");
    ret = etRunner::get().setWinStack(tw_shared, NULL, EINA_FALSE);
    etRunner::get().waitEvent(E_TC_EVENT_TYPE_FOCUS_CHANGED);
@@ -89,7 +89,7 @@ TEST_F(etTestInput, keygrab_win_shared)
 
    eina_stringshare_del(etRunner::get().ev.key.name);
    etRunner::get().ev.key.name = NULL;
-   etRunner::get().ev.key.win = NULL;
+   etRunner::get().ev.win = NULL;
 
    evas_object_key_ungrab(tw_shared->elm_win, "XF86Menu", 0, 0);
    ret = elm_win_keygrab_unset(tw_shared->elm_win, "XF86Menu", 0, 0);
@@ -108,7 +108,7 @@ TEST_F(etTestInput, keygrab_win_orexcl)
    ret = evas_object_key_grab(tw_orexcl->elm_win, "XF86Menu", 0, 0, EINA_TRUE);
    ASSERT_TRUE(ret);
 
-   etRunner::get().ev.key.win = tw_orexcl->elm_win;
+   etRunner::get().ev.win = tw_orexcl->elm_win;
    etRunner::get().ev.key.name = eina_stringshare_add("XF86Menu");
    ret = etRunner::get().setWinStack(tw_orexcl, NULL, EINA_FALSE);
    etRunner::get().waitEvent(E_TC_EVENT_TYPE_FOCUS_CHANGED);
@@ -119,7 +119,7 @@ TEST_F(etTestInput, keygrab_win_orexcl)
 
    eina_stringshare_del(etRunner::get().ev.key.name);
    etRunner::get().ev.key.name = NULL;
-   etRunner::get().ev.key.win = NULL;
+   etRunner::get().ev.win = NULL;
 
    evas_object_key_ungrab(tw_orexcl->elm_win, "XF86Menu", 0, 0);
    ret = elm_win_keygrab_unset(tw_orexcl->elm_win, "XF86Menu", 0, 0);
@@ -138,7 +138,7 @@ TEST_F(etTestInput, keygrab_win_excl)
    ret = evas_object_key_grab(tw_excl->elm_win, "XF86Menu", 0, 0, EINA_TRUE);
    ASSERT_TRUE(ret);
 
-   etRunner::get().ev.key.win = tw_excl->elm_win;
+   etRunner::get().ev.win = tw_excl->elm_win;
    etRunner::get().ev.key.name = eina_stringshare_add("XF86Menu");
    ret = etRunner::get().setWinStack(tw_excl, NULL, EINA_FALSE);
    etRunner::get().waitEvent(E_TC_EVENT_TYPE_FOCUS_CHANGED);
@@ -149,7 +149,7 @@ TEST_F(etTestInput, keygrab_win_excl)
 
    eina_stringshare_del(etRunner::get().ev.key.name);
    etRunner::get().ev.key.name = NULL;
-   etRunner::get().ev.key.win = NULL;
+   etRunner::get().ev.win = NULL;
 
    evas_object_key_ungrab(tw_excl->elm_win, "XF86Menu", 0, 0);
    ret = elm_win_keygrab_unset(tw_excl->elm_win, "XF86Menu", 0, 0);
@@ -170,7 +170,7 @@ TEST_F(etTestInput, keygrab_win_topposition)
    ret = evas_object_key_grab(tw_topposition->elm_win, "XF86Menu", 0, 0, EINA_FALSE);
    ASSERT_TRUE(ret);
 
-   etRunner::get().ev.key.win = tw_topposition->elm_win;
+   etRunner::get().ev.win = tw_topposition->elm_win;
    etRunner::get().ev.key.name = eina_stringshare_add("XF86Menu");
 
    ret = etRunner::get().waitEvent(E_TC_EVENT_TYPE_INPUT_EVAS_KEY);
@@ -178,7 +178,7 @@ TEST_F(etTestInput, keygrab_win_topposition)
 
    eina_stringshare_del(etRunner::get().ev.key.name);
    etRunner::get().ev.key.name = NULL;
-   etRunner::get().ev.key.win = NULL;
+   etRunner::get().ev.win = NULL;
 
    evas_object_key_ungrab(tw_topposition->elm_win, "XF86Menu", 0, 0);
    ret = elm_win_keygrab_unset(tw_topposition->elm_win, "XF86Menu", 0, 0);
@@ -236,7 +236,7 @@ TEST_F(etTestInput, keygrab_win)
    ASSERT_TRUE(ret);
 
    // test exclusive grab
-   etRunner::get().ev.key.win = tw_excl->elm_win;
+   etRunner::get().ev.win = tw_excl->elm_win;
    etRunner::get().ev.key.name = eina_stringshare_add("XF86Menu");
 
    ret = etRunner::get().waitEvent(E_TC_EVENT_TYPE_INPUT_EVAS_KEY);
@@ -249,7 +249,7 @@ TEST_F(etTestInput, keygrab_win)
    ASSERT_TRUE(ret);
 
    // test override exclusive grab
-   etRunner::get().ev.key.win = tw_orexcl->elm_win;
+   etRunner::get().ev.win = tw_orexcl->elm_win;
    etRunner::get().ev.key.name = eina_stringshare_add("XF86Menu");
 
    ret = etRunner::get().waitEvent(E_TC_EVENT_TYPE_INPUT_EVAS_KEY);
@@ -262,7 +262,7 @@ TEST_F(etTestInput, keygrab_win)
    ASSERT_TRUE(ret);
 
    // test top position grab
-   etRunner::get().ev.key.win = tw_topposition->elm_win;
+   etRunner::get().ev.win = tw_topposition->elm_win;
    etRunner::get().ev.key.name = eina_stringshare_add("XF86Menu");
 
    ret = etRunner::get().waitEvent(E_TC_EVENT_TYPE_INPUT_EVAS_KEY);
@@ -275,7 +275,7 @@ TEST_F(etTestInput, keygrab_win)
    ASSERT_TRUE(ret);
 
    // test shared grab
-   etRunner::get().ev.key.win = tw_shared->elm_win;
+   etRunner::get().ev.win = tw_shared->elm_win;
    etRunner::get().ev.key.name = eina_stringshare_add("XF86Menu");
 
    ret = etRunner::get().waitEvent(E_TC_EVENT_TYPE_INPUT_EVAS_KEY);
@@ -288,5 +288,5 @@ TEST_F(etTestInput, keygrab_win)
    ASSERT_TRUE(ret);
    
    etRunner::get().ev.key.name = NULL;
-   etRunner::get().ev.key.win = NULL;
+   etRunner::get().ev.win = NULL;
 }