Use TestInfo to get test name

Change-Id: I8654a29b3a9cef11a5adede0670e4665b8ead547
Signed-off-by: Junkyeong Kim <jk0430.kim@samsung.com>

diff --git a/src/testcase/0002_base_operation.cpp b/src/testcase/0002_base_operation.cpp
index 43e6cd4..0b36503 100644 (file)
--- a/src/testcase/0002_base_operation.cpp
+++ b/src/testcase/0002_base_operation.cpp
@@ -9,6 +9,8 @@ class etTestBaseOperation : public ::etTCBase
 
  protected:
     etWin *tw = NULL;
+    std::string testCaseName;
+    std::string testName;
 
     void initTC(Eina_Bool alpha_set);
 };
@@ -16,11 +18,16 @@ class etTestBaseOperation : public ::etTCBase
 void
 etTestBaseOperation::initTC(Eina_Bool alpha_set)
 {
+   const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info();
+
    tw = initNormalWin("TCWin_Normal", EINA_TRUE);
    ASSERT_TRUE(tw != NULL) << "failed to initiation window";
 
    if (alpha_set)
      elm_win_alpha_set(tw->elm_win, alpha_set);
+
+   testCaseName = test_info->test_case_name();
+   testName = test_info->name();
 }
 
 TEST_F(etTestBaseOperation, win_show)
@@ -30,7 +37,7 @@ TEST_F(etTestBaseOperation, win_show)
    ASSERT_TRUE(showTCWin(tw)) << "failed to show window";
    ASSERT_VIS_ON(tw);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseOperation", "win_show"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseOperation, win_stack)
@@ -61,7 +68,7 @@ TEST_F(etTestBaseOperation, win_stack)
 
    ASSERT_TRUE(res);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseOperation", "win_stack"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseOperation, alpha_win_show)
@@ -71,7 +78,7 @@ TEST_F(etTestBaseOperation, alpha_win_show)
    ASSERT_TRUE(showTCWin(tw)) << "failed to show window";
    ASSERT_VIS_ON(tw);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseOperation", "alpha_win_show"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseOperation, alpha_win_stack)
@@ -102,5 +109,5 @@ TEST_F(etTestBaseOperation, alpha_win_stack)
 
    ASSERT_TRUE(res);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseOperation", "alpha_win_stack"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }

diff --git a/src/testcase/0003_base_operation_multi_wins.cpp b/src/testcase/0003_base_operation_multi_wins.cpp
index e02cd0d..39dc7c8 100644 (file)
--- a/src/testcase/0003_base_operation_multi_wins.cpp
+++ b/src/testcase/0003_base_operation_multi_wins.cpp
@@ -11,6 +11,8 @@ class etTestBaseMulti : public ::etTCBase
     etWin *tw_red = NULL;
     etWin *tw_green = NULL;
     etWin *tw_blue = NULL;
+    std::string testCaseName;
+    std::string testName;
 
     void initTC(Eina_Bool show_win, Eina_Bool usr_geom);
 };
@@ -18,6 +20,8 @@ class etTestBaseMulti : public ::etTCBase
 void
 etTestBaseMulti::initTC(Eina_Bool show_win, Eina_Bool usr_geom)
 {
+   const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info();
+
    tw_red = initNormalWin("TCWin_Normal_red", usr_geom);
    ASSERT_TRUE(tw_red != NULL) << "failed to initiation window";
    if (show_win)
@@ -41,6 +45,9 @@ etTestBaseMulti::initTC(Eina_Bool show_win, Eina_Bool usr_geom)
         showTCWin(tw_blue);
         ASSERT_VIS_ON(tw_blue);
      }
+
+   testCaseName = test_info->test_case_name();
+   testName = test_info->name();
 }
 
 TEST_F(etTestBaseMulti, multi_all_wins_basic)
@@ -86,7 +93,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_basic)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_basic"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_wins_show1)
@@ -148,7 +155,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_show1)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_show1"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_wins_show2)
@@ -210,7 +217,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_show2)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_show2"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_wins_show3)
@@ -272,7 +279,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_show3)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_show3"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_wins_raise1)
@@ -322,7 +329,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_raise1)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_raise1"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_wins_raise2)
@@ -372,7 +379,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_raise2)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_raise2"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_wins_stack_above1)
@@ -422,7 +429,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_stack_above1)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_stack_above1"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_wins_stack_above2)
@@ -472,7 +479,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_stack_above2)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_stack_above2"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_wins_stack_above3)
@@ -522,7 +529,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_stack_above3)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_stack_above3"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_wins_lower1)
@@ -588,7 +595,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_lower1)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_lower1"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_wins_lower2)
@@ -654,7 +661,7 @@ TEST_F(etTestBaseMulti, multi_all_wins_lower2)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_wins_lower2"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_full_wins_basic)
@@ -700,7 +707,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_basic)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_basic"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_full_wins_show1)
@@ -762,7 +769,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_show1)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_show1"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_full_wins_show2)
@@ -824,7 +831,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_show2)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_show2"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_full_wins_show3)
@@ -886,7 +893,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_show3)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_show3"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_full_wins_raise1)
@@ -936,7 +943,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_raise1)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_raise1"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_full_wins_raise2)
@@ -986,7 +993,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_raise2)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_raise2"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_full_wins_stack_above1)
@@ -1036,7 +1043,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_stack_above1)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_stack_above1"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_full_wins_stack_above2)
@@ -1086,7 +1093,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_stack_above2)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_stack_above2"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_full_wins_stack_above3)
@@ -1136,7 +1143,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_stack_above3)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_stack_above3"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_full_wins_lower1)
@@ -1202,7 +1209,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_lower1)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_lower1"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_full_wins_lower2)
@@ -1268,7 +1275,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_lower2)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_lower2"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_all_full_wins_lower_activate)
@@ -1320,7 +1327,7 @@ TEST_F(etTestBaseMulti, multi_all_full_wins_lower_activate)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_all_full_wins_lower_activate"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_2wins_show1)
@@ -1371,7 +1378,7 @@ TEST_F(etTestBaseMulti, multi_2wins_show1)
 
    ASSERT_EQ(2, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_2wins_show1"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_2wins_show2)
@@ -1422,7 +1429,7 @@ TEST_F(etTestBaseMulti, multi_2wins_show2)
 
    ASSERT_EQ(2, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_2wins_show2"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_2wins_show3)
@@ -1473,7 +1480,7 @@ TEST_F(etTestBaseMulti, multi_2wins_show3)
 
    ASSERT_EQ(2, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_2wins_show3"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_full_2wins_show1)
@@ -1524,7 +1531,7 @@ TEST_F(etTestBaseMulti, multi_full_2wins_show1)
 
    ASSERT_EQ(2, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_full_2wins_show1"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_full_2wins_show2)
@@ -1575,7 +1582,7 @@ TEST_F(etTestBaseMulti, multi_full_2wins_show2)
 
    ASSERT_EQ(2, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_full_2wins_show2"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestBaseMulti, multi_full_2wins_show3)
@@ -1626,5 +1633,5 @@ TEST_F(etTestBaseMulti, multi_full_2wins_show3)
 
    ASSERT_EQ(2, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestBaseMulti", "multi_full_2wins_show3"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }

diff --git a/src/testcase/0004_transient_for.cpp b/src/testcase/0004_transient_for.cpp
index 164d044..de66acb 100644 (file)
--- a/src/testcase/0004_transient_for.cpp
+++ b/src/testcase/0004_transient_for.cpp
@@ -11,6 +11,8 @@ class etTestTransientFor : public ::etTCBase
     etWin *tw_parent = NULL;
     etWin *tw_child = NULL;
     etWin *tw_base = NULL;
+    std::string testCaseName;
+    std::string testName;
 
     void initTC(Eina_Bool show_win, Eina_Bool usr_geom);
 };
@@ -18,6 +20,8 @@ class etTestTransientFor : public ::etTCBase
 void
 etTestTransientFor::initTC(Eina_Bool show_win, Eina_Bool usr_geom)
 {
+   const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info();
+
    tw_parent = initNormalWin("TCWin_Normal_parent", usr_geom);
    if (show_win)
      {
@@ -41,6 +45,9 @@ etTestTransientFor::initTC(Eina_Bool show_win, Eina_Bool usr_geom)
         ASSERT_VIS_ON(tw_base);
      }
    ASSERT_TRUE(tw_base != NULL) << "failed to initiation window";
+
+   testCaseName = test_info->test_case_name();
+   testName = test_info->name();
 }
 
 TEST_F(etTestTransientFor, transient_for_basic)
@@ -91,7 +98,7 @@ TEST_F(etTestTransientFor, transient_for_basic)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestTransientFor", "transient_for_basic"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestTransientFor, transient_for_basic2)
@@ -146,7 +153,7 @@ TEST_F(etTestTransientFor, transient_for_basic2)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestTransientFor", "transient_for_basic2"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestTransientFor, transient_for_raise)
@@ -203,7 +210,7 @@ TEST_F(etTestTransientFor, transient_for_raise)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestTransientFor", "transient_for_raise"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestTransientFor, transient_for_lower)
@@ -276,7 +283,7 @@ TEST_F(etTestTransientFor, transient_for_lower)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestTransientFor", "transient_for_lower"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestTransientFor, transient_for_above)
@@ -332,5 +339,5 @@ TEST_F(etTestTransientFor, transient_for_above)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestTransientFor", "transient_for_above"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }

diff --git a/src/testcase/0005_notification.cpp b/src/testcase/0005_notification.cpp
index bb01730..6f74867 100644 (file)
--- a/src/testcase/0005_notification.cpp
+++ b/src/testcase/0005_notification.cpp
@@ -12,6 +12,8 @@ class etTestNotification : public ::etTCBase
     etWin *tw_normal = NULL;
     etWin *tw_noti1 = NULL;
     etWin *tw_noti2 = NULL;
+    std::string testCaseName;
+    std::string testName;
 
     void initTC(Eina_Bool usr_geom);
 };
@@ -19,6 +21,8 @@ class etTestNotification : public ::etTCBase
 void
 etTestNotification::initTC(Eina_Bool usr_geom)
 {
+   const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info();
+
    tw_normal = initNormalWin("TCWin_Normal_normal", usr_geom);
    showTCWin(tw_normal);
    ASSERT_VIS_ON(tw_normal);
@@ -33,6 +37,9 @@ etTestNotification::initTC(Eina_Bool usr_geom)
    showTCWin(tw_noti2);
    ASSERT_VIS_ON(tw_noti2);
    ASSERT_TRUE(tw_noti2 != NULL) << "failed to initiation window";
+
+   testCaseName = test_info->test_case_name();
+   testName = test_info->name();
 }
 
 TEST_F(etTestNotification, notification_level_default)
@@ -97,7 +104,7 @@ TEST_F(etTestNotification, notification_level_default)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_level_default"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestNotification, notification_level_medium)
@@ -162,7 +169,7 @@ TEST_F(etTestNotification, notification_level_medium)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_level_medium"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestNotification, notification_level_high)
@@ -227,7 +234,7 @@ TEST_F(etTestNotification, notification_level_high)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_level_high"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestNotification, notification_level_top)
@@ -292,7 +299,7 @@ TEST_F(etTestNotification, notification_level_top)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_level_top"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestNotification, notification_level_none)
@@ -414,7 +421,7 @@ TEST_F(etTestNotification, notification_level_none)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_level_none"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestNotification, notification_level_change)
@@ -586,7 +593,7 @@ TEST_F(etTestNotification, notification_level_change)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_level_change"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestNotification, notification_fullsize_level_default)
@@ -651,7 +658,7 @@ TEST_F(etTestNotification, notification_fullsize_level_default)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_fullsize_level_default"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestNotification, notification_fullsize_level_medium)
@@ -716,7 +723,7 @@ TEST_F(etTestNotification, notification_fullsize_level_medium)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_fullsize_level_medium"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestNotification, notification_fullsize_level_high)
@@ -781,7 +788,7 @@ TEST_F(etTestNotification, notification_fullsize_level_high)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_fullsize_level_high"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestNotification, notification_fullsize_level_top)
@@ -846,7 +853,7 @@ TEST_F(etTestNotification, notification_fullsize_level_top)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_fullsize_level_top"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestNotification, notification_fullsize_level_none)
@@ -968,7 +975,7 @@ TEST_F(etTestNotification, notification_fullsize_level_none)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_fullsize_level_none"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestNotification, notification_fullsize_level_change)
@@ -1140,5 +1147,5 @@ TEST_F(etTestNotification, notification_fullsize_level_change)
 
    ASSERT_EQ(3, pass_count);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestNotification", "notification_fullsize_level_change"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }

diff --git a/src/testcase/0006_tzsh.cpp b/src/testcase/0006_tzsh.cpp
index 861da07..d6a3036 100644 (file)
--- a/src/testcase/0006_tzsh.cpp
+++ b/src/testcase/0006_tzsh.cpp
@@ -36,6 +36,8 @@ class etTestTzsh : public ::etTCBase
 
  protected:
     etWin     *tw_base = NULL;
+    std::string testCaseName;
+    std::string testName;
 
     void initTC();
 };
@@ -43,8 +45,13 @@ class etTestTzsh : public ::etTCBase
 void
 etTestTzsh::initTC()
 {
+   const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info();
+
    tw_base = initNormalWin("TCWin_Normal_base", EINA_FALSE);
    ASSERT_TRUE(tw_base != NULL) << "failed to initiation window";
+
+   testCaseName = test_info->test_case_name();
+   testName = test_info->name();
 }
 
 /******************
@@ -150,7 +157,7 @@ TEST_F(etTestTzsh, scrsaver_basic)
 
    etRunner::get().freeWinInfoList(list);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestTzsh", "scrsaver_basic"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 /* Name:
@@ -204,5 +211,5 @@ TEST_F(etTestTzsh, scrsaver_mng_basic)
    ASSERT_TRUE(chk_timeout_val_);
    ASSERT_EQ(2, chk_cb_called_);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestTzsh", "scrsaver_mng_basic"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }

diff --git a/src/testcase/0007_rotation.cpp b/src/testcase/0007_rotation.cpp
index 097990e..ee572f0 100644 (file)
--- a/src/testcase/0007_rotation.cpp
+++ b/src/testcase/0007_rotation.cpp
@@ -10,8 +10,9 @@ class etTestRotation : public ::etTCBase
  protected:
     const int rots[4] = {0, 90, 180, 270};
     int saved_rot_ = 0;
-
     etWin *tw_base = NULL;
+    std::string testCaseName;
+    std::string testName;
 
     void initTC();
     void testWinRotation(etWin *tw, int rot);
@@ -20,6 +21,8 @@ class etTestRotation : public ::etTCBase
 void
 etTestRotation::initTC()
 {
+   const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info();
+
    tw_base = initNormalWin("TCWin_Normal_Rotation", EINA_TRUE);
    showTCWin(tw_base);
    ASSERT_VIS_ON(tw_base);
@@ -27,6 +30,9 @@ etTestRotation::initTC()
 
    // available rotations
    elm_win_wm_rotation_available_rotations_set(tw_base->elm_win, rots, 4);
+
+   testCaseName = test_info->test_case_name();
+   testName = test_info->name();
 }
 
 void
@@ -65,5 +71,5 @@ TEST_F(etTestRotation, available_rotations)
         testWinRotation(tw_base, rot);
      }
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestRotation", "available_rotations"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }

diff --git a/src/testcase/0010_splash.cpp b/src/testcase/0010_splash.cpp
index 21b3c3c..2b7833f 100644 (file)
--- a/src/testcase/0010_splash.cpp
+++ b/src/testcase/0010_splash.cpp
@@ -15,6 +15,8 @@ class etTestSplash : public ::etTCBase
 
  protected:
     etWin *tw = NULL;
+    std::string testCaseName;
+    std::string testName;
 
     void initTC(char * path, int type);
 };
@@ -23,6 +25,7 @@ void
 etTestSplash::initTC(char * path, int type)
 {
    Eina_Bool ret = EINA_FALSE;
+   const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info();
 
    tw = initNormalWin("TCWin_Splash", EINA_FALSE);
    ASSERT_TRUE(tw != NULL) << "failed to initiation window";
@@ -30,6 +33,9 @@ etTestSplash::initTC(char * path, int type)
    ret = etRunner::get().setSplashLaunch(path, type);
    etRunner::get().setSplashOwner();
    ASSERT_TRUE(ret);
+
+   testCaseName = test_info->test_case_name();
+   testName = test_info->name();
 }
 
 TEST_F(etTestSplash, splash_edc)
@@ -55,7 +61,7 @@ TEST_F(etTestSplash, splash_edc)
 
    ASSERT_TRUE(res);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestSplash", "splash_edc"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestSplash, splash_img)
@@ -81,7 +87,7 @@ TEST_F(etTestSplash, splash_img)
 
    ASSERT_TRUE(res);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestSplash", "splash_img"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestSplash, splash_disappear_after_real)
@@ -112,7 +118,7 @@ TEST_F(etTestSplash, splash_disappear_after_real)
      }
    etRunner::get().freeWinInfoList(list);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestSplash", "splash_disappear_after_real"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 
 TEST_F(etTestSplash, splash_evas_callback_after_real)
@@ -144,6 +150,6 @@ TEST_F(etTestSplash, splash_evas_callback_after_real)
      }
    etRunner::get().freeWinInfoList(list);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestSplash", "splash_evas_callback_after_real"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 }
 

diff --git a/src/testcase/0011_effect.cpp b/src/testcase/0011_effect.cpp
index 95377a9..0bd8f83 100644 (file)
--- a/src/testcase/0011_effect.cpp
+++ b/src/testcase/0011_effect.cpp
@@ -10,6 +10,8 @@ class etTestEffect : public ::etTCBase
  protected:
     etWin *tw = NULL;
     etWin *tw_green = NULL;
+    std::string testCaseName;
+    std::string testName;
 
     void initTC();
 };
@@ -17,11 +19,16 @@ class etTestEffect : public ::etTCBase
 void
 etTestEffect::initTC()
 {
+   const ::testing::TestInfo *const test_info = ::testing::UnitTest::GetInstance()->current_test_info();
+
    tw = initNormalWin("TCWin_Effect_Show1", EINA_FALSE);
    ASSERT_TRUE(tw != NULL) << "failed to initiation window";
 
    tw_green = initNormalWin("TCWin_Effect_GREEN", EINA_FALSE);
    ASSERT_TRUE(tw_green != NULL) << "failed to initiation window";
+
+   testCaseName = test_info->test_case_name();
+   testName = test_info->name();
 }
 
 TEST_F(etTestEffect, effect_show)
@@ -36,7 +43,7 @@ TEST_F(etTestEffect, effect_show)
    showTCWin(tw);
    ASSERT_EVENT(tw, E_TC_EVENT_TYPE_EFFECT);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestEffect", "effect_show"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 
    return;
 }
@@ -53,7 +60,7 @@ TEST_F(etTestEffect, effect_show_evas_callback)
    showTCWin(tw);
    ASSERT_EVENT(tw, E_TC_EVENT_TYPE_EFFECT_EVAS_CB);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestEffect", "effect_show_evas_callback"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 
    return;
 }
@@ -73,7 +80,7 @@ TEST_F(etTestEffect, effect_hide_bylower)
    elm_win_lower(tw->elm_win);
    ASSERT_EVENT(tw, E_TC_EVENT_TYPE_EFFECT);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestEffect", "effect_hide_bylower"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 
    return;
 }
@@ -93,7 +100,7 @@ TEST_F(etTestEffect, effect_hide_byunmap)
    tw->hide();
    ASSERT_EVENT(tw, E_TC_EVENT_TYPE_EFFECT);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestEffect", "effect_hide_byunmap"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 
    return;
 }
@@ -114,7 +121,7 @@ TEST_F(etTestEffect, effect_bg)
    showTCWin(tw_green);
    ASSERT_EVENT(tw, E_TC_EVENT_TYPE_EFFECT);
 
-   ASSERT_EQ(etRunner::get().verifyTC("etTestEffect", "effect_bg"), EINA_TRUE);
+   ASSERT_EQ(etRunner::get().verifyTC(testCaseName, testName), EINA_TRUE);
 
    return;
 }