0004_transient_for: fix typo and clearify some test names

Change-Id: I42e36be583323a4b70d30952838bcf7b7e7fcb36

diff --git a/data/img/mobile/etTestTransientFor/transient_for_above.png b/data/img/mobile/etTestTransientFor/transient_for_above.png
deleted file mode 100644 (file)
index 6d685ea..0000000
Binary files a/data/img/mobile/etTestTransientFor/transient_for_above.png and /dev/null differ

diff --git a/data/img/mobile/etTestTransientFor/transient_for_stack_above.png b/data/img/mobile/etTestTransientFor/transient_for_stack_above.png
new file mode 100644 (file)
index 0000000..6d685ea
Binary files /dev/null and b/data/img/mobile/etTestTransientFor/transient_for_stack_above.png differ

diff --git a/src/testcase/0004_transient_for.cpp b/src/testcase/0004_transient_for.cpp
index e0fb60ca6648ebf9492631cbcf4a0215eb5528fe..d465ea698db105914998d5e73c5c2ec66ba49747 100644 (file)
--- a/src/testcase/0004_transient_for.cpp
+++ b/src/testcase/0004_transient_for.cpp
@@ -64,7 +64,7 @@ TEST_F(etTestTransientFor, transient_for_basic)
    // set transient_for
    res = etRunner::get().setWinTransientFor(tw_child, tw_parent, EINA_TRUE);
    ASSERT_TRUE(res);
-   etRunner::get().work(0.1); // wait for activate done. It does not change stack.
+   etRunner::get().work(0.1); // wait for transient_for done.
 
    // Expected stack res:
    // [Top] tw_base -> tw_child -> tw_parent [Bottom]
@@ -170,7 +170,7 @@ TEST_F(etTestTransientFor, transient_for_raise)
    // set transient_for
    res = etRunner::get().setWinTransientFor(tw_child, tw_parent, EINA_TRUE);
    ASSERT_TRUE(res);
-   etRunner::get().work(0.1); // wait for activate done. It does not change stack.
+   etRunner::get().work(0.1); // wait for transient_for done.
 
    // tw_parent raise
    res = etRunner::get().setWinStack(tw_parent, NULL, EINA_TRUE);
@@ -227,7 +227,7 @@ TEST_F(etTestTransientFor, transient_for_lower)
    // set transient_for
    res = etRunner::get().setWinTransientFor(tw_child, tw_parent, EINA_TRUE);
    ASSERT_TRUE(res);
-   etRunner::get().work(0.1); // wait for activate done. It does not change stack.
+   etRunner::get().work(0.1); // wait for transient_for done.
 
    // tw_parent raise for prepare lower
    res = etRunner::get().setWinStack(tw_parent, NULL, EINA_TRUE);
@@ -287,7 +287,7 @@ TEST_F(etTestTransientFor, transient_for_lower)
    ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
-TEST_F(etTestTransientFor, transient_for_above)
+TEST_F(etTestTransientFor, transient_for_stack_above)
 {
    etWin *tw = NULL;
    Eina_Bool res = EINA_FALSE;
@@ -300,9 +300,9 @@ TEST_F(etTestTransientFor, transient_for_above)
    // set transient_for
    res = etRunner::get().setWinTransientFor(tw_child, tw_parent, EINA_TRUE);
    ASSERT_TRUE(res);
-   etRunner::get().work(0.1); // wait for activate done. It does not change stack.
+   etRunner::get().work(0.1); // wait for transient_for done.
 
-   // tw_parent raise for prepare lower
+   // tw_parent set stack above of tw_base
    res = etRunner::get().setWinStack(tw_parent, tw_base, EINA_TRUE);
    ASSERT_TRUE(res);
    ASSERT_EVENT(tw_parent, E_TC_EVENT_TYPE_STACK_CHANGED);
@@ -367,7 +367,7 @@ TEST_F(etTestTransientFor, transient_for_layer_change)
    // set transient_for tw_child
    res = etRunner::get().setWinTransientFor(tw_child, tw_parent, EINA_TRUE);
    ASSERT_TRUE(res);
-   etRunner::get().work(0.1); // wait for activate done. It does not change stack.
+   etRunner::get().work(0.1); // wait for transient_for done.
 
    // Expected stack res:
    // [Top] tw_base -> tw_child -> tw_noti -> tw_parent [Bottom]
@@ -435,7 +435,7 @@ TEST_F(etTestTransientFor, transient_for_layer_revert)
    // set transient_for tw_child
    res = etRunner::get().setWinTransientFor(tw_child, tw_parent, EINA_TRUE);
    ASSERT_TRUE(res);
-   etRunner::get().work(0.1); // wait for activate done. It does not change stack.
+   etRunner::get().work(0.1); // wait for transient_for done.
 
    // Expected stack res:
    // [Top] tw_base -> tw_child -> tw_noti -> tw_parent [Bottom]
@@ -483,7 +483,7 @@ TEST_F(etTestTransientFor, transient_for_layer_revert)
    ASSERT_EVENT(tw_noti, E_TC_EVENT_TYPE_STACK_CHANGED);
 
    // Expected stack res:
-   // [Top] tw_noti -> ... -> tw_child -> tw_parent -> tw_base [Bottom]
+   // [Top] tw_noti -> ... -> tw_base -> tw_child -> tw_parent [Bottom]
    list = etRunner::get().getWinInfoList();
    ASSERT_TRUE(list != NULL);
 
@@ -553,12 +553,12 @@ TEST_F(etTestTransientFor, transient_for_always_on_top_basic)
    // set transient_for tw_aot
    res = etRunner::get().setWinTransientFor(tw_aot, tw_parent, EINA_TRUE);
    ASSERT_TRUE(res);
-   etRunner::get().work(0.1); // wait for activate done. It does not change stack.
+   etRunner::get().work(0.1); // wait for transient_for done.
 
    // set transient_for tw_child
    res = etRunner::get().setWinTransientFor(tw_child, tw_parent, EINA_TRUE);
    ASSERT_TRUE(res);
-   etRunner::get().work(0.1); // wait for activate done. It does not change stack.
+   etRunner::get().work(0.1); // wait for transient_for done.
 
    // Expected stack res:
    // [Top] tw_base -> tw_aot -> tw_child -> tw_parent [Bottom]
@@ -622,12 +622,12 @@ TEST_F(etTestTransientFor, transient_for_always_on_top_basic2)
    // set transient_for tw_child
    res = etRunner::get().setWinTransientFor(tw_child, tw_parent, EINA_TRUE);
    ASSERT_TRUE(res);
-   etRunner::get().work(0.1); // wait for activate done. It does not change stack.
+   etRunner::get().work(0.1); // wait for transient_for done.
 
    // set transient_for tw_aot
    res = etRunner::get().setWinTransientFor(tw_aot, tw_parent, EINA_TRUE);
    ASSERT_TRUE(res);
-   etRunner::get().work(0.1); // wait for activate done. It does not change stack.
+   etRunner::get().work(0.1); // wait for transient_for done.
 
    // Expected stack res:
    // [Top] tw_base -> tw_aot -> tw_child -> tw_parent [Bottom]
@@ -671,7 +671,7 @@ TEST_F(etTestTransientFor, transient_for_always_on_top_basic2)
    ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
-TEST_F(etTestTransientFor, transient_for_multi_child)
+TEST_F(etTestTransientFor, transient_for_multi_child_basic)
 {
    etWin *tw = NULL;
    Eina_Bool res = EINA_FALSE;
@@ -743,7 +743,7 @@ TEST_F(etTestTransientFor, transient_for_multi_child)
 //   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
-TEST_F(etTestTransientFor, transient_for_multi_child2)
+TEST_F(etTestTransientFor, transient_for_multi_child_re_apply)
 {
    etWin *tw = NULL;
    Eina_Bool res = EINA_FALSE;
@@ -862,7 +862,7 @@ TEST_F(etTestTransientFor, transient_for_multi_child2)
 //   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
-TEST_F(etTestTransientFor, transient_for_multi_child3)
+TEST_F(etTestTransientFor, transient_for_multi_child_re_apply2)
 {
    etWin *tw = NULL;
    Eina_Bool res = EINA_FALSE;