Efl_Ui: Move elementary and change namespace Ui for ui related models

Summary:
Select and View is ui characteristic features,
so Efl_Select_Model and Efl_View_Model move to elementary from ecore
seems more natural.

namespace also should changed to Efl.Ui as it's right place.

Test Plan: run the test while building it

Reviewers: cedric, felipealmeida, bu5hm4n, zmike, lauromoura

Reviewed By: zmike

Subscribers: #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D9820

9 files changed, 149 insertions, 117 deletions

diff --git a/src/tests/efl/efl_suite.c b/src/tests/efl/efl_suite.c
index 4385b82f72..d5a444b3bf 100644
--- a/src/tests/efl/efl_suite.c
+++ b/src/tests/efl/efl_suite.c
@@ -27,7 +27,6 @@
 
 static const Efl_Test_Case etc[] = {
    { "Efl_Container_Model", efl_test_case_container_model },
-   { "Efl_View_Model", efl_test_case_view_model },
    { "Efl_Boolean_Model", efl_test_case_boolean_model },
    { NULL, NULL }
 };
diff --git a/src/tests/efl/efl_suite.h b/src/tests/efl/efl_suite.h
index 4a670deab9..2d4cc7af21 100644
--- a/src/tests/efl/efl_suite.h
+++ b/src/tests/efl/efl_suite.h
@@ -22,7 +22,6 @@
 #include <check.h>
 #include "../efl_check.h"
 void efl_test_case_container_model(TCase *tc);
-void efl_test_case_view_model(TCase *tc);
 void efl_test_case_boolean_model(TCase *tc);
 
 #endif /* EFL_SUITE_H_ */
diff --git a/src/tests/efl/efl_test_composite_model.c b/src/tests/efl/efl_test_composite_model.c
index b3c9ebdc33..9538a1173f 100644
--- a/src/tests/efl/efl_test_composite_model.c
+++ b/src/tests/efl/efl_test_composite_model.c
@@ -70,47 +70,6 @@ _children_slice_get_then(void *data EINA_UNUSED,
    return v;
 }
 
-static Eina_Value
-_selection_children_slice_get_then(void *data EINA_UNUSED,
-                                   const Eina_Value v,
-                                   const Eina_Future *dead_future EINA_UNUSED)
-{
-   unsigned int i, len;
-   Efl_Model *child = NULL;
-
-   fail_if(eina_value_type_get(&v) != EINA_VALUE_TYPE_ARRAY);
-
-   EINA_VALUE_ARRAY_FOREACH(&v, len, i, child)
-     {
-        Eina_Value *p_int = NULL;
-        Eina_Value *p_bool = NULL;
-        Eina_Value *p_index = NULL;
-        int v_int = 0;
-        unsigned int index = 0;
-        Eina_Bool v_bool = EINA_FALSE;
-
-        p_bool = efl_model_property_get(child, "selected");
-        p_int = efl_model_property_get(child, "test_p_int");
-        p_index = efl_model_property_get(child, "child.index");
-
-        eina_value_get(p_bool, &v_bool);
-        eina_value_get(p_int, &v_int);
-        fail_if(!eina_value_uint_convert(p_index, &index));
-
-        fail_if(v_bool != base_selections[i]);
-        fail_if(v_int != base_ints[i]);
-        ck_assert_int_eq(i, index);
-
-        eina_value_free(p_bool);
-        eina_value_free(p_int);
-        eina_value_free(p_index);
-     }
-
-   ecore_main_loop_quit();
-
-   return v;
-}
-
 EFL_START_TEST(efl_test_boolean_model)
 {
    Efl_Generic_Model *base_model, *child;
@@ -145,62 +104,6 @@ EFL_START_TEST(efl_test_boolean_model)
 }
 EFL_END_TEST
 
-static Eina_Value
-_wait_propagate(void *data EINA_UNUSED,
-                const Eina_Value v,
-                const Eina_Future *dead_future EINA_UNUSED)
-{
-   ecore_main_loop_quit();
-   return v;
-}
-
-EFL_START_TEST(efl_test_select_model)
-{
-   Efl_Generic_Model *base_model, *child;
-   int i;
-   Eina_Value v = { 0 };
-   Efl_Select_Model *model;
-   Eina_Future *future;
-   Eina_Iterator *it;
-   uint64_t *index;
-
-   eina_value_setup(&v, EINA_VALUE_TYPE_INT);
-
-   base_model = efl_add_ref(EFL_GENERIC_MODEL_CLASS, efl_main_loop_get());
-   ck_assert(!!base_model);
-
-   for (i = 0; i < child_number; ++i)
-     {
-        child = efl_model_child_add(base_model);
-        ck_assert(!!child);
-        ck_assert(eina_value_set(&v, base_ints[i]));
-        efl_model_property_set(child, "test_p_int", &v);
-     }
-
-   model = efl_add_ref(EFL_SELECT_MODEL_CLASS, efl_main_loop_get(),
-                   efl_ui_view_model_set(efl_added, base_model));
-   ck_assert(!!model);
-   future = efl_model_property_set(model, "child.selected", eina_value_int_new(2));
-   eina_future_then(future, _wait_propagate, NULL, NULL);
-   ecore_main_loop_begin();
-
-   future = efl_model_children_slice_get(model, 0, efl_model_children_count_get(model));
-   eina_future_then(future, _selection_children_slice_get_then, NULL, NULL);
-
-   ecore_main_loop_begin();
-
-   it = efl_select_model_selected_get(model);
-   EINA_ITERATOR_FOREACH(it, index)
-     fail_if(*index != 2);
-   eina_iterator_free(it);
-
-   it = efl_select_model_unselected_get(model);
-   EINA_ITERATOR_FOREACH(it, index)
-     fail_if(*index == 2);
-   eina_iterator_free(it);
-}
-EFL_END_TEST
-
 typedef struct _Efl_Filter_Model_Wait Efl_Filter_Model_Wait;
 struct _Efl_Filter_Model_Wait
 {
@@ -465,6 +368,5 @@ void
 efl_test_case_boolean_model(TCase *tc)
 {
    tcase_add_test(tc, efl_test_boolean_model);
-   tcase_add_test(tc, efl_test_select_model);
    tcase_add_test(tc, efl_test_filter_model);
 }
diff --git a/src/tests/efl/meson.build b/src/tests/efl/meson.build
index 6bd1353804..aba64ac2f3 100644
--- a/src/tests/efl/meson.build
+++ b/src/tests/efl/meson.build
@@ -3,7 +3,6 @@ efl_suite_src = [
   'efl_suite.h',
   'efl_test_composite_model.c',
   'efl_test_container_model.c',
-  'efl_test_view_model.c'
 ]
 
 efl_suite_bin = executable('efl_suite',
diff --git a/src/tests/elementary/efl_ui_suite.c b/src/tests/elementary/efl_ui_suite.c
index 07f3c40b06..b893f253c1 100644
--- a/src/tests/elementary/efl_ui_suite.c
+++ b/src/tests/elementary/efl_ui_suite.c
@@ -38,6 +38,8 @@ static const Efl_Test_Case etc[] = {
   { "efl_ui_collection", efl_ui_test_item_container },
   { "efl_ui_grid_container", efl_ui_test_grid_container },
   { "efl_ui_list_container", efl_ui_test_list_container },
+  { "efl_ui_select_model", efl_ui_test_select_model },
+  { "efl_ui_view_model", efl_ui_test_view_model },
   { NULL, NULL }
 };
 
diff --git a/src/tests/elementary/efl_ui_suite.h b/src/tests/elementary/efl_ui_suite.h
index 0ddf9bd62f..00294a9a71 100644
--- a/src/tests/elementary/efl_ui_suite.h
+++ b/src/tests/elementary/efl_ui_suite.h
@@ -49,6 +49,8 @@ void efl_ui_test_grid_container(TCase *tc);
 void efl_ui_test_config(TCase *tc);
 void efl_ui_test_popup(TCase *tc);
 void efl_ui_test_scroller(TCase *tc);
+void efl_ui_test_select_model(TCase *tc);
+void efl_ui_test_view_model(TCase *tc);
 
 void loop_timer_interval_set(Eo *obj, double in);
 
diff --git a/src/tests/elementary/efl_ui_test_select_model.c b/src/tests/elementary/efl_ui_test_select_model.c
new file mode 100644
index 0000000000..e11155c0aa
--- /dev/null
+++ b/src/tests/elementary/efl_ui_test_select_model.c
@@ -0,0 +1,130 @@
+/* EFL - EFL library
+ * Copyright (C) 2013 Cedric Bail
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library;
+ * if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "efl_ui_suite.h"
+
+static const int child_number = 3;
+static const int base_ints[] = { 41, 42, 43 };
+static const Eina_Bool base_selections[] = { EINA_FALSE, EINA_FALSE, EINA_TRUE };
+
+static Eina_Value
+_selection_children_slice_get_then(void *data EINA_UNUSED,
+                                   const Eina_Value v,
+                                   const Eina_Future *dead_future EINA_UNUSED)
+{
+   unsigned int i, len;
+   Efl_Model *child = NULL;
+
+   fail_if(eina_value_type_get(&v) != EINA_VALUE_TYPE_ARRAY);
+
+   EINA_VALUE_ARRAY_FOREACH(&v, len, i, child)
+     {
+        Eina_Value *p_int = NULL;
+        Eina_Value *p_bool = NULL;
+        Eina_Value *p_index = NULL;
+        int v_int = 0;
+        unsigned int index = 0;
+        Eina_Bool v_bool = EINA_FALSE;
+
+        p_bool = efl_model_property_get(child, "selected");
+        p_int = efl_model_property_get(child, "test_p_int");
+        p_index = efl_model_property_get(child, "child.index");
+
+        eina_value_get(p_bool, &v_bool);
+        eina_value_get(p_int, &v_int);
+        fail_if(!eina_value_uint_convert(p_index, &index));
+
+        fail_if(v_bool != base_selections[i]);
+        fail_if(v_int != base_ints[i]);
+        ck_assert_int_eq(i, index);
+
+        eina_value_free(p_bool);
+        eina_value_free(p_int);
+        eina_value_free(p_index);
+     }
+
+   ecore_main_loop_quit();
+
+   return v;
+}
+
+static Eina_Value
+_wait_propagate(void *data EINA_UNUSED,
+                const Eina_Value v,
+                const Eina_Future *dead_future EINA_UNUSED)
+{
+   ecore_main_loop_quit();
+   return v;
+}
+
+EFL_START_TEST(efl_test_select_model)
+{
+   Efl_Generic_Model *base_model, *child;
+   int i;
+   Eina_Value v = { 0 };
+   Efl_Ui_Select_Model *model;
+   Eina_Future *future;
+   Eina_Iterator *it;
+   uint64_t *index;
+
+   eina_value_setup(&v, EINA_VALUE_TYPE_INT);
+
+   base_model = efl_add_ref(EFL_GENERIC_MODEL_CLASS, efl_main_loop_get());
+   ck_assert(!!base_model);
+
+   for (i = 0; i < child_number; ++i)
+     {
+        child = efl_model_child_add(base_model);
+        ck_assert(!!child);
+        ck_assert(eina_value_set(&v, base_ints[i]));
+        efl_model_property_set(child, "test_p_int", &v);
+     }
+
+   model = efl_add_ref(EFL_UI_SELECT_MODEL_CLASS, efl_main_loop_get(),
+                   efl_ui_view_model_set(efl_added, base_model));
+   ck_assert(!!model);
+   future = efl_model_property_set(model, "child.selected", eina_value_int_new(2));
+   eina_future_then(future, _wait_propagate, NULL, NULL);
+   ecore_main_loop_begin();
+
+   future = efl_model_children_slice_get(model, 0, efl_model_children_count_get(model));
+   eina_future_then(future, _selection_children_slice_get_then, NULL, NULL);
+
+   ecore_main_loop_begin();
+
+   it = efl_ui_select_model_selected_get(model);
+   EINA_ITERATOR_FOREACH(it, index)
+     fail_if(*index != 2);
+   eina_iterator_free(it);
+
+   it = efl_ui_select_model_unselected_get(model);
+   EINA_ITERATOR_FOREACH(it, index)
+     fail_if(*index == 2);
+   eina_iterator_free(it);
+}
+EFL_END_TEST
+
+void
+efl_ui_test_select_model(TCase *tc)
+{
+   tcase_add_test(tc, efl_test_select_model);
+}
diff --git a/src/tests/efl/efl_test_view_model.c b/src/tests/elementary/efl_ui_test_view_model.c
index 13e0a13027..b282ea1252 100644
--- a/src/tests/efl/efl_test_view_model.c
+++ b/src/tests/elementary/efl_ui_test_view_model.c
@@ -20,10 +20,7 @@
 # include "config.h"
 #endif
 
-#include "efl_suite.h"
-
-#include <Efl.h>
-#include <Ecore.h>
+#include "efl_ui_suite.h"
 
 static const int child_number = 3;
 static const int base_ints[] = { 41, 42, 43 };
@@ -31,7 +28,7 @@ static const char *_efl_test_view_model_label_format = "Index %i.";
 static const char *dependences[] = { "test_p_int" };
 
 static Eina_Value *
-_efl_test_view_model_label_get(void *data, const Efl_View_Model *mv, Eina_Stringshare *property)
+_efl_test_view_model_label_get(void *data, const Efl_Ui_View_Model *mv, Eina_Stringshare *property)
 {
    Eina_Strbuf *buf;
    Eina_Value *r;
@@ -54,7 +51,7 @@ _efl_test_view_model_label_get(void *data, const Efl_View_Model *mv, Eina_String
 }
 
 static Eina_Future *
-_efl_test_view_model_label_set(void *data EINA_UNUSED, Efl_View_Model *mv, Eina_Stringshare *property EINA_UNUSED, Eina_Value *value EINA_UNUSED)
+_efl_test_view_model_label_set(void *data EINA_UNUSED, Efl_Ui_View_Model *mv, Eina_Stringshare *property EINA_UNUSED, Eina_Value *value EINA_UNUSED)
 {
    return efl_loop_future_rejected(mv, EFL_MODEL_ERROR_READ_ONLY);
 }
@@ -66,7 +63,7 @@ _efl_test_view_model_label_clean(void *data)
 }
 
 static Eina_Value *
-_efl_test_view_model_color_get(void *data EINA_UNUSED, const Efl_View_Model *mv, Eina_Stringshare *property)
+_efl_test_view_model_color_get(void *data EINA_UNUSED, const Efl_Ui_View_Model *mv, Eina_Stringshare *property)
 {
    Eina_Strbuf *buf;
    Eina_Value *r;
@@ -88,7 +85,7 @@ _efl_test_view_model_color_get(void *data EINA_UNUSED, const Efl_View_Model *mv,
 }
 
 static Eina_Future *
-_efl_test_view_model_color_set(void *data EINA_UNUSED, Efl_View_Model *mv, Eina_Stringshare *property EINA_UNUSED, Eina_Value *value EINA_UNUSED)
+_efl_test_view_model_color_set(void *data EINA_UNUSED, Efl_Ui_View_Model *mv, Eina_Stringshare *property EINA_UNUSED, Eina_Value *value EINA_UNUSED)
 {
    return efl_loop_future_rejected(mv, EFL_MODEL_ERROR_READ_ONLY);
 }
@@ -318,36 +315,36 @@ EFL_START_TEST(efl_test_view_model)
         efl_model_property_set(child, "test_p_int", &v);
      }
 
-   mv = efl_add_ref(EFL_VIEW_MODEL_CLASS, efl_main_loop_get(),
+   mv = efl_add_ref(EFL_UI_VIEW_MODEL_CLASS, efl_main_loop_get(),
                     efl_ui_view_model_set(efl_added, base_model));
    ck_assert(!!mv);
 
-   efl_view_model_property_logic_add(mv, "label",
+   efl_ui_view_model_property_logic_add(mv, "label",
                                      (void*) _efl_test_view_model_label_format, _efl_test_view_model_label_get, _efl_test_view_model_label_clean,
                                      (void*) _efl_test_view_model_label_format, _efl_test_view_model_label_set, _efl_test_view_model_label_clean,
                                      EINA_C_ARRAY_ITERATOR_NEW(dependences));
 
-   efl_view_model_property_logic_add(mv, "color",
+   efl_ui_view_model_property_logic_add(mv, "color",
                                      NULL, _efl_test_view_model_color_get, _efl_test_view_model_color_clean,
                                      NULL, _efl_test_view_model_color_set, _efl_test_view_model_color_clean,
                                      EINA_C_ARRAY_ITERATOR_NEW(dependences));
 
-   efl_view_model_property_logic_add(mv, "deadend",
+   efl_ui_view_model_property_logic_add(mv, "deadend",
                                      NULL, NULL, NULL,
                                      NULL, NULL, NULL,
                                      NULL);
 
-   efl_view_model_property_string_add(mv, "output",
+   efl_ui_view_model_property_string_add(mv, "output",
                                       "${label} has ${color} for index ${index}",
                                       "${index} not ready",
                                       "${index} in error");
 
-   efl_view_model_property_string_add(mv, "broken",
+   efl_ui_view_model_property_string_add(mv, "broken",
                                       "${nope} has ${color} for index ${index}",
                                       "${index} not ready",
                                       "${index} in error with '${nope}'");
 
-   efl_view_model_property_string_add(mv, "weird", "${} % { } has ${", NULL, NULL);
+   efl_ui_view_model_property_string_add(mv, "weird", "${} % { } has ${", NULL, NULL);
 
    f = efl_model_children_slice_get(mv, 0, efl_model_children_count_get(mv));
    f = efl_future_then(mv, f, .success_type = EINA_VALUE_TYPE_ARRAY,
@@ -367,7 +364,7 @@ EFL_START_TEST(efl_test_view_model)
 EFL_END_TEST
 
 void
-efl_test_case_view_model(TCase *tc)
+efl_ui_test_view_model(TCase *tc)
 {
    tcase_add_test(tc, efl_test_view_model);
 }
diff --git a/src/tests/elementary/meson.build b/src/tests/elementary/meson.build
index 5204c6473a..161a389967 100644
--- a/src/tests/elementary/meson.build
+++ b/src/tests/elementary/meson.build
@@ -154,6 +154,8 @@ efl_ui_suite_src = [
   'efl_ui_test_position_manager_common.c',
   'efl_ui_test_popup.c',
   'efl_ui_test_scroller.c',
+  'efl_ui_test_select_model.c',
+  'efl_ui_test_view_model.c',
 ]
 
 efl_ui_suite = executable('efl_ui_suite',