summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-15 14:07:52 +0000
committerTom Hacohen <tom@stosb.com>2016-03-15 15:25:54 +0000
commit8706d03b43a59578e9c0965545efbc13f4407cab (patch)
treee9c954901591f42c7c6dddb9763438db04b84215 /src/tests
parentbd2a9015c354073a4bd378d5c5362397f2aee6e4 (diff)
Change the EFL according to the renaming of the eo_add() current object.
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/ecore/ecore_test_animator.c4
-rw-r--r--src/tests/eio/eio_model_test_file.c2
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c2
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.c4
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_method.c2
-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
-rw-r--r--src/tests/eo/constructors/constructors_main.c4
-rw-r--r--src/tests/eo/suite/eo_test_general.c8
-rw-r--r--src/tests/eo/suite/eo_test_threaded_calls.c2
-rw-r--r--src/tests/eolian_js/eolian_js_test_constructor_method_impl.c4
-rw-r--r--src/tests/evas/evas_test_image.c2
12 files changed, 19 insertions, 19 deletions
diff --git a/src/tests/ecore/ecore_test_animator.c b/src/tests/ecore/ecore_test_animator.c
index e2f17bcd9c..c4487e79e7 100644
--- a/src/tests/ecore/ecore_test_animator.c
+++ b/src/tests/ecore/ecore_test_animator.c
@@ -30,7 +30,7 @@ START_TEST(ecore_test_animators)
30 fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n"); 30 fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
31 31
32 ecore_animator_frametime_set(interval1); 32 ecore_animator_frametime_set(interval1);
33 animator = eo_add(ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(eoid, 1, _anim_cb, &interval1)); 33 animator = eo_add(ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(eo_self, 1, _anim_cb, &interval1));
34 34
35 fail_if(!animator); 35 fail_if(!animator);
36 36
@@ -38,7 +38,7 @@ START_TEST(ecore_test_animators)
38 38
39 ecore_animator_frametime_set(interval2); 39 ecore_animator_frametime_set(interval2);
40 prev = 0; 40 prev = 0;
41 animator = eo_add(ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(eoid, 1, _anim_cb, &interval2)); 41 animator = eo_add(ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(eo_self, 1, _anim_cb, &interval2));
42 fail_if(!animator); 42 fail_if(!animator);
43 43
44 ecore_main_loop_begin(); 44 ecore_main_loop_begin();
diff --git a/src/tests/eio/eio_model_test_file.c b/src/tests/eio/eio_model_test_file.c
index 5873d7ab83..dc89c6f14a 100644
--- a/src/tests/eio/eio_model_test_file.c
+++ b/src/tests/eio/eio_model_test_file.c
@@ -165,7 +165,7 @@ START_TEST(eio_model_test_test_file)
165 fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n"); 165 fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
166 fail_if(!eio_init(), "ERROR: Cannot init EIO!\n"); 166 fail_if(!eio_init(), "ERROR: Cannot init EIO!\n");
167 167
168 filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eoid, EFL_MODEL_TEST_FILENAME_PATH)); 168 filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, EFL_MODEL_TEST_FILENAME_PATH));
169 fail_if(!filemodel, "ERROR: Cannot init model!\n"); 169 fail_if(!filemodel, "ERROR: Cannot init model!\n");
170 170
171 eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_LOAD_STATUS, _load_status_cb, NULL); 171 eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_LOAD_STATUS, _load_status_cb, NULL);
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index b718edd137..dd92ef0a51 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -125,7 +125,7 @@ START_TEST(eio_model_test_test_monitor_add)
125 125
126 tmpdir = eina_environment_tmp_get(); 126 tmpdir = eina_environment_tmp_get();
127 127
128 filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eoid, tmpdir)); 128 filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, tmpdir));
129 fail_if(!filemodel, "ERROR: Cannot init model!\n"); 129 fail_if(!filemodel, "ERROR: Cannot init model!\n");
130 130
131 eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_CHILD_ADDED, _children_added_cb, NULL); 131 eo_event_callback_add(filemodel, EFL_MODEL_BASE_EVENT_CHILD_ADDED, _children_added_cb, NULL);
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c
index 5439217e46..b89f1e9ac9 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.c
@@ -123,7 +123,7 @@ check_property(Eo *object, const char *property_name, const char *expected_value
123Eo * 123Eo *
124create_connection(void) 124create_connection(void)
125{ 125{
126 Eo *connection = eo_add_ref(ELDBUS_MODEL_CONNECTION_CLASS, NULL, eldbus_model_connection_constructor(eoid, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE)); 126 Eo *connection = eo_add_ref(ELDBUS_MODEL_CONNECTION_CLASS, NULL, eldbus_model_connection_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE));
127 ck_assert_ptr_ne(NULL, connection); 127 ck_assert_ptr_ne(NULL, connection);
128 return connection; 128 return connection;
129} 129}
@@ -139,7 +139,7 @@ create_and_load_connection(void)
139Eo * 139Eo *
140create_object(void) 140create_object(void)
141{ 141{
142 Eo *object = eo_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eoid, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, ELDBUS_FDO_BUS, ELDBUS_FDO_PATH)); 142 Eo *object = eo_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, ELDBUS_FDO_BUS, ELDBUS_FDO_PATH));
143 ck_assert_ptr_ne(NULL, object); 143 ck_assert_ptr_ne(NULL, object);
144 return object; 144 return object;
145} 145}
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_method.c b/src/tests/eldbus/eldbus_test_eldbus_model_method.c
index 51ed4afc34..1c78995ab4 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_method.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_method.c
@@ -29,7 +29,7 @@ _setup(void)
29 29
30 fake_server = fake_server_start(&fake_server_data); 30 fake_server = fake_server_start(&fake_server_data);
31 31
32 fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eoid, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH)); 32 fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
33 ck_assert_ptr_ne(NULL, fake_server_object); 33 ck_assert_ptr_ne(NULL, fake_server_object);
34 34
35 efl_model_load_and_wait_for_load_status(fake_server_object, EFL_MODEL_LOAD_STATUS_LOADED); 35 efl_model_load_and_wait_for_load_status(fake_server_object, EFL_MODEL_LOAD_STATUS_LOADED);
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
index 7c3187430e..8cbfe45250 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
@@ -27,7 +27,7 @@ _setup(void)
27 27
28 fake_server = fake_server_start(&fake_server_data); 28 fake_server = fake_server_start(&fake_server_data);
29 29
30 fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eoid, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH)); 30 fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
31 ck_assert_ptr_ne(NULL, fake_server_object); 31 ck_assert_ptr_ne(NULL, fake_server_object);
32 32
33 efl_model_load_and_wait_for_load_status(fake_server_object, EFL_MODEL_LOAD_STATUS_LOADED); 33 efl_model_load_and_wait_for_load_status(fake_server_object, EFL_MODEL_LOAD_STATUS_LOADED);
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 09ef4cc9ca..ec62822c3a 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
@@ -33,7 +33,7 @@ _setup(void)
33 }; 33 };
34 fake_server = fake_server_start(&fake_server_data); 34 fake_server = fake_server_start(&fake_server_data);
35 35
36 fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eoid, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH)); 36 fake_server_object = eo_add(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
37 ck_assert_ptr_ne(NULL, fake_server_object); 37 ck_assert_ptr_ne(NULL, fake_server_object);
38 38
39 efl_model_load_and_wait_for_load_status(fake_server_object, EFL_MODEL_LOAD_STATUS_LOADED); 39 efl_model_load_and_wait_for_load_status(fake_server_object, EFL_MODEL_LOAD_STATUS_LOADED);
diff --git a/src/tests/eo/constructors/constructors_main.c b/src/tests/eo/constructors/constructors_main.c
index 5844e46624..45cd50dfb9 100644
--- a/src/tests/eo/constructors/constructors_main.c
+++ b/src/tests/eo/constructors/constructors_main.c
@@ -76,14 +76,14 @@ main(int argc, char *argv[])
76 fail_if(a != 0); 76 fail_if(a != 0);
77 77
78 my_init_count = 0; 78 my_init_count = 0;
79 obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(eoid, 7)); 79 obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(eo_self, 7));
80 fail_if(!obj); 80 fail_if(!obj);
81 fail_if(my_init_count != 2); 81 fail_if(my_init_count != 2);
82 a = simple_a_get(obj); 82 a = simple_a_get(obj);
83 fail_if(a != 7); 83 fail_if(a != 7);
84 84
85 my_init_count = 0; 85 my_init_count = 0;
86 obj = eo_add(SIMPLE_CLASS, NULL, simple_b_set(eoid, 6), simple_a_set(eoid, -1), b = simple_b_get(eoid)); 86 obj = eo_add(SIMPLE_CLASS, NULL, simple_b_set(eo_self, 6), simple_a_set(eo_self, -1), b = simple_b_get(eo_self));
87 fail_if(obj); 87 fail_if(obj);
88 fail_if(b != 6); 88 fail_if(b != 6);
89 fail_if(my_init_count != 0); 89 fail_if(my_init_count != 0);
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 2960902715..0a9b74c7d5 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -798,24 +798,24 @@ START_TEST(eo_add_do_and_custom)
798 Eo *obj = NULL; 798 Eo *obj = NULL;
799 eo_init(); 799 eo_init();
800 800
801 obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor(eoid)); 801 obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor(eo_self));
802 fail_if(!obj); 802 fail_if(!obj);
803 eo_unref(obj); 803 eo_unref(obj);
804 804
805 obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(eoid, 7)); 805 obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(eo_self, 7));
806 fail_if(!obj); 806 fail_if(!obj);
807 pd = eo_data_scope_get(obj, SIMPLE_CLASS); 807 pd = eo_data_scope_get(obj, SIMPLE_CLASS);
808 fail_if(pd->a != 7); 808 fail_if(pd->a != 7);
809 eo_unref(obj); 809 eo_unref(obj);
810 810
811 obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor(eoid), simple_a_set(eoid, 7)); 811 obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor(eo_self), simple_a_set(eo_self, 7));
812 fail_if(!obj); 812 fail_if(!obj);
813 pd = eo_data_scope_get(obj, SIMPLE_CLASS); 813 pd = eo_data_scope_get(obj, SIMPLE_CLASS);
814 fail_if(pd->a != 7); 814 fail_if(pd->a != 7);
815 eo_unref(obj); 815 eo_unref(obj);
816 816
817 Eina_Bool finalized; 817 Eina_Bool finalized;
818 obj = eo_add(SIMPLE_CLASS, NULL, finalized = eo_finalized_get(eoid)); 818 obj = eo_add(SIMPLE_CLASS, NULL, finalized = eo_finalized_get(eo_self));
819 fail_if(finalized); 819 fail_if(finalized);
820 820
821 finalized = eo_finalized_get(obj); 821 finalized = eo_finalized_get(obj);
diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c
index b25b00b672..3f2231d88d 100644
--- a/src/tests/eo/suite/eo_test_threaded_calls.c
+++ b/src/tests/eo/suite/eo_test_threaded_calls.c
@@ -94,7 +94,7 @@ _thread_job(void *data, Eina_Thread t EINA_UNUSED)
94 fail_if(EINA_LOCK_SUCCEED != eina_spinlock_take(&locks[0])); 94 fail_if(EINA_LOCK_SUCCEED != eina_spinlock_take(&locks[0]));
95 } 95 }
96 96
97 obj = eo_add(THREAD_TEST_CLASS, NULL, thread_test_constructor(eoid, v)); 97 obj = eo_add(THREAD_TEST_CLASS, NULL, thread_test_constructor(eo_self, v));
98 98
99 thread_test_try_swap_stack(obj); 99 thread_test_try_swap_stack(obj);
100 v = thread_test_v_get(obj); 100 v = thread_test_v_get(obj);
diff --git a/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c b/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c
index 1740e61466..3ad0631a21 100644
--- a/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c
+++ b/src/tests/eolian_js/eolian_js_test_constructor_method_impl.c
@@ -132,7 +132,7 @@ _constructor_method_class_classoutmethod1(Eo* obj EINA_UNUSED, Constructor_Metho
132{ 132{
133 fprintf(stderr, "classoutmethod1\n"); 133 fprintf(stderr, "classoutmethod1\n");
134 fflush(stderr); 134 fflush(stderr);
135 return eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(eoid, one), constructor_method_class_constructor2(eoid, two)); 135 return eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(eo_self, one), constructor_method_class_constructor2(eo_self, two));
136} 136}
137 137
138EOLIAN static void 138EOLIAN static void
@@ -140,7 +140,7 @@ _constructor_method_class_classoutmethod2(Eo* obj EINA_UNUSED, Constructor_Metho
140{ 140{
141 fprintf(stderr, "classoutmethod2\n"); 141 fprintf(stderr, "classoutmethod2\n");
142 fflush(stderr); 142 fflush(stderr);
143 *out_class = eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(eoid, one), constructor_method_class_constructor2(eoid, two)); 143 *out_class = eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(eo_self, one), constructor_method_class_constructor2(eo_self, two));
144} 144}
145 145
146 146
diff --git a/src/tests/evas/evas_test_image.c b/src/tests/evas/evas_test_image.c
index 0f7514c3a0..39a923bf1d 100644
--- a/src/tests/evas/evas_test_image.c
+++ b/src/tests/evas/evas_test_image.c
@@ -646,7 +646,7 @@ START_TEST(evas_object_image_defaults)
646 eo_del(o); 646 eo_del(o);
647 647
648 /* test eo defaults */ 648 /* test eo defaults */
649 eo_add(&o, EVAS_IMAGE_CLASS, e); 649 o = eo_add(EVAS_IMAGE_CLASS, e);
650 fail_if(!efl_gfx_fill_filled_get(o)); 650 fail_if(!efl_gfx_fill_filled_get(o));
651 eo_del(o); 651 eo_del(o);
652 652