Merge "[TC] Follow the changed EFL migration API and structure"

diff --git a/TC/elm_ts/actionslider/utc_UIFW_elm_actionslider_indicator_pos_set_func.c b/TC/elm_ts/actionslider/utc_UIFW_elm_actionslider_indicator_pos_set_func.c
index 8ea41db..18e8ca6 100644 (file)
--- a/TC/elm_ts/actionslider/utc_UIFW_elm_actionslider_indicator_pos_set_func.c
+++ b/TC/elm_ts/actionslider/utc_UIFW_elm_actionslider_indicator_pos_set_func.c
@@ -77,7 +77,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_actionslider_indicator_pos_set_func_01(void)
 {
-       elm_actionslider_indicator_pos_set(actionslider, ELM_ACTIONSLIDER_INDICATOR_LEFT);
+       elm_actionslider_indicator_pos_set(actionslider, ELM_ACTIONSLIDER_LEFT);
 
        tet_result(TET_PASS);
 }

diff --git a/TC/elm_ts/actionslider/utc_UIFW_elm_actionslider_magnet_pos_set_func.c b/TC/elm_ts/actionslider/utc_UIFW_elm_actionslider_magnet_pos_set_func.c
index a72cb38..45b5d36 100644 (file)
--- a/TC/elm_ts/actionslider/utc_UIFW_elm_actionslider_magnet_pos_set_func.c
+++ b/TC/elm_ts/actionslider/utc_UIFW_elm_actionslider_magnet_pos_set_func.c
@@ -77,7 +77,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_actionslider_magnet_pos_set_func_01(void)
 {
-       elm_actionslider_magnet_pos_set(actionslider, ELM_ACTIONSLIDER_MAGNET_RIGHT);
+       elm_actionslider_magnet_pos_set(actionslider, ELM_ACTIONSLIDER_RIGHT);
 
        tet_result(TET_PASS);
 }

diff --git a/TC/elm_ts/box/utc_UIFW_elm_box_homogenous_set_func.c b/TC/elm_ts/box/utc_UIFW_elm_box_homogenous_set_func.c
index 55c6ea7..02ea678 100644 (file)
--- a/TC/elm_ts/box/utc_UIFW_elm_box_homogenous_set_func.c
+++ b/TC/elm_ts/box/utc_UIFW_elm_box_homogenous_set_func.c
@@ -35,8 +35,8 @@ static void cleanup(void);
 void (*tet_startup)(void) = startup;
 void (*tet_cleanup)(void) = cleanup;
 
-static void utc_UIFW_elm_box_homogenous_set_func_01(void);
-static void utc_UIFW_elm_box_homogenous_set_func_02(void);
+static void utc_UIFW_elm_box_homogeneous_set_func_01(void);
+static void utc_UIFW_elm_box_homogeneous_set_func_02(void);
 
 enum {
        POSITIVE_TC_IDX = 0x01,
@@ -44,8 +44,8 @@ enum {
 };
 
 struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_box_homogenous_set_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_box_homogenous_set_func_02, NEGATIVE_TC_IDX },
+       { utc_UIFW_elm_box_homogeneous_set_func_01, POSITIVE_TC_IDX },
+       { utc_UIFW_elm_box_homogeneous_set_func_02, NEGATIVE_TC_IDX },
        { NULL, 0 }
 };
 
@@ -68,35 +68,35 @@ static void cleanup(void)
 }
 
 /**
- * @brief Positive test case of elm_box_homogenous_set()
+ * @brief Positive test case of elm_box_homogeneous_set()
  */
-static void utc_UIFW_elm_box_homogenous_set_func_01(void)
+static void utc_UIFW_elm_box_homogeneous_set_func_01(void)
 {
        Evas_Object *test_eo = NULL;
 
        test_eo = elm_box_add(main_win);
 
        // Current return tyep of this API is "Void"
-       elm_box_homogenous_set(test_eo, EINA_TRUE);
+       elm_box_homogeneous_set(test_eo, EINA_TRUE);
 
        tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]: PASS, Set homogenous layout ON.");
+       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]: PASS, Set homogeneous layout ON.");
 
 }
 
 /**
- * @brief Positive test case of ug_init elm_box_homogenous_set()
+ * @brief Positive test case of ug_init elm_box_homogeneous_set()
  */
-static void utc_UIFW_elm_box_homogenous_set_func_02(void)
+static void utc_UIFW_elm_box_homogeneous_set_func_02(void)
 {
        Evas_Object *test_eo = NULL;
 
        test_eo = elm_box_add(main_win);
 
        // Current return tyep of this API is "Void"
-       elm_box_homogenous_set(test_eo, EINA_FALSE);
+       elm_box_homogeneous_set(test_eo, EINA_FALSE);
 
        tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Positive, [RESULT]: PASS, Set homogenous layout OFF.");
+       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Positive, [RESULT]: PASS, Set homogeneous layout OFF.");
 
 }

diff --git a/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_clear_func.c b/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_clear_func.c
index 2a339ad..00f22af 100644 (file)
--- a/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_clear_func.c
+++ b/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_clear_func.c
@@ -72,7 +72,7 @@ static void cleanup(void)
 static void utc_UIFW_elm_ctxpopup_clear_func_01(void)
 {
        Evas_Object *obj = elm_ctxpopup_add(main_win);
-       Elm_Ctxpopup_Item *item = elm_ctxpopup_item_append(obj, "TEST", NULL, NULL, NULL);
+       Elm_Object_Item *item = elm_ctxpopup_item_append(obj, "TEST", NULL, NULL, NULL);
        evas_object_show(obj);
        elm_ctxpopup_clear(obj);
 

diff --git a/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_append_func.c b/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_append_func.c
index 8d502cf..6062b90 100644 (file)
--- a/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_append_func.c
+++ b/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_append_func.c
@@ -76,7 +76,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_ctxpopup_item_append_func_01(void)
 {
-       Elm_Ctxpopup_Item * item = elm_ctxpopup_item_append(ctxpopup, "TEST", NULL, NULL, NULL );
+       Elm_Object_Item * item = elm_ctxpopup_item_append(ctxpopup, "TEST", NULL, NULL, NULL );
 
        if (!item)
        {
@@ -92,7 +92,7 @@ static void utc_UIFW_elm_ctxpopup_item_append_func_01(void)
  */
 static void utc_UIFW_elm_ctxpopup_item_append_func_02(void)
 {
-       Elm_Ctxpopup_Item *item = elm_ctxpopup_item_append( NULL, "TEST", NULL, NULL, NULL );
+       Elm_Object_Item *item = elm_ctxpopup_item_append( NULL, "TEST", NULL, NULL, NULL );
 
        if (item)
        {

diff --git a/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_del_func.c b/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_del_func.c
index 350d9a1..2f67880 100644 (file)
--- a/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_del_func.c
+++ b/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_del_func.c
@@ -67,13 +67,13 @@ static void cleanup(void)
 }
 
 /**
- * @brief Positive test case of elm_ctxpopup_item_del()
+ * @brief Positive test case of elm_object_item_del()
  */
 static void utc_UIFW_elm_ctxpopup_item_del_func_01(void)
 {
        Evas_Object *obj = elm_ctxpopup_add(main_win);
-       Elm_Ctxpopup_Item *item = elm_ctxpopup_item_append(obj, "TEST", NULL, NULL, NULL);
-       elm_ctxpopup_item_del(item);
+       Elm_Object_Item *item = elm_ctxpopup_item_append(obj, "TEST", NULL, NULL, NULL);
+       elm_object_item_del(item);
        evas_object_show(obj);
 
        tet_result(TET_PASS);

diff --git a/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_disabled_get_func.c b/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_disabled_get_func.c
index 2d21b1b..496ae92 100644 (file)
--- a/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_disabled_get_func.c
+++ b/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_disabled_get_func.c
@@ -68,19 +68,19 @@ static void cleanup(void)
 }
 
 /**
- * @brief Positive test case of elm_ctxpopup_item_disabled_get()
+ * @brief Positive test case of elm_object_item_disabled_get()
  */
 static void utc_UIFW_elm_ctxpopup_item_disabled_get_func_01(void)
 {
        Evas_Object *obj = elm_ctxpopup_add(main_win);
-       Elm_Ctxpopup_Item *item = elm_ctxpopup_item_append(obj, "TEST", NULL, NULL, NULL);
+       Elm_Object_Item *item = elm_ctxpopup_item_append(obj, "TEST", NULL, NULL, NULL);
        elm_ctxpopup_item_disabled_set(item, EINA_TRUE);
        evas_object_show(obj);
 
-   Eina_Bool r = elm_ctxpopup_item_disabled_get(item);
+   Eina_Bool r = elm_object_item_disabled_get(item);
 
        if (r != EINA_TRUE) {
-               tet_infoline("elm_ctxpopup_item_disabled_get() failed in positive test case");
+               tet_infoline("elm_object_item_disabled_get() failed in positive test case");
                tet_result(TET_FAIL);
                return;
        }
@@ -89,18 +89,18 @@ static void utc_UIFW_elm_ctxpopup_item_disabled_get_func_01(void)
 }
 
 /**
- * @brief Negative test case of ug_init elm_ctxpopup_item_disabled_get()
+ * @brief Negative test case of ug_init elm_object_item_disabled_get()
  */
 static void utc_UIFW_elm_ctxpopup_item_disabled_get_func_02(void)
 {
    Evas_Object *obj = elm_ctxpopup_add(main_win);
-       Elm_Ctxpopup_Item *item = elm_ctxpopup_item_append(obj, "TEST", NULL, NULL, NULL);
+       Elm_Object_Item *item = elm_ctxpopup_item_append(obj, "TEST", NULL, NULL, NULL);
        evas_object_show(obj);
 
-   Eina_Bool r = elm_ctxpopup_item_disabled_get(item);
+   Eina_Bool r = elm_object_item_disabled_get(item);
 
        if (r == EINA_TRUE) {
-               tet_infoline("elm_ctxpopup_item_disabled_get() failed in positive test case");
+               tet_infoline("elm_object_item_disabled_get() failed in positive test case");
                tet_result(TET_FAIL);
                return;
        }

diff --git a/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_disabled_set_func.c b/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_disabled_set_func.c
index b5dec44..2292d6d 100644 (file)
--- a/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_disabled_set_func.c
+++ b/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_disabled_set_func.c
@@ -72,7 +72,7 @@ static void cleanup(void)
 static void utc_UIFW_elm_ctxpopup_item_disabled_set_func_01(void)
 {
        Evas_Object *obj = elm_ctxpopup_add(main_win);
-       Elm_Ctxpopup_Item *item = elm_ctxpopup_item_append(obj, "TEST", NULL, NULL, NULL);
+       Elm_Object_Item *item = elm_ctxpopup_item_append(obj, "TEST", NULL, NULL, NULL);
        elm_ctxpopup_item_disabled_set(item, EINA_TRUE);
        evas_object_show(obj);
 

diff --git a/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_icon_get_func.c b/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_icon_get_func.c
index aebe713..6d889f9 100644 (file)
--- a/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_icon_get_func.c
+++ b/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_icon_get_func.c
@@ -80,7 +80,7 @@ static void utc_UIFW_elm_ctxpopup_item_icon_get_func_01(void)
        evas_object_size_hint_min_set(icon, 50, 50);
        evas_object_show(icon);
 
-       Elm_Ctxpopup_Item *item = elm_ctxpopup_item_append( ctxpopup, "TEST", icon, NULL, NULL );
+       Elm_Object_Item *item = elm_ctxpopup_item_append( ctxpopup, "TEST", icon, NULL, NULL );
        Evas_Object *icon2 = elm_ctxpopup_item_icon_get(item);
 
        if ( icon != icon2 )
@@ -101,7 +101,7 @@ static void utc_UIFW_elm_ctxpopup_item_icon_get_func_02(void)
        evas_object_size_hint_min_set(icon, 50, 50);
        evas_object_show(icon);
 
-       Elm_Ctxpopup_Item *item = elm_ctxpopup_item_append( ctxpopup, "TEST", icon, NULL, NULL );
+       Elm_Object_Item *item = elm_ctxpopup_item_append( ctxpopup, "TEST", icon, NULL, NULL );
 
        Evas_Object *icon2 = elm_ctxpopup_item_icon_get(NULL);
 

diff --git a/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_icon_set_func.c b/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_icon_set_func.c
index f27317f..c905911 100644 (file)
--- a/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_icon_set_func.c
+++ b/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_icon_set_func.c
@@ -74,7 +74,7 @@ static void utc_UIFW_elm_ctxpopup_item_icon_set_func_01(void)
        Evas_Object *ctxpopup = elm_ctxpopup_add(main_win);
        evas_object_show(ctxpopup);
 
-       Elm_Ctxpopup_Item *item = elm_ctxpopup_item_append(ctxpopup, "Test", NULL, NULL, NULL );
+       Elm_Object_Item *item = elm_ctxpopup_item_append(ctxpopup, "Test", NULL, NULL, NULL );
        elm_ctxpopup_item_icon_set( item, NULL);
 
        tet_result(TET_PASS);

diff --git a/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_label_get_func.c b/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_label_get_func.c
index 24b2257..216aa7b 100644 (file)
--- a/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_label_get_func.c
+++ b/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_label_get_func.c
@@ -77,7 +77,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_ctxpopup_item_label_get_func_01(void)
 {
-       Elm_Ctxpopup_Item * item = elm_ctxpopup_item_append(ctxpopup, "TEST", NULL, NULL, NULL);
+       Elm_Object_Item * item = elm_ctxpopup_item_append(ctxpopup, "TEST", NULL, NULL, NULL);
        char *label = elm_ctxpopup_item_label_get(item);
 
        if (strcmp( label, "TEST"))
@@ -94,7 +94,7 @@ static void utc_UIFW_elm_ctxpopup_item_label_get_func_01(void)
  */
 static void utc_UIFW_elm_ctxpopup_item_label_get_func_02(void)
 {
-       Elm_Ctxpopup_Item * item = elm_ctxpopup_item_append(ctxpopup, "TEST", NULL, NULL, NULL);
+       Elm_Object_Item * item = elm_ctxpopup_item_append(ctxpopup, "TEST", NULL, NULL, NULL);
        char *label = elm_ctxpopup_item_label_get(NULL);
 
        if (label)

diff --git a/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_label_set_func.c b/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_label_set_func.c
index f38096f..434efe6 100644 (file)
--- a/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_label_set_func.c
+++ b/TC/elm_ts/ctxpopup/utc_UIFW_elm_ctxpopup_item_label_set_func.c
@@ -74,7 +74,7 @@ static void utc_UIFW_elm_ctxpopup_item_label_set_func_01(void)
        Evas_Object *obj = elm_ctxpopup_add(main_win);
        evas_object_show(obj);
 
-       Elm_Ctxpopup_Item *item = elm_ctxpopup_item_append(obj, "TEST", NULL, NULL, NULL);
+       Elm_Object_Item *item = elm_ctxpopup_item_append(obj, "TEST", NULL, NULL, NULL);
        elm_ctxpopup_item_label_set( item, "NONE");
 
        tet_result(TET_PASS);