utc_elm_object_focus: make sure elm_win have focus before focus test run

Focus test should be executed after elm_win is focused.

Change-Id: I1b05442ddaa41412f2f8495b5c456607c95027ce

diff --git a/TC/elementary/elm_object/utc_elm_object_focused_item_get.c b/TC/elementary/elm_object/utc_elm_object_focused_item_get.c
index b889f02b96569e8dd89b0e220653860010b35f13..bc111018007f726d7da6894acd33424d1c26481f 100644 (file)
--- a/TC/elementary/elm_object/utc_elm_object_focused_item_get.c
+++ b/TC/elementary/elm_object/utc_elm_object_focused_item_get.c
@@ -42,21 +42,11 @@ teardown(void)
    printf(" ============ Cleanup ============ \n");
 }
 
-static Eina_Bool
-_timer_cb_focused(void *data)
-{
-   ecore_main_loop_quit();
-   return EINA_FALSE;
-}
-
-static Eina_Bool
-_timer_cb(void *data)
+static void
+_win_focused_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
 {
    elm_object_item_focus_set(first, EINA_TRUE);
-
-   ecore_timer_add(1, _timer_cb_focused, NULL);
-
-   return EINA_FALSE;
+   ecore_main_loop_quit();
 }
 
 /**
@@ -97,7 +87,7 @@ START_TEST(utc_elm_object_focused_item_get_p)
    evas_object_resize(list, 200, 200);
    evas_object_show(list);
 
-   ecore_timer_add(1, _timer_cb, NULL);
+   evas_object_smart_callback_add(main_win, "focused", _win_focused_cb, NULL);
 
    ecore_main_loop_begin();
 

diff --git a/TC/elementary/elm_object/utc_elm_object_item_focus.c b/TC/elementary/elm_object/utc_elm_object_item_focus.c
index e2de6c15ea41e47a4e6b7edf64f5a649f2dff051..135dfef63b4857341f7dbe0ea2054f82b8e98fe0 100644 (file)
--- a/TC/elementary/elm_object/utc_elm_object_item_focus.c
+++ b/TC/elementary/elm_object/utc_elm_object_item_focus.c
@@ -40,8 +40,8 @@ teardown(void)
    printf(" ============ Cleanup ============ \n");
 }
 
-static Eina_Bool
-_timer_cb(void *data)
+static void
+_win_focused_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
 {
    ecore_main_loop_quit();
    return EINA_FALSE;
@@ -116,7 +116,7 @@ START_TEST(utc_elm_object_item_focus_p)
 
    elm_object_item_focus_set(first, EINA_TRUE);
 
-   ecore_timer_add(1, _timer_cb, NULL);
+   evas_object_smart_callback_add(main_win, "focused", _win_focused_cb, NULL);
 
    ecore_main_loop_begin();