[genlist] change tc to compliant merged elm

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

diff --git a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_display_only_set_func.c b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_display_only_set_func.c
index 0ccd314..3b78628 100644 (file)
--- a/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_display_only_set_func.c
+++ b/TC/elm_ts/genlist/utc_UIFW_elm_genlist_item_display_only_set_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; \
+       } \
 }
 
 
@@ -47,6 +47,7 @@ enum {
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_genlist_item_display_only_set_func_01, POSITIVE_TC_IDX },
        { utc_UIFW_elm_genlist_item_display_only_set_func_02, NEGATIVE_TC_IDX },
+       { NULL, 0 }
 };
 
 static void startup(void)
@@ -54,15 +55,15 @@ static void startup(void)
        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 = NULL;
-       itc.func.icon_get = NULL;
+       itc.func.text_get = NULL;
+       itc.func.content_get = NULL;
        itc.func.state_get = NULL;
        itc.func.del = NULL;
 }
@@ -71,7 +72,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 ============ ");
@@ -82,15 +83,14 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_genlist_item_display_only_set_func_01(void)
 {
-   Elm_Genlist_Item *item = NULL;
-   Eina_Bool ret = EINA_FALSE;
+       Elm_Object_Item *item = NULL;
+       Eina_Bool ret = EINA_FALSE;
 
-   item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,
-                       ELM_GENLIST_ITEM_NONE, NULL, NULL);      
-       elm_genlist_item_display_only_set(item, 1);
+       item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+       elm_genlist_item_display_only_set(item, EINA_TRUE);
 
        ret = elm_genlist_item_display_only_get(item);
-   
+
        if (!ret) {
                tet_infoline("elm_genlist_item_display_only_set() failed in positive test case");
                tet_result(TET_FAIL);
@@ -104,13 +104,10 @@ static void utc_UIFW_elm_genlist_item_display_only_set_func_01(void)
  */
 static void utc_UIFW_elm_genlist_item_display_only_set_func_02(void)
 {
-   Elm_Genlist_Item *item = NULL;
-   Eina_Bool ret = EINA_FALSE;
-
-   item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL,
-                       ELM_GENLIST_ITEM_NONE, NULL, NULL);      
-   
-       elm_genlist_item_display_only_set(NULL, 0);
-   
+       Elm_Object_Item *item = NULL;
+
+       item = elm_genlist_item_append(genlist, &itc, (void *) 0, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+       elm_genlist_item_display_only_set(NULL, EINA_FALSE);
+
        tet_result(TET_PASS);
 }