From 67c589836aadbae61a6af0bf7ac3325a63609733 Mon Sep 17 00:00:00 2001 From: sumanth Date: Wed, 21 Sep 2011 19:56:36 +0900 Subject: [PATCH] elm_slider_format_function_set() API test case is corrected. TC build & execution errors are fixed in Slider, Datefield widgets. Review comments are corrected. Change-Id: Id0e003e96e9d485fb95a5a70af79cac0bc9c4d31 --- .../utc_UIFW_elm_datefield_date_format_set_func.c | 8 +----- ...elm_slider_indicator_format_function_set_func.c | 33 +++++++++------------- 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/TC/elm_ts/datefield/utc_UIFW_elm_datefield_date_format_set_func.c b/TC/elm_ts/datefield/utc_UIFW_elm_datefield_date_format_set_func.c index 607c0a4..9ba25a8 100644 --- a/TC/elm_ts/datefield/utc_UIFW_elm_datefield_date_format_set_func.c +++ b/TC/elm_ts/datefield/utc_UIFW_elm_datefield_date_format_set_func.c @@ -99,13 +99,7 @@ static void utc_UIFW_elm_datefield_date_format_set_func_01(void) static void utc_UIFW_elm_datefield_date_format_set_func_02(void) { datefield = elm_datefield_add(main_win); - elm_datefield_date_format_set(datefield, "dmydmy"); - - if (strcmp(elm_datefield_date_format_get(datefield), "mmddyy")) { - tet_infoline("elm_datefield_date_format_set() failed in negative test case"); - tet_result(TET_FAIL); - return; - } + elm_datefield_date_format_set(NULL, "ddmmyy"); evas_object_resize(datefield, 480, 80); evas_object_move(datefield, 0, 40); diff --git a/TC/elm_ts/slider/utc_UIFW_elm_slider_indicator_format_function_set_func.c b/TC/elm_ts/slider/utc_UIFW_elm_slider_indicator_format_function_set_func.c index c42caf0..71fd0f6 100644 --- a/TC/elm_ts/slider/utc_UIFW_elm_slider_indicator_format_function_set_func.c +++ b/TC/elm_ts/slider/utc_UIFW_elm_slider_indicator_format_function_set_func.c @@ -67,10 +67,18 @@ static void cleanup(void) tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ "); } -static const char *format_func (double val) +static char* +_indicator_format(double val) { - const char *format = "%1.0f"; - return format; + char *indicator = malloc(sizeof(char) * 32); + snprintf(indicator, 32, "%1.0f u", val); + return indicator; +} + +static void +_indicator_free(char *str) +{ + free(str); } /** @@ -79,18 +87,11 @@ static const char *format_func (double val) static void utc_UIFW_elm_slider_indicator_format_function_set_func_01(void) { Evas_Object *slider; - const char *ret_for = NULL; slider = elm_slider_add(main_win); - elm_slider_indicator_format_function_set(slider, format_func); - ret_for = elm_slider_indicator_format_get(slider); + elm_slider_indicator_format_function_set(slider, _indicator_format, _indicator_free); - if (!slider) { - tet_infoline("elm_slider_indicator_format_function_set() failed in positive test case"); - tet_result(TET_FAIL); - return; - } tet_result(TET_PASS); } @@ -104,13 +105,7 @@ static void utc_UIFW_elm_slider_indicator_format_function_set_func_02(void) slider = elm_slider_add(main_win); - elm_slider_indicator_format_function_set(NULL, format_func); - ret_for = elm_slider_indicator_format_get(slider); + elm_slider_indicator_format_function_set(NULL, _indicator_format, _indicator_free); - if (!slider) { - tet_infoline("elm_slider_indicator_format_function_set() failed in negative test case"); - tet_result(TET_FAIL); - return; - } - tet_result(TET_PASS); + tet_result(TET_PASS); } -- 2.7.4