tests: update to recent changes

diff --git a/src/tests/elementary/elm_test_focus.c b/src/tests/elementary/elm_test_focus.c
index cf14dc3..250e3b1 100644 (file)
--- a/src/tests/elementary/elm_test_focus.c
+++ b/src/tests/elementary/elm_test_focus.c
@@ -48,20 +48,18 @@ END_TEST
 START_TEST(pos_check)
 {
    Efl_Ui_Focus_Manager *m;
-   Efl_Ui_Focus_Object *middle, *east, *west, *north, *south;
+   Efl_Ui_Focus_Object *middle, *east, *west, *north, *south, *root;
 
    elm_init(1, NULL);
 
    elm_focus_test_setup_cross(&middle, &south, &north, &east, &west);
 
-   m = efl_add(EFL_UI_FOCUS_MANAGER_CLASS, NULL,
-    efl_ui_focus_manager_root_set(efl_added, middle)
-   );
-
-   efl_ui_focus_manager_register(m, north, middle, NULL);
-   efl_ui_focus_manager_register(m, south, middle, NULL);
-   efl_ui_focus_manager_register(m, west, middle, NULL);
-   efl_ui_focus_manager_register(m, east, middle, NULL);
+   m = elm_focus_test_manager_new(&root);
+   efl_ui_focus_manager_register(m, middle, root, NULL);
+   efl_ui_focus_manager_register(m, north, root, NULL);
+   efl_ui_focus_manager_register(m, south, root, NULL);
+   efl_ui_focus_manager_register(m, west, root, NULL);
+   efl_ui_focus_manager_register(m, east, root, NULL);
 
 #define CHECK(obj, r,l,u,d) \
    efl_ui_focus_manager_focus(m, obj); \
@@ -120,7 +118,7 @@ END_TEST
 START_TEST(border_check)
 {
    Efl_Ui_Focus_Manager *m;
-   Efl_Ui_Focus_Object *middle, *east, *west, *north, *south;
+   Efl_Ui_Focus_Object *middle, *east, *west, *north, *south, *root;
    Eina_List *list = NULL;
    Eina_Iterator *iter;
    Efl_Ui_Focus_Object *obj;
@@ -129,13 +127,12 @@ START_TEST(border_check)
 
    elm_focus_test_setup_cross(&middle, &south, &north, &east, &west);
 
-   m = efl_add(EFL_UI_FOCUS_MANAGER_CLASS, NULL,
-      efl_ui_focus_manager_root_set(efl_added, middle)
-    );
-   efl_ui_focus_manager_register(m, south, middle, NULL);
-   efl_ui_focus_manager_register(m, north, middle, NULL);
-   efl_ui_focus_manager_register(m, east, middle, NULL);
-   efl_ui_focus_manager_register(m, west, middle, NULL);
+   m = elm_focus_test_manager_new(&root);
+   efl_ui_focus_manager_register(m, middle, root, NULL);
+   efl_ui_focus_manager_register(m, south, root, NULL);
+   efl_ui_focus_manager_register(m, north, root, NULL);
+   efl_ui_focus_manager_register(m, east, root, NULL);
+   efl_ui_focus_manager_register(m, west, root, NULL);
 
    iter = efl_ui_focus_manager_border_elements_get(m);
 
@@ -160,18 +157,16 @@ END_TEST
 START_TEST(logical_chain)
 {
    Efl_Ui_Focus_Manager *m;
+   Efl_Ui_Focus_Object *lroot;
    int i = 0;
 
    elm_init(1, NULL);
 
    TEST_OBJ_NEW(root, 0, 0, 20, 20);
 
-   m = efl_add(EFL_UI_FOCUS_MANAGER_CLASS, NULL,
-    efl_ui_focus_manager_root_set(efl_added, root)
-   );
-   fail_if(!m);
+   m = elm_focus_test_manager_new(&lroot);
 
-   efl_ui_focus_manager_focus(m, root);
+   fail_if(!m);
 
    i++;
    TEST_OBJ_NEW(child1, 0, i*20, 20, 20);
@@ -195,9 +190,10 @@ START_TEST(logical_chain)
    TEST_OBJ_NEW(subchild23, 0, i*20, 20, 20);
 
    //register everything
+   efl_ui_focus_manager_register(m, root, lroot, NULL);
    efl_ui_focus_manager_register(m, child1, root, NULL);
    efl_ui_focus_manager_register(m, child2, root, NULL);
-   efl_ui_focus_manager_register_logical(m, child3, root);
+   efl_ui_focus_manager_register_logical(m, child3, root, NULL);
    efl_ui_focus_manager_register(m, subchild11, child1, NULL);
    efl_ui_focus_manager_register(m, subchild12, child1, NULL);
    efl_ui_focus_manager_register(m, subchild13, child1, NULL);
@@ -205,6 +201,8 @@ START_TEST(logical_chain)
    efl_ui_focus_manager_register(m, subchild22, child3, NULL);
    efl_ui_focus_manager_register(m, subchild23, child3, NULL);
 
+   efl_ui_focus_manager_focus(m, root);
+
    Efl_Object *logical_chain[] = {
     child1, subchild11, subchild12, subchild13,
     child2, subchild21, subchild22, subchild23, root, NULL

diff --git a/src/tests/elementary/elm_test_focus_common.c b/src/tests/elementary/elm_test_focus_common.c
index 402fac8..1e23553 100644 (file)
--- a/src/tests/elementary/elm_test_focus_common.c
+++ b/src/tests/elementary/elm_test_focus_common.c
@@ -38,6 +38,23 @@ elm_focus_test_setup_cross(Efl_Ui_Focus_Object **middle,
    *west = elm_focus_test_object_new("west", 0, 40, 20, 20);
 }
 
+
+Efl_Ui_Focus_Manager*
+elm_focus_test_manager_new(Efl_Ui_Focus_Object **middle)
+{
+   Efl_Ui_Focus_Object *root;
+   Efl_Ui_Focus_Manager *m;
+
+   root = elm_focus_test_object_new("middle", 40, 40, 20, 20);
+   m = efl_add(EFL_UI_FOCUS_MANAGER_CLASS, NULL,
+     efl_ui_focus_manager_root_set(efl_added, root)
+   );
+   if (middle)
+     *middle = root;
+
+   return m;
+}
+
 //Test class implementation
 
 typedef struct {

diff --git a/src/tests/elementary/elm_test_focus_common.h b/src/tests/elementary/elm_test_focus_common.h
index 97fbdd1..13587ef 100644 (file)
--- a/src/tests/elementary/elm_test_focus_common.h
+++ b/src/tests/elementary/elm_test_focus_common.h
@@ -25,4 +25,5 @@ void elm_focus_test_setup_cross(Efl_Ui_Focus_Object **middle,
                                 Efl_Ui_Focus_Object **east,
                                 Efl_Ui_Focus_Object **west);
 
+Efl_Ui_Focus_Manager *elm_focus_test_manager_new(Efl_Ui_Focus_Object **middle);
 #endif
\ No newline at end of file

diff --git a/src/tests/elementary/elm_test_focus_sub.c b/src/tests/elementary/elm_test_focus_sub.c
index f9012c6..f626014 100644 (file)
--- a/src/tests/elementary/elm_test_focus_sub.c
+++ b/src/tests/elementary/elm_test_focus_sub.c
@@ -18,12 +18,6 @@ _focus_test_sub_efl_ui_focus_object_focus_get(Eo *obj EINA_UNUSED, Focus_Test_Su
    return EINA_FALSE;
 }
 
-EOLIAN static Efl_Ui_Focus_Manager*
-_focus_test_sub_efl_ui_focus_user_manager_get(Eo *obj, Focus_Test_Sub_Data *pd EINA_UNUSED)
-{
-   return efl_parent_get(obj);
-}
-
 static Eina_List *registered;
 static Eina_List *unregistered;
 
@@ -51,11 +45,11 @@ _set_equal(Eina_List *a, Eina_List *b)
    Eina_List *n;
    void *d;
 
-   if (eina_list_count(a) != eina_list_count(b)) return EINA_FALSE;
+   ck_assert_int_eq(eina_list_count(a), eina_list_count(b));
 
    EINA_LIST_FOREACH(a, n, d)
      {
-        if (!eina_list_data_find(b, d)) return EINA_FALSE;
+        ck_assert_ptr_ne(eina_list_data_find(b, d), NULL);
      }
    return EINA_TRUE;
 }
@@ -85,7 +79,6 @@ _setup(Efl_Ui_Focus_Manager **m, Efl_Ui_Focus_Manager_Sub **sub, Efl_Ui_Focus_Ob
    efl_object_override(manager, &manager_tracker);
 
    Efl_Ui_Focus_Manager_Sub *subm = efl_add(FOCUS_TEST_SUB_CLASS, manager,
-    efl_ui_focus_manager_sub_parent_set(efl_added, root_manager),
     efl_ui_focus_manager_root_set(efl_added, root)
    );
 
@@ -110,7 +103,7 @@ START_TEST(correct_register)
    TEST_OBJ_NEW(child3, 0, 10, 10, 10);
 
    set1 = eina_list_append(set1, sub);
-   set1 = eina_list_append(set1, root);
+   //set1 = eina_list_append(set1, root);
    set1 = eina_list_append(set1, child1);
    set1 = eina_list_append(set1, child2);
    set1 = eina_list_append(set1, child3);

diff --git a/src/tests/elementary/focus_test_sub.eo b/src/tests/elementary/focus_test_sub.eo
index 60c6a43..fcf37fd 100644 (file)
--- a/src/tests/elementary/focus_test_sub.eo
+++ b/src/tests/elementary/focus_test_sub.eo
@@ -2,6 +2,5 @@ class Focus.Test.Sub(Efl.Ui.Focus.Manager.Sub) {
     implements {
         Efl.Ui.Focus.Object.geometry_get;
         Efl.Ui.Focus.Object.focus.get;
-        Efl.Ui.Focus.User.manager.get;
     }
 }
\ No newline at end of file