From 0ddcdfd0e3ffbe3e824e05abcbca88ec0257b890 Mon Sep 17 00:00:00 2001 From: WooHyun Jung Date: Tue, 25 Jan 2011 13:50:59 +0900 Subject: [PATCH] [TC] slider - deprecated APIs are deleted --- TC/elm_ts/slider/Makefile | 6 +- TC/elm_ts/slider/tslist | 6 +- ...t_func.c => utc_UIFW_elm_slider_end_get_func.c} | 28 ++--- .../utc_UIFW_elm_slider_end_label_get_func.c | 110 ------------------- .../utc_UIFW_elm_slider_end_label_set_func.c | 110 ------------------- ...t_func.c => utc_UIFW_elm_slider_end_set_func.c} | 28 ++--- .../utc_UIFW_elm_slider_value_animated_set_func.c | 116 --------------------- 7 files changed, 32 insertions(+), 372 deletions(-) rename TC/elm_ts/slider/{utc_UIFW_elm_slider_end_icon_get_func.c => utc_UIFW_elm_slider_end_get_func.c} (77%) delete mode 100644 TC/elm_ts/slider/utc_UIFW_elm_slider_end_label_get_func.c delete mode 100644 TC/elm_ts/slider/utc_UIFW_elm_slider_end_label_set_func.c rename TC/elm_ts/slider/{utc_UIFW_elm_slider_end_icon_set_func.c => utc_UIFW_elm_slider_end_set_func.c} (72%) delete mode 100644 TC/elm_ts/slider/utc_UIFW_elm_slider_value_animated_set_func.c diff --git a/TC/elm_ts/slider/Makefile b/TC/elm_ts/slider/Makefile index b6dfb5f..3975ea3 100644 --- a/TC/elm_ts/slider/Makefile +++ b/TC/elm_ts/slider/Makefile @@ -1,10 +1,8 @@ CC ?= gcc TARGETS = utc_UIFW_elm_slider_add_func \ - utc_UIFW_elm_slider_end_icon_get_func \ - utc_UIFW_elm_slider_end_icon_set_func \ - utc_UIFW_elm_slider_end_label_get_func \ - utc_UIFW_elm_slider_end_label_set_func \ + utc_UIFW_elm_slider_end_get_func \ + utc_UIFW_elm_slider_end_set_func \ utc_UIFW_elm_slider_horizontal_get_func \ utc_UIFW_elm_slider_horizontal_set_func \ utc_UIFW_elm_slider_icon_get_func \ diff --git a/TC/elm_ts/slider/tslist b/TC/elm_ts/slider/tslist index d3d13fa..3807667 100644 --- a/TC/elm_ts/slider/tslist +++ b/TC/elm_ts/slider/tslist @@ -1,8 +1,6 @@ /elm_ts/slider/utc_UIFW_elm_slider_add_func -/elm_ts/slider/utc_UIFW_elm_slider_end_icon_get_func -/elm_ts/slider/utc_UIFW_elm_slider_end_icon_set_func -/elm_ts/slider/utc_UIFW_elm_slider_end_label_get_func -/elm_ts/slider/utc_UIFW_elm_slider_end_label_set_func +/elm_ts/slider/utc_UIFW_elm_slider_end_get_func +/elm_ts/slider/utc_UIFW_elm_slider_end_set_func /elm_ts/slider/utc_UIFW_elm_slider_horizontal_get_func /elm_ts/slider/utc_UIFW_elm_slider_horizontal_set_func /elm_ts/slider/utc_UIFW_elm_slider_icon_get_func diff --git a/TC/elm_ts/slider/utc_UIFW_elm_slider_end_icon_get_func.c b/TC/elm_ts/slider/utc_UIFW_elm_slider_end_get_func.c similarity index 77% rename from TC/elm_ts/slider/utc_UIFW_elm_slider_end_icon_get_func.c rename to TC/elm_ts/slider/utc_UIFW_elm_slider_end_get_func.c index 4189cb4..2fd64c7 100644 --- a/TC/elm_ts/slider/utc_UIFW_elm_slider_end_icon_get_func.c +++ b/TC/elm_ts/slider/utc_UIFW_elm_slider_end_get_func.c @@ -35,8 +35,8 @@ static void cleanup(void); void (*tet_startup)(void) = startup; void (*tet_cleanup)(void) = cleanup; -static void utc_UIFW_elm_slider_end_icon_get_func_01(void); -static void utc_UIFW_elm_slider_end_icon_get_func_02(void); +static void utc_UIFW_elm_slider_end_get_func_01(void); +static void utc_UIFW_elm_slider_end_get_func_02(void); enum { POSITIVE_TC_IDX = 0x01, @@ -44,8 +44,8 @@ enum { }; struct tet_testlist tet_testlist[] = { - { utc_UIFW_elm_slider_end_icon_get_func_01, POSITIVE_TC_IDX }, - { utc_UIFW_elm_slider_end_icon_get_func_02, NEGATIVE_TC_IDX }, + { utc_UIFW_elm_slider_end_get_func_01, POSITIVE_TC_IDX }, + { utc_UIFW_elm_slider_end_get_func_02, NEGATIVE_TC_IDX }, { NULL, 0 } }; @@ -68,9 +68,9 @@ static void cleanup(void) } /** - * @brief Positive test case of elm_slider_end_icon_get() + * @brief Positive test case of elm_slider_end_get() */ -static void utc_UIFW_elm_slider_end_icon_get_func_01(void) +static void utc_UIFW_elm_slider_end_get_func_01(void) { Evas_Object *icon, *ret_icon = NULL; Evas_Object *slider; @@ -88,11 +88,11 @@ static void utc_UIFW_elm_slider_end_icon_get_func_01(void) evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5); - elm_slider_end_icon_set(slider, icon); - ret_icon = elm_slider_end_icon_get(slider); + elm_slider_end_set(slider, icon); + ret_icon = elm_slider_end_get(slider); if (!ret_icon) { - tet_infoline("elm_slider_end_icon_get() failed in positive test case"); + tet_infoline("elm_slider_end_get() failed in positive test case"); tet_result(TET_FAIL); return; } @@ -100,9 +100,9 @@ static void utc_UIFW_elm_slider_end_icon_get_func_01(void) } /** - * @brief Negative test case of ug_init elm_slider_end_icon_get() + * @brief Negative test case of ug_init elm_slider_end_get() */ -static void utc_UIFW_elm_slider_end_icon_get_func_02(void) +static void utc_UIFW_elm_slider_end_get_func_02(void) { Evas_Object *icon, *ret_icon; Evas_Object *slider; @@ -120,11 +120,11 @@ static void utc_UIFW_elm_slider_end_icon_get_func_02(void) evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5); - elm_slider_end_icon_set(slider, icon); - ret_icon = elm_slider_end_icon_get(NULL); + elm_slider_end_set(slider, icon); + ret_icon = elm_slider_end_get(NULL); if (ret_icon) { - tet_infoline("elm_slider_end_icon_get() failed in negative test case"); + tet_infoline("elm_slider_end_get() failed in negative test case"); tet_result(TET_FAIL); return; } diff --git a/TC/elm_ts/slider/utc_UIFW_elm_slider_end_label_get_func.c b/TC/elm_ts/slider/utc_UIFW_elm_slider_end_label_get_func.c deleted file mode 100644 index 040a52e..0000000 --- a/TC/elm_ts/slider/utc_UIFW_elm_slider_end_label_get_func.c +++ /dev/null @@ -1,110 +0,0 @@ -#include -#include - -// 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; \ - } \ -} - -// 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; \ - } \ -} - - -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_slider_end_label_get_func_01(void); -static void utc_UIFW_elm_slider_end_label_get_func_02(void); - -enum { - POSITIVE_TC_IDX = 0x01, - NEGATIVE_TC_IDX, -}; - -struct tet_testlist tet_testlist[] = { - { utc_UIFW_elm_slider_end_label_get_func_01, POSITIVE_TC_IDX }, - { utc_UIFW_elm_slider_end_label_get_func_02, NEGATIVE_TC_IDX }, - { NULL, 0 } -}; - -static void startup(void) -{ - tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ "); - elm_init(0, NULL); - main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC); - evas_object_show(main_win); -} - -static void cleanup(void) -{ - if ( NULL != main_win ) { - evas_object_del(main_win); - main_win = NULL; - } - elm_shutdown(); - tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ "); -} - -/** - * @brief Positive test case of elm_slider_end_label_get() - */ -static void utc_UIFW_elm_slider_end_label_get_func_01(void) -{ - Evas_Object *slider; - const char *ret = NULL; - - slider = elm_slider_add(main_win); - - elm_slider_end_label_set(slider, "Hello!!!"); - ret = elm_slider_end_label_get(slider); - - if (!ret && !strcmp(ret, "Hello!!!")) { - tet_infoline("elm_slider_end_label_get() failed in positive test case"); - tet_result(TET_FAIL); - return; - } - tet_result(TET_PASS); -} - -/** - * @brief Negative test case of ug_init elm_slider_end_label_get() - */ -static void utc_UIFW_elm_slider_end_label_get_func_02(void) -{ - Evas_Object *slider; - const char *ret = NULL; - - slider = elm_slider_add(main_win); - - elm_slider_end_label_set(slider, "Hello!!!"); - ret = elm_slider_end_label_get(NULL); - - if (ret) { - tet_infoline("elm_slider_end_label_get() failed in negative test case"); - tet_result(TET_FAIL); - return; - } - tet_result(TET_PASS); -} diff --git a/TC/elm_ts/slider/utc_UIFW_elm_slider_end_label_set_func.c b/TC/elm_ts/slider/utc_UIFW_elm_slider_end_label_set_func.c deleted file mode 100644 index fd9c02f..0000000 --- a/TC/elm_ts/slider/utc_UIFW_elm_slider_end_label_set_func.c +++ /dev/null @@ -1,110 +0,0 @@ -#include -#include - -// 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; \ - } \ -} - -// 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; \ - } \ -} - - -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_slider_end_label_set_func_01(void); -static void utc_UIFW_elm_slider_end_label_set_func_02(void); - -enum { - POSITIVE_TC_IDX = 0x01, - NEGATIVE_TC_IDX, -}; - -struct tet_testlist tet_testlist[] = { - { utc_UIFW_elm_slider_end_label_set_func_01, POSITIVE_TC_IDX }, - { utc_UIFW_elm_slider_end_label_set_func_02, NEGATIVE_TC_IDX }, - { NULL, 0 } -}; - -static void startup(void) -{ - tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ "); - elm_init(0, NULL); - main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC); - evas_object_show(main_win); -} - -static void cleanup(void) -{ - if ( NULL != main_win ) { - evas_object_del(main_win); - main_win = NULL; - } - elm_shutdown(); - tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ "); -} - -/** - * @brief Positive test case of elm_slider_end_label_set() - */ -static void utc_UIFW_elm_slider_end_label_set_func_01(void) -{ - Evas_Object *slider; - const char *ret = NULL; - - slider = elm_slider_add(main_win); - - elm_slider_end_label_set(slider, "Hello!!!"); - ret = elm_slider_end_label_get(slider); - - if (!ret && !strcmp(ret, "Hello!!!")) { - tet_infoline("elm_slider_end_label_set() failed in positive test case"); - tet_result(TET_FAIL); - return; - } - tet_result(TET_PASS); -} - -/** - * @brief Negative test case of ug_init elm_slider_end_label_set() - */ -static void utc_UIFW_elm_slider_end_label_set_func_02(void) -{ - Evas_Object *slider; - const char *ret = NULL; - - slider = elm_slider_add(main_win); - - elm_slider_end_label_set(NULL, "Hello!!!"); - ret = elm_slider_end_label_get(slider); - - if (ret) { - tet_infoline("elm_slider_end_label_set() failed in negative test case"); - tet_result(TET_FAIL); - return; - } - tet_result(TET_PASS); -} diff --git a/TC/elm_ts/slider/utc_UIFW_elm_slider_end_icon_set_func.c b/TC/elm_ts/slider/utc_UIFW_elm_slider_end_set_func.c similarity index 72% rename from TC/elm_ts/slider/utc_UIFW_elm_slider_end_icon_set_func.c rename to TC/elm_ts/slider/utc_UIFW_elm_slider_end_set_func.c index 7f61b5d..f9c33f3 100644 --- a/TC/elm_ts/slider/utc_UIFW_elm_slider_end_icon_set_func.c +++ b/TC/elm_ts/slider/utc_UIFW_elm_slider_end_set_func.c @@ -35,8 +35,8 @@ static void cleanup(void); void (*tet_startup)(void) = startup; void (*tet_cleanup)(void) = cleanup; -static void utc_UIFW_elm_slider_end_icon_set_func_01(void); -static void utc_UIFW_elm_slider_end_icon_set_func_02(void); +static void utc_UIFW_elm_slider_end_set_func_01(void); +static void utc_UIFW_elm_slider_end_set_func_02(void); enum { POSITIVE_TC_IDX = 0x01, @@ -44,8 +44,8 @@ enum { }; struct tet_testlist tet_testlist[] = { - { utc_UIFW_elm_slider_end_icon_set_func_01, POSITIVE_TC_IDX }, - { utc_UIFW_elm_slider_end_icon_set_func_02, NEGATIVE_TC_IDX }, + { utc_UIFW_elm_slider_end_set_func_01, POSITIVE_TC_IDX }, + { utc_UIFW_elm_slider_end_set_func_02, NEGATIVE_TC_IDX }, { NULL, 0 } }; @@ -68,9 +68,9 @@ static void cleanup(void) } /** - * @brief Positive test case of elm_slider_end_icon_set() + * @brief Positive test case of elm_slider_end_set() */ -static void utc_UIFW_elm_slider_end_icon_set_func_01(void) +static void utc_UIFW_elm_slider_end_set_func_01(void) { Evas_Object *icon, *ret_icon; Evas_Object *slider; @@ -81,11 +81,11 @@ static void utc_UIFW_elm_slider_end_icon_set_func_01(void) evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); slider = elm_slider_add(main_win); - ret = elm_slider_end_icon_set(slider, icon); - ret_icon = elm_slider_end_icon_get(slider); + ret = elm_slider_end_set(slider, icon); + ret_icon = elm_slider_end_get(slider); if (!ret_icon && !ret) { - tet_infoline("elm_slider_end_icon_set() failed in positive test case"); + tet_infoline("elm_slider_end_set() failed in positive test case"); tet_result(TET_FAIL); return; } @@ -93,9 +93,9 @@ static void utc_UIFW_elm_slider_end_icon_set_func_01(void) } /** - * @brief Negative test case of ug_init elm_slider_end_icon_set() + * @brief Negative test case of ug_init elm_slider_end_set() */ -static void utc_UIFW_elm_slider_end_icon_set_func_02(void) +static void utc_UIFW_elm_slider_end_set_func_02(void) { Evas_Object *icon, *ret_icon; Evas_Object *slider; @@ -106,11 +106,11 @@ static void utc_UIFW_elm_slider_end_icon_set_func_02(void) evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); slider = elm_slider_add(main_win); - ret = elm_slider_end_icon_set(slider, NULL); - ret_icon = elm_slider_end_icon_get(slider); + ret = elm_slider_end_set(slider, NULL); + ret_icon = elm_slider_end_get(slider); if (ret_icon && ret) { - tet_infoline("elm_slider_end_icon_set() failed in negative test case"); + tet_infoline("elm_slider_end_set() failed in negative test case"); tet_result(TET_FAIL); return; } diff --git a/TC/elm_ts/slider/utc_UIFW_elm_slider_value_animated_set_func.c b/TC/elm_ts/slider/utc_UIFW_elm_slider_value_animated_set_func.c deleted file mode 100644 index 5cc1fdd..0000000 --- a/TC/elm_ts/slider/utc_UIFW_elm_slider_value_animated_set_func.c +++ /dev/null @@ -1,116 +0,0 @@ -#include -#include - -// 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; \ - } \ -} - -// 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; \ - } \ -} - - -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_slider_value_animated_set_func_01(void); -static void utc_UIFW_elm_slider_value_animated_set_func_02(void); - -enum { - POSITIVE_TC_IDX = 0x01, - NEGATIVE_TC_IDX, -}; - -struct tet_testlist tet_testlist[] = { - { utc_UIFW_elm_slider_value_animated_set_func_01, POSITIVE_TC_IDX }, - { utc_UIFW_elm_slider_value_animated_set_func_02, NEGATIVE_TC_IDX }, - { NULL, 0 } -}; - -static void startup(void) -{ - tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ "); - elm_init(0, NULL); - main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC); - evas_object_show(main_win); -} - -static void cleanup(void) -{ - if ( NULL != main_win ) { - evas_object_del(main_win); - main_win = NULL; - } - elm_shutdown(); - tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ "); -} - -/** - * @brief Positive test case of elm_slider_value_animated_set() - */ -static void utc_UIFW_elm_slider_value_animated_set_func_01(void) -{ - Evas_Object *slider; - - slider = elm_slider_add(main_win); - - elm_slider_min_max_set(slider, 0, 9); - elm_slider_label_set(slider, "Text"); - elm_slider_value_set(slider, 3); - elm_slider_value_animated_set(slider, 0.5); - evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5); - - if (!slider) { - tet_infoline("elm_slider_value_animated_set() failed in positive test case"); - tet_result(TET_FAIL); - return; - } - tet_result(TET_PASS); -} - -/** - * @brief Negative test case of ug_init elm_slider_value_animated_set() - */ -static void utc_UIFW_elm_slider_value_animated_set_func_02(void) -{ - Evas_Object *slider; - - slider = elm_slider_add(main_win); - - elm_slider_min_max_set(slider, 0, 9); - elm_slider_label_set(slider, "Text"); - elm_slider_value_set(slider, 3); - elm_slider_value_animated_set(NULL, 0.5); - evas_object_size_hint_weight_set(slider, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(slider, EVAS_HINT_FILL, 0.5); - - if (!slider) { - tet_infoline("elm_slider_value_animated_set() failed in negative test case"); - tet_result(TET_FAIL); - return; - } - tet_result(TET_PASS); -} -- 2.7.4