[genlist] change tc to compliant merged elm

[framework/uifw/elementary.git] / TC / elm_ts / genlist / utc_UIFW_elm_genlist_item_top_show_func.c

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_top_show_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_top_show_func.c
index 1b46fb2..cdd1e5c 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_top_show_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_top_show_func.c
@@ -7,11 +7,11 @@
 { \
        Evas_Object *err = y; \
        if (err == (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
+       { \
+               tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
+               tet_result(TET_FAIL); \
+               return; \
+       } \
 }
 
 // For checking the result of the negative test case.
@@ -19,11 +19,11 @@
 { \
        Evas_Object *err = y; \
        if (err != (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
+       { \
+               tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
+               tet_result(TET_FAIL); \
+               return; \
+       } \
 }
 
 
@@ -52,7 +52,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part )
+static char *_gl_text_get( const void *data, Evas_Object *obj, const char *part )
 {
        int index = (int) data;
 
@@ -64,20 +64,20 @@ static char *_gl_label_get( const void *data, Evas_Object *obj, const char *part
 
 static void startup(void)
 {
-       Elm_Genlist_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int index = 0;
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
-       evas_object_show(main_win);     
+       evas_object_show(main_win);
        genlist = elm_genlist_add(main_win);
        evas_object_show(genlist);
        elm_win_resize_object_add(main_win, genlist);
        evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        itc.item_style = "1line_textonly";
-       itc.func.label_get = _gl_label_get;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = _gl_text_get;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
        for (index = 0; index < 5; index++) {
@@ -90,7 +90,7 @@ static void cleanup(void)
 {
        if ( NULL != main_win ) {
                evas_object_del(main_win);
-               main_win = NULL;
+               main_win = NULL;
        }
        elm_shutdown();
        tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
@@ -101,7 +101,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_top_show_func_01(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_top_show(it);
@@ -113,7 +113,7 @@ static void utc_UIFW_elm_genlist_item_top_show_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_top_show_func_02(void)
 {
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
 
        it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
        elm_genlist_item_top_show(NULL);