gengrid TC modified
authorJeonghyun Yun <jh0506.yun@samsung.com>
Fri, 24 Feb 2012 02:35:43 +0000 (21:35 -0500)
committerJeonghyun Yun <jh0506.yun@samsung.com>
Fri, 24 Feb 2012 02:35:43 +0000 (21:35 -0500)
TC/elm_ts/gengrid/Makefile
TC/elm_ts/gengrid/tslist
TC/elm_ts/gengrid/utc_UIFW_elm_gengrid_item_append_func.c
TC/elm_ts/gengrid/utc_UIFW_elm_gengrid_item_data_get_func.c [deleted file]
TC/elm_ts/gengrid/utc_UIFW_elm_gengrid_item_disabled_get_func.c [deleted file]
TC/elm_ts/gengrid/utc_UIFW_elm_gengrid_item_object_get_func.c
TC/elm_ts/gengrid/utc_UIFW_elm_gengrid_item_pos_get_func.c
TC/elm_ts/gengrid/utc_UIFW_elm_gengrid_item_prepend_func.c
TC/elm_ts/gengrid/utc_UIFW_elm_gengrid_item_selected_get_func.c
TC/elm_ts/gengrid/utc_UIFW_elm_gengrid_selected_item_get_func.c
TC/elm_ts/gengrid/utc_UIFW_elm_gengrid_selected_items_get_func.c

index cf4bf46..59846cb 100755 (executable)
@@ -6,13 +6,11 @@ TARGETS = utc_UIFW_elm_gengrid_add_func \
          utc_UIFW_elm_gengrid_item_append_func \
          utc_UIFW_elm_gengrid_item_prepend_func \
          utc_UIFW_elm_gengrid_item_object_get_func \
-         utc_UIFW_elm_gengrid_item_data_get_func \
          utc_UIFW_elm_gengrid_item_pos_get_func \
          utc_UIFW_elm_gengrid_multi_select_get_func \
          utc_UIFW_elm_gengrid_selected_item_get_func \
          utc_UIFW_elm_gengrid_selected_items_get_func \
          utc_UIFW_elm_gengrid_item_selected_get_func \
-         utc_UIFW_elm_gengrid_item_disabled_get_func \
          utc_UIFW_elm_gengrid_always_select_mode_get_func \
          utc_UIFW_elm_gengrid_no_select_mode_get_func \
          utc_UIFW_elm_gengrid_bounce_get_func
index 5797691..0b4d792 100644 (file)
@@ -4,13 +4,11 @@
 /elm_ts/gengrid/utc_UIFW_elm_gengrid_item_append_func
 /elm_ts/gengrid/utc_UIFW_elm_gengrid_item_prepend_func
 /elm_ts/gengrid/utc_UIFW_elm_gengrid_item_object_get_func
-/elm_ts/gengrid/utc_UIFW_elm_gengrid_item_data_get_func
 /elm_ts/gengrid/utc_UIFW_elm_gengrid_item_pos_get_func
 /elm_ts/gengrid/utc_UIFW_elm_gengrid_multi_select_get_func
 /elm_ts/gengrid/utc_UIFW_elm_gengrid_selected_item_get_func
 /elm_ts/gengrid/utc_UIFW_elm_gengrid_selected_items_get_func
 /elm_ts/gengrid/utc_UIFW_elm_gengrid_item_selected_get_func
-/elm_ts/gengrid/utc_UIFW_elm_gengrid_item_disabled_get_func
 /elm_ts/gengrid/utc_UIFW_elm_gengrid_always_select_mode_get_func
 /elm_ts/gengrid/utc_UIFW_elm_gengrid_no_select_mode_get_func
 /elm_ts/gengrid/utc_UIFW_elm_gengrid_bounce_get_func
index ff01f1d..c2c30d0 100644 (file)
@@ -91,8 +91,8 @@ static void startup(void)
 
        test_eo = elm_gengrid_add(test_win);
        gic.item_style = "default_grid";
-       gic.func.label_get = NULL;
-       gic.func.icon_get = NULL;
+       gic.func.text_get = NULL;
+       gic.func.content_get = NULL;
 
        tet_infoline("[[ TET_MSG ]]:: Completing startup");
 }
@@ -126,7 +126,7 @@ static void cleanup(void)
 
 static void utc_UIFW_elm_gengrid_item_append_func_01(void)
 {
-       Elm_Gengrid_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
 
        item = elm_gengrid_item_append(test_eo, &gic, NULL, NULL, NULL);
        TET_CHECK_PASS(NULL, item);
@@ -137,7 +137,7 @@ static void utc_UIFW_elm_gengrid_item_append_func_01(void)
 
 static void utc_UIFW_elm_gengrid_item_append_func_02(void)
 {
-       Elm_Gengrid_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
 
        item = elm_gengrid_item_append(NULL, NULL, NULL, NULL, NULL);
        TET_CHECK_FAIL(NULL, item);
diff --git a/TC/elm_ts/gengrid/utc_UIFW_elm_gengrid_item_data_get_func.c b/TC/elm_ts/gengrid/utc_UIFW_elm_gengrid_item_data_get_func.c
deleted file mode 100644 (file)
index 86ec61e..0000000
+++ /dev/null
@@ -1,152 +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...) \
-{ \
-       if (y == (x1)) \
-               { \
-                       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...) \
-{ \
-       if (y != (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-Evas_Object *main_win, *main_bg;
-Evas_Object *test_win, *test_bg;
-Evas_Object *test_eo = NULL;
-Elm_Gengrid_Item_Class gic;
-Elm_Gengrid_Item *item;
-
-void _elm_precondition(void);
-static void _win_del(void *data, Evas_Object *obj, void *event_info);
-
-static void _win_del(void *data, Evas_Object *obj, void *event_info)
-{
-       elm_exit();
-}
-
-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);
-
-       evas_object_resize(main_win, 320, 480);
-       evas_object_show(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_gengrid_item_data_get_func_01(void);
-static void utc_UIFW_elm_gengrid_item_data_get_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_gengrid_item_data_get_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_gengrid_item_data_get_func_02, NEGATIVE_TC_IDX },
-       { NULL, 0 }
-};
-
-static void startup(void)
-{
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
-
-       _elm_precondition();
-
-       test_win = elm_win_add(NULL, "Page Control", ELM_WIN_BASIC);
-       elm_win_title_set(test_win, "Page Control");
-       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);
-
-       test_eo = elm_gengrid_add(test_win);
-       gic.item_style = "default_grid";
-       gic.func.label_get = NULL;
-       gic.func.icon_get = NULL;
-
-       item = elm_gengrid_item_append(test_eo, &gic, test_bg, NULL, NULL);
-
-       tet_infoline("[[ TET_MSG ]]:: Completing startup");
-}
-
-static void cleanup(void)
-{
-       if ( NULL != main_win ) {
-               main_win = NULL;
-       }
-
-       if ( NULL != main_bg ) {
-               main_bg = NULL;
-       }
-
-       if ( NULL != test_win ) {
-               test_win = NULL;
-       }
-
-       if ( NULL != test_bg ) {
-               test_bg = NULL;
-       }
-
-       if ( NULL != test_eo ) {
-               test_eo = NULL;
-       }
-
-       elm_exit();
-
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
-}
-
-static void utc_UIFW_elm_gengrid_item_data_get_func_01(void)
-{
-       void *data = NULL;
-
-       data = elm_gengrid_item_data_get(item);
-
-       TET_CHECK_PASS(NULL, data);
-
-       tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, elm_gengrid_item_data_get");
-}
-
-static void utc_UIFW_elm_gengrid_item_data_get_func_02(void)
-{
-       void *data = NULL;
-
-       data = elm_gengrid_item_data_get(NULL);
-
-       TET_CHECK_FAIL(NULL, data);
-
-       tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, elm_gengrid_item_data_get");
-}
diff --git a/TC/elm_ts/gengrid/utc_UIFW_elm_gengrid_item_disabled_get_func.c b/TC/elm_ts/gengrid/utc_UIFW_elm_gengrid_item_disabled_get_func.c
deleted file mode 100644 (file)
index ba5cc3c..0000000
+++ /dev/null
@@ -1,154 +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...) \
-{ \
-       if (y == (x1)) \
-               { \
-                       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...) \
-{ \
-       if (y != (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-Evas_Object *main_win, *main_bg;
-Evas_Object *test_win, *test_bg;
-Evas_Object *test_eo = NULL;
-Elm_Gengrid_Item_Class gic;
-Elm_Gengrid_Item *item;
-
-void _elm_precondition(void);
-static void _win_del(void *data, Evas_Object *obj, void *event_info);
-
-static void _win_del(void *data, Evas_Object *obj, void *event_info)
-{
-       elm_exit();
-}
-
-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);
-
-       evas_object_resize(main_win, 320, 480);
-       evas_object_show(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_gengrid_item_disabled_get_func_01(void);
-static void utc_UIFW_elm_gengrid_item_disabled_get_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_gengrid_item_disabled_get_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_gengrid_item_disabled_get_func_02, NEGATIVE_TC_IDX },
-       { NULL, 0 }
-};
-
-static void startup(void)
-{
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
-
-       _elm_precondition();
-
-       test_win = elm_win_add(NULL, "Page Control", ELM_WIN_BASIC);
-       elm_win_title_set(test_win, "Page Control");
-       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);
-
-       test_eo = elm_gengrid_add(test_win);
-
-       gic.item_style = "default_grid";
-        gic.func.label_get = NULL;
-        gic.func.icon_get = NULL;
-
-        item = elm_gengrid_item_append(test_eo, &gic, NULL, NULL, NULL);
-        elm_gengrid_item_disabled_set(item, EINA_TRUE);
-
-       tet_infoline("[[ TET_MSG ]]:: Completing startup");
-}
-
-static void cleanup(void)
-{
-       if ( NULL != main_win ) {
-               main_win = NULL;
-       }
-
-       if ( NULL != main_bg ) {
-               main_bg = NULL;
-       }
-
-       if ( NULL != test_win ) {
-               test_win = NULL;
-       }
-
-       if ( NULL != test_bg ) {
-               test_bg = NULL;
-       }
-
-       if ( NULL != test_eo ) {
-               test_eo = NULL;
-       }
-
-       elm_exit();
-
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
-}
-
-static void utc_UIFW_elm_gengrid_item_disabled_get_func_01(void)
-{
-       Eina_Bool flag = EINA_FALSE;
-
-       flag = elm_gengrid_item_disabled_get(item);
-
-       TET_CHECK_PASS(EINA_FALSE, flag);
-
-       tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, elm_gengrid_item_disabled_get");
-}
-
-static void utc_UIFW_elm_gengrid_item_disabled_get_func_02(void)
-{
-       Eina_Bool flag = EINA_FALSE;
-
-       flag = elm_gengrid_item_disabled_get(NULL);
-
-       TET_CHECK_FAIL(EINA_FALSE, flag);
-
-       tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, elm_gengrid_item_disabled_get");
-}
index 7ce1a6f..7d2a522 100644 (file)
@@ -28,7 +28,7 @@ Evas_Object *main_win, *main_bg;
 Evas_Object *test_win, *test_bg;
 Evas_Object *test_eo = NULL;
 Elm_Gengrid_Item_Class gic;
-Elm_Gengrid_Item *item;
+Elm_Object_Item *item;
 
 void _elm_precondition(void);
 static void _win_del(void *data, Evas_Object *obj, void *event_info);
@@ -72,7 +72,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static Evas_Object * _icon_get(const void *data, Evas_Object *obj, const char *part)
+static Evas_Object * _content_get(void *data, Evas_Object *obj, const char *part)
 {
        if (!strcmp(part, "elm.swallow.icon"))
        {
@@ -112,8 +112,8 @@ static void startup(void)
        elm_gengrid_multi_select_set(test_eo, EINA_TRUE);
 
        gic.item_style = "default_grid";
-       gic.func.label_get = NULL;
-       gic.func.icon_get = _icon_get;
+       gic.func.text_get = NULL;
+       gic.func.content_get = _content_get;
 
        item = elm_gengrid_item_append(test_eo, &gic, NULL, NULL, NULL);
 
index 3823d80..49b5906 100644 (file)
@@ -28,7 +28,7 @@ Evas_Object *main_win, *main_bg;
 Evas_Object *test_win, *test_bg;
 Evas_Object *test_eo = NULL;
 Elm_Gengrid_Item_Class gic;
-Elm_Gengrid_Item *item;
+Elm_Object_Item *item;
 
 void _elm_precondition(void);
 static void _win_del(void *data, Evas_Object *obj, void *event_info);
@@ -72,7 +72,7 @@ struct tet_testlist tet_testlist[] = {
        { NULL, 0 }
 };
 
-static Evas_Object * _icon_get(const void *data, Evas_Object *obj, const char *part)
+static Evas_Object * _content_get(void *data, Evas_Object *obj, const char *part)
 {
        if (!strcmp(part, "elm.swallow.icon"))
        {
@@ -112,8 +112,8 @@ static void startup(void)
        elm_gengrid_multi_select_set(test_eo, EINA_TRUE);
 
        gic.item_style = "default_grid";
-       gic.func.label_get = NULL;
-       gic.func.icon_get = _icon_get;
+       gic.func.text_get = NULL;
+       gic.func.content_get = _content_get;
 
        item = elm_gengrid_item_append(test_eo, &gic, test_bg, NULL, NULL);
 
index bcf002a..ffd2313 100644 (file)
@@ -91,8 +91,8 @@ static void startup(void)
 
        test_eo = elm_gengrid_add(test_win);
        gic.item_style = "default_grid";
-       gic.func.label_get = NULL;
-       gic.func.icon_get = NULL;
+       gic.func.text_get = NULL;
+       gic.func.content_get = NULL;
 
        tet_infoline("[[ TET_MSG ]]:: Completing startup");
 }
@@ -126,7 +126,7 @@ static void cleanup(void)
 
 static void utc_UIFW_elm_gengrid_item_prepend_func_01(void)
 {
-       Elm_Gengrid_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
 
        item = elm_gengrid_item_prepend(test_eo, &gic, NULL, NULL, NULL);
        TET_CHECK_PASS(NULL, item);
@@ -137,7 +137,7 @@ static void utc_UIFW_elm_gengrid_item_prepend_func_01(void)
 
 static void utc_UIFW_elm_gengrid_item_prepend_func_02(void)
 {
-       Elm_Gengrid_Item *item = NULL;
+       Elm_Object_Item *item = NULL;
 
        item = elm_gengrid_item_prepend(NULL, NULL, NULL, NULL, NULL);
        TET_CHECK_FAIL(NULL, item);
index 9efb337..84481d4 100644 (file)
@@ -28,7 +28,7 @@ Evas_Object *main_win, *main_bg;
 Evas_Object *test_win, *test_bg;
 Evas_Object *test_eo = NULL;
 Elm_Gengrid_Item_Class gic;
-Elm_Gengrid_Item *item;
+Elm_Object_Item *item;
 
 void _elm_precondition(void);
 static void _win_del(void *data, Evas_Object *obj, void *event_info);
@@ -93,8 +93,8 @@ static void startup(void)
        test_eo = elm_gengrid_add(test_win);
 
        gic.item_style = "default_grid";
-        gic.func.label_get = NULL;
-        gic.func.icon_get = NULL;
+        gic.func.text_get = NULL;
+        gic.func.content_get = NULL;
 
         item = elm_gengrid_item_append(test_eo, &gic, NULL, NULL, NULL);
         elm_gengrid_item_selected_set(item, EINA_TRUE);
index c8e53f1..ace9e4e 100644 (file)
@@ -28,7 +28,7 @@ Evas_Object *main_win, *main_bg;
 Evas_Object *test_win, *test_bg;
 Evas_Object *test_eo = NULL;
 Elm_Gengrid_Item_Class gic;
-Elm_Gengrid_Item *item;
+Elm_Object_Item *item;
 
 void _elm_precondition(void);
 static void _win_del(void *data, Evas_Object *obj, void *event_info);
@@ -93,8 +93,8 @@ static void startup(void)
 
        test_eo = elm_gengrid_add(test_win);
        gic.item_style = "default_grid";
-       gic.func.label_get = NULL;
-       gic.func.icon_get = NULL;
+       gic.func.text_get = NULL;
+       gic.func.content_get = NULL;
 
        item = elm_gengrid_item_append(test_eo, &gic, test_bg, NULL, NULL);
        elm_gengrid_item_selected_set(item, EINA_TRUE);
@@ -131,7 +131,7 @@ static void cleanup(void)
 
 static void utc_UIFW_elm_gengrid_selected_item_get_func_01(void)
 {
-       Elm_Gengrid_Item *temp_item = NULL;
+       Elm_Object_Item *temp_item = NULL;
 
        temp_item = elm_gengrid_selected_item_get(test_eo);
 
@@ -143,7 +143,7 @@ static void utc_UIFW_elm_gengrid_selected_item_get_func_01(void)
 
 static void utc_UIFW_elm_gengrid_selected_item_get_func_02(void)
 {
-       Elm_Gengrid_Item *temp_item = NULL;
+       Elm_Object_Item *temp_item = NULL;
 
        temp_item = elm_gengrid_selected_item_get(NULL);
 
index e20ccab..fd0817f 100644 (file)
@@ -28,7 +28,7 @@ Evas_Object *main_win, *main_bg;
 Evas_Object *test_win, *test_bg;
 Evas_Object *test_eo = NULL;
 Elm_Gengrid_Item_Class gic;
-Elm_Gengrid_Item *item;
+Elm_Object_Item *item;
 
 void _elm_precondition(void);
 static void _win_del(void *data, Evas_Object *obj, void *event_info);
@@ -92,8 +92,8 @@ static void startup(void)
 
        test_eo = elm_gengrid_add(test_win);
        gic.item_style = "default_grid";
-       gic.func.label_get = NULL;
-       gic.func.icon_get = NULL;
+       gic.func.text_get = NULL;
+       gic.func.content_get = NULL;
 
        item = elm_gengrid_item_append(test_eo, &gic, test_bg, NULL, NULL);
        elm_gengrid_item_selected_set(item, EINA_TRUE);