e_test_base: rename removeTCWin to hideTCWina and added deleteTCWin method

Change-Id: Ic13b55b0298f5b7669e6ec3527e9288c2e81066a

diff --git a/src/e_test_base.cpp b/src/e_test_base.cpp
index 6fde378..394573e 100644 (file)
--- a/src/e_test_base.cpp
+++ b/src/e_test_base.cpp
@@ -191,12 +191,23 @@ etTCBase::showActivateTCWin(etWin *tw)
 }
 
 Eina_Bool
-etTCBase::removeTCWin(etWin *tw)
+etTCBase::hideTCWin(etWin *tw)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(tw, EINA_FALSE);
    EINA_SAFETY_ON_NULL_RETURN_VAL(tw->elm_win, EINA_FALSE);
 
    tw->hide();
+
+   return EINA_TRUE;
+}
+
+Eina_Bool
+etTCBase::deleteTCWin(etWin *tw)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(tw, EINA_FALSE);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(tw->elm_win, EINA_FALSE);
+
+   tw->deInit();
    deregisterTCWin(tw);
 
    return EINA_TRUE;

diff --git a/src/e_test_base.h b/src/e_test_base.h
index 0642b6c..d0b278d 100644 (file)
--- a/src/e_test_base.h
+++ b/src/e_test_base.h
@@ -22,7 +22,8 @@ class etTCBase : public ::testing::Test
    Eina_Bool  deregisterTCWin(etWin *tw);
    Eina_Bool  showTCWin(etWin *tw);
    Eina_Bool  showActivateTCWin(etWin *tw);
-   Eina_Bool  removeTCWin(etWin *tw);
+   Eina_Bool  hideTCWin(etWin *tw);
+   Eina_Bool  deleteTCWin(etWin *tw);
 
  protected:
    std::shared_ptr<eventItem> ev_result;

diff --git a/src/testcase/0008_focus.cpp b/src/testcase/0008_focus.cpp
index c2d5be6..592fa91 100644 (file)
--- a/src/testcase/0008_focus.cpp
+++ b/src/testcase/0008_focus.cpp
@@ -181,7 +181,7 @@ TEST_F(etTestFocus, focus_destroy)
    initTC(EINA_TRUE, EINA_TRUE);
 
    // delete tw_blue
-   removeTCWin(tw_blue);
+   hideTCWin(tw_blue);
    tw_blue = NULL;
    ASSERT_FOCUS_IN(tw_green);
 
@@ -404,7 +404,7 @@ TEST_F(etTestFocus, focus_obscured_activate_destroy)
    ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_RAISE);
 
    // remove tw_blocker
-   removeTCWin(tw_blocker);
+   hideTCWin(tw_blocker);
    tw_blocker = NULL;
    ASSERT_VIS_ON(tw_red);
 
@@ -671,7 +671,7 @@ TEST_F(etTestFocus, focus_visibility)
    ASSERT_FOCUS_IN(tw_blocker);
 
    // hide blocker
-   removeTCWin(tw_blocker);
+   hideTCWin(tw_blocker);
    tw_blocker = NULL;
    ASSERT_FOCUS_IN(tw_blue);
 
@@ -817,7 +817,7 @@ TEST_F(etTestFocus, focus_touch_history)
    etRunner::get().freeWinInfoList(list);
 
    // remove blue win
-   removeTCWin(tw_blue);
+   hideTCWin(tw_blue);
    tw_blue = NULL;
    ASSERT_FOCUS_IN(tw_red);
 
@@ -836,7 +836,7 @@ TEST_F(etTestFocus, focus_touch_history)
    etRunner::get().freeWinInfoList(list);
 
    // remove red win
-   removeTCWin(tw_red);
+   hideTCWin(tw_red);
    tw_red = NULL;
    ASSERT_FOCUS_IN(tw_green);
 
@@ -1162,7 +1162,7 @@ TEST_F(etTestFocus, focus_fullsize_destroy)
    initTC(EINA_TRUE, EINA_FALSE);
 
    // delete tw_blue
-   removeTCWin(tw_blue);
+   hideTCWin(tw_blue);
    tw_blue = NULL;
    ASSERT_FOCUS_IN(tw_green);
 
@@ -1318,7 +1318,7 @@ TEST_F(etTestFocus, focus_fullsize_obscured_activate_destroy)
    ASSERT_EVENT(tw_red, E_TC_EVENT_TYPE_STACK_ABOVE);
 
    // remove tw_blocker
-   removeTCWin(tw_blocker);
+   hideTCWin(tw_blocker);
    tw_blocker = NULL;
    ASSERT_FOCUS_IN(tw_red);
 
@@ -1589,7 +1589,7 @@ TEST_F(etTestFocus, focus_fullsize_below_skip_above_remove)
    etRunner::get().work(0.1); // waiting for adjust focus skip set
 
    // remove tw_blue
-   removeTCWin(tw_blue);
+   hideTCWin(tw_blue);
    ASSERT_VIS_ON(tw_green);
 
    // Expected focus res: