Merge "[entry] fixed bug in getting geometry of wd->scroller"

[framework/uifw/elementary.git] / TC / elm_ts / navigationbar_ex / utc_UIFW_elm_navigationbar_ex_item_pop_func.c

diff --git a/TC/elm_ts/navigationbar_ex/utc_UIFW_elm_navigationbar_ex_item_pop_func.c b/TC/elm_ts/navigationbar_ex/utc_UIFW_elm_navigationbar_ex_item_pop_func.c
index 5a14eec..79645d1 100644 (file)
--- a/TC/elm_ts/navigationbar_ex/utc_UIFW_elm_navigationbar_ex_item_pop_func.c
+++ b/TC/elm_ts/navigationbar_ex/utc_UIFW_elm_navigationbar_ex_item_pop_func.c
@@ -27,7 +27,9 @@
 }
 
 
-Evas_Object *main_win;
+Evas_Object *main_win, *navi_ex;
+Elm_Navigationbar_ex_Item* item;
+
 
 static void startup(void);
 static void cleanup(void);
@@ -54,7 +56,14 @@ 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);
+       navi_ex = elm_navigationbar_ex_add(main_win);
+       evas_object_show(navi_ex);
+       Evas_Object *btn = elm_button_add(navi_ex);
+       evas_object_show(btn);
+       item = elm_navigationbar_ex_item_push(navi_ex, btn, "topbar_1fn");
+       elm_navigationbar_ex_item_title_button_set(item, "button", NULL, ELM_NAVIGATIONBAR_EX_FUNCTION_BUTTON1, NULL, NULL);
+       elm_win_resize_object_add(main_win, navi_ex);
 }
 
 static void cleanup(void)
@@ -72,16 +81,7 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_navigationbar_ex_item_pop_func_01(void)
 {
-       int r = 0;
-
-/*
-       r = elm_navigationbar_ex_item_pop(...);
-*/
-       if (!r) {
-               tet_infoline("elm_navigationbar_ex_item_pop() failed in positive test case");
-               tet_result(TET_FAIL);
-               return;
-       }
+       elm_navigationbar_ex_item_pop(navi_ex);
        tet_result(TET_PASS);
 }
 
@@ -90,15 +90,6 @@ static void utc_UIFW_elm_navigationbar_ex_item_pop_func_01(void)
  */
 static void utc_UIFW_elm_navigationbar_ex_item_pop_func_02(void)
 {
-       int r = 0;
-
-/*
-       r = elm_navigationbar_ex_item_pop(...);
-*/
-       if (r) {
-               tet_infoline("elm_navigationbar_ex_item_pop() failed in negative test case");
-               tet_result(TET_FAIL);
-               return;
-       }
+       elm_navigationbar_ex_item_pop(NULL);
        tet_result(TET_PASS);
 }