summaryrefslogtreecommitdiff
path: root/src/tests/eio
diff options
context:
space:
mode:
authorSangHyeon Jade Lee <sh10233.lee@samsung.com>2019-01-31 13:35:34 +0900
committerSangHyeon Jade Lee <sh10233.lee@samsung.com>2019-01-31 14:59:37 +0900
commit5525c89a3d1091cd17c5df6fbdc7378f0d0b4ff3 (patch)
tree16e710a757db55ef1f6de3201b5f4542de3a7680 /src/tests/eio
parentc713bb90d3fe4a56ebd5f4f88cd5a248c5b7e482 (diff)
efl_model : rename all efl_model based classes.
Summary: As the result of discussion in T7458, we need to rename all efl_model based classes with efl_XXX_Model sequence. I've run few vote for this, see V42, V43 few classes are totally renamed as our consideration of misnaming. | Efl.Model_Loop | Efl.Loop_Model | | Efl.Model_Item | Efl.Generic_Model | | Efl.Model_Container | Efl.Container_Model | | Efl.Model_Container_Item | Efl.Container_Model_Item | | Efl.Model_Composite | Efl.Composite_Model | | Efl.Model_Composite_Boolean | Efl.Boolean_Model | | Efl.Model_Composite_Boolean_Chlidren | Efl.Boolean_Model_Item | | Efl.Model_Composite_Selection | Efl.Select_Model | | Efl.Model_Composite_Selection_Chlidren | Efl.Select_Model_Item | | Efl.Model_View | Efl.View_Model | | Eio.Model | Efl.Io.Model | | Efl.Ui.Model_State | Efl.Ui.State_Model | | Efl.Ui.Model_Size | Efl.Ui.Size_Model | | Efl.Ui.Model_Exact | Efl.Ui.Exact_Model | | Efl.Ui.Model_Average | Efl.Ui.Average_Model | | Efl.Ui.Model_Homogeneous | Efl.Ui.Homogeneous_Model | I worried about Efl.Io.Model changes, cause it is widely used, but as I tested, there is no issue found yet. Eldbus.Model also may can changed Efl.Dbus.Model, but I cannot found any class who using Efl.Dbus namespace, so I left it future work. Test Plan: Run the Make Test, it works well except Efl test about selection. there are class inheritance problem exist in select_model, I reported it and will fix it in another patch. Reviewers: cedric, felipealmeida, woohyun, Hermet Reviewed By: cedric Subscribers: lauromoura Tags: #efl, #do_not_merge Differential Revision: https://phab.enlightenment.org/D7533
Diffstat (limited to 'src/tests/eio')
-rw-r--r--src/tests/eio/efl_io_model_test_file.c (renamed from src/tests/eio/eio_model_test_file.c)10
-rw-r--r--src/tests/eio/efl_io_model_test_monitor_add.c (renamed from src/tests/eio/eio_model_test_monitor_add.c)10
-rw-r--r--src/tests/eio/eio_suite.c4
-rw-r--r--src/tests/eio/eio_suite.h4
-rw-r--r--src/tests/eio/meson.build4
5 files changed, 16 insertions, 16 deletions
diff --git a/src/tests/eio/eio_model_test_file.c b/src/tests/eio/efl_io_model_test_file.c
index 53e941fe2c..f714761c66 100644
--- a/src/tests/eio/eio_model_test_file.c
+++ b/src/tests/eio/efl_io_model_test_file.c
@@ -158,7 +158,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(model,
158 { EFL_MODEL_EVENT_PROPERTIES_CHANGED, _property_changed }, 158 { EFL_MODEL_EVENT_PROPERTIES_CHANGED, _property_changed },
159 { EFL_MODEL_EVENT_CHILD_ADDED, _child_added }) 159 { EFL_MODEL_EVENT_CHILD_ADDED, _child_added })
160 160
161EFL_START_TEST(eio_model_test_test_file) 161EFL_START_TEST(efl_io_model_test_test_file)
162{ 162{
163 Eo *filemodel = NULL; 163 Eo *filemodel = NULL;
164 Eina_Value *result; 164 Eina_Value *result;
@@ -166,8 +166,8 @@ EFL_START_TEST(eio_model_test_test_file)
166 166
167 memset(&reqs, 0, sizeof(struct reqs_t)); 167 memset(&reqs, 0, sizeof(struct reqs_t));
168 168
169 filemodel = efl_add(EIO_MODEL_CLASS, efl_main_loop_get(), 169 filemodel = efl_add(EFL_IO_MODEL_CLASS, efl_main_loop_get(),
170 eio_model_path_set(efl_added, EFL_MODEL_TEST_FILENAME_PATH)); 170 efl_io_model_path_set(efl_added, EFL_MODEL_TEST_FILENAME_PATH));
171 fail_if(!filemodel, "ERROR: Cannot init model!\n"); 171 fail_if(!filemodel, "ERROR: Cannot init model!\n");
172 172
173 handler = ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, exit_func, NULL); 173 handler = ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, exit_func, NULL);
@@ -196,7 +196,7 @@ EFL_START_TEST(eio_model_test_test_file)
196EFL_END_TEST 196EFL_END_TEST
197 197
198void 198void
199eio_model_test_file(TCase *tc) 199efl_io_model_test_file(TCase *tc)
200{ 200{
201 tcase_add_test(tc, eio_model_test_test_file); 201 tcase_add_test(tc, efl_io_model_test_test_file);
202} 202}
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/efl_io_model_test_monitor_add.c
index fb1edbdd01..7fee539015 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/efl_io_model_test_monitor_add.c
@@ -92,15 +92,15 @@ _children_added_cb(void *d EINA_UNUSED, const Efl_Event* event)
92 eina_future_then(future, _children_get, event->object, NULL); 92 eina_future_then(future, _children_get, event->object, NULL);
93} 93}
94 94
95EFL_START_TEST(eio_model_test_test_monitor_add) 95EFL_START_TEST(efl_io_model_test_test_monitor_add)
96{ 96{
97 Eo *filemodel = NULL; 97 Eo *filemodel = NULL;
98 98
99 tmpdir = eina_environment_tmp_get(); 99 tmpdir = eina_environment_tmp_get();
100 100
101 filemodel = efl_add(EIO_MODEL_CLASS, 101 filemodel = efl_add(EFL_IO_MODEL_CLASS,
102 efl_main_loop_get(), 102 efl_main_loop_get(),
103 eio_model_path_set(efl_added, tmpdir)); 103 efl_io_model_path_set(efl_added, tmpdir));
104 fail_if(!filemodel, "ERROR: Cannot init model!\n"); 104 fail_if(!filemodel, "ERROR: Cannot init model!\n");
105 105
106 efl_event_callback_add(filemodel, EFL_MODEL_EVENT_CHILD_ADDED, &_children_added_cb, filemodel); 106 efl_event_callback_add(filemodel, EFL_MODEL_EVENT_CHILD_ADDED, &_children_added_cb, filemodel);
@@ -115,7 +115,7 @@ EFL_START_TEST(eio_model_test_test_monitor_add)
115EFL_END_TEST 115EFL_END_TEST
116 116
117void 117void
118eio_model_test_monitor_add(TCase *tc) 118efl_io_model_test_monitor_add(TCase *tc)
119{ 119{
120 tcase_add_test(tc, eio_model_test_test_monitor_add); 120 tcase_add_test(tc, efl_io_model_test_test_monitor_add);
121} 121}
diff --git a/src/tests/eio/eio_suite.c b/src/tests/eio/eio_suite.c
index 45ea556639..59579f06d8 100644
--- a/src/tests/eio/eio_suite.c
+++ b/src/tests/eio/eio_suite.c
@@ -24,8 +24,8 @@ static const Efl_Test_Case etc[] = {
24 {"Eio", eio_test_init}, 24 {"Eio", eio_test_init},
25 {"Eio_Monitor", eio_test_monitor}, 25 {"Eio_Monitor", eio_test_monitor},
26 {"Eio_Sentry", eio_test_sentry}, 26 {"Eio_Sentry", eio_test_sentry},
27 {"Eio Model", eio_model_test_file}, 27 {"Efl Io Model", efl_io_model_test_file},
28 {"Eio Model Monitor", eio_model_test_monitor_add}, 28 {"Efl Io Model Monitor", efl_io_model_test_monitor_add},
29 {"Eio File", eio_test_file}, 29 {"Eio File", eio_test_file},
30 {"Eio Job", eio_test_job}, 30 {"Eio Job", eio_test_job},
31#ifdef XATTR_TEST_DIR 31#ifdef XATTR_TEST_DIR
diff --git a/src/tests/eio/eio_suite.h b/src/tests/eio/eio_suite.h
index 4f66cbc86b..46347823ba 100644
--- a/src/tests/eio/eio_suite.h
+++ b/src/tests/eio/eio_suite.h
@@ -5,8 +5,8 @@
5#include "../efl_check.h" 5#include "../efl_check.h"
6void eio_test_monitor(TCase *tc); 6void eio_test_monitor(TCase *tc);
7void eio_test_sentry(TCase *tc); 7void eio_test_sentry(TCase *tc);
8void eio_model_test_file(TCase *tc); 8void efl_io_model_test_file(TCase *tc);
9void eio_model_test_monitor_add(TCase *tc); 9void efl_io_model_test_monitor_add(TCase *tc);
10void eio_test_file(TCase *tc); 10void eio_test_file(TCase *tc);
11void eio_test_job(TCase *tc); 11void eio_test_job(TCase *tc);
12void eio_test_job_xattr(TCase *tc); 12void eio_test_job_xattr(TCase *tc);
diff --git a/src/tests/eio/meson.build b/src/tests/eio/meson.build
index 09feb3769b..516ac2417d 100644
--- a/src/tests/eio/meson.build
+++ b/src/tests/eio/meson.build
@@ -1,7 +1,7 @@
1eio_suite_src = [ 1eio_suite_src = [
2 'eio_suite.c', 2 'eio_suite.c',
3 'eio_model_test_file.c', 3 'efl_io_model_test_file.c',
4 'eio_model_test_monitor_add.c', 4 'efl_io_model_test_monitor_add.c',
5 'eio_test_monitor.c', 5 'eio_test_monitor.c',
6 'eio_test_sentry.c', 6 'eio_test_sentry.c',
7 'eio_test_file.c', 7 'eio_test_file.c',