summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c4
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.c18
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.h16
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_signal.c2
-rw-r--r--src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c2
5 files changed, 21 insertions, 21 deletions
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index f47655eba2..09c0f13254 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -98,8 +98,8 @@ START_TEST(eio_model_test_test_monitor_add)
98 filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, tmpdir)); 98 filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, tmpdir));
99 fail_if(!filemodel, "ERROR: Cannot init model!\n"); 99 fail_if(!filemodel, "ERROR: Cannot init model!\n");
100 100
101 eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_CHILD_ADDED, &_children_added_cb, filemodel); 101 eo_event_callback_add(filemodel, EFL_MODEL_EVENT_CHILD_ADDED, &_children_added_cb, filemodel);
102 eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_CHILD_REMOVED, &_children_removed_cb, NULL); 102 eo_event_callback_add(filemodel, EFL_MODEL_EVENT_CHILD_REMOVED, &_children_removed_cb, NULL);
103 103
104 Eina_Promise* promise; 104 Eina_Promise* promise;
105 efl_model_children_slice_get(filemodel, 0, 0, &promise); 105 efl_model_children_slice_get(filemodel, 0, 0, &promise);
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c
index dcd9fe4ac7..361aead2a7 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.c
@@ -102,8 +102,8 @@ efl_model_wait_for_event(Eo *obj, const Eo_Event_Description* event)
102 eo_event_callback_del(obj, event, _eo_event_quit_cb, NULL); 102 eo_event_callback_del(obj, event, _eo_event_quit_cb, NULL);
103} 103}
104 104
105Efl_Model_Base * 105Efl_Model *
106efl_model_nth_child_get(Efl_Model_Base *efl_model, unsigned int n) 106efl_model_nth_child_get(Efl_Model *efl_model, unsigned int n)
107{ 107{
108 Eina_Accessor *accessor; 108 Eina_Accessor *accessor;
109 Eina_Promise *promise; 109 Eina_Promise *promise;
@@ -122,8 +122,8 @@ efl_model_nth_child_get(Efl_Model_Base *efl_model, unsigned int n)
122 return child; 122 return child;
123} 123}
124 124
125Efl_Model_Base * 125Efl_Model *
126efl_model_first_child_get(Efl_Model_Base *efl_model) 126efl_model_first_child_get(Efl_Model *efl_model)
127{ 127{
128 return efl_model_nth_child_get(efl_model, 1); 128 return efl_model_nth_child_get(efl_model, 1);
129} 129}
@@ -180,7 +180,7 @@ create_object(void)
180} 180}
181 181
182void 182void
183check_efl_model_children_count_eq(Efl_Model_Base *efl_model, unsigned int expected_children_count) 183check_efl_model_children_count_eq(Efl_Model *efl_model, unsigned int expected_children_count)
184{ 184{
185 unsigned int actual_children_count; 185 unsigned int actual_children_count;
186 Eina_Promise *promise; 186 Eina_Promise *promise;
@@ -190,7 +190,7 @@ check_efl_model_children_count_eq(Efl_Model_Base *efl_model, unsigned int expect
190} 190}
191 191
192void 192void
193check_efl_model_children_count_ge(Efl_Model_Base *efl_model, unsigned int minimum_children_count) 193check_efl_model_children_count_ge(Efl_Model *efl_model, unsigned int minimum_children_count)
194{ 194{
195 unsigned int actual_children_count; 195 unsigned int actual_children_count;
196 Eina_Promise *promise; 196 Eina_Promise *promise;
@@ -200,7 +200,7 @@ check_efl_model_children_count_ge(Efl_Model_Base *efl_model, unsigned int minimu
200} 200}
201 201
202void 202void
203check_efl_model_children_slice_get(Efl_Model_Base *efl_model) 203check_efl_model_children_slice_get(Efl_Model *efl_model)
204{ 204{
205 unsigned count; 205 unsigned count;
206 Eina_Promise *promise; 206 Eina_Promise *promise;
@@ -400,7 +400,7 @@ eldbus_model_signal_from_proxy_get(Eldbus_Model_Proxy *proxy, const char *signal
400} 400}
401 401
402void 402void
403check_efl_model_property_int_eq(Efl_Model_Base *efl_model, const char *property, int expected_value) 403check_efl_model_property_int_eq(Efl_Model *efl_model, const char *property, int expected_value)
404{ 404{
405 Eina_Value property_value; 405 Eina_Value property_value;
406 Eina_Promise *promise; 406 Eina_Promise *promise;
@@ -420,7 +420,7 @@ check_efl_model_property_int_eq(Efl_Model_Base *efl_model, const char *property,
420} 420}
421 421
422void 422void
423check_efl_model_property_int_set(Efl_Model_Base *efl_model, const char *property, int value) 423check_efl_model_property_int_set(Efl_Model *efl_model, const char *property, int value)
424{ 424{
425 Eina_Value eina_value, value_ret; 425 Eina_Value eina_value, value_ret;
426 Eina_Promise *promise; 426 Eina_Promise *promise;
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.h b/src/tests/eldbus/eldbus_test_eldbus_model.h
index 641073fe4c..53f61fcd3d 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model.h
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.h
@@ -11,14 +11,14 @@ Eo *create_connection(void);
11Eo *create_object(void); 11Eo *create_object(void);
12 12
13void efl_model_wait_for_event(Eo *obj, const Eo_Event_Description *event); 13void efl_model_wait_for_event(Eo *obj, const Eo_Event_Description *event);
14Efl_Model_Base *efl_model_nth_child_get(Efl_Model_Base *obj, unsigned int n); 14Efl_Model *efl_model_nth_child_get(Efl_Model *obj, unsigned int n);
15Efl_Model_Base *efl_model_first_child_get(Efl_Model_Base *efl_model); 15Efl_Model *efl_model_first_child_get(Efl_Model *efl_model);
16 16
17void check_efl_model_children_count_eq(Efl_Model_Base *obj, unsigned int expected_children_count); 17void check_efl_model_children_count_eq(Efl_Model *obj, unsigned int expected_children_count);
18void check_efl_model_children_count_ge(Efl_Model_Base *obj, unsigned int minimum_children_count); 18void check_efl_model_children_count_ge(Efl_Model *obj, unsigned int minimum_children_count);
19void check_efl_model_children_slice_get(Efl_Model_Base *efl_model); 19void check_efl_model_children_slice_get(Efl_Model *efl_model);
20void check_efl_model_property_int_eq(Efl_Model_Base *obj, const char *property, int expected_value); 20void check_efl_model_property_int_eq(Efl_Model *obj, const char *property, int expected_value);
21void check_efl_model_property_int_set(Efl_Model_Base *obj, const char *property, int value); 21void check_efl_model_property_int_set(Efl_Model *obj, const char *property, int value);
22void check_efl_model_promise_error(Eina_Promise *promise, Eina_Error *err); 22void check_efl_model_promise_error(Eina_Promise *promise, Eina_Error *err);
23 23
24 24
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
index e90404dc56..42bcdf38be 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
@@ -127,7 +127,7 @@ START_TEST(signals)
127 127
128 eldbus_model_method_call(ping_method); 128 eldbus_model_method_call(ping_method);
129 129
130 efl_model_wait_for_event(pong_signal, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED); 130 efl_model_wait_for_event(pong_signal, EFL_MODEL_EVENT_PROPERTIES_CHANGED);
131 131
132 check_efl_model_property_int_eq(pong_signal, ARGUMENT_A, 100); 132 check_efl_model_property_int_eq(pong_signal, ARGUMENT_A, 100);
133} 133}
diff --git a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
index 99a11955df..8b5e87e419 100644
--- a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
+++ b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
@@ -85,7 +85,7 @@ _check_property_set(const char *property_name, int expected_property_value, int
85 efl_model_property_set(fake_server_proxy, property_name, &value, NULL); 85 efl_model_property_set(fake_server_proxy, property_name, &value, NULL);
86 eina_value_flush(&value); 86 eina_value_flush(&value);
87 87
88 efl_model_wait_for_event(fake_server_proxy, EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED); 88 efl_model_wait_for_event(fake_server_proxy, EFL_MODEL_EVENT_PROPERTIES_CHANGED);
89 89
90 ck_assert_int_eq(expected_property_value, *actual_property_value); 90 ck_assert_int_eq(expected_property_value, *actual_property_value);
91} 91}