summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-11 12:24:08 +0000
committerTom Hacohen <tom@stosb.com>2016-03-11 12:29:03 +0000
commitf24210caac8d50940ddef858994571be59179c10 (patch)
treecfc8b264e77abbab9827517d1827f9a4fb4dcd50 /src/tests
parent9fdac37187e35f45570c3808011d0283c658652d (diff)
Revert "Automatic migration to the new eo_add syntax."
This reverts commit 4f949a2757b6332306264d7f126b15ba7bfd37d4.
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/ecore/ecore_test_animator.c4
-rw-r--r--src/tests/ecore/ecore_test_ecore_audio.c36
-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.c6
-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/emotion/emotion_test_main-eo.c4
-rw-r--r--src/tests/eo/access/access_main.c3
-rw-r--r--src/tests/eo/children/children_main.c14
-rw-r--r--src/tests/eo/composite_objects/composite_objects_comp.c3
-rw-r--r--src/tests/eo/composite_objects/composite_objects_main.c3
-rw-r--r--src/tests/eo/constructors/constructors_main.c21
-rw-r--r--src/tests/eo/function_overrides/function_overrides_main.c9
-rw-r--r--src/tests/eo/interface/interface_main.c3
-rw-r--r--src/tests/eo/mixin/mixin_main.c5
-rw-r--r--src/tests/eo/signals/signals_main.c3
-rw-r--r--src/tests/eo/suite/eo_test_call_errors.c9
-rw-r--r--src/tests/eo/suite/eo_test_class_behaviour_errors.c6
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c3
-rw-r--r--src/tests/eo/suite/eo_test_threaded_calls.c2
-rw-r--r--src/tests/eo/suite/eo_test_value.c3
-rw-r--r--src/tests/eolian_js/eolian_js_test_constructor_method_impl.c6
-rw-r--r--src/tests/evas/evas_test_mesh.c4
25 files changed, 65 insertions, 92 deletions
diff --git a/src/tests/ecore/ecore_test_animator.c b/src/tests/ecore/ecore_test_animator.c
index c00cdd7..e2f17bc 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 eo_add(&animator, ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(animator, 1, _anim_cb, &interval1)); 33 animator = eo_add(ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(eoid, 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 eo_add(&animator, ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(animator, 1, _anim_cb, &interval2)); 41 animator = eo_add(ECORE_ANIMATOR_CLASS, NULL, ecore_animator_timeline_constructor(eoid, 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/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index a6589ce..0240903 100644
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -62,14 +62,14 @@ START_TEST(ecore_test_ecore_audio_obj_pulse)
62 Eina_Bool ret = EINA_FALSE; 62 Eina_Bool ret = EINA_FALSE;
63 Eina_Bool pulse_context_failed = EINA_FALSE; 63 Eina_Bool pulse_context_failed = EINA_FALSE;
64 64
65 eo_add(&in, ECORE_AUDIO_IN_SNDFILE_CLASS, NULL); 65 in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL);
66 fail_if(!in); 66 fail_if(!in);
67 67
68 ecore_audio_obj_name_set(in, "modem.wav"); 68 ecore_audio_obj_name_set(in, "modem.wav");
69 ret = ecore_audio_obj_source_set(in, TESTS_SRC_DIR"/modem.wav"); 69 ret = ecore_audio_obj_source_set(in, TESTS_SRC_DIR"/modem.wav");
70 fail_if(!ret); 70 fail_if(!ret);
71 71
72 eo_add(&out, ECORE_AUDIO_OUT_PULSE_CLASS, NULL); 72 out = eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL);
73 fail_if(!out); 73 fail_if(!out);
74 74
75 ecore_timer_add(0.3, _seek_vol, in); 75 ecore_timer_add(0.3, _seek_vol, in);
@@ -112,12 +112,12 @@ START_TEST(ecore_test_ecore_audio_cleanup)
112 int freq = 1000; 112 int freq = 1000;
113 Eina_Bool ret = EINA_FALSE; 113 Eina_Bool ret = EINA_FALSE;
114 114
115 eo_add(&in, ECORE_AUDIO_IN_TONE_CLASS, NULL); 115 in = eo_add(ECORE_AUDIO_IN_TONE_CLASS, NULL);
116 fail_if(!in); 116 fail_if(!in);
117 eo_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &freq); 117 eo_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &freq);
118 ecore_audio_obj_in_length_set(in, 2); 118 ecore_audio_obj_in_length_set(in, 2);
119 119
120 eo_add(&out, ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL); 120 out = eo_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL);
121 fail_if(!out); 121 fail_if(!out);
122 ret = ecore_audio_obj_format_set(out, ECORE_AUDIO_FORMAT_OGG); 122 ret = ecore_audio_obj_format_set(out, ECORE_AUDIO_FORMAT_OGG);
123 fail_if(!ret); 123 fail_if(!ret);
@@ -143,7 +143,7 @@ START_TEST(ecore_test_ecore_audio_obj_tone)
143 Eina_Bool ret; 143 Eina_Bool ret;
144 char *tmp; 144 char *tmp;
145 145
146 eo_add(&in, ECORE_AUDIO_IN_TONE_CLASS, NULL); 146 in = eo_add(ECORE_AUDIO_IN_TONE_CLASS, NULL);
147 fail_if(!in); 147 fail_if(!in);
148 148
149 ecore_audio_obj_name_set(in, "tone"); 149 ecore_audio_obj_name_set(in, "tone");
@@ -201,7 +201,7 @@ START_TEST(ecore_test_ecore_audio_obj_tone)
201 len = ecore_audio_obj_in_remaining_get(in); 201 len = ecore_audio_obj_in_remaining_get(in);
202 fail_if(len != 1.0); 202 fail_if(len != 1.0);
203 203
204 eo_add(&out, ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL); 204 out = eo_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL);
205 fail_if(!out); 205 fail_if(!out);
206 206
207 ecore_audio_obj_name_set(out, "tmp.wav"); 207 ecore_audio_obj_name_set(out, "tmp.wav");
@@ -235,7 +235,7 @@ START_TEST(ecore_test_ecore_audio_obj_sndfile)
235 Ecore_Audio_Format fmt; 235 Ecore_Audio_Format fmt;
236 const char *src; 236 const char *src;
237 237
238 eo_add(&in, ECORE_AUDIO_IN_SNDFILE_CLASS, NULL); 238 in = eo_add(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL);
239 fail_if(!in); 239 fail_if(!in);
240 240
241 fmt = ecore_audio_obj_format_get(in); 241 fmt = ecore_audio_obj_format_get(in);
@@ -281,7 +281,7 @@ START_TEST(ecore_test_ecore_audio_obj_sndfile)
281 len = ecore_audio_obj_in_seek(in, -1.0, SEEK_END); 281 len = ecore_audio_obj_in_seek(in, -1.0, SEEK_END);
282 fail_if(fabs(rem - 1 - len) > 0.1); 282 fail_if(fabs(rem - 1 - len) > 0.1);
283 283
284 eo_add(&out, ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL); 284 out = eo_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL);
285 fail_if(!out); 285 fail_if(!out);
286 286
287 ecore_audio_obj_name_set(out, "tmp.wav"); 287 ecore_audio_obj_name_set(out, "tmp.wav");
@@ -322,12 +322,9 @@ START_TEST(ecore_test_ecore_audio_obj_in_out)
322 Eina_List *in3; 322 Eina_List *in3;
323 Eina_Bool attached; 323 Eina_Bool attached;
324 324
325 Eo *in = NULL; 325 Eo *in = eo_add(ECORE_AUDIO_IN_CLASS, NULL);
326 eo_add(&in, ECORE_AUDIO_IN_CLASS, NULL); 326 Eo *in2 = eo_add(ECORE_AUDIO_IN_CLASS, NULL);
327 Eo *in2 = NULL; 327 Eo *out = eo_add(ECORE_AUDIO_OUT_CLASS, NULL);
328 eo_add(&in2, ECORE_AUDIO_IN_CLASS, NULL);
329 Eo *out = NULL;
330 eo_add(&out, ECORE_AUDIO_OUT_CLASS, NULL);
331 328
332 fail_if(!in); 329 fail_if(!in);
333 fail_if(!in2); 330 fail_if(!in2);
@@ -423,10 +420,10 @@ START_TEST(ecore_test_ecore_audio_obj_vio)
423{ 420{
424 Eo *in, *out; 421 Eo *in, *out;
425 422
426 eo_add(&in, ECORE_AUDIO_IN_CLASS, NULL); 423 in = eo_add(ECORE_AUDIO_IN_CLASS, NULL);
427 fail_if(!in); 424 fail_if(!in);
428 425
429 eo_add(&out, ECORE_AUDIO_OUT_CLASS, NULL); 426 out = eo_add(ECORE_AUDIO_OUT_CLASS, NULL);
430 fail_if(!out); 427 fail_if(!out);
431 428
432 ecore_audio_obj_vio_set(in, &in_vio, NULL, NULL); 429 ecore_audio_obj_vio_set(in, &in_vio, NULL, NULL);
@@ -461,8 +458,7 @@ START_TEST(ecore_test_ecore_audio_obj_in)
461 Ecore_Audio_Vio vio; 458 Ecore_Audio_Vio vio;
462 Eina_Bool freed = EINA_FALSE; 459 Eina_Bool freed = EINA_FALSE;
463 460
464 Eo *in = NULL; 461 Eo *in = eo_add(ECORE_AUDIO_IN_CLASS, NULL);
465 eo_add(&in, ECORE_AUDIO_IN_CLASS, NULL);
466 462
467 fail_if(!in); 463 fail_if(!in);
468 464
@@ -549,10 +545,10 @@ START_TEST(ecore_test_ecore_audio_obj)
549 double volume; 545 double volume;
550 Eo *objs[2], *obj; 546 Eo *objs[2], *obj;
551 547
552 eo_add(&objs[0], ECORE_AUDIO_IN_CLASS, NULL); 548 objs[0] = eo_add(ECORE_AUDIO_IN_CLASS, NULL);
553 fail_if(!objs[0]); 549 fail_if(!objs[0]);
554 550
555 eo_add(&objs[1], ECORE_AUDIO_OUT_CLASS, NULL); 551 objs[1] = eo_add(ECORE_AUDIO_OUT_CLASS, NULL);
556 fail_if(!objs[1]); 552 fail_if(!objs[1]);
557 553
558 for (i=0; i<2; i++) { 554 for (i=0; i<2; i++) {
diff --git a/src/tests/eio/eio_model_test_file.c b/src/tests/eio/eio_model_test_file.c
index 8018c5b..5873d7a 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 eo_add(&filemodel, EIO_MODEL_CLASS, NULL, eio_model_path_set(filemodel, EFL_MODEL_TEST_FILENAME_PATH)); 168 filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eoid, 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 0cf0c9f..b718edd 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 eo_add(&filemodel, EIO_MODEL_CLASS, NULL, eio_model_path_set(filemodel, tmpdir)); 128 filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eoid, 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 d1dcbfc..5439217 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.c
@@ -123,8 +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 = NULL; 126 Eo *connection = eo_add_ref(ELDBUS_MODEL_CONNECTION_CLASS, NULL, eldbus_model_connection_constructor(eoid, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE));
127 eo_add_ref(&connection, ELDBUS_MODEL_CONNECTION_CLASS, NULL, eldbus_model_connection_constructor(connection, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE));
128 ck_assert_ptr_ne(NULL, connection); 127 ck_assert_ptr_ne(NULL, connection);
129 return connection; 128 return connection;
130} 129}
@@ -140,8 +139,7 @@ create_and_load_connection(void)
140Eo * 139Eo *
141create_object(void) 140create_object(void)
142{ 141{
143 Eo *object = NULL; 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));
144 eo_add_ref(&object, ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(object, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, ELDBUS_FDO_BUS, ELDBUS_FDO_PATH));
145 ck_assert_ptr_ne(NULL, object); 143 ck_assert_ptr_ne(NULL, object);
146 return object; 144 return object;
147} 145}
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_method.c b/src/tests/eldbus/eldbus_test_eldbus_model_method.c
index 06e5bf7..51ed4af 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 eo_add(&fake_server_object, ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(fake_server_object, 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(eoid, 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 3f51d07..7c31874 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 eo_add(&fake_server_object, ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(fake_server_object, 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(eoid, 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 0195aff..09ef4cc 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 eo_add(&fake_server_object, ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(fake_server_object, 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(eoid, 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/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index 0f9ea64..f88e045 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -111,7 +111,7 @@ main_delete_request(Ecore_Evas *ee EINA_UNUSED)
111static void 111static void
112bg_setup(void) 112bg_setup(void)
113{ 113{
114 eo_add(&o_bg, EDJE_OBJECT_CLASS, evas); 114 o_bg = eo_add(EDJE_OBJECT_CLASS, evas);
115 efl_file_set(o_bg, theme_file, "background"); 115 efl_file_set(o_bg, theme_file, "background");
116 efl_gfx_position_set(o_bg, 0, 0); 116 efl_gfx_position_set(o_bg, 0, 0);
117 efl_gfx_size_set(o_bg, startw, starth); 117 efl_gfx_size_set(o_bg, startw, starth);
@@ -639,7 +639,7 @@ init_video_object(const char *module_filename, const char *filename)
639 fd = calloc(1, sizeof(Frame_Data)); 639 fd = calloc(1, sizeof(Frame_Data));
640 if (!fd) exit(1); 640 if (!fd) exit(1);
641 641
642 eo_add(&oe, EDJE_OBJECT_CLASS, evas); 642 oe = eo_add(EDJE_OBJECT_CLASS, evas);
643 eo_event_callback_add(oe, EVAS_OBJECT_EVENT_FREE, _oe_free_cb, fd); 643 eo_event_callback_add(oe, EVAS_OBJECT_EVENT_FREE, _oe_free_cb, fd);
644 eo_key_data_set(oe, "frame_data", fd); 644 eo_key_data_set(oe, "frame_data", fd);
645 efl_file_set(oe, theme_file, reflex ? "video_controller/reflex" : "video_controller"); 645 efl_file_set(oe, theme_file, reflex ? "video_controller/reflex" : "video_controller");
diff --git a/src/tests/eo/access/access_main.c b/src/tests/eo/access/access_main.c
index 348422f..d8d825b 100644
--- a/src/tests/eo/access/access_main.c
+++ b/src/tests/eo/access/access_main.c
@@ -13,8 +13,7 @@ main(int argc, char *argv[])
13 (void) argv; 13 (void) argv;
14 eo_init(); 14 eo_init();
15 15
16 Eo *obj = NULL; 16 Eo *obj = eo_add(INHERIT_CLASS, NULL);
17 eo_add(&obj, INHERIT_CLASS, NULL);
18 17
19 simple_a_set(obj, 1); 18 simple_a_set(obj, 1);
20 inherit_prot_print(obj); 19 inherit_prot_print(obj);
diff --git a/src/tests/eo/children/children_main.c b/src/tests/eo/children/children_main.c
index 25e9f9f..9d30277 100644
--- a/src/tests/eo/children/children_main.c
+++ b/src/tests/eo/children/children_main.c
@@ -22,15 +22,11 @@ main(int argc, char *argv[])
22 22
23 eo_init(); 23 eo_init();
24 24
25 Eo *parent = NULL; 25 Eo *parent = eo_add(SIMPLE_CLASS, NULL);
26 eo_add(&parent, SIMPLE_CLASS, NULL); 26
27 27 Eo *child1 = eo_add(SIMPLE_CLASS, parent);
28 Eo *child1 = NULL; 28 Eo *child2 = eo_add(SIMPLE_CLASS, parent);
29 eo_add(&child1, SIMPLE_CLASS, parent); 29 Eo *child3 = eo_add(SIMPLE_CLASS, parent);
30 Eo *child2 = NULL;
31 eo_add(&child2, SIMPLE_CLASS, parent);
32 Eo *child3 = NULL;
33 eo_add(&child3, SIMPLE_CLASS, parent);
34 30
35 iter = eo_children_iterator_new(parent); 31 iter = eo_children_iterator_new(parent);
36 fail_if(!iter); 32 fail_if(!iter);
diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c
index 349bf8f..51824a9 100644
--- a/src/tests/eo/composite_objects/composite_objects_comp.c
+++ b/src/tests/eo/composite_objects/composite_objects_comp.c
@@ -26,8 +26,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
26{ 26{
27 obj = eo_constructor(eo_super(obj, MY_CLASS)); 27 obj = eo_constructor(eo_super(obj, MY_CLASS));
28 28
29 Eo *simple = NULL; 29 Eo *simple = eo_add(SIMPLE_CLASS, obj);
30 eo_add(&simple, SIMPLE_CLASS, obj);
31 eo_composite_attach(obj, simple); 30 eo_composite_attach(obj, simple);
32 eo_event_callback_forwarder_add(simple, EV_A_CHANGED, obj); 31 eo_event_callback_forwarder_add(simple, EV_A_CHANGED, obj);
33 32
diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c
index 47902a4..6f9e914 100644
--- a/src/tests/eo/composite_objects/composite_objects_main.c
+++ b/src/tests/eo/composite_objects/composite_objects_main.c
@@ -30,8 +30,7 @@ main(int argc, char *argv[])
30 (void) argv; 30 (void) argv;
31 eo_init(); 31 eo_init();
32 32
33 Eo *obj = NULL; 33 Eo *obj = eo_add(COMP_CLASS, NULL);
34 eo_add(&obj, COMP_CLASS, NULL);
35 eo_event_callback_add(obj, EV_A_CHANGED, _a_changed_cb, NULL); 34 eo_event_callback_add(obj, EV_A_CHANGED, _a_changed_cb, NULL);
36 35
37 fail_if(!eo_isa(obj, COMP_CLASS)); 36 fail_if(!eo_isa(obj, COMP_CLASS));
diff --git a/src/tests/eo/constructors/constructors_main.c b/src/tests/eo/constructors/constructors_main.c
index bb2baa1..5844e46 100644
--- a/src/tests/eo/constructors/constructors_main.c
+++ b/src/tests/eo/constructors/constructors_main.c
@@ -24,8 +24,7 @@ main(int argc, char *argv[])
24 (void) argv; 24 (void) argv;
25 eo_init(); 25 eo_init();
26 26
27 Eo *obj = NULL; 27 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
28 eo_add(&obj, SIMPLE_CLASS, NULL);
29 28
30 fail_if(my_init_count != 2); 29 fail_if(my_init_count != 2);
31 30
@@ -43,14 +42,14 @@ main(int argc, char *argv[])
43 42
44 fail_if(my_init_count != 0); 43 fail_if(my_init_count != 0);
45 44
46 eo_add(&obj, SIMPLE2_CLASS, NULL); 45 obj = eo_add(SIMPLE2_CLASS, NULL);
47 fail_if(obj); 46 fail_if(obj);
48 47
49 eo_add(&obj, SIMPLE3_CLASS, NULL); 48 obj = eo_add(SIMPLE3_CLASS, NULL);
50 fail_if(obj); 49 fail_if(obj);
51 50
52 my_init_count = 0; 51 my_init_count = 0;
53 eo_add(&obj, SIMPLE4_CLASS, NULL); 52 obj = eo_add(SIMPLE4_CLASS, NULL);
54 53
55 fail_if(my_init_count != 2); 54 fail_if(my_init_count != 2);
56 55
@@ -58,33 +57,33 @@ main(int argc, char *argv[])
58 57
59 fail_if(my_init_count != 0); 58 fail_if(my_init_count != 0);
60 59
61 eo_add(&obj, SIMPLE5_CLASS, NULL); 60 obj = eo_add(SIMPLE5_CLASS, NULL);
62 fail_if(!obj); 61 fail_if(!obj);
63 eo_unref(obj); 62 eo_unref(obj);
64 63
65 eo_add(&obj, SIMPLE6_CLASS, NULL); 64 obj = eo_add(SIMPLE6_CLASS, NULL);
66 fail_if(!obj); 65 fail_if(!obj);
67 eo_unref(obj); 66 eo_unref(obj);
68 67
69 eo_add(&obj, SIMPLE7_CLASS, NULL); 68 obj = eo_add(SIMPLE7_CLASS, NULL);
70 fail_if(obj); 69 fail_if(obj);
71 70
72 my_init_count = 0; 71 my_init_count = 0;
73 eo_add(&obj, SIMPLE_CLASS, NULL); 72 obj = eo_add(SIMPLE_CLASS, NULL);
74 fail_if(!obj); 73 fail_if(!obj);
75 fail_if(my_init_count != 2); 74 fail_if(my_init_count != 2);
76 a = simple_a_get(obj); 75 a = simple_a_get(obj);
77 fail_if(a != 0); 76 fail_if(a != 0);
78 77
79 my_init_count = 0; 78 my_init_count = 0;
80 eo_add(&obj, SIMPLE_CLASS, NULL, simple_a_set(obj, 7)); 79 obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(eoid, 7));
81 fail_if(!obj); 80 fail_if(!obj);
82 fail_if(my_init_count != 2); 81 fail_if(my_init_count != 2);
83 a = simple_a_get(obj); 82 a = simple_a_get(obj);
84 fail_if(a != 7); 83 fail_if(a != 7);
85 84
86 my_init_count = 0; 85 my_init_count = 0;
87 eo_add(&obj, SIMPLE_CLASS, NULL, simple_b_set(obj, 6), simple_a_set(obj, -1), b = simple_b_get(obj)); 86 obj = eo_add(SIMPLE_CLASS, NULL, simple_b_set(eoid, 6), simple_a_set(eoid, -1), b = simple_b_get(eoid));
88 fail_if(obj); 87 fail_if(obj);
89 fail_if(b != 6); 88 fail_if(b != 6);
90 fail_if(my_init_count != 0); 89 fail_if(my_init_count != 0);
diff --git a/src/tests/eo/function_overrides/function_overrides_main.c b/src/tests/eo/function_overrides/function_overrides_main.c
index a9148ed..b2aa840 100644
--- a/src/tests/eo/function_overrides/function_overrides_main.c
+++ b/src/tests/eo/function_overrides/function_overrides_main.c
@@ -18,8 +18,7 @@ main(int argc, char *argv[])
18 eo_init(); 18 eo_init();
19 19
20 Eina_Bool called = EINA_FALSE; 20 Eina_Bool called = EINA_FALSE;
21 Eo *obj = NULL; 21 Eo *obj = eo_add(INHERIT2_CLASS, NULL);
22 eo_add(&obj, INHERIT2_CLASS, NULL);
23 22
24 simple_a_set(obj, 1); 23 simple_a_set(obj, 1);
25 Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS); 24 Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS);
@@ -27,7 +26,7 @@ main(int argc, char *argv[])
27 26
28 eo_unref(obj); 27 eo_unref(obj);
29 28
30 eo_add(&obj, INHERIT3_CLASS, NULL); 29 obj = eo_add(INHERIT3_CLASS, NULL);
31 30
32 simple_a_set(obj, 1); 31 simple_a_set(obj, 1);
33 pd = eo_data_scope_get(obj, SIMPLE_CLASS); 32 pd = eo_data_scope_get(obj, SIMPLE_CLASS);
@@ -35,7 +34,7 @@ main(int argc, char *argv[])
35 34
36 eo_unref(obj); 35 eo_unref(obj);
37 36
38 eo_add(&obj, INHERIT2_CLASS, NULL); 37 obj = eo_add(INHERIT2_CLASS, NULL);
39 called = inherit2_print(obj); 38 called = inherit2_print(obj);
40 fail_if(!called); 39 fail_if(!called);
41 called = inherit2_print(obj); 40 called = inherit2_print(obj);
@@ -43,7 +42,7 @@ main(int argc, char *argv[])
43 fail_if(!called); 42 fail_if(!called);
44 eo_unref(obj); 43 eo_unref(obj);
45 44
46 eo_add(&obj, SIMPLE_CLASS, NULL); 45 obj = eo_add(SIMPLE_CLASS, NULL);
47 called = inherit2_print(obj); 46 called = inherit2_print(obj);
48 fail_if(called); 47 fail_if(called);
49 48
diff --git a/src/tests/eo/interface/interface_main.c b/src/tests/eo/interface/interface_main.c
index 489a4e8..a85f030 100644
--- a/src/tests/eo/interface/interface_main.c
+++ b/src/tests/eo/interface/interface_main.c
@@ -16,8 +16,7 @@ main(int argc, char *argv[])
16 (void) argv; 16 (void) argv;
17 eo_init(); 17 eo_init();
18 18
19 Eo *obj = NULL; 19 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
20 eo_add(&obj, SIMPLE_CLASS, NULL);
21 20
22 simple_a_set(obj, 1); 21 simple_a_set(obj, 1);
23 simple_b_set(obj, 2); 22 simple_b_set(obj, 2);
diff --git a/src/tests/eo/mixin/mixin_main.c b/src/tests/eo/mixin/mixin_main.c
index 1c5cebd..d3c1dbf 100644
--- a/src/tests/eo/mixin/mixin_main.c
+++ b/src/tests/eo/mixin/mixin_main.c
@@ -18,8 +18,7 @@ main(int argc, char *argv[])
18 (void) argv; 18 (void) argv;
19 eo_init(); 19 eo_init();
20 20
21 Eo *obj = NULL; 21 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
22 eo_add(&obj, SIMPLE_CLASS, NULL);
23 22
24 simple_a_set(obj, 1); 23 simple_a_set(obj, 1);
25 simple_b_set(obj, 2); 24 simple_b_set(obj, 2);
@@ -41,7 +40,7 @@ main(int argc, char *argv[])
41 40
42 eo_unref(obj); 41 eo_unref(obj);
43 42
44 eo_add(&obj, INHERIT_CLASS, NULL); 43 obj = eo_add(INHERIT_CLASS, NULL);
45 simple_a_set(obj, 5); 44 simple_a_set(obj, 5);
46 a = simple_a_get(obj); 45 a = simple_a_get(obj);
47 printf("%d\n", a); 46 printf("%d\n", a);
diff --git a/src/tests/eo/signals/signals_main.c b/src/tests/eo/signals/signals_main.c
index f69faf5..5d40331 100644
--- a/src/tests/eo/signals/signals_main.c
+++ b/src/tests/eo/signals/signals_main.c
@@ -37,8 +37,7 @@ main(int argc, char *argv[])
37 (void) argv; 37 (void) argv;
38 eo_init(); 38 eo_init();
39 39
40 Eo *obj = NULL; 40 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
41 eo_add(&obj, SIMPLE_CLASS, NULL);
42 Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS); 41 Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS);
43 42
44 /* The order of these two is undetermined. */ 43 /* The order of these two is undetermined. */
diff --git a/src/tests/eo/suite/eo_test_call_errors.c b/src/tests/eo/suite/eo_test_call_errors.c
index f4c2d42..551c58d 100644
--- a/src/tests/eo/suite/eo_test_call_errors.c
+++ b/src/tests/eo/suite/eo_test_call_errors.c
@@ -17,8 +17,7 @@ START_TEST(eo_pure_virtual_fct_call)
17 eo_init(); 17 eo_init();
18 eina_log_print_cb_set(eo_test_print_cb, &ctx); 18 eina_log_print_cb_set(eo_test_print_cb, &ctx);
19 19
20 Eo *obj = NULL; 20 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
21 eo_add(&obj, SIMPLE_CLASS, NULL);
22 fail_if(!obj); 21 fail_if(!obj);
23 22
24 TEST_EO_ERROR("_eo_call_resolve", "in %s:%d: you called a pure virtual func '%s' (%d) of class '%s'."); 23 TEST_EO_ERROR("_eo_call_resolve", "in %s:%d: you called a pure virtual func '%s' (%d) of class '%s'.");
@@ -36,8 +35,7 @@ START_TEST(eo_api_not_implemented_call)
36 eo_init(); 35 eo_init();
37 eina_log_print_cb_set(eo_test_print_cb, &ctx); 36 eina_log_print_cb_set(eo_test_print_cb, &ctx);
38 37
39 Eo *obj = NULL; 38 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
40 eo_add(&obj, SIMPLE_CLASS, NULL);
41 fail_if(!obj); 39 fail_if(!obj);
42 40
43 TEST_EO_ERROR("_eo_api_op_id_get", "Unable to resolve op for api func %p"); 41 TEST_EO_ERROR("_eo_api_op_id_get", "Unable to resolve op for api func %p");
@@ -55,8 +53,7 @@ START_TEST(eo_op_not_found_in_super)
55 eo_init(); 53 eo_init();
56 eina_log_print_cb_set(eo_test_print_cb, &ctx); 54 eina_log_print_cb_set(eo_test_print_cb, &ctx);
57 55
58 Eo *obj = NULL; 56 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
59 eo_add(&obj, SIMPLE_CLASS, NULL);
60 fail_if(!obj); 57 fail_if(!obj);
61 58
62 TEST_EO_ERROR("_eo_call_resolve", "in %s:%d: func '%s' (%d) could not be resolved for class '%s' for super of '%s'."); 59 TEST_EO_ERROR("_eo_call_resolve", "in %s:%d: func '%s' (%d) could not be resolved for class '%s' for super of '%s'.");
diff --git a/src/tests/eo/suite/eo_test_class_behaviour_errors.c b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
index 5288f06..12c478f 100644
--- a/src/tests/eo/suite/eo_test_class_behaviour_errors.c
+++ b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
@@ -45,8 +45,7 @@ START_TEST(eo_destructor_unref)
45 klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL); 45 klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL);
46 fail_if(!klass); 46 fail_if(!klass);
47 47
48 Eo *obj = NULL; 48 Eo *obj = eo_add(klass, NULL);
49 eo_add(&obj, klass, NULL);
50 fail_if(!obj); 49 fail_if(!obj);
51 50
52 TEST_EO_ERROR("_eo_unref", "Object %p deletion already triggered. You wrongly call eo_unref() within a destructor."); 51 TEST_EO_ERROR("_eo_unref", "Object %p deletion already triggered. You wrongly call eo_unref() within a destructor.");
@@ -77,8 +76,7 @@ START_TEST(eo_destructor_double_del)
77 klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL); 76 klass = eo_class_new(&class_desc, SIMPLE_CLASS, NULL);
78 fail_if(!klass); 77 fail_if(!klass);
79 78
80 Eo *obj = NULL; 79 Eo *obj = eo_add(klass, NULL);
81 eo_add(&obj, klass, NULL);
82 eo_manual_free_set(obj, EINA_TRUE); 80 eo_manual_free_set(obj, EINA_TRUE);
83 fail_if(!obj); 81 fail_if(!obj);
84 82
diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index ef5d8e9..224e80a 100644
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -54,8 +54,7 @@ static Eo *
54_part_get(Eo *obj, void *class_data EINA_UNUSED, const char *name EINA_UNUSED) 54_part_get(Eo *obj, void *class_data EINA_UNUSED, const char *name EINA_UNUSED)
55{ 55{
56 /* A normal part get will do something saner, we just create objects. */ 56 /* A normal part get will do something saner, we just create objects. */
57 Eo *ret = NULL; 57 return eo_add(SIMPLE_CLASS, obj);
58 return eo_add(&ret, SIMPLE_CLASS, obj);
59} 58}
60 59
61EO_VOID_FUNC_BODYV(simple_recursive, EO_FUNC_CALL(n), int n); 60EO_VOID_FUNC_BODYV(simple_recursive, EO_FUNC_CALL(n), int n);
diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c
index 76a9ca9..b25b00b 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 eo_add(&obj, THREAD_TEST_CLASS, NULL, thread_test_constructor(obj, v)); 97 obj = eo_add(THREAD_TEST_CLASS, NULL, thread_test_constructor(eoid, 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/eo/suite/eo_test_value.c b/src/tests/eo/suite/eo_test_value.c
index b9fac0d..6162389 100644
--- a/src/tests/eo/suite/eo_test_value.c
+++ b/src/tests/eo/suite/eo_test_value.c
@@ -17,8 +17,7 @@ START_TEST(eo_value)
17 Eina_Value val2, eo_val; 17 Eina_Value val2, eo_val;
18 void *tmpp = NULL; 18 void *tmpp = NULL;
19 Eo_Dbg_Info *eo_dbg_info; 19 Eo_Dbg_Info *eo_dbg_info;
20 Eo *obj = NULL; 20 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
21 eo_add(&obj, SIMPLE_CLASS, NULL);
22 21
23 eo_dbg_info = EO_DBG_INFO_LIST_APPEND(NULL, "Root"); 22 eo_dbg_info = EO_DBG_INFO_LIST_APPEND(NULL, "Root");
24 eo_dbg_info_get(obj, eo_dbg_info); 23 eo_dbg_info_get(obj, eo_dbg_info);
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 adff8f5..1740e61 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,8 +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 Eo *ret = NULL; 135 return eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(eoid, one), constructor_method_class_constructor2(eoid, two));
136 return eo_add(&ret, MY_CLASS, NULL, constructor_method_class_constructor1(ret, one), constructor_method_class_constructor2(ret, two));
137} 136}
138 137
139EOLIAN static void 138EOLIAN static void
@@ -141,8 +140,7 @@ _constructor_method_class_classoutmethod2(Eo* obj EINA_UNUSED, Constructor_Metho
141{ 140{
142 fprintf(stderr, "classoutmethod2\n"); 141 fprintf(stderr, "classoutmethod2\n");
143 fflush(stderr); 142 fflush(stderr);
144 *out_class = NULL; 143 *out_class = eo_add(MY_CLASS, NULL, constructor_method_class_constructor1(eoid, one), constructor_method_class_constructor2(eoid, two));
145 eo_add(&out_class, MY_CLASS, NULL, constructor_method_class_constructor1(out_class, one), constructor_method_class_constructor2(out_class, two));
146} 144}
147 145
148 146
diff --git a/src/tests/evas/evas_test_mesh.c b/src/tests/evas/evas_test_mesh.c
index a339584..40a2239 100644
--- a/src/tests/evas/evas_test_mesh.c
+++ b/src/tests/evas/evas_test_mesh.c
@@ -44,8 +44,8 @@
44 EINA_ITERATOR_FOREACH(it, file) \ 44 EINA_ITERATOR_FOREACH(it, file) \
45 { \ 45 { \
46 int set_ok, save_ok; \ 46 int set_ok, save_ok; \
47 eo_add(&mesh, EVAS_CANVAS3D_MESH_CLASS, e); \ 47 mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, e); \
48 eo_add(&mesh2, EVAS_CANVAS3D_MESH_CLASS, e); \ 48 mesh2 = eo_add(EVAS_CANVAS3D_MESH_CLASS, e); \
49 fail_if(mesh == NULL); \ 49 fail_if(mesh == NULL); \
50 fail_if(mesh2 == NULL); \ 50 fail_if(mesh2 == NULL); \
51 snprintf(buffer, PATH_MAX, "%s%s", tmp, ext); \ 51 snprintf(buffer, PATH_MAX, "%s%s", tmp, ext); \