[multibuttonentry][index] Modified TC
authorGoun Lee <gouni.lee@samsung.com>
Fri, 24 Feb 2012 11:10:53 +0000 (20:10 +0900)
committerGoun Lee <gouni.lee@samsung.com>
Fri, 24 Feb 2012 11:10:53 +0000 (20:10 +0900)
26 files changed:
TC/elm_ts/index/Makefile [changed mode: 0755->0644]
TC/elm_ts/index/tslist
TC/elm_ts/index/utc_UIFW_elm_index_item_append_func.c
TC/elm_ts/index/utc_UIFW_elm_index_item_append_relative_func.c
TC/elm_ts/index/utc_UIFW_elm_index_item_clear_func.c
TC/elm_ts/index/utc_UIFW_elm_index_item_data_get_func.c
TC/elm_ts/index/utc_UIFW_elm_index_item_del_func.c
TC/elm_ts/index/utc_UIFW_elm_index_item_find_func.c
TC/elm_ts/index/utc_UIFW_elm_index_item_go_func.c
TC/elm_ts/index/utc_UIFW_elm_index_item_letter_get_func.c
TC/elm_ts/index/utc_UIFW_elm_index_item_prepend_func.c
TC/elm_ts/index/utc_UIFW_elm_index_item_prepend_relative_func.c
TC/elm_ts/index/utc_UIFW_elm_index_item_sorted_insert_func.c
TC/elm_ts/multibuttonentry/Makefile [changed mode: 0755->0644]
TC/elm_ts/multibuttonentry/tslist
TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_first_item_get_func.c [new file with mode: 0644]
TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_append_func.c [moved from TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_add_start_func.c with 74% similarity]
TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_insert_after_func.c [moved from TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_add_after_func.c with 72% similarity]
TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_insert_before_func.c [moved from TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_add_before_func.c with 71% similarity]
TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_label_get_func.c [deleted file]
TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_next_get_func.c [moved from TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_next_func.c with 86% similarity]
TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_prepend_func.c [moved from TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_add_end_func.c with 75% similarity]
TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_prev_get_func.c [moved from TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_prev_func.c with 86% similarity]
TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_items_get_func.c
TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_last_item_get_func.c [moved from TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_del_func.c with 67% similarity]
TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_selected_item_get_func.c [moved from TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_selected_get_func.c with 72% similarity]

old mode 100755 (executable)
new mode 100644 (file)
index 0ffcb86..306779f
@@ -4,9 +4,6 @@ TARGETS = utc_UIFW_elm_index_add_func \
                utc_UIFW_elm_index_active_set_func \
                utc_UIFW_elm_index_item_append_func \
                utc_UIFW_elm_index_item_append_relative_func \
-               utc_UIFW_elm_index_item_data_get_func \
-               utc_UIFW_elm_index_item_data_set_func \
-               utc_UIFW_elm_index_item_del_func \
                utc_UIFW_elm_index_item_find_func \
                utc_UIFW_elm_index_item_go_func \
                utc_UIFW_elm_index_item_letter_get_func \
index 998ece1..caa0b22 100644 (file)
@@ -2,9 +2,6 @@
 /elm_ts/index/utc_UIFW_elm_index_active_set_func
 /elm_ts/index/utc_UIFW_elm_index_item_append_func
 /elm_ts/index/utc_UIFW_elm_index_item_append_relative_func
-/elm_ts/index/utc_UIFW_elm_index_item_data_get_func
-/elm_ts/index/utc_UIFW_elm_index_item_data_set_func
-/elm_ts/index/utc_UIFW_elm_index_item_del_func
 /elm_ts/index/utc_UIFW_elm_index_item_find_func
 /elm_ts/index/utc_UIFW_elm_index_item_go_func
 /elm_ts/index/utc_UIFW_elm_index_item_letter_get_func
index 2779e07..888a7f6 100644 (file)
@@ -68,7 +68,7 @@ static void cleanup(void)
        tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
 }
 
-char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
+static char *gli_label_get(void *data, Evas_Object *obj, const char *part)
 {
    char buf[256];
    int j = (int)data;
@@ -84,8 +84,8 @@ char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
 static void utc_UIFW_elm_index_item_append_func_01(void)
 {
        Evas_Object *idx = NULL;
-       Elm_Genlist_Item *it = NULL,*it_gl = NULL;
-       Elm_Index_Item *it_idx = NULL;
+       Elm_Object_Item *it = NULL,*it_gl = NULL;
+       Elm_Object_Item *it_idx = NULL;
        Evas_Object *gl = NULL;
        int i = 0, j = 0;
        const char  *letter = NULL;
@@ -95,8 +95,8 @@ static void utc_UIFW_elm_index_item_append_func_01(void)
        evas_object_show(gl);
        evas_object_show(idx);
        itci.item_style     = "default";
-       itci.func.label_get = gli_label_get;
-       itci.func.icon_get  = NULL;
+        itci.func.text_get = gli_label_get;
+        itci.func.content_get  = NULL;
        itci.func.state_get = NULL;
        itci.func.del       = NULL;
        for (i = 0; i <=40; i++) {
@@ -126,8 +126,8 @@ static void utc_UIFW_elm_index_item_append_func_01(void)
 static void utc_UIFW_elm_index_item_append_func_02(void)
 {
        Evas_Object *idx = NULL;
-       Elm_Genlist_Item *it = NULL, *it_gl=NULL;
-       Elm_Index_Item *it_idx = NULL;
+       Elm_Object_Item *it = NULL, *it_gl=NULL;
+       Elm_Object_Item *it_idx = NULL;
        Evas_Object *gl = NULL;
        int i = 0, j = 0;
        gl = elm_genlist_add(main_win);
@@ -135,8 +135,8 @@ static void utc_UIFW_elm_index_item_append_func_02(void)
        evas_object_show(gl);
        evas_object_show(idx);
        itci.item_style     = "default";
-       itci.func.label_get = gli_label_get;
-       itci.func.icon_get  = NULL;
+       itci.func.text_get = gli_label_get;
+       itci.func.content_get  = NULL;
        itci.func.state_get = NULL;
        itci.func.del       = NULL;
        for (i = 0; i <=40; i++) {
index fd8f626..db3bd69 100644 (file)
@@ -68,7 +68,7 @@ static void cleanup(void)
        tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
 }
 
-char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
+char *gli_label_get(void *data, Evas_Object *obj, const char *part)
 {
    char buf[256];
    int j = (int)data;
@@ -84,9 +84,9 @@ char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
 static void utc_UIFW_elm_index_item_append_relative_func_01(void)
 {
        Evas_Object *idx = NULL;
-       Elm_Genlist_Item *it = NULL, *it_gl=NULL;
+       Elm_Object_Item *it = NULL, *it_gl=NULL;
        Evas_Object *gl = NULL;
-       Elm_Index_Item *it_idx = NULL;
+       Elm_Object_Item *it_idx = NULL;
        int i = 0, j = 0;
        const char  *letter = NULL;
        gl = elm_genlist_add(main_win);
@@ -94,8 +94,8 @@ static void utc_UIFW_elm_index_item_append_relative_func_01(void)
        evas_object_show(gl);
        evas_object_show(idx);
        itci.item_style     = "default";
-       itci.func.label_get = gli_label_get;
-       itci.func.icon_get  = NULL;
+        itci.func.text_get = gli_label_get;
+        itci.func.content_get  = NULL;
        itci.func.state_get = NULL;
        itci.func.del       = NULL;
        for (i = 0; i <=40; i++) {
@@ -130,17 +130,17 @@ static void utc_UIFW_elm_index_item_append_relative_func_01(void)
 static void utc_UIFW_elm_index_item_append_relative_func_02(void)
 {
        Evas_Object *idx = NULL;
-       Elm_Genlist_Item *it = NULL, *it_gl=NULL;
+       Elm_Object_Item *it = NULL, *it_gl=NULL;
        Evas_Object *gl = NULL;
-       Elm_Index_Item *it_idx = NULL;
+       Elm_Object_Item *it_idx = NULL;
        int i = 0, j = 0;
        gl = elm_genlist_add(main_win);
        idx= elm_index_add(main_win);
        evas_object_show(gl);
        evas_object_show(idx);
     itci.item_style     = "default";
-    itci.func.label_get = gli_label_get;
-    itci.func.icon_get  = NULL;
+    itci.func.text_get = gli_label_get;
+    itci.func.content_get  = NULL;
     itci.func.state_get = NULL;
     itci.func.del       = NULL;
     for (i = 0; i <=40; i++) {
index 30c427d..567722f 100644 (file)
@@ -68,7 +68,7 @@ static void cleanup(void)
        tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
 }
 
-char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
+char *gli_label_get(void *data, Evas_Object *obj, const char *part)
 {
    char buf[256];
    int j = (int)data;
@@ -84,17 +84,17 @@ char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
 static void utc_UIFW_elm_index_item_clear_func_01(void)
 {
        Evas_Object *idx = NULL;
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
        Evas_Object *gl = NULL;
-       Elm_Index_Item *it_idx = NULL;
+       Elm_Object_Item *it_idx = NULL;
        int i = 0, j = 0;
        gl = elm_genlist_add(main_win);
        idx= elm_index_add(main_win);
        evas_object_show(gl);
        evas_object_show(idx);
        itci.item_style     = "default";
-       itci.func.label_get = gli_label_get;
-       itci.func.icon_get  = NULL;
+        itci.func.text_get = gli_label_get;
+        itci.func.content_get  = NULL;
        itci.func.state_get = NULL;
        itci.func.del       = NULL;
        for (i = 0; i <=40; i++) {
@@ -124,8 +124,8 @@ static void utc_UIFW_elm_index_item_clear_func_02(void)
 {
        Evas_Object *idx = NULL;
        Evas_Object *gl = NULL;
-       Elm_Genlist_Item *it = NULL;
-       Elm_Index_Item *it_idx = NULL;
+       Elm_Object_Item *it = NULL;
+       Elm_Object_Item *it_idx = NULL;
        int i = 0, j = 0;
 
        gl = elm_genlist_add(main_win);
@@ -133,8 +133,8 @@ static void utc_UIFW_elm_index_item_clear_func_02(void)
        evas_object_show(gl);
        evas_object_show(idx);
        itci.item_style     = "default";
-       itci.func.label_get = gli_label_get;
-       itci.func.icon_get  = NULL;
+        itci.func.text_get = gli_label_get;
+        itci.func.content_get  = NULL;
        itci.func.state_get = NULL;
        itci.func.del       = NULL;
        for (i = 0; i <=40; i++) {
index 5e5a39c..0ce3a63 100644 (file)
@@ -68,7 +68,7 @@ static void cleanup(void)
        tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
 }
 
-char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
+char *gli_label_get(void *data, Evas_Object *obj, const char *part)
 {
    char buf[256];
    int j = (int)data;
@@ -84,9 +84,9 @@ char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
 static void utc_UIFW_elm_index_item_data_get_func_01(void)
 {
        Evas_Object *idx = NULL;
-       Elm_Genlist_Item *it = NULL;
-       Elm_Genlist_Item *it_gl = NULL;
-       Elm_Index_Item *item = NULL;
+       Elm_Object_Item *it = NULL;
+       Elm_Object_Item *it_gl = NULL;
+       Elm_Object_Item *item = NULL;
        Evas_Object *gl = NULL;
        void *d = NULL;
        int i = 0, j = 0;
@@ -128,9 +128,9 @@ static void utc_UIFW_elm_index_item_data_get_func_01(void)
 static void utc_UIFW_elm_index_item_data_get_func_02(void)
 {
        Evas_Object *idx = NULL;
-       Elm_Genlist_Item *it = NULL;
-       Elm_Genlist_Item *it_gl = NULL;
-       Elm_Index_Item *item = NULL;
+       Elm_Object_Item *it = NULL;
+       Elm_Object_Item *it_gl = NULL;
+       Elm_Object_Item *item = NULL;
        Evas_Object *gl = NULL;
        void *d = NULL;
        int i = 0, j = 0;
index 7480355..411c1f2 100644 (file)
@@ -68,7 +68,7 @@ static void cleanup(void)
        tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
 }
 
-char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
+char *gli_label_get(void *data, Evas_Object *obj, const char *part)
 {
    char buf[256];
    int j = (int)data;
@@ -85,8 +85,8 @@ static void utc_UIFW_elm_index_item_del_func_01(void)
 {
        Evas_Object *idx = NULL;
        Evas_Object *gl = NULL;
-       Elm_Genlist_Item *it = NULL, *it_gl=NULL;
-       Elm_Index_Item *it_idx = NULL;
+       Elm_Object_Item *it = NULL, *it_gl=NULL;
+       Elm_Object_Item *it_idx = NULL;
        int i = 0, j = 0;
 
        gl = elm_genlist_add(main_win);
@@ -126,8 +126,8 @@ static void utc_UIFW_elm_index_item_del_func_02(void)
 {
        Evas_Object *idx = NULL;
        Evas_Object *gl = NULL;
-       Elm_Genlist_Item *it = NULL, *it_gl=NULL;
-       Elm_Index_Item *it_idx = NULL;
+       Elm_Object_Item *it = NULL, *it_gl=NULL;
+       Elm_Object_Item *it_idx = NULL;
        int i = 0, j = 0;
 
        gl = elm_genlist_add(main_win);
index 454c80f..a350237 100644 (file)
@@ -68,7 +68,7 @@ static void cleanup(void)
        tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
 }
 
-char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
+char *gli_label_get(void *data, Evas_Object *obj, const char *part)
 {
    char buf[256];
    int j = (int)data;
@@ -84,9 +84,9 @@ char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
 static void utc_UIFW_elm_index_item_find_func_01(void)
 {
        Evas_Object *idx = NULL;
-       Elm_Genlist_Item *it = NULL,*it_gl = NULL;
+       Elm_Object_Item *it = NULL,*it_gl = NULL;
        Evas_Object *gl = NULL;
-       Elm_Index_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        int i = 0, j = 0;
 
        gl = elm_genlist_add(main_win);
@@ -94,8 +94,8 @@ static void utc_UIFW_elm_index_item_find_func_01(void)
        evas_object_show(gl);
        evas_object_show(idx);
        itci.item_style     = "default";
-       itci.func.label_get = gli_label_get;
-       itci.func.icon_get  = NULL;
+        itci.func.text_get = gli_label_get;
+        itci.func.content_get  = NULL;
        itci.func.state_get = NULL;
        itci.func.del       = NULL;
        for (i = 0; i < 40; i++) {
@@ -125,8 +125,8 @@ static void utc_UIFW_elm_index_item_find_func_02(void)
 {
        Evas_Object *idx = NULL;
        Evas_Object *gl = NULL;
-       Elm_Genlist_Item *it = NULL,*it_gl = NULL;
-       Elm_Index_Item *item = NULL;
+       Elm_Object_Item *it = NULL,*it_gl = NULL;
+       Elm_Object_Item *item = NULL;
        int i = 0, j = 0;
 
        gl = elm_genlist_add(main_win);
@@ -134,8 +134,8 @@ static void utc_UIFW_elm_index_item_find_func_02(void)
        evas_object_show(gl);
        evas_object_show(idx);
        itci.item_style     = "default";
-       itci.func.label_get = gli_label_get;
-       itci.func.icon_get  = NULL;
+        itci.func.text_get = gli_label_get;
+        itci.func.content_get  = NULL;
        itci.func.state_get = NULL;
        itci.func.del       = NULL;
        for (i = 0; i < 40; i++) {
index fa76a2d..b27e5ec 100644 (file)
@@ -68,7 +68,7 @@ static void cleanup(void)
        tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
 }
 
-char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
+char *gli_label_get(void *data, Evas_Object *obj, const char *part)
 {
    char buf[256];
    int j = (int)data;
@@ -84,7 +84,7 @@ char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
 static void utc_UIFW_elm_index_item_go_func_01(void)
 {
        Evas_Object *idx = NULL;
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
        Evas_Object *gl = NULL;
        int i = 0, j = 0, level=-1;
 
@@ -93,8 +93,8 @@ static void utc_UIFW_elm_index_item_go_func_01(void)
        evas_object_show(gl);
        evas_object_show(idx);
        itci.item_style     = "default";
-       itci.func.label_get = gli_label_get;
-       itci.func.icon_get  = NULL;
+       itci.func.text_get = gli_label_get;
+       itci.func.content_get  = NULL;
        itci.func.state_get = NULL;
        itci.func.del       = NULL;
        for (i = 0; i <=40; i++) {
@@ -122,7 +122,7 @@ static void utc_UIFW_elm_index_item_go_func_01(void)
 static void utc_UIFW_elm_index_item_go_func_02(void)
 {
        Evas_Object *idx = NULL;
-       Elm_Genlist_Item *it = NULL;
+       Elm_Object_Item *it = NULL;
        Evas_Object *gl = NULL;
        int i = 0, j = 0, level=-1;
 
@@ -131,8 +131,8 @@ static void utc_UIFW_elm_index_item_go_func_02(void)
        evas_object_show(gl);
        evas_object_show(idx);
        itci.item_style     = "default";
-       itci.func.label_get = gli_label_get;
-       itci.func.icon_get  = NULL;
+       itci.func.text_get = gli_label_get;
+       itci.func.content_get  = NULL;
        itci.func.state_get = NULL;
        itci.func.del       = NULL;
        for (i = 0; i <=40; i++) {
index 340fa3b..d391ffe 100644 (file)
@@ -68,7 +68,7 @@ static void cleanup(void)
        tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
 }
 
-char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
+char *gli_label_get(void *data, Evas_Object *obj, const char *part)
 {
    char buf[256];
    int j = (int)data;
@@ -84,9 +84,9 @@ char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
 static void utc_UIFW_elm_index_item_letter_get_func_01(void)
 {
        Evas_Object *idx = NULL;
-       Elm_Genlist_Item *it = NULL,*it_gl = NULL;
+       Elm_Object_Item *it = NULL,*it_gl = NULL;
        Evas_Object *gl = NULL;
-       Elm_Index_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
        const char *ptr = NULL;
        int i = 0, j = 0;
 
@@ -94,10 +94,10 @@ static void utc_UIFW_elm_index_item_letter_get_func_01(void)
        idx= elm_index_add(main_win);
        evas_object_show(gl);
        evas_object_show(idx);
-       itci.item_style     = "default";
-       itci.func.label_get = gli_label_get;
-       itci.func.icon_get  = NULL;
-       itci.func.state_get = NULL;
+       itci.item_style     = "default";
+       itci.func.text_get = gli_label_get;
+       itci.func.content_get  = NULL;
+       itci.func.state_get = NULL;
        itci.func.del       = NULL;
        for (i = 0; i < 40; i++) {
                it = elm_genlist_item_append(gl, &itci,(void *)j, NULL, ELM_GENLIST_ITEM_NONE, NULL,NULL);
@@ -126,8 +126,8 @@ static void utc_UIFW_elm_index_item_letter_get_func_01(void)
 static void utc_UIFW_elm_index_item_letter_get_func_02(void)
 {
        Evas_Object *idx = NULL;
-       Elm_Genlist_Item *it = NULL,*it_gl = NULL;
-       Elm_Index_Item *item = NULL;
+       Elm_Object_Item *it = NULL,*it_gl = NULL;
+       Elm_Object_Item *item = NULL;
        Evas_Object *gl = NULL;
        const char *ptr = NULL;
        int i = 0, j = 0;
@@ -137,9 +137,9 @@ static void utc_UIFW_elm_index_item_letter_get_func_02(void)
        evas_object_show(gl);
        evas_object_show(idx);
        itci.item_style     = "default";
-       itci.func.label_get = gli_label_get;
-       itci.func.icon_get  = NULL;
-       itci.func.state_get = NULL;
+       itci.func.text_get = gli_label_get;
+       itci.func.content_get  = NULL;
+       itci.func.state_get = NULL;
        itci.func.del       = NULL;
        for (i = 0; i < 40; i++) {
                it = elm_genlist_item_append(gl, &itci,(void *)j, NULL, ELM_GENLIST_ITEM_NONE, NULL,NULL);
index 40c6939..32abbf3 100644 (file)
@@ -68,7 +68,7 @@ static void cleanup(void)
        tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
 }
 
-char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
+char *gli_label_get(void *data, Evas_Object *obj, const char *part)
 {
    char buf[256];
    int j = (int)data;
@@ -84,8 +84,8 @@ char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
 static void utc_UIFW_elm_index_item_prepend_func_01(void)
 {
        Evas_Object *idx = NULL;
-       Elm_Genlist_Item *it = NULL,*it_gl = NULL;
-       Elm_Index_Item *it_idx = NULL;
+       Elm_Object_Item *it = NULL,*it_gl = NULL;
+       Elm_Object_Item *it_idx = NULL;
        Evas_Object *gl = NULL;
        int i = 0, j = 0;
        const char  *letter = NULL;
@@ -95,8 +95,8 @@ static void utc_UIFW_elm_index_item_prepend_func_01(void)
        evas_object_show(gl);
        evas_object_show(idx);
        itci.item_style     = "default";
-       itci.func.label_get = gli_label_get;
-       itci.func.icon_get  = NULL;
+        itci.func.text_get = gli_label_get;
+        itci.func.content_get  = NULL;
        itci.func.state_get = NULL;
        itci.func.del       = NULL;
        for (i = 0; i <=40; i++) {
@@ -126,8 +126,8 @@ static void utc_UIFW_elm_index_item_prepend_func_01(void)
 static void utc_UIFW_elm_index_item_prepend_func_02(void)
 {
        Evas_Object *idx = NULL;
-       Elm_Genlist_Item *it = NULL, *it_gl=NULL;
-       Elm_Index_Item *it_idx = NULL;
+       Elm_Object_Item *it = NULL, *it_gl=NULL;
+       Elm_Object_Item *it_idx = NULL;
        Evas_Object *gl = NULL;
        int i = 0, j = 0;
 
@@ -136,8 +136,8 @@ static void utc_UIFW_elm_index_item_prepend_func_02(void)
         evas_object_show(gl);
        evas_object_show(idx);
        itci.item_style     = "default";
-       itci.func.label_get = gli_label_get;
-       itci.func.icon_get  = NULL;
+       itci.func.text_get = gli_label_get;
+       itci.func.content_get  = NULL;
        itci.func.state_get = NULL;
        itci.func.del       = NULL;
        for (i = 0; i <=40; i++) {
index dd5bb3d..ae7ed86 100644 (file)
@@ -68,7 +68,7 @@ static void cleanup(void)
        tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
 }
 
-char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
+char *gli_label_get(void *data, Evas_Object *obj, const char *part)
 {
    char buf[256];
    int j = (int)data;
@@ -84,9 +84,9 @@ char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
 static void utc_UIFW_elm_index_item_prepend_relative_func_01(void)
 {
        Evas_Object *idx = NULL;
-       Elm_Genlist_Item *it = NULL, *it_gl=NULL;
+       Elm_Object_Item *it = NULL, *it_gl=NULL;
        Evas_Object *gl = NULL;
-       Elm_Index_Item *it_idx = NULL;
+       Elm_Object_Item *it_idx = NULL;
        int i = 0, j = 0;
 
        const char  *letter = NULL;
@@ -95,8 +95,8 @@ static void utc_UIFW_elm_index_item_prepend_relative_func_01(void)
        evas_object_show(gl);
        evas_object_show(idx);
        itci.item_style     = "default";
-       itci.func.label_get = gli_label_get;
-       itci.func.icon_get  = NULL;
+        itci.func.text_get = gli_label_get;
+        itci.func.content_get  = NULL;
        itci.func.state_get = NULL;
        itci.func.del       = NULL;
        for (i = 0; i <=40; i++) {
@@ -130,9 +130,9 @@ static void utc_UIFW_elm_index_item_prepend_relative_func_01(void)
 static void utc_UIFW_elm_index_item_prepend_relative_func_02(void)
 {
        Evas_Object *idx = NULL;
-       Elm_Genlist_Item *it = NULL, *it_gl=NULL;
+       Elm_Object_Item *it = NULL, *it_gl=NULL;
        Evas_Object *gl = NULL;
-       Elm_Index_Item *it_idx = NULL;
+       Elm_Object_Item *it_idx = NULL;
        int i = 0, j = 0;
 
        gl = elm_genlist_add(main_win);
@@ -140,8 +140,8 @@ static void utc_UIFW_elm_index_item_prepend_relative_func_02(void)
        evas_object_show(gl);
        evas_object_show(idx);
        itci.item_style     = "default";
-       itci.func.label_get = gli_label_get;
-       itci.func.icon_get  = NULL;
+        itci.func.text_get = gli_label_get;
+        itci.func.content_get  = NULL;
        itci.func.state_get = NULL;
        itci.func.del       = NULL;
        for (i = 0; i <=40; i++) {
index 68c2a8d..d7e3382 100644 (file)
@@ -68,7 +68,7 @@ static void cleanup(void)
        tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
 }
 
-char *gli_label_get(const void *data, Evas_Object *obj, const char *part)
+char *gli_label_get(void *data, Evas_Object *obj, const char *part)
 {
    char buf[256];
    int j = (int)data;
@@ -83,11 +83,11 @@ int
 test_index2_cmp(const void *data1, const void *data2)
 {
    const char *label1, *label2;
-   const Elm_List_Item *it1 = data1;
-   const Elm_List_Item *it2 = data2;
+   const Elm_Object_Item *it1 = data1;
+   const Elm_Object_Item *it2 = data2;
 
-   label1 = elm_list_item_label_get(it1);
-   label2 = elm_list_item_label_get(it2);
+   label1 = elm_object_item_text_get(it1);
+   label2 = elm_object_item_text_get(it2);
 
    return strcasecmp(label1, label2);
 }
@@ -96,8 +96,8 @@ int
 test_index2_icmp(const void *data1, const void *data2)
 {
    const char *label1, *label2;
-   const Elm_Index_Item *it1 = data1;
-   const Elm_Index_Item *it2 = data2;
+   const Elm_Object_Item *it1 = data1;
+   const Elm_Object_Item *it2 = data2;
 
    label1 = elm_index_item_letter_get(it1);
    label2 = elm_index_item_letter_get(it2);
@@ -110,9 +110,9 @@ test_index2_icmp(const void *data1, const void *data2)
 static void utc_UIFW_elm_index_item_sorted_insert_func_01(void)
 {
        Evas_Object *idx = NULL;
-       Elm_Genlist_Item *it = NULL, *it_gl=NULL;
+       Elm_Object_Item *it = NULL, *it_gl=NULL;
        Evas_Object *gl = NULL;
-       Elm_Index_Item *it_idx = NULL;
+       Elm_Object_Item *it_idx = NULL;
        int i = 0, j = 0;
 
        const char  *letter = NULL;
@@ -121,8 +121,8 @@ static void utc_UIFW_elm_index_item_sorted_insert_func_01(void)
        evas_object_show(gl);
        evas_object_show(idx);
        itci.item_style     = "default";
-       itci.func.label_get = gli_label_get;
-       itci.func.icon_get  = NULL;
+        itci.func.text_get = gli_label_get;
+        itci.func.content_get  = NULL;
        itci.func.state_get = NULL;
        itci.func.del       = NULL;
        for (i = 0; i <=40; i++) {
@@ -157,9 +157,9 @@ static void utc_UIFW_elm_index_item_sorted_insert_func_01(void)
 static void utc_UIFW_elm_index_item_sorted_insert_func_02(void)
 {
        Evas_Object *idx = NULL;
-       Elm_Genlist_Item *it = NULL, *it_gl=NULL;
+       Elm_Object_Item *it = NULL, *it_gl=NULL;
        Evas_Object *gl = NULL;
-       Elm_Index_Item *it_idx = NULL;
+       Elm_Object_Item *it_idx = NULL;
        int i = 0, j = 0;
 
        gl = elm_genlist_add(main_win);
@@ -167,8 +167,8 @@ static void utc_UIFW_elm_index_item_sorted_insert_func_02(void)
        evas_object_show(gl);
        evas_object_show(idx);
        itci.item_style     = "default";
-       itci.func.label_get = gli_label_get;
-       itci.func.icon_get  = NULL;
+        itci.func.text_get = gli_label_get;
+        itci.func.content_get  = NULL;
        itci.func.state_get = NULL;
        itci.func.del       = NULL;
        for (i = 0; i <=40; i++) {
old mode 100755 (executable)
new mode 100644 (file)
index 5c3cfe4..893d6d0
@@ -1,21 +1,18 @@
 CC ?= gcc
 
 TARGETS = utc_UIFW_elm_multibuttonentry_add_func \
-         utc_UIFW_elm_multibuttonentry_label_get_func \
          utc_UIFW_elm_multibuttonentry_entry_get_func \
-         utc_UIFW_elm_multibuttonentry_item_add_start_func \
-         utc_UIFW_elm_multibuttonentry_item_add_end_func \
-         utc_UIFW_elm_multibuttonentry_item_add_before_func \
-         utc_UIFW_elm_multibuttonentry_item_add_after_func \
+         utc_UIFW_elm_multibuttonentry_item_prepend_func \
+         utc_UIFW_elm_multibuttonentry_item_append_func \
+         utc_UIFW_elm_multibuttonentry_item_insert_before_func \
+         utc_UIFW_elm_multibuttonentry_item_insert_after_func \
          utc_UIFW_elm_multibuttonentry_items_get_func \
-         utc_UIFW_elm_multibuttonentry_item_first_get_func \
-         utc_UIFW_elm_multibuttonentry_item_last_get_func \
-         utc_UIFW_elm_multibuttonentry_item_selected_get_func \
-         utc_UIFW_elm_multibuttonentry_item_del_func \
+         utc_UIFW_elm_multibuttonentry_first_item_get_func \
+         utc_UIFW_elm_multibuttonentry_last_item_get_func \
+         utc_UIFW_elm_multibuttonentry_selected_item_get_func \
          utc_UIFW_elm_multibuttonentry_items_del_func \
-         utc_UIFW_elm_multibuttonentry_item_label_get_func \
-         utc_UIFW_elm_multibuttonentry_item_prev_func \
-         utc_UIFW_elm_multibuttonentry_item_next_func \
+         utc_UIFW_elm_multibuttonentry_item_prev_get_func \
+         utc_UIFW_elm_multibuttonentry_item_next_get_func \
          utc_UIFW_elm_multibuttonentry_item_data_get_func
 
 PKGS = elementary evas
index 54718d3..d47cc12 100644 (file)
@@ -1,17 +1,14 @@
 /elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_add_func
-/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_label_get_func
 /elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_entry_get_func
-/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_add_start_func
-/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_add_end_func
-/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_add_before_func
-/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_add_after_func
+/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_prepend_func
+/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_append_func
+/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_insert_before_func
+/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_insert_after_func
 /elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_items_get_func
-/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_first_get_func
-/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_last_get_func
-/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_selected_get_func
-/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_del_func
+/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_first_item_get_func
+/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_last_item_get_func
+/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_selected_item_get_func
 /elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_items_del_func
-/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_label_get_func
-/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_prev_func
-/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_next_func
+/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_prev_get_func
+/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_next_get_func
 /elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_data_get_func
diff --git a/TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_first_item_get_func.c b/TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_first_item_get_func.c
new file mode 100644 (file)
index 0000000..4ece7a0
--- /dev/null
@@ -0,0 +1,186 @@
+#include <tet_api.h>
+#include <Elementary.h>
+
+// Definitions
+// For checking the result of the positive test case.
+#define TET_CHECK_PASS(x1, y...) \
+{ \
+       Elm_Object_Item *err = y; \
+       Elm_Object_Item *val = x1; \
+       if (err == val) \
+               { \
+                       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.
+#define TET_CHECK_FAIL(x1, y...) \
+{ \
+       Elm_Object_Item *err = y; \
+       Elm_Object_Item *val = x1; \
+       if (err != val) \
+               { \
+                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
+                       tet_result(TET_FAIL); \
+                       return; \
+               } \
+}
+
+
+Evas_Object *main_win;
+
+static void startup(void);
+static void cleanup(void);
+
+void (*tet_startup)(void) = startup;
+void (*tet_cleanup)(void) = cleanup;
+
+static void utc_UIFW_elm_multibuttonentry_first_item_get_func_01(void);
+static void utc_UIFW_elm_multibuttonentry_first_item_get_func_02(void);
+
+enum {
+       POSITIVE_TC_IDX = 0x01,
+       NEGATIVE_TC_IDX,
+};
+
+struct tet_testlist tet_testlist[] = {
+       { utc_UIFW_elm_multibuttonentry_first_item_get_func_01, POSITIVE_TC_IDX },
+       { utc_UIFW_elm_multibuttonentry_first_item_get_func_02, NEGATIVE_TC_IDX },
+       { NULL, 0 }
+};
+
+// Declare the global variables
+Evas_Object *main_win, *main_bg;
+Evas_Object *test_win, *test_bg;
+Evas_Object *test_eo = NULL;
+// Declare internal functions
+void _elm_precondition(void);
+static void _win_del(void *data, Evas_Object *obj, void *event_info);
+
+
+// Delete main window
+static void _win_del(void *data, Evas_Object *obj, void *event_info)
+{
+       elm_exit();
+}
+
+// Do precondition.
+void _elm_precondition(void)
+{
+       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
+       elm_init(0, NULL);
+       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
+       elm_win_title_set(main_win, "Elementary Unit Test Suite");
+       evas_object_smart_callback_add(main_win, "delete,request", _win_del, NULL);
+       main_bg = elm_bg_add(main_win);
+       evas_object_size_hint_weight_set(main_bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       elm_win_resize_object_add(main_win, main_bg);
+       evas_object_show(main_bg);
+
+       // set an initial window size
+       evas_object_resize(main_win, 320, 480);
+       // show the window
+       evas_object_show(main_win);
+}
+
+// Start up function for each test purpose
+static void
+startup()
+{
+       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
+
+       // Elm precondition
+       _elm_precondition();
+
+       // Test precondition
+       test_win = elm_win_add(NULL, "Multi Button Entry", ELM_WIN_BASIC);
+       elm_win_title_set(test_win, "Multi Button Entry");
+       elm_win_autodel_set(test_win, 1);
+
+       test_bg = elm_bg_add(test_win);
+       elm_win_resize_object_add(test_win, test_bg);
+       evas_object_size_hint_weight_set(test_bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_show(test_bg);
+
+       evas_object_resize(test_win, 480, 800);
+       evas_object_show(test_win);
+
+       tet_infoline("[[ TET_MSG ]]:: Completing startup");
+}
+
+// Clean up function for each test purpose
+static void
+cleanup()
+{
+       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
+
+       // Clean up the used resources.
+       if ( NULL != main_win ) {
+               evas_object_del(main_win);
+               main_win = NULL;
+       }
+
+       if ( NULL != main_bg ) {
+               evas_object_del(main_bg);
+               main_bg = NULL;
+       }
+
+       if ( NULL != test_win ) {
+               evas_object_del(test_win);
+               test_win = NULL;
+       }
+
+       if ( NULL != test_bg ) {
+               evas_object_del(test_bg);
+               test_bg = NULL;
+       }
+
+       if ( NULL != test_eo ) {
+               evas_object_del(test_eo);
+               test_eo = NULL;
+       }
+
+       // clean up and shut down
+       elm_shutdown(); ;
+
+       tet_infoline("[[ TET_MSG ]]:: ========= TC COMPLETE  ========== ");
+}
+
+/**
+ * @brief Positive test case of elm_multibuttonentry_first_item_get()
+ */
+static void utc_UIFW_elm_multibuttonentry_first_item_get_func_01(void)
+{
+       Elm_Object_Item *added_item1 = NULL, *added_item2 = NULL, *first_item = NULL;
+
+       test_eo = elm_multibuttonentry_add(test_win);
+       added_item1 = elm_multibuttonentry_item_append(test_eo, "item1", NULL);
+       added_item2 = elm_multibuttonentry_item_append(test_eo, "item2", NULL);
+       first_item = elm_multibuttonentry_first_item_get(test_eo);
+       if (first_item != added_item1) {
+               tet_infoline("elm_multibuttonentry_first_item_get() failed in positive test case");
+               tet_result(TET_FAIL);
+               return;
+       }
+       tet_result(TET_PASS);
+       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, elm_multibuttonentry_first_item_get().");
+}
+
+/**
+ * @brief Negative test case of ug_init elm_multibuttonentry_first_item_get()
+ */
+static void utc_UIFW_elm_multibuttonentry_first_item_get_func_02(void)
+{
+       Elm_Object_Item *added_item1 = NULL, *added_item2 = NULL, *first_item = NULL;
+
+       test_eo = elm_multibuttonentry_add(test_win);
+       added_item1 = elm_multibuttonentry_item_append(test_eo, "item1", NULL);
+       added_item2 = elm_multibuttonentry_item_append(test_eo, "item2", NULL);
+       first_item = elm_multibuttonentry_first_item_get(test_win);
+       TET_CHECK_FAIL(NULL, first_item);
+
+       tet_result(TET_PASS);
+       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, elm_multibuttonentry_first_item_get().");
+}
@@ -5,8 +5,8 @@
 // For checking the result of the positive test case.
 #define TET_CHECK_PASS(x1, y...) \
 { \
-       Elm_Multibuttonentry_Item *err = y; \
-       Elm_Multibuttonentry_Item *val = x1; \
+       Elm_Object_Item *err = y; \
+       Elm_Object_Item *val = x1; \
        if (err == val) \
                { \
                        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
@@ -18,8 +18,8 @@
 // For checking the result of the negative test case.
 #define TET_CHECK_FAIL(x1, y...) \
 { \
-       Elm_Multibuttonentry_Item *err = y; \
-       Elm_Multibuttonentry_Item *val = x1; \
+       Elm_Object_Item *err = y; \
+       Elm_Object_Item *val = x1; \
        if (err != val) \
                { \
                        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
@@ -37,8 +37,8 @@ static void cleanup(void);
 void (*tet_startup)(void) = startup;
 void (*tet_cleanup)(void) = cleanup;
 
-static void utc_UIFW_elm_multibuttonentry_item_add_start_func_01(void);
-static void utc_UIFW_elm_multibuttonentry_item_add_start_func_02(void);
+static void utc_UIFW_elm_multibuttonentry_item_append_func_01(void);
+static void utc_UIFW_elm_multibuttonentry_item_append_func_02(void);
 
 enum {
        POSITIVE_TC_IDX = 0x01,
@@ -46,8 +46,8 @@ enum {
 };
 
 struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_multibuttonentry_item_add_start_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_multibuttonentry_item_add_start_func_02, NEGATIVE_TC_IDX },
+       { utc_UIFW_elm_multibuttonentry_item_append_func_01, POSITIVE_TC_IDX },
+       { utc_UIFW_elm_multibuttonentry_item_append_func_02, NEGATIVE_TC_IDX },
        { NULL, 0 }
 };
 
@@ -70,7 +70,6 @@ static void _win_del(void *data, Evas_Object *obj, void *event_info)
 void _elm_precondition(void)
 {
        elm_init(0, NULL);
-
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        elm_win_title_set(main_win, "Elementary Unit Test Suite");
        evas_object_smart_callback_add(main_win, "delete,request", _win_del, NULL);
@@ -150,42 +149,39 @@ cleanup()
        tet_infoline("[[ TET_MSG ]]:: ========= TC COMPLETE  ========== ");
 }
 
-
 /**
- * @brief Positive test case of elm_multibuttonentry_item_add_start()
+ * @brief Positive test case of elm_multibuttonentry_item_append()
  */
-static void utc_UIFW_elm_multibuttonentry_item_add_start_func_01(void)
+static void utc_UIFW_elm_multibuttonentry_item_append_func_01(void)
 {
-       Elm_Multibuttonentry_Item *added_item = NULL, *first_item = NULL;
+       Elm_Object_Item *added_item = NULL, *last_item = NULL;
 
        test_eo = elm_multibuttonentry_add(test_win);
-       added_item = elm_multibuttonentry_item_add_start(test_eo, "item1", NULL);
+       added_item = elm_multibuttonentry_item_append(test_eo, "item1", NULL);
        TET_CHECK_PASS(NULL, added_item);
 
-       first_item = elm_multibuttonentry_item_first_get(test_eo);
-       if (added_item != first_item) {
-               tet_infoline("elm_multibuttonentry_item_add_start() failed in positive test case");
+       last_item = elm_multibuttonentry_last_item_get(test_eo);
+       if (added_item != last_item) {
+               tet_infoline("elm_multibuttonentry_item_append() failed in positive test case");
                tet_result(TET_FAIL);
                return;
        }
-
        tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, elm_multibuttonentry_item_add_start().");
+       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, elm_multibuttonentry_item_append().");
 }
 
-
 /**
- * @brief Negative test case of ug_init elm_multibuttonentry_item_add_start()
+ * @brief Negative test case of ug_init elm_multibuttonentry_item_append()
  */
-static void utc_UIFW_elm_multibuttonentry_item_add_start_func_02(void)
+static void utc_UIFW_elm_multibuttonentry_item_append_func_02(void)
 {
-       Elm_Multibuttonentry_Item *added_item = NULL;
+
+       Elm_Object_Item *added_item = NULL;
 
        test_eo = elm_multibuttonentry_add(test_win);
-       added_item = elm_multibuttonentry_item_add_start(test_eo, NULL, NULL);
+       added_item = elm_multibuttonentry_item_append(test_eo, NULL, NULL);
        TET_CHECK_FAIL(NULL, added_item);
 
        tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, elm_multibuttonentry_item_add_start().");
+       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, elm_multibuttonentry_item_append().");
 }
-
@@ -5,7 +5,7 @@
 // For checking the result of the positive test case.
 #define TET_CHECK_PASS(x1, y...) \
 { \
-       Elm_Multibuttonentry_Item *err = y; \
+       Elm_Object_Item *err = y; \
        if (err == (x1)) \
                { \
                        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
@@ -17,7 +17,7 @@
 // For checking the result of the negative test case.
 #define TET_CHECK_FAIL(x1, y...) \
 { \
-       Elm_Multibuttonentry_Item *err = y; \
+       Elm_Object_Item *err = y; \
        if (err != (x1)) \
                { \
                        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
@@ -35,8 +35,8 @@ static void cleanup(void);
 void (*tet_startup)(void) = startup;
 void (*tet_cleanup)(void) = cleanup;
 
-static void utc_UIFW_elm_multibuttonentry_item_add_after_func_01(void);
-static void utc_UIFW_elm_multibuttonentry_item_add_after_func_02(void);
+static void utc_UIFW_elm_multibuttonentry_item_insert_after_func_01(void);
+static void utc_UIFW_elm_multibuttonentry_item_insert_after_func_02(void);
 
 enum {
        POSITIVE_TC_IDX = 0x01,
@@ -44,8 +44,8 @@ enum {
 };
 
 struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_multibuttonentry_item_add_after_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_multibuttonentry_item_add_after_func_02, NEGATIVE_TC_IDX },
+       { utc_UIFW_elm_multibuttonentry_item_insert_after_func_01, POSITIVE_TC_IDX },
+       { utc_UIFW_elm_multibuttonentry_item_insert_after_func_02, NEGATIVE_TC_IDX },
        { NULL, 0 }
 };
 
@@ -67,8 +67,8 @@ static void _win_del(void *data, Evas_Object *obj, void *event_info)
 // Do precondition.
 void _elm_precondition(void)
 {
+       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
-
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        elm_win_title_set(main_win, "Elementary Unit Test Suite");
        evas_object_smart_callback_add(main_win, "delete,request", _win_del, NULL);
@@ -81,8 +81,6 @@ void _elm_precondition(void)
        evas_object_resize(main_win, 320, 480);
        // show the window
        evas_object_show(main_win);
-
-       //elm_run();
 }
 
 // Start up function for each test purpose
@@ -148,44 +146,40 @@ cleanup()
        tet_infoline("[[ TET_MSG ]]:: ========= TC COMPLETE  ========== ");
 }
 
-
 /**
- * @brief Positive test case of elm_multibuttonentry_item_add_after()
+ * @brief Positive test case of elm_multibuttonentry_item_insert_after()
  */
-static void utc_UIFW_elm_multibuttonentry_item_add_after_func_01(void)
+static void utc_UIFW_elm_multibuttonentry_item_insert_after_func_01(void)
 {
-       Elm_Multibuttonentry_Item *added_item1 = NULL, *added_item2 = NULL, *after_item = NULL;
+       Elm_Object_Item *added_item1 = NULL, *added_item2 = NULL, *after_item = NULL;
 
        test_eo = elm_multibuttonentry_add(test_win);
-       added_item1 = elm_multibuttonentry_item_add_start(test_eo, "item1", NULL);
-       added_item2 = elm_multibuttonentry_item_add_after(test_eo, "item2", added_item1, NULL);
+       added_item1 = elm_multibuttonentry_item_prepend(test_eo, "item1", NULL);
+       added_item2 = elm_multibuttonentry_item_insert_after(test_eo, added_item1, "item2", NULL);
        TET_CHECK_PASS(NULL, added_item2);
 
-       after_item = elm_multibuttonentry_item_next(added_item1);
+       after_item = elm_multibuttonentry_item_next_get(added_item1);
        if (added_item2 != after_item) {
-               tet_infoline("elm_multibuttonentry_item_add_after() failed in positive test case");
+               tet_infoline("elm_multibuttonentry_item_insert_after() failed in positive test case");
                tet_result(TET_FAIL);
                return;
        }
-
        tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, elm_multibuttonentry_item_add_after().");
+       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, elm_multibuttonentry_item_insert_after().");
 }
 
-
 /**
- * @brief Negative test case of ug_init elm_multibuttonentry_item_add_after()
+ * @brief Negative test case of ug_init elm_multibuttonentry_item_insert_after()
  */
-static void utc_UIFW_elm_multibuttonentry_item_add_after_func_02(void)
+static void utc_UIFW_elm_multibuttonentry_item_insert_after_func_02(void)
 {
-       Elm_Multibuttonentry_Item *added_item1 = NULL, *added_item2 = NULL;
+       Elm_Object_Item *added_item1 = NULL, *added_item2 = NULL;
 
        test_eo = elm_multibuttonentry_add(NULL);
-       added_item1 = elm_multibuttonentry_item_add_start(test_eo, "item1", NULL);
-       added_item2 = elm_multibuttonentry_item_add_after(test_eo, NULL, added_item1, NULL);
+       added_item1 = elm_multibuttonentry_item_prepend(test_eo, "item1", NULL);
+       added_item2 = elm_multibuttonentry_item_insert_after(test_eo, added_item1, NULL, NULL);
        TET_CHECK_FAIL(NULL, added_item2);
 
        tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, elm_multibuttonentry_item_add_after().");
+       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, elm_multibuttonentry_item_insert_after().");
 }
-
@@ -5,7 +5,7 @@
 // For checking the result of the positive test case.
 #define TET_CHECK_PASS(x1, y...) \
 { \
-       Elm_Multibuttonentry_Item *err = y; \
+       Elm_Object_Item *err = y; \
        if (err == (x1)) \
                { \
                        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
@@ -17,7 +17,7 @@
 // For checking the result of the negative test case.
 #define TET_CHECK_FAIL(x1, y...) \
 { \
-       Elm_Multibuttonentry_Item *err = y; \
+       Elm_Object_Item *err = y; \
        if (err != (x1)) \
                { \
                        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
@@ -35,8 +35,8 @@ static void cleanup(void);
 void (*tet_startup)(void) = startup;
 void (*tet_cleanup)(void) = cleanup;
 
-static void utc_UIFW_elm_multibuttonentry_item_add_before_func_01(void);
-static void utc_UIFW_elm_multibuttonentry_item_add_before_func_02(void);
+static void utc_UIFW_elm_multibuttonentry_item_insert_before_func_01(void);
+static void utc_UIFW_elm_multibuttonentry_item_insert_before_func_02(void);
 
 enum {
        POSITIVE_TC_IDX = 0x01,
@@ -44,8 +44,8 @@ enum {
 };
 
 struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_multibuttonentry_item_add_before_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_multibuttonentry_item_add_before_func_02, NEGATIVE_TC_IDX },
+       { utc_UIFW_elm_multibuttonentry_item_insert_before_func_01, POSITIVE_TC_IDX },
+       { utc_UIFW_elm_multibuttonentry_item_insert_before_func_02, NEGATIVE_TC_IDX },
        { NULL, 0 }
 };
 
@@ -67,8 +67,8 @@ static void _win_del(void *data, Evas_Object *obj, void *event_info)
 // Do precondition.
 void _elm_precondition(void)
 {
+       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
-
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        elm_win_title_set(main_win, "Elementary Unit Test Suite");
        evas_object_smart_callback_add(main_win, "delete,request", _win_del, NULL);
@@ -148,44 +148,40 @@ cleanup()
        tet_infoline("[[ TET_MSG ]]:: ========= TC COMPLETE  ========== ");
 }
 
-
 /**
- * @brief Positive test case of elm_multibuttonentry_item_add_before()
+ * @brief Positive test case of elm_multibuttonentry_item_insert_before()
  */
-static void utc_UIFW_elm_multibuttonentry_item_add_before_func_01(void)
+static void utc_UIFW_elm_multibuttonentry_item_insert_before_func_01(void)
 {
-       Elm_Multibuttonentry_Item *added_item1 = NULL, *added_item2 = NULL, *before_item = NULL;
+       Elm_Object_Item *added_item1 = NULL, *added_item2 = NULL, *before_item = NULL;
 
        test_eo = elm_multibuttonentry_add(test_win);
-       added_item1 = elm_multibuttonentry_item_add_start(test_eo, "item1", NULL);
-       added_item2 = elm_multibuttonentry_item_add_before(test_eo, "item2", added_item1, NULL);
+       added_item1 = elm_multibuttonentry_item_prepend(test_eo, "item1", NULL);
+       added_item2 = elm_multibuttonentry_item_insert_before(test_eo, added_item1, "item2", NULL);
        TET_CHECK_PASS(NULL, added_item2);
 
-       before_item = elm_multibuttonentry_item_prev(added_item1);
+       before_item = elm_multibuttonentry_item_prev_get(added_item1);
        if (added_item2 != before_item) {
-               tet_infoline("elm_multibuttonentry_item_add_before() failed in positive test case");
+               tet_infoline("elm_multibuttonentry_item_insert_before() failed in positive test case");
                tet_result(TET_FAIL);
                return;
        }
-
        tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, elm_multibuttonentry_item_add_before().");
+       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, elm_multibuttonentry_item_insert_before().");
 }
 
-
 /**
- * @brief Negative test case of ug_init elm_multibuttonentry_item_add_before()
+ * @brief Negative test case of ug_init elm_multibuttonentry_item_insert_before()
  */
-static void utc_UIFW_elm_multibuttonentry_item_add_before_func_02(void)
+static void utc_UIFW_elm_multibuttonentry_item_insert_before_func_02(void)
 {
-       Elm_Multibuttonentry_Item *added_item1 = NULL, *added_item2 = NULL;
+       Elm_Object_Item *added_item1 = NULL, *added_item2 = NULL;
 
        test_eo = elm_multibuttonentry_add(NULL);
-       added_item1 = elm_multibuttonentry_item_add_start(test_eo, "item1", NULL);
-       added_item2 = elm_multibuttonentry_item_add_before(test_eo, NULL, added_item1, NULL);
+       added_item1 = elm_multibuttonentry_item_prepend(test_eo, "item1", NULL);
+       added_item2 = elm_multibuttonentry_item_insert_before(test_eo, added_item1, NULL, NULL);
        TET_CHECK_FAIL(NULL, added_item2);
 
        tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, elm_multibuttonentry_item_add_before().");
+       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, elm_multibuttonentry_item_insert_before().");
 }
-
diff --git a/TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_label_get_func.c b/TC/elm_ts/multibuttonentry/utc_UIFW_elm_multibuttonentry_item_label_get_func.c
deleted file mode 100644 (file)
index 5b22130..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-#include <tet_api.h>
-#include <Elementary.h>
-
-// Definitions
-// For checking the result of the positive test case.
-#define TET_CHECK_PASS(x1, y...) \
-{ \
-       Evas_Object *err = y; \
-       if (err == (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-#define TET_CHECK_STRING_PASS(x, y)\
-{\
-       if (x == NULL || y == NULL)\
-       {\
-               tet_printf("[TET_CHECK_STRING_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__);\
-               tet_printf("[TET_CHECK_STRING_PASS]:: Test string is NULL");\
-               tet_result(TET_FAIL);\
-               return;\
-       }\
-       if (strcmp(x, y))\
-       {\
-               tet_printf("[TET_CHECK_STRING_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__);\
-               tet_result(TET_FAIL);\
-               return;\
-       }\
-}
-
-// For checking the result of the negative test case.
-#define TET_CHECK_FAIL(x1, y...) \
-{ \
-       Evas_Object *err = y; \
-       if (err != (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-#define TET_CHECK_STRING_FAIL(x, y)\
-{\
-       if (x == NULL || y == NULL)\
-               return;\
-       if (strcmp(x, y) == 0)\
-       {\
-               tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-               tet_result(TET_FAIL);\
-               return;\
-       }\
-}
-
-Evas_Object *main_win;
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_UIFW_elm_multibuttonentry_item_label_get_func_01(void);
-static void utc_UIFW_elm_multibuttonentry_item_label_get_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_multibuttonentry_item_label_get_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_multibuttonentry_item_label_get_func_02, NEGATIVE_TC_IDX },
-       { NULL, 0 }
-};
-
-// Declare the global variables
-Evas_Object *main_win, *main_bg;
-Evas_Object *test_win, *test_bg;
-Evas_Object *test_eo = NULL;
-// Declare internal functions
-void _elm_precondition(void);
-static void _win_del(void *data, Evas_Object *obj, void *event_info);
-
-
-// Delete main window
-static void _win_del(void *data, Evas_Object *obj, void *event_info)
-{
-       elm_exit();
-}
-
-// Do precondition.
-void _elm_precondition(void)
-{
-       elm_init(0, NULL);
-
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
-       elm_win_title_set(main_win, "Elementary Unit Test Suite");
-       evas_object_smart_callback_add(main_win, "delete,request", _win_del, NULL);
-       main_bg = elm_bg_add(main_win);
-       evas_object_size_hint_weight_set(main_bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       elm_win_resize_object_add(main_win, main_bg);
-       evas_object_show(main_bg);
-
-       // set an initial window size
-       evas_object_resize(main_win, 320, 480);
-       // show the window
-       evas_object_show(main_win);
-
-       //elm_run();
-}
-
-// Start up function for each test purpose
-static void
-startup()
-{
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
-
-       // Elm precondition
-       _elm_precondition();
-
-       // Test precondition
-       test_win = elm_win_add(NULL, "Multi Button Entry", ELM_WIN_BASIC);
-       elm_win_title_set(test_win, "Multi Button Entry");
-       elm_win_autodel_set(test_win, 1);
-
-       test_bg = elm_bg_add(test_win);
-       elm_win_resize_object_add(test_win, test_bg);
-       evas_object_size_hint_weight_set(test_bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_show(test_bg);
-
-       evas_object_resize(test_win, 480, 800);
-       evas_object_show(test_win);
-
-       tet_infoline("[[ TET_MSG ]]:: Completing startup");
-}
-
-// Clean up function for each test purpose
-static void
-cleanup()
-{
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
-
-       // Clean up the used resources.
-       if ( NULL != main_win ) {
-               evas_object_del(main_win);
-               main_win = NULL;
-       }
-
-       if ( NULL != main_bg ) {
-               evas_object_del(main_bg);
-               main_bg = NULL;
-       }
-
-       if ( NULL != test_win ) {
-               evas_object_del(test_win);
-               test_win = NULL;
-       }
-
-       if ( NULL != test_bg ) {
-               evas_object_del(test_bg);
-               test_bg = NULL;
-       }
-
-       if ( NULL != test_eo ) {
-               evas_object_del(test_eo);
-               test_eo = NULL;
-       }
-
-       // clean up and shut down
-       elm_shutdown(); ;
-
-       tet_infoline("[[ TET_MSG ]]:: ========= TC COMPLETE  ========== ");
-}
-
-
-/**
- * @brief Positive test case of elm_multibuttonentry_item_label_get()
- */
-static void utc_UIFW_elm_multibuttonentry_item_label_get_func_01(void)
-{
-       const char *ret_str = NULL;
-       Elm_Multibuttonentry_Item *item;
-
-       test_eo = elm_multibuttonentry_add(test_win);
-       item = elm_multibuttonentry_item_add_end(test_eo, "test", NULL);
-       ret_str = elm_multibuttonentry_item_label_get(item);
-       TET_CHECK_STRING_PASS("test", ret_str);
-
-       tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, An Multi Button Entry is added successfully.");
-}
-
-
-/**
- * @brief Negative test case of ug_init elm_multibuttonentry_item_label_get()
- */
-static void utc_UIFW_elm_multibuttonentry_item_label_get_func_02(void)
-{
-       char *ret_str = NULL;
-       Elm_Multibuttonentry_Item *item;
-
-       test_eo = elm_multibuttonentry_add(test_win);
-       item = elm_multibuttonentry_item_add_end(test_eo, "test", NULL);
-       elm_multibuttonentry_item_label_set(item, "");
-       ret_str = elm_multibuttonentry_item_label_get(item);
-       TET_CHECK_STRING_FAIL("test", ret_str);
-
-       tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, Adding an Multi Button Entry has failed.");
-}
-
@@ -35,8 +35,8 @@ static void cleanup(void);
 void (*tet_startup)(void) = startup;
 void (*tet_cleanup)(void) = cleanup;
 
-static void utc_UIFW_elm_multibuttonentry_item_next_func_01(void);
-static void utc_UIFW_elm_multibuttonentry_item_next_func_02(void);
+static void utc_UIFW_elm_multibuttonentry_item_next_get_func_01(void);
+static void utc_UIFW_elm_multibuttonentry_item_next_get_func_02(void);
 
 enum {
        POSITIVE_TC_IDX = 0x01,
@@ -44,8 +44,8 @@ enum {
 };
 
 struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_multibuttonentry_item_next_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_multibuttonentry_item_next_func_02, NEGATIVE_TC_IDX },
+       { utc_UIFW_elm_multibuttonentry_item_next_get_func_01, POSITIVE_TC_IDX },
+       { utc_UIFW_elm_multibuttonentry_item_next_get_func_02, NEGATIVE_TC_IDX },
        { NULL, 0 }
 };
 
@@ -67,8 +67,8 @@ static void _win_del(void *data, Evas_Object *obj, void *event_info)
 // Do precondition.
 void _elm_precondition(void)
 {
+       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
-
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        elm_win_title_set(main_win, "Elementary Unit Test Suite");
        evas_object_smart_callback_add(main_win, "delete,request", _win_del, NULL);
@@ -81,8 +81,6 @@ void _elm_precondition(void)
        evas_object_resize(main_win, 320, 480);
        // show the window
        evas_object_show(main_win);
-
-       //elm_run();
 }
 
 // Start up function for each test purpose
@@ -148,11 +146,10 @@ cleanup()
        tet_infoline("[[ TET_MSG ]]:: ========= TC COMPLETE  ========== ");
 }
 
-
 /**
- * @brief Positive test case of elm_multibuttonentry_item_next()
+ * @brief Positive test case of elm_multibuttonentry_item_next_get()
  */
-static void utc_UIFW_elm_multibuttonentry_item_next_func_01(void)
+static void utc_UIFW_elm_multibuttonentry_item_next_get_func_01(void)
 {
        test_eo = elm_multibuttonentry_add(test_win);
        TET_CHECK_PASS(NULL, test_eo);
@@ -161,11 +158,10 @@ static void utc_UIFW_elm_multibuttonentry_item_next_func_01(void)
        tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, An Multi Button Entry is added successfully.");
 }
 
-
 /**
- * @brief Negative test case of ug_init elm_multibuttonentry_item_next()
+ * @brief Negative test case of ug_init elm_multibuttonentry_item_next_get()
  */
-static void utc_UIFW_elm_multibuttonentry_item_next_func_02(void)
+static void utc_UIFW_elm_multibuttonentry_item_next_get_func_02(void)
 {
        test_eo = elm_multibuttonentry_add(NULL);
        TET_CHECK_FAIL(NULL, test_eo);
@@ -173,4 +169,3 @@ static void utc_UIFW_elm_multibuttonentry_item_next_func_02(void)
        tet_result(TET_PASS);
        tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, Adding an Multi Button Entry has failed.");
 }
-
@@ -5,8 +5,8 @@
 // For checking the result of the positive test case.
 #define TET_CHECK_PASS(x1, y...) \
 { \
-       Elm_Multibuttonentry_Item *err = y; \
-       Elm_Multibuttonentry_Item *val = x1; \
+       Elm_Object_Item *err = y; \
+       Elm_Object_Item *val = x1; \
        if (err == val) \
                { \
                        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
@@ -18,8 +18,8 @@
 // For checking the result of the negative test case.
 #define TET_CHECK_FAIL(x1, y...) \
 { \
-       Elm_Multibuttonentry_Item *err = y; \
-       Elm_Multibuttonentry_Item *val = x1; \
+       Elm_Object_Item *err = y; \
+       Elm_Object_Item *val = x1; \
        if (err != val) \
                { \
                        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
@@ -37,8 +37,8 @@ static void cleanup(void);
 void (*tet_startup)(void) = startup;
 void (*tet_cleanup)(void) = cleanup;
 
-static void utc_UIFW_elm_multibuttonentry_item_add_end_func_01(void);
-static void utc_UIFW_elm_multibuttonentry_item_add_end_func_02(void);
+static void utc_UIFW_elm_multibuttonentry_item_prepend_func_01(void);
+static void utc_UIFW_elm_multibuttonentry_item_prepend_func_02(void);
 
 enum {
        POSITIVE_TC_IDX = 0x01,
@@ -46,8 +46,8 @@ enum {
 };
 
 struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_multibuttonentry_item_add_end_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_multibuttonentry_item_add_end_func_02, NEGATIVE_TC_IDX },
+       { utc_UIFW_elm_multibuttonentry_item_prepend_func_01, POSITIVE_TC_IDX },
+       { utc_UIFW_elm_multibuttonentry_item_prepend_func_02, NEGATIVE_TC_IDX },
        { NULL, 0 }
 };
 
@@ -70,7 +70,6 @@ static void _win_del(void *data, Evas_Object *obj, void *event_info)
 void _elm_precondition(void)
 {
        elm_init(0, NULL);
-
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        elm_win_title_set(main_win, "Elementary Unit Test Suite");
        evas_object_smart_callback_add(main_win, "delete,request", _win_del, NULL);
@@ -83,8 +82,6 @@ void _elm_precondition(void)
        evas_object_resize(main_win, 320, 480);
        // show the window
        evas_object_show(main_win);
-
-       //elm_run();
 }
 
 // Start up function for each test purpose
@@ -121,7 +118,7 @@ cleanup()
        // Clean up the used resources.
        if ( NULL != main_win ) {
                evas_object_del(main_win);
-               main_win = NULL;
+               main_win = NULL;
        }
 
        if ( NULL != main_bg ) {
@@ -150,43 +147,38 @@ cleanup()
        tet_infoline("[[ TET_MSG ]]:: ========= TC COMPLETE  ========== ");
 }
 
-
 /**
- * @brief Positive test case of elm_multibuttonentry_item_add_end()
+ * @brief Positive test case of elm_multibuttonentry_item_prepend()
  */
-static void utc_UIFW_elm_multibuttonentry_item_add_end_func_01(void)
+static void utc_UIFW_elm_multibuttonentry_item_prepend_func_01(void)
 {
-       Elm_Multibuttonentry_Item *added_item = NULL, *last_item = NULL;
+       Elm_Object_Item  *added_item = NULL, *first_item = NULL;
 
        test_eo = elm_multibuttonentry_add(test_win);
-       added_item = elm_multibuttonentry_item_add_end(test_eo, "item1", NULL);
+       added_item = elm_multibuttonentry_item_prepend(test_eo, "item1", NULL);
        TET_CHECK_PASS(NULL, added_item);
 
-       last_item = elm_multibuttonentry_item_last_get(test_eo);
-       if (added_item != last_item) {
-               tet_infoline("elm_multibuttonentry_item_add_end() failed in positive test case");
+       first_item = elm_multibuttonentry_first_item_get(test_eo);
+       if (added_item != first_item) {
+               tet_infoline("elm_multibuttonentry_item_prepend() failed in positive test case");
                tet_result(TET_FAIL);
                return;
        }
-
        tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, elm_multibuttonentry_item_add_end().");
+       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, elm_multibuttonentry_item_prepend().");
 }
 
-
 /**
- * @brief Negative test case of ug_init elm_multibuttonentry_item_add_end()
+ * @brief Negative test case of ug_init elm_multibuttonentry_item_prepend()
  */
-static void utc_UIFW_elm_multibuttonentry_item_add_end_func_02(void)
+static void utc_UIFW_elm_multibuttonentry_item_prepend_func_02(void)
 {
-
-       Elm_Multibuttonentry_Item *added_item = NULL;
+       Elm_Object_Item  *added_item = NULL;
 
        test_eo = elm_multibuttonentry_add(test_win);
-       added_item = elm_multibuttonentry_item_add_end(test_eo, NULL, NULL);
+       added_item = elm_multibuttonentry_first_item_get(test_eo);
        TET_CHECK_FAIL(NULL, added_item);
 
        tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, elm_multibuttonentry_item_add_end().");
+       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, elm_multibuttonentry_item_prepend().");
 }
-
@@ -35,8 +35,8 @@ static void cleanup(void);
 void (*tet_startup)(void) = startup;
 void (*tet_cleanup)(void) = cleanup;
 
-static void utc_UIFW_elm_multibuttonentry_item_prev_func_01(void);
-static void utc_UIFW_elm_multibuttonentry_item_prev_func_02(void);
+static void utc_UIFW_elm_multibuttonentry_item_prev_get_func_01(void);
+static void utc_UIFW_elm_multibuttonentry_item_prev_get_func_02(void);
 
 enum {
        POSITIVE_TC_IDX = 0x01,
@@ -44,8 +44,8 @@ enum {
 };
 
 struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_multibuttonentry_item_prev_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_multibuttonentry_item_prev_func_02, NEGATIVE_TC_IDX },
+       { utc_UIFW_elm_multibuttonentry_item_prev_get_func_01, POSITIVE_TC_IDX },
+       { utc_UIFW_elm_multibuttonentry_item_prev_get_func_02, NEGATIVE_TC_IDX },
        { NULL, 0 }
 };
 
@@ -67,8 +67,8 @@ static void _win_del(void *data, Evas_Object *obj, void *event_info)
 // Do precondition.
 void _elm_precondition(void)
 {
+       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
-
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        elm_win_title_set(main_win, "Elementary Unit Test Suite");
        evas_object_smart_callback_add(main_win, "delete,request", _win_del, NULL);
@@ -81,8 +81,6 @@ void _elm_precondition(void)
        evas_object_resize(main_win, 320, 480);
        // show the window
        evas_object_show(main_win);
-
-       //elm_run();
 }
 
 // Start up function for each test purpose
@@ -148,11 +146,10 @@ cleanup()
        tet_infoline("[[ TET_MSG ]]:: ========= TC COMPLETE  ========== ");
 }
 
-
 /**
- * @brief Positive test case of elm_multibuttonentry_item_prev()
+ * @brief Positive test case of elm_multibuttonentry_item_prev_get()
  */
-static void utc_UIFW_elm_multibuttonentry_item_prev_func_01(void)
+static void utc_UIFW_elm_multibuttonentry_item_prev_get_func_01(void)
 {
        test_eo = elm_multibuttonentry_add(test_win);
        TET_CHECK_PASS(NULL, test_eo);
@@ -161,11 +158,10 @@ static void utc_UIFW_elm_multibuttonentry_item_prev_func_01(void)
        tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, An Multi Button Entry is added successfully.");
 }
 
-
 /**
- * @brief Negative test case of ug_init elm_multibuttonentry_item_prev()
+ * @brief Negative test case of ug_init elm_multibuttonentry_item_prev_get()
  */
-static void utc_UIFW_elm_multibuttonentry_item_prev_func_02(void)
+static void utc_UIFW_elm_multibuttonentry_item_prev_get_func_02(void)
 {
        test_eo = elm_multibuttonentry_add(NULL);
        TET_CHECK_FAIL(NULL, test_eo);
@@ -173,4 +169,3 @@ static void utc_UIFW_elm_multibuttonentry_item_prev_func_02(void)
        tet_result(TET_PASS);
        tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, Adding an Multi Button Entry has failed.");
 }
-
index fcf4852..c02dada 100644 (file)
@@ -171,12 +171,12 @@ static void utc_UIFW_elm_multibuttonentry_items_get_func_01(void)
        }
 
        for(i=0; i< 5; i++){
-               elm_multibuttonentry_item_add_end(test_eo, "item", NULL);
+               elm_multibuttonentry_item_append(test_eo, "item", NULL);
        }
 
        // test 2
        items = elm_multibuttonentry_items_get(test_eo);
-       TET_CHECK_PASS(NULL, items);
+       TET_CHECK_PASS(NULL, (Eina_List*)items);
 
        // test 3
        count = eina_list_count(items);
@@ -196,12 +196,12 @@ static void utc_UIFW_elm_multibuttonentry_items_get_func_01(void)
  */
 static void utc_UIFW_elm_multibuttonentry_items_get_func_02(void)
 {
-       Eina_List *items = NULL;
+       const Eina_List *items = NULL;
        int i=0;
 
        test_eo = elm_multibuttonentry_add(NULL);
        for(i=0; i< 5; i++){
-               elm_multibuttonentry_item_add_end(test_eo, "item", NULL);
+               elm_multibuttonentry_item_prepend(test_eo, "item", NULL);
        }
        items = elm_multibuttonentry_items_get(NULL);
        TET_CHECK_FAIL(NULL, items);
@@ -5,8 +5,9 @@
 // For checking the result of the positive test case.
 #define TET_CHECK_PASS(x1, y...) \
 { \
-       Evas_Object *err = y; \
-       if (err == (x1)) \
+       Elm_Object_Item *err = y; \
+       Elm_Object_Item *val = x1; \
+       if (err == val) \
                { \
                        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
                        tet_result(TET_FAIL); \
@@ -17,8 +18,9 @@
 // For checking the result of the negative test case.
 #define TET_CHECK_FAIL(x1, y...) \
 { \
-       Evas_Object *err = y; \
-       if (err != (x1)) \
+       Elm_Object_Item *err = y; \
+       Elm_Object_Item *val = x1; \
+       if (err != val) \
                { \
                        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
                        tet_result(TET_FAIL); \
@@ -35,8 +37,8 @@ static void cleanup(void);
 void (*tet_startup)(void) = startup;
 void (*tet_cleanup)(void) = cleanup;
 
-static void utc_UIFW_elm_multibuttonentry_item_del_func_01(void);
-static void utc_UIFW_elm_multibuttonentry_item_del_func_02(void);
+static void utc_UIFW_elm_multibuttonentry_last_item_get_func_01(void);
+static void utc_UIFW_elm_multibuttonentry_last_item_get_func_02(void);
 
 enum {
        POSITIVE_TC_IDX = 0x01,
@@ -44,8 +46,8 @@ enum {
 };
 
 struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_multibuttonentry_item_del_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_multibuttonentry_item_del_func_02, NEGATIVE_TC_IDX },
+       { utc_UIFW_elm_multibuttonentry_last_item_get_func_01, POSITIVE_TC_IDX },
+       { utc_UIFW_elm_multibuttonentry_last_item_get_func_02, NEGATIVE_TC_IDX },
        { NULL, 0 }
 };
 
@@ -67,8 +69,8 @@ static void _win_del(void *data, Evas_Object *obj, void *event_info)
 // Do precondition.
 void _elm_precondition(void)
 {
+       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
-
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        elm_win_title_set(main_win, "Elementary Unit Test Suite");
        evas_object_smart_callback_add(main_win, "delete,request", _win_del, NULL);
@@ -81,8 +83,6 @@ void _elm_precondition(void)
        evas_object_resize(main_win, 320, 480);
        // show the window
        evas_object_show(main_win);
-
-       //elm_run();
 }
 
 // Start up function for each test purpose
@@ -148,49 +148,39 @@ cleanup()
        tet_infoline("[[ TET_MSG ]]:: ========= TC COMPLETE  ========== ");
 }
 
-
 /**
- * @brief Positive test case of elm_multibuttonentry_item_del()
+ * @brief Positive test case of elm_multibuttonentry_last_item_get()
  */
-static void utc_UIFW_elm_multibuttonentry_item_del_func_01(void)
+static void utc_UIFW_elm_multibuttonentry_last_item_get_func_01(void)
 {
-       Elm_Multibuttonentry_Item *added_item1 = NULL, *added_item2 = NULL, *first_item = NULL;
+       Elm_Object_Item *added_item1 = NULL, *added_item2 = NULL, *last_item = NULL;
 
        test_eo = elm_multibuttonentry_add(test_win);
-       added_item1 = elm_multibuttonentry_item_add_end(test_eo, "item1", NULL);
-       added_item2 = elm_multibuttonentry_item_add_end(test_eo, "item2", NULL);
-       elm_multibuttonentry_item_del(added_item1);
-       first_item = elm_multibuttonentry_item_first_get(test_eo);
-       if (first_item != added_item2) {
-               tet_infoline("elm_multibuttonentry_item_del() failed in positive test case");
+       added_item1 = elm_multibuttonentry_item_append(test_eo, "item1", NULL);
+       added_item2 = elm_multibuttonentry_item_append(test_eo, "item2", NULL);
+       last_item = elm_multibuttonentry_last_item_get(test_eo);
+       if (last_item != added_item2) {
+               tet_infoline("elm_multibuttonentry_last_item_get() failed in positive test case");
                tet_result(TET_FAIL);
                return;
        }
-
        tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, elm_multibuttonentry_item_del().");
+       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, elm_multibuttonentry_last_item_get().");
 }
 
-
 /**
- * @brief Negative test case of ug_init elm_multibuttonentry_item_del()
+ * @brief Negative test case of ug_init elm_multibuttonentry_last_item_get()
  */
-static void utc_UIFW_elm_multibuttonentry_item_del_func_02(void)
+static void utc_UIFW_elm_multibuttonentry_last_item_get_func_02(void)
 {
-       Elm_Multibuttonentry_Item *added_item1 = NULL;
-       const Eina_List *items = NULL;
+       Elm_Object_Item *added_item1 = NULL, *added_item2 = NULL, *last_item = NULL;
 
        test_eo = elm_multibuttonentry_add(test_win);
-       added_item1 = elm_multibuttonentry_item_add_end(test_eo, "item1", NULL);
-       elm_multibuttonentry_item_del(NULL);
-       items = elm_multibuttonentry_items_get(test_eo);
-       if (!items) {
-               tet_infoline("elm_multibuttonentry_item_del() failed in negative test case");
-               tet_result(TET_FAIL);
-               return;
-       }
+       added_item1 = elm_multibuttonentry_item_append(test_eo, "item1", NULL);
+       added_item2 = elm_multibuttonentry_item_append(test_eo, "item2", NULL);
+       last_item = elm_multibuttonentry_last_item_get(test_win);
+       TET_CHECK_FAIL(NULL, last_item);
 
        tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, elm_multibuttonentry_item_del().");
+       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, elm_multibuttonentry_last_item_get().");
 }
-
@@ -5,7 +5,7 @@
 // For checking the result of the positive test case.
 #define TET_CHECK_PASS(x1, y...) \
 { \
-       Elm_Multibuttonentry_Item *err = y; \
+       Elm_Object_Item *err = y; \
        if (err == (x1)) \
                { \
                        tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
@@ -17,7 +17,7 @@
 // For checking the result of the negative test case.
 #define TET_CHECK_FAIL(x1, y...) \
 { \
-       Elm_Multibuttonentry_Item *err = y; \
+       Elm_Object_Item *err = y; \
        if (err != (x1)) \
                { \
                        tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
@@ -35,8 +35,8 @@ static void cleanup(void);
 void (*tet_startup)(void) = startup;
 void (*tet_cleanup)(void) = cleanup;
 
-static void utc_UIFW_elm_multibuttonentry_item_selected_get_func_01(void);
-static void utc_UIFW_elm_multibuttonentry_item_selected_get_func_02(void);
+static void utc_UIFW_elm_multibuttonentry_selected_item_get_func_01(void);
+static void utc_UIFW_elm_multibuttonentry_selected_item_get_func_02(void);
 
 enum {
        POSITIVE_TC_IDX = 0x01,
@@ -44,8 +44,8 @@ enum {
 };
 
 struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_multibuttonentry_item_selected_get_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_multibuttonentry_item_selected_get_func_02, NEGATIVE_TC_IDX },
+       { utc_UIFW_elm_multibuttonentry_selected_item_get_func_01, POSITIVE_TC_IDX },
+       { utc_UIFW_elm_multibuttonentry_selected_item_get_func_02, NEGATIVE_TC_IDX },
        { NULL, 0 }
 };
 
@@ -67,8 +67,8 @@ static void _win_del(void *data, Evas_Object *obj, void *event_info)
 // Do precondition.
 void _elm_precondition(void)
 {
+       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
-
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        elm_win_title_set(main_win, "Elementary Unit Test Suite");
        evas_object_smart_callback_add(main_win, "delete,request", _win_del, NULL);
@@ -81,8 +81,6 @@ void _elm_precondition(void)
        evas_object_resize(main_win, 320, 480);
        // show the window
        evas_object_show(main_win);
-
-       //elm_run();
 }
 
 // Start up function for each test purpose
@@ -148,44 +146,41 @@ cleanup()
        tet_infoline("[[ TET_MSG ]]:: ========= TC COMPLETE  ========== ");
 }
 
-
 /**
- * @brief Positive test case of elm_multibuttonentry_item_selected_get()
+ * @brief Positive test case of elm_multibuttonentry_selected_item_get()
  */
-static void utc_UIFW_elm_multibuttonentry_item_selected_get_func_01(void)
+static void utc_UIFW_elm_multibuttonentry_selected_item_get_func_01(void)
 {
-       Elm_Multibuttonentry_Item *added_item1 = NULL, *added_item2 = NULL, *selected_item = NULL;
+       Elm_Object_Item *added_item1 = NULL, *added_item2 = NULL, *selected_item = NULL;
 
        test_eo = elm_multibuttonentry_add(test_win);
-       added_item1 = elm_multibuttonentry_item_add_end(test_eo, "item1", NULL);
-       added_item2 = elm_multibuttonentry_item_add_end(test_eo, "item2", NULL);
-       elm_multibuttonentry_item_selected_set(added_item1);
-       selected_item = elm_multibuttonentry_item_selected_get(test_eo);
+       added_item1 = elm_multibuttonentry_item_prepend(test_eo, "item1", NULL);
+       added_item2 = elm_multibuttonentry_item_prepend(test_eo, "item2", NULL);
+       elm_multibuttonentry_item_select(added_item1, EINA_TRUE);
+
+       selected_item = elm_multibuttonentry_selected_item_get(test_eo);
        if (selected_item != added_item1) {
-               tet_infoline("elm_multibuttonentry_item_selected_get() failed in positive test case");
+               tet_infoline("elm_multibuttonentry_selected_item_get() failed in positive test case");
                tet_result(TET_FAIL);
                return;
        }
-
        tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, elm_multibuttonentry_item_selected_get().");
+       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, elm_multibuttonentry_selected_item_get().");
 }
 
-
 /**
- * @brief Negative test case of ug_init elm_multibuttonentry_item_selected_get()
+ * @brief Negative test case of ug_init elm_multibuttonentry_selected_item_get()
  */
-static void utc_UIFW_elm_multibuttonentry_item_selected_get_func_02(void)
+static void utc_UIFW_elm_multibuttonentry_selected_item_get_func_02(void)
 {
-       Elm_Multibuttonentry_Item *added_item1 = NULL, *added_item2 = NULL, *selected_item = NULL;
+       Elm_Object_Item *added_item1 = NULL, *added_item2 = NULL, *selected_item = NULL;
 
        test_eo = elm_multibuttonentry_add(NULL);
-       added_item1 = elm_multibuttonentry_item_add_end(test_eo, "item1", NULL);
-       added_item2 = elm_multibuttonentry_item_add_end(test_eo, "item2", NULL);
-       selected_item = elm_multibuttonentry_item_selected_get(test_eo);
+       added_item1 = elm_multibuttonentry_item_prepend(test_eo, "item1", NULL);
+       added_item2 = elm_multibuttonentry_item_prepend(test_eo, "item2", NULL);
+       selected_item = elm_multibuttonentry_selected_item_get(test_eo);
        TET_CHECK_FAIL(NULL, selected_item);
 
        tet_result(TET_PASS);
        tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, elm_multibuttonentry_item_selected_get().");
 }
-