From: Shilpa Singh Date: Fri, 11 Feb 2011 06:11:39 +0000 (+0530) Subject: navigationbar: [Test cases crash issue fixed in test cases] X-Git-Tag: REL_I9200_20110603-1~354^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f60fa45883a71656ea07757a31291361d9352088;p=framework%2Fuifw%2Felementary.git navigationbar: [Test cases crash issue fixed in test cases] Change-Id: I20febec0cfd4748f326bd79a635246367e5024d6 --- diff --git a/TC/elm_ts/navigationbar/utc_UIFW_elm_navigationbar_title_object_add_func.c b/TC/elm_ts/navigationbar/utc_UIFW_elm_navigationbar_title_object_add_func.c index a6e65ee..e1a42fd 100644 --- a/TC/elm_ts/navigationbar/utc_UIFW_elm_navigationbar_title_object_add_func.c +++ b/TC/elm_ts/navigationbar/utc_UIFW_elm_navigationbar_title_object_add_func.c @@ -30,8 +30,7 @@ Evas_Object *main_win, *navibar; -char buf[4096]; - +char buf[PATH_MAX]; static void startup(void); static void cleanup(void); @@ -61,6 +60,7 @@ static void startup(void) evas_object_show(main_win); navibar = elm_navigationbar_add(main_win); evas_object_show(navibar); + elm_win_resize_object_add(main_win, navibar); } static void cleanup(void) @@ -87,16 +87,12 @@ static void utc_UIFW_elm_navigationbar_title_object_add_func_01(void) elm_icon_file_set(content, buf, NULL); evas_object_size_hint_aspect_set(content, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); elm_icon_scale_set(content, 1, 1); - - Evas_Object *segment = elm_segment_control_add(navibar); - elm_segment_control_add_segment(navibar, NULL, "Sg1", EINA_FALSE); - elm_segment_control_add_segment(navibar, NULL, "Sg2", EINA_FALSE); - elm_segment_control_add_segment(navibar, NULL, "Sg3", EINA_FALSE); - evas_object_show(segment); - - elm_navigationbar_push(navibar, "title", NULL, NULL, NULL, content); - elm_navigationbar_title_object_add(navibar, content, segment); - + + Evas_Object *title = elm_button_add(navibar); + evas_object_show(title); + + elm_navigationbar_push(navibar, "title", NULL, NULL, NULL, content); + elm_navigationbar_title_object_add(navibar, content, title); tet_result(TET_PASS); } @@ -105,20 +101,16 @@ static void utc_UIFW_elm_navigationbar_title_object_add_func_01(void) */ static void utc_UIFW_elm_navigationbar_title_object_add_func_02(void) { - Evas_Object *content = elm_icon_add(navibar); snprintf(buf, sizeof(buf), "%s/00_volume_icon.png", ICON_DIR); elm_icon_file_set(content, buf, NULL); evas_object_size_hint_aspect_set(content, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); elm_icon_scale_set(content, 1, 1); - - Evas_Object *segment = elm_segment_control_add(navibar); - elm_segment_control_add_segment(navibar, NULL, "Sg1", EINA_FALSE); - elm_segment_control_add_segment(navibar, NULL, "Sg2", EINA_FALSE); - elm_segment_control_add_segment(navibar, NULL, "Sg3", EINA_FALSE); - evas_object_show(segment); - - elm_navigationbar_push(navibar, "title", NULL, NULL, NULL, content); - elm_navigationbar_title_object_add(NULL, content, segment); + + Evas_Object *title = elm_button_add(navibar); + evas_object_show(title); + + elm_navigationbar_push(navibar, "title", NULL, NULL, NULL, content); + elm_navigationbar_title_object_add(NULL, NULL, NULL); tet_result(TET_PASS); } diff --git a/TC/elm_ts/navigationbar/utc_UIFW_elm_navigationbar_title_object_list_get_func.c b/TC/elm_ts/navigationbar/utc_UIFW_elm_navigationbar_title_object_list_get_func.c index 3a8636c..91b3986 100644 --- a/TC/elm_ts/navigationbar/utc_UIFW_elm_navigationbar_title_object_list_get_func.c +++ b/TC/elm_ts/navigationbar/utc_UIFW_elm_navigationbar_title_object_list_get_func.c @@ -31,7 +31,7 @@ Evas_Object *main_win, *navibar; -char buf[4096]; +char buf[PATH_MAX]; static void startup(void); static void cleanup(void); @@ -61,6 +61,7 @@ static void startup(void) evas_object_show(main_win); navibar = elm_navigationbar_add(main_win); evas_object_show(navibar); + elm_win_resize_object_add(main_win, navibar); } static void cleanup(void) @@ -88,14 +89,11 @@ static void utc_UIFW_elm_navigationbar_title_object_list_get_func_01(void) evas_object_size_hint_aspect_set(content, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); elm_icon_scale_set(content, 1, 1); - Evas_Object *segment = elm_segment_control_add(navibar); - elm_segment_control_add_segment(navibar, NULL, "Sg1", EINA_FALSE); - elm_segment_control_add_segment(navibar, NULL, "Sg2", EINA_FALSE); - elm_segment_control_add_segment(navibar, NULL, "Sg3", EINA_FALSE); - evas_object_show(segment); - - elm_navigationbar_push(navibar, "title", NULL, NULL, NULL, content); - elm_navigationbar_title_object_add(navibar, content, segment); + Evas_Object *title = elm_button_add(navibar); + evas_object_show(title); + + elm_navigationbar_push(navibar, "title", NULL, NULL, NULL, content); + elm_navigationbar_title_object_add(navibar, content, title); Eina_List *list = elm_navigationbar_title_object_list_get(navibar, content); if (!list) { tet_infoline("elm_navigationbar_title_object_list_get() failed in positive test case"); @@ -117,14 +115,12 @@ static void utc_UIFW_elm_navigationbar_title_object_list_get_func_02(void) evas_object_size_hint_aspect_set(content, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); elm_icon_scale_set(content, 1, 1); - Evas_Object *segment = elm_segment_control_add(navibar); - elm_segment_control_add_segment(navibar, NULL, "Sg1", EINA_FALSE); - elm_segment_control_add_segment(navibar, NULL, "Sg2", EINA_FALSE); - elm_segment_control_add_segment(navibar, NULL, "Sg3", EINA_FALSE); - evas_object_show(segment); + Evas_Object *title = elm_button_add(navibar); + evas_object_show(title); - elm_navigationbar_push(navibar, "title", NULL, NULL, NULL, content); - Eina_List *list = elm_navigationbar_title_object_list_get(navibar, content); + elm_navigationbar_push(navibar, "title", NULL, NULL, NULL, content); + elm_navigationbar_title_object_add(navibar, content, title); + Eina_List *list = elm_navigationbar_title_object_list_get(NULL, content); if (list) { tet_infoline("elm_navigationbar_title_object_list_get() failed in negative test case"); tet_result(TET_FAIL); diff --git a/TC/elm_ts/navigationbar/utc_UIFW_elm_navigationbar_title_object_list_unset_func.c b/TC/elm_ts/navigationbar/utc_UIFW_elm_navigationbar_title_object_list_unset_func.c index b7201f9..4036585 100644 --- a/TC/elm_ts/navigationbar/utc_UIFW_elm_navigationbar_title_object_list_unset_func.c +++ b/TC/elm_ts/navigationbar/utc_UIFW_elm_navigationbar_title_object_list_unset_func.c @@ -30,7 +30,7 @@ Evas_Object *main_win, *navibar; -char buf[4096]; +char buf[PATH_MAX]; static void startup(void); @@ -58,9 +58,10 @@ static void startup(void) tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ "); elm_init(0, NULL); main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC); - evas_object_show(main_win); + evas_object_show(main_win); navibar = elm_navigationbar_add(main_win); evas_object_show(navibar); + elm_win_resize_object_add(main_win, navibar); } static void cleanup(void) @@ -89,14 +90,11 @@ static void utc_UIFW_elm_navigationbar_title_object_list_unset_func_01(void) evas_object_size_hint_aspect_set(content, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); elm_icon_scale_set(content, 1, 1); - Evas_Object *segment = elm_segment_control_add(navibar); - elm_segment_control_add_segment(navibar, NULL, "Sg1", EINA_FALSE); - elm_segment_control_add_segment(navibar, NULL, "Sg2", EINA_FALSE); - elm_segment_control_add_segment(navibar, NULL, "Sg3", EINA_FALSE); - evas_object_show(segment); - - elm_navigationbar_push(navibar, "title", NULL, NULL, NULL, content); - elm_navigationbar_title_object_add(navibar, content, segment); + Evas_Object *title = elm_button_add(navibar); + evas_object_show(title); + + elm_navigationbar_push(navibar, "title", NULL, NULL, NULL, content); + elm_navigationbar_title_object_add(navibar, content, title); elm_navigationbar_title_object_list_unset(navibar, content, &list); if (!list) { tet_infoline("elm_navigationbar_title_object_list_unset() failed in positive test case"); @@ -118,13 +116,11 @@ static void utc_UIFW_elm_navigationbar_title_object_list_unset_func_02(void) evas_object_size_hint_aspect_set(content, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); elm_icon_scale_set(content, 1, 1); - Evas_Object *segment = elm_segment_control_add(navibar); - elm_segment_control_add_segment(navibar, NULL, "Sg1", EINA_FALSE); - elm_segment_control_add_segment(navibar, NULL, "Sg2", EINA_FALSE); - elm_segment_control_add_segment(navibar, NULL, "Sg3", EINA_FALSE); - evas_object_show(segment); + Evas_Object *title = elm_button_add(navibar); + evas_object_show(title); - elm_navigationbar_push(navibar, "title", NULL, NULL, NULL, content); + elm_navigationbar_push(navibar, "title", NULL, NULL, NULL, content); + elm_navigationbar_title_object_add(navibar, content, title); elm_navigationbar_title_object_list_unset(NULL, content, &list); if (list) { tet_infoline("elm_navigationbar_title_object_list_unset() failed in negative test case");