summaryrefslogtreecommitdiff
path: root/src/tests/eo
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests/eo')
-rw-r--r--src/tests/eo/access/access_main.c3
-rw-r--r--src/tests/eo/access/access_simple.c2
-rw-r--r--src/tests/eo/children/children_main.c8
-rw-r--r--src/tests/eo/composite_objects/composite_objects_comp.c14
-rw-r--r--src/tests/eo/composite_objects/composite_objects_main.c34
-rw-r--r--src/tests/eo/composite_objects/composite_objects_simple.c2
-rw-r--r--src/tests/eo/constructors/constructors_main.c16
-rw-r--r--src/tests/eo/constructors/constructors_mixin.c7
-rw-r--r--src/tests/eo/constructors/constructors_simple.c6
-rw-r--r--src/tests/eo/constructors/constructors_simple2.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple6.c2
-rw-r--r--src/tests/eo/constructors/constructors_simple7.c2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit2.c12
-rw-r--r--src/tests/eo/function_overrides/function_overrides_inherit3.c2
-rw-r--r--src/tests/eo/function_overrides/function_overrides_main.c27
-rw-r--r--src/tests/eo/function_overrides/function_overrides_simple.c4
-rw-r--r--src/tests/eo/interface/interface_main.c13
-rw-r--r--src/tests/eo/interface/interface_simple.c6
-rw-r--r--src/tests/eo/mixin/mixin_inherit.c2
-rw-r--r--src/tests/eo/mixin/mixin_main.c13
-rw-r--r--src/tests/eo/mixin/mixin_mixin.c7
-rw-r--r--src/tests/eo/mixin/mixin_mixin2.c9
-rw-r--r--src/tests/eo/mixin/mixin_mixin3.c9
-rw-r--r--src/tests/eo/signals/signals_main.c108
-rw-r--r--src/tests/eo/signals/signals_simple.c10
-rw-r--r--src/tests/eo/suite/eo_test_call_errors.c6
-rw-r--r--src/tests/eo/suite/eo_test_class_behaviour_errors.c2
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c6
-rw-r--r--src/tests/eo/suite/eo_test_general.c182
-rw-r--r--src/tests/eo/suite/eo_test_threaded_calls.c5
-rw-r--r--src/tests/eo/suite/eo_test_value.c2
31 files changed, 278 insertions, 245 deletions
diff --git a/src/tests/eo/access/access_main.c b/src/tests/eo/access/access_main.c
index 61cd381..d8d825b 100644
--- a/src/tests/eo/access/access_main.c
+++ b/src/tests/eo/access/access_main.c
@@ -15,7 +15,8 @@ main(int argc, char *argv[])
15 15
16 Eo *obj = eo_add(INHERIT_CLASS, NULL); 16 Eo *obj = eo_add(INHERIT_CLASS, NULL);
17 17
18 eo_do(obj, simple_a_set(1), inherit_prot_print()); 18 simple_a_set(obj, 1);
19 inherit_prot_print(obj);
19 20
20 Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS); 21 Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS);
21 printf("Pub: %d\n", pd->public_x2); 22 printf("Pub: %d\n", pd->public_x2);
diff --git a/src/tests/eo/access/access_simple.c b/src/tests/eo/access/access_simple.c
index 55e55e0..b4f8766 100644
--- a/src/tests/eo/access/access_simple.c
+++ b/src/tests/eo/access/access_simple.c
@@ -27,7 +27,7 @@ _a_set(Eo *obj, void *class_data, int a)
27 pd->protected.protected_x1 = a + 1; 27 pd->protected.protected_x1 = a + 1;
28 pd->protected.public.public_x2 = a + 2; 28 pd->protected.public.public_x2 = a + 2;
29 29
30 eo_do(obj, eo_event_callback_call(EV_A_CHANGED, &pd->a)); 30 eo_event_callback_call(obj, EV_A_CHANGED, &pd->a);
31} 31}
32 32
33EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a); 33EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
diff --git a/src/tests/eo/children/children_main.c b/src/tests/eo/children/children_main.c
index 0e0832f..8935228 100644
--- a/src/tests/eo/children/children_main.c
+++ b/src/tests/eo/children/children_main.c
@@ -28,7 +28,7 @@ main(int argc, char *argv[])
28 Eo *child2 = eo_add(SIMPLE_CLASS, parent); 28 Eo *child2 = eo_add(SIMPLE_CLASS, parent);
29 Eo *child3 = eo_add(SIMPLE_CLASS, parent); 29 Eo *child3 = eo_add(SIMPLE_CLASS, parent);
30 30
31 eo_do(parent, iter = eo_children_iterator_new()); 31 iter = eo_children_iterator_new(parent);
32 fail_if(!iter); 32 fail_if(!iter);
33 33
34 CHECK_ITER_DATA(iter, chld, child1); 34 CHECK_ITER_DATA(iter, chld, child1);
@@ -40,7 +40,7 @@ main(int argc, char *argv[])
40 40
41 eo_del(child2); 41 eo_del(child2);
42 42
43 eo_do(parent, iter = eo_children_iterator_new()); 43 iter = eo_children_iterator_new(parent);
44 fail_if(!iter); 44 fail_if(!iter);
45 45
46 CHECK_ITER_DATA(iter, chld, child1); 46 CHECK_ITER_DATA(iter, chld, child1);
@@ -52,7 +52,7 @@ main(int argc, char *argv[])
52 52
53 eo_del(child1); 53 eo_del(child1);
54 54
55 eo_do(parent, iter = eo_children_iterator_new()); 55 iter = eo_children_iterator_new(parent);
56 fail_if(!iter); 56 fail_if(!iter);
57 57
58 CHECK_ITER_DATA(iter, chld, child3); 58 CHECK_ITER_DATA(iter, chld, child3);
@@ -62,7 +62,7 @@ main(int argc, char *argv[])
62 62
63 eo_del(child3); 63 eo_del(child3);
64 64
65 eo_do(parent, iter = eo_children_iterator_new()); 65 iter = eo_children_iterator_new(parent);
66 fail_if(iter); 66 fail_if(iter);
67 67
68 eo_unref(parent); 68 eo_unref(parent);
diff --git a/src/tests/eo/composite_objects/composite_objects_comp.c b/src/tests/eo/composite_objects/composite_objects_comp.c
index 32116c9..59ab956 100644
--- a/src/tests/eo/composite_objects/composite_objects_comp.c
+++ b/src/tests/eo/composite_objects/composite_objects_comp.c
@@ -16,7 +16,7 @@ static int
16_a_get(Eo *obj, void *class_data EINA_UNUSED) 16_a_get(Eo *obj, void *class_data EINA_UNUSED)
17{ 17{
18 int a = 0; 18 int a = 0;
19 eo_do_super(obj, MY_CLASS, a = simple_a_get()); 19 a = simple_a_get(eo_super(obj, MY_CLASS));
20 20
21 return a; 21 return a;
22} 22}
@@ -25,16 +25,16 @@ static Eo *
25_constructor(Eo *obj, void *class_data EINA_UNUSED) 25_constructor(Eo *obj, void *class_data EINA_UNUSED)
26{ 26{
27 Eina_Bool tmp; 27 Eina_Bool tmp;
28 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 28 obj = eo_constructor(eo_super(obj, MY_CLASS));
29 29
30 Eo *simple = eo_add(SIMPLE_CLASS, obj); 30 Eo *simple = eo_add(SIMPLE_CLASS, obj);
31 eo_do(obj, eo_composite_attach(simple)); 31 eo_composite_attach(obj, simple);
32 eo_do(simple, eo_event_callback_forwarder_add(EV_A_CHANGED, obj)); 32 eo_event_callback_forwarder_add(simple, EV_A_CHANGED, obj);
33 33
34 fail_if(eo_do_ret(obj, tmp, eo_composite_part_is())); 34 fail_if(eo_composite_part_is(obj));
35 fail_if(!eo_do_ret(simple, tmp, eo_composite_part_is())); 35 fail_if(!eo_composite_part_is(simple));
36 36
37 eo_do(obj, eo_key_data_set("simple-obj", simple)); 37 eo_key_data_set(obj, "simple-obj", simple);
38 38
39 return obj; 39 return obj;
40} 40}
diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c
index 5ad11c6..9e90eb4 100644
--- a/src/tests/eo/composite_objects/composite_objects_main.c
+++ b/src/tests/eo/composite_objects/composite_objects_main.c
@@ -32,49 +32,49 @@ main(int argc, char *argv[])
32 eo_init(); 32 eo_init();
33 33
34 Eo *obj = eo_add(COMP_CLASS, NULL); 34 Eo *obj = eo_add(COMP_CLASS, NULL);
35 eo_do(obj, eo_event_callback_add(EV_A_CHANGED, _a_changed_cb, NULL)); 35 eo_event_callback_add(obj, EV_A_CHANGED, _a_changed_cb, NULL);
36 36
37 fail_if(!eo_isa(obj, COMP_CLASS)); 37 fail_if(!eo_isa(obj, COMP_CLASS));
38 fail_if(!eo_isa(obj, SIMPLE_CLASS)); 38 fail_if(!eo_isa(obj, SIMPLE_CLASS));
39 39
40 int a = 0; 40 int a = 0;
41 cb_called = EINA_FALSE; 41 cb_called = EINA_FALSE;
42 eo_do(obj, simple_a_set(1)); 42 simple_a_set(obj, 1);
43 fail_if(!cb_called); 43 fail_if(!cb_called);
44 44
45 /* Test functions from all across the chain. */ 45 /* Test functions from all across the chain. */
46 cb_called = EINA_FALSE; 46 cb_called = EINA_FALSE;
47 eo_do(obj, simple_a_set1(1)); 47 simple_a_set1(obj, 1);
48 fail_if(!cb_called); 48 fail_if(!cb_called);
49 cb_called = EINA_FALSE; 49 cb_called = EINA_FALSE;
50 eo_do(obj, simple_a_set15(1)); 50 simple_a_set15(obj, 1);
51 fail_if(!cb_called); 51 fail_if(!cb_called);
52 cb_called = EINA_FALSE; 52 cb_called = EINA_FALSE;
53 eo_do(obj, simple_a_set32(1)); 53 simple_a_set32(obj, 1);
54 fail_if(!cb_called); 54 fail_if(!cb_called);
55 55
56 eo_do(obj, a = simple_a_get()); 56 a = simple_a_get(obj);
57 fail_if(a != 1); 57 fail_if(a != 1);
58 58
59 /* disable the callback forwarder, and fail if it's still called. */ 59 /* disable the callback forwarder, and fail if it's still called. */
60 Eo *simple = NULL; 60 Eo *simple = NULL;
61 eo_do(obj, simple = eo_key_data_get("simple-obj")); 61 simple = eo_key_data_get(obj, "simple-obj");
62 eo_ref(simple); 62 eo_ref(simple);
63 eo_do(simple, eo_event_callback_forwarder_del(EV_A_CHANGED, obj)); 63 eo_event_callback_forwarder_del(simple, EV_A_CHANGED, obj);
64 64
65 cb_called = EINA_FALSE; 65 cb_called = EINA_FALSE;
66 eo_do(obj, simple_a_set(2)); 66 simple_a_set(obj, 2);
67 fail_if(cb_called); 67 fail_if(cb_called);
68 68
69 fail_if(!eo_do_ret(simple, tmp,eo_composite_part_is())); 69 fail_if(!eo_composite_part_is(simple));
70 fail_if(!eo_do_ret(obj, tmp,eo_composite_detach(simple))); 70 fail_if(!eo_composite_detach(obj, simple));
71 fail_if(eo_do_ret(obj, tmp,eo_composite_detach(simple))); 71 fail_if(eo_composite_detach(obj, simple));
72 fail_if(eo_do_ret(simple, tmp,eo_composite_part_is())); 72 fail_if(eo_composite_part_is(simple));
73 fail_if(!eo_do_ret(obj, tmp,eo_composite_attach(simple))); 73 fail_if(!eo_composite_attach(obj, simple));
74 fail_if(!eo_do_ret(simple, tmp,eo_composite_part_is())); 74 fail_if(!eo_composite_part_is(simple));
75 fail_if(eo_do_ret(obj, tmp,eo_composite_attach(simple))); 75 fail_if(eo_composite_attach(obj, simple));
76 76
77 fail_if(eo_do_ret(simple, tmp,eo_composite_attach(obj))); 77 fail_if(eo_composite_attach(simple, obj));
78 78
79 eo_unref(simple); 79 eo_unref(simple);
80 eo_unref(obj); 80 eo_unref(obj);
diff --git a/src/tests/eo/composite_objects/composite_objects_simple.c b/src/tests/eo/composite_objects/composite_objects_simple.c
index b9c906e..5c64cc0 100644
--- a/src/tests/eo/composite_objects/composite_objects_simple.c
+++ b/src/tests/eo/composite_objects/composite_objects_simple.c
@@ -17,7 +17,7 @@ _a_set(Eo *obj, void *class_data, int a)
17 printf("%s %d\n", eo_class_name_get(MY_CLASS), a); 17 printf("%s %d\n", eo_class_name_get(MY_CLASS), a);
18 pd->a = a; 18 pd->a = a;
19 19
20 eo_do(obj, eo_event_callback_call(EV_A_CHANGED, &pd->a)); 20 eo_event_callback_call(obj, EV_A_CHANGED, &pd->a);
21} 21}
22 22
23static int 23static int
diff --git a/src/tests/eo/constructors/constructors_main.c b/src/tests/eo/constructors/constructors_main.c
index cab5e7f..5844e46 100644
--- a/src/tests/eo/constructors/constructors_main.c
+++ b/src/tests/eo/constructors/constructors_main.c
@@ -28,10 +28,13 @@ main(int argc, char *argv[])
28 28
29 fail_if(my_init_count != 2); 29 fail_if(my_init_count != 2);
30 30
31 eo_do(obj, simple_a_set(1), simple_b_set(2)); 31 simple_a_set(obj, 1);
32 simple_b_set(obj, 2);
32 33
33 int a = 0, b = 0; 34 int a = 0, b = 0;
34 eo_do(obj, a = simple_a_get(), b = simple_b_get(), mixin_add_and_print(5)); 35 a = simple_a_get(obj);
36 b = simple_b_get(obj);
37 mixin_add_and_print(obj, 5);
35 fail_if(a != 1); 38 fail_if(a != 1);
36 fail_if(b != 2); 39 fail_if(b != 2);
37 40
@@ -69,19 +72,18 @@ main(int argc, char *argv[])
69 obj = eo_add(SIMPLE_CLASS, NULL); 72 obj = eo_add(SIMPLE_CLASS, NULL);
70 fail_if(!obj); 73 fail_if(!obj);
71 fail_if(my_init_count != 2); 74 fail_if(my_init_count != 2);
72 eo_do(obj, a = simple_a_get()); 75 a = simple_a_get(obj);
73 fail_if(a != 0); 76 fail_if(a != 0);
74 77
75 my_init_count = 0; 78 my_init_count = 0;
76 obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(7)); 79 obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(eoid, 7));
77 fail_if(!obj); 80 fail_if(!obj);
78 fail_if(my_init_count != 2); 81 fail_if(my_init_count != 2);
79 eo_do(obj, a = simple_a_get();); 82 a = simple_a_get(obj);
80 fail_if(a != 7); 83 fail_if(a != 7);
81 84
82 my_init_count = 0; 85 my_init_count = 0;
83 obj = eo_add(SIMPLE_CLASS, NULL, simple_b_set(6), simple_a_set(-1), 86 obj = eo_add(SIMPLE_CLASS, NULL, simple_b_set(eoid, 6), simple_a_set(eoid, -1), b = simple_b_get(eoid));
84 b = simple_b_get());
85 fail_if(obj); 87 fail_if(obj);
86 fail_if(b != 6); 88 fail_if(b != 6);
87 fail_if(my_init_count != 0); 89 fail_if(my_init_count != 0);
diff --git a/src/tests/eo/constructors/constructors_mixin.c b/src/tests/eo/constructors/constructors_mixin.c
index 10213b1..b2e523b 100644
--- a/src/tests/eo/constructors/constructors_mixin.c
+++ b/src/tests/eo/constructors/constructors_mixin.c
@@ -12,7 +12,8 @@ static void
12_add_and_print_set(Eo *obj, void *class_data EINA_UNUSED, int x) 12_add_and_print_set(Eo *obj, void *class_data EINA_UNUSED, int x)
13{ 13{
14 int a = 0, b = 0; 14 int a = 0, b = 0;
15 eo_do(obj, a = simple_a_get(), b = simple_b_get()); 15 a = simple_a_get(obj);
16 b = simple_b_get(obj);
16 printf("%s %d\n", __func__, a + b + x); 17 printf("%s %d\n", __func__, a + b + x);
17} 18}
18 19
@@ -23,13 +24,13 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
23{ 24{
24 my_init_count++; 25 my_init_count++;
25 26
26 return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 27 return eo_constructor(eo_super(obj, MY_CLASS));
27} 28}
28 29
29static void 30static void
30_destructor(Eo *obj, void *class_data EINA_UNUSED) 31_destructor(Eo *obj, void *class_data EINA_UNUSED)
31{ 32{
32 eo_do_super(obj, MY_CLASS, eo_destructor()); 33 eo_destructor(eo_super(obj, MY_CLASS));
33 34
34 my_init_count--; 35 my_init_count--;
35} 36}
diff --git a/src/tests/eo/constructors/constructors_simple.c b/src/tests/eo/constructors/constructors_simple.c
index d287485..370ca60 100644
--- a/src/tests/eo/constructors/constructors_simple.c
+++ b/src/tests/eo/constructors/constructors_simple.c
@@ -44,7 +44,7 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED)
44{ 44{
45 my_init_count++; 45 my_init_count++;
46 46
47 return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 47 return eo_constructor(eo_super(obj, MY_CLASS));
48} 48}
49 49
50static Eo* 50static Eo*
@@ -53,7 +53,7 @@ _finalize(Eo *obj, void *class_data EINA_UNUSED)
53 Eo *ret; 53 Eo *ret;
54 Private_Data *pd = class_data; 54 Private_Data *pd = class_data;
55 55
56 eo_do_super(obj, MY_CLASS, ret = eo_finalize()); 56 ret = eo_finalize(eo_super(obj, MY_CLASS));
57 57
58 if (pd->a < 0) 58 if (pd->a < 0)
59 { 59 {
@@ -66,7 +66,7 @@ _finalize(Eo *obj, void *class_data EINA_UNUSED)
66static void 66static void
67_destructor(Eo *obj, void *class_data EINA_UNUSED) 67_destructor(Eo *obj, void *class_data EINA_UNUSED)
68{ 68{
69 eo_do_super(obj, MY_CLASS, eo_destructor()); 69 eo_destructor(eo_super(obj, MY_CLASS));
70 70
71 my_init_count--; 71 my_init_count--;
72} 72}
diff --git a/src/tests/eo/constructors/constructors_simple2.c b/src/tests/eo/constructors/constructors_simple2.c
index e0c6804..b1e59f8 100644
--- a/src/tests/eo/constructors/constructors_simple2.c
+++ b/src/tests/eo/constructors/constructors_simple2.c
@@ -11,7 +11,7 @@
11static Eo * 11static Eo *
12_constructor(Eo *obj, void *class_data EINA_UNUSED) 12_constructor(Eo *obj, void *class_data EINA_UNUSED)
13{ 13{
14 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 14 obj = eo_constructor(eo_super(obj, MY_CLASS));
15 15
16 return NULL; 16 return NULL;
17} 17}
diff --git a/src/tests/eo/constructors/constructors_simple6.c b/src/tests/eo/constructors/constructors_simple6.c
index 9f4355d..f3e12b8 100644
--- a/src/tests/eo/constructors/constructors_simple6.c
+++ b/src/tests/eo/constructors/constructors_simple6.c
@@ -11,7 +11,7 @@
11static void 11static void
12_destructor(Eo *obj, void *class_data EINA_UNUSED) 12_destructor(Eo *obj, void *class_data EINA_UNUSED)
13{ 13{
14 eo_do_super(obj, MY_CLASS, eo_destructor()); 14 eo_destructor(eo_super(obj, MY_CLASS));
15} 15}
16 16
17static Eo_Op_Description op_descs [] = { 17static Eo_Op_Description op_descs [] = {
diff --git a/src/tests/eo/constructors/constructors_simple7.c b/src/tests/eo/constructors/constructors_simple7.c
index d3ec9ea..c821d25 100644
--- a/src/tests/eo/constructors/constructors_simple7.c
+++ b/src/tests/eo/constructors/constructors_simple7.c
@@ -15,7 +15,7 @@ static Eo *
15_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) 15_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
16{ 16{
17 /* FIXME: Actually test it. */ 17 /* FIXME: Actually test it. */
18 return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 18 return eo_constructor(eo_super(obj, MY_CLASS));
19} 19}
20 20
21static Eo_Op_Description op_descs [] = { 21static Eo_Op_Description op_descs [] = {
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit2.c b/src/tests/eo/function_overrides/function_overrides_inherit2.c
index e250ee3..b4602aa 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit2.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit2.c
@@ -15,11 +15,11 @@ static void
15_a_set(Eo *obj, void *class_data EINA_UNUSED, int a) 15_a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
16{ 16{
17 printf("%s %d\n", eo_class_name_get(MY_CLASS), a); 17 printf("%s %d\n", eo_class_name_get(MY_CLASS), a);
18 eo_do(obj, simple_a_print()); 18 simple_a_print(obj);
19 eo_do_super(obj, MY_CLASS, simple_a_set(a + 1)); 19 simple_a_set(eo_super(obj, MY_CLASS), a + 1);
20 20
21 Eina_Bool called = EINA_FALSE; 21 Eina_Bool called = EINA_FALSE;
22 eo_do_super(obj, MY_CLASS, called = simple_a_print()); 22 called = simple_a_print(eo_super(obj, MY_CLASS));
23 fail_if(!called); 23 fail_if(!called);
24} 24}
25 25
@@ -28,7 +28,7 @@ _print(Eo *obj, void *class_data EINA_UNUSED)
28{ 28{
29 Eina_Bool called = EINA_FALSE; 29 Eina_Bool called = EINA_FALSE;
30 printf("Hey\n"); 30 printf("Hey\n");
31 eo_do_super(obj, MY_CLASS, called = inherit2_print()); 31 called = inherit2_print(eo_super(obj, MY_CLASS));
32 fail_if(called); 32 fail_if(called);
33 33
34 return EINA_TRUE; 34 return EINA_TRUE;
@@ -47,10 +47,10 @@ _class_print(Eo_Class *klass, void *data EINA_UNUSED)
47{ 47{
48 Eina_Bool called = EINA_FALSE; 48 Eina_Bool called = EINA_FALSE;
49 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); 49 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS));
50 eo_do_super(klass, MY_CLASS, called = simple_class_print()); 50 called = simple_class_print(eo_super(klass, MY_CLASS));
51 fail_if(!called); 51 fail_if(!called);
52 52
53 eo_do_super(klass, MY_CLASS, called = simple_class_print2()); 53 called = simple_class_print2(eo_super(klass, MY_CLASS));
54 fail_if(!called); 54 fail_if(!called);
55 55
56 return EINA_TRUE; 56 return EINA_TRUE;
diff --git a/src/tests/eo/function_overrides/function_overrides_inherit3.c b/src/tests/eo/function_overrides/function_overrides_inherit3.c
index 2f96d59..4c23281 100644
--- a/src/tests/eo/function_overrides/function_overrides_inherit3.c
+++ b/src/tests/eo/function_overrides/function_overrides_inherit3.c
@@ -13,7 +13,7 @@ static void
13_a_set(Eo *obj, void *class_data EINA_UNUSED, int a) 13_a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
14{ 14{
15 printf("%s %d\n", eo_class_name_get(MY_CLASS), a); 15 printf("%s %d\n", eo_class_name_get(MY_CLASS), a);
16 eo_do_super(obj, MY_CLASS, simple_a_set(a + 1)); 16 simple_a_set(eo_super(obj, MY_CLASS), a + 1);
17} 17}
18 18
19static Eo_Op_Description op_descs[] = { 19static Eo_Op_Description op_descs[] = {
diff --git a/src/tests/eo/function_overrides/function_overrides_main.c b/src/tests/eo/function_overrides/function_overrides_main.c
index 920595c..b2aa840 100644
--- a/src/tests/eo/function_overrides/function_overrides_main.c
+++ b/src/tests/eo/function_overrides/function_overrides_main.c
@@ -20,7 +20,7 @@ main(int argc, char *argv[])
20 Eina_Bool called = EINA_FALSE; 20 Eina_Bool called = EINA_FALSE;
21 Eo *obj = eo_add(INHERIT2_CLASS, NULL); 21 Eo *obj = eo_add(INHERIT2_CLASS, NULL);
22 22
23 eo_do(obj, simple_a_set(1)); 23 simple_a_set(obj, 1);
24 Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS); 24 Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS);
25 fail_if(pd->a != 2); 25 fail_if(pd->a != 2);
26 26
@@ -28,47 +28,48 @@ main(int argc, char *argv[])
28 28
29 obj = eo_add(INHERIT3_CLASS, NULL); 29 obj = eo_add(INHERIT3_CLASS, NULL);
30 30
31 eo_do(obj, simple_a_set(1)); 31 simple_a_set(obj, 1);
32 pd = eo_data_scope_get(obj, SIMPLE_CLASS); 32 pd = eo_data_scope_get(obj, SIMPLE_CLASS);
33 fail_if(pd->a != 3); 33 fail_if(pd->a != 3);
34 34
35 eo_unref(obj); 35 eo_unref(obj);
36 36
37 obj = eo_add(INHERIT2_CLASS, NULL); 37 obj = eo_add(INHERIT2_CLASS, NULL);
38 eo_do(obj, called = inherit2_print()); 38 called = inherit2_print(obj);
39 fail_if(!called); 39 fail_if(!called);
40 eo_do(obj, called = inherit2_print(), called = inherit2_print()); 40 called = inherit2_print(obj);
41 called = inherit2_print(obj);
41 fail_if(!called); 42 fail_if(!called);
42 eo_unref(obj); 43 eo_unref(obj);
43 44
44 obj = eo_add(SIMPLE_CLASS, NULL); 45 obj = eo_add(SIMPLE_CLASS, NULL);
45 eo_do(obj, called = inherit2_print()); 46 called = inherit2_print(obj);
46 fail_if(called); 47 fail_if(called);
47 48
48#ifdef EO_DEBUG 49#ifdef EO_DEBUG
49 eo_do(obj, called = simple_class_print()); 50 called = simple_class_print(obj);
50 fail_if(called); 51 fail_if(called);
51#endif 52#endif
52 53
53 eo_do(SIMPLE_CLASS, called = simple_class_print()); 54 called = simple_class_print(SIMPLE_CLASS);
54 fail_if(!called); 55 fail_if(!called);
55 56
56 eo_do(INHERIT_CLASS, called = simple_class_print()); 57 called = simple_class_print(INHERIT_CLASS);
57 fail_if(!called); 58 fail_if(!called);
58 59
59 eo_do(INHERIT2_CLASS, called = simple_class_print()); 60 called = simple_class_print(INHERIT2_CLASS);
60 fail_if(!called); 61 fail_if(!called);
61 62
62 eo_do(INHERIT3_CLASS, called = simple_class_print()); 63 called = simple_class_print(INHERIT3_CLASS);
63 fail_if(!called); 64 fail_if(!called);
64 65
65#ifdef EO_DEBUG 66#ifdef EO_DEBUG
66 eo_do(SIMPLE_CLASS, called = simple_a_print()); 67 called = simple_a_print(SIMPLE_CLASS);
67 fail_if(called); 68 fail_if(called);
68#endif 69#endif
69 70
70 eo_do_super(obj, SIMPLE_CLASS, eo_constructor()); 71 eo_constructor(eo_super(obj, SIMPLE_CLASS));
71 eo_do_super(obj, SIMPLE_CLASS, eo_destructor()); 72 eo_destructor(eo_super(obj, SIMPLE_CLASS));
72 73
73 eo_unref(obj); 74 eo_unref(obj);
74 75
diff --git a/src/tests/eo/function_overrides/function_overrides_simple.c b/src/tests/eo/function_overrides/function_overrides_simple.c
index dc5f0dd..57942f7 100644
--- a/src/tests/eo/function_overrides/function_overrides_simple.c
+++ b/src/tests/eo/function_overrides/function_overrides_simple.c
@@ -34,10 +34,10 @@ _class_print(Eo_Class *klass, void *class_data EINA_UNUSED)
34{ 34{
35 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS)); 35 printf("Print %s-%s\n", eo_class_name_get(klass), eo_class_name_get(MY_CLASS));
36 Eina_Bool called = EINA_FALSE; 36 Eina_Bool called = EINA_FALSE;
37 eo_do_super(klass, MY_CLASS, called = simple_class_print()); 37 called = simple_class_print(eo_super(klass, MY_CLASS));
38 fail_if(called); 38 fail_if(called);
39 39
40 eo_do_super(klass, MY_CLASS, called = simple_class_print2()); 40 called = simple_class_print2(eo_super(klass, MY_CLASS));
41 fail_if(called); 41 fail_if(called);
42 42
43 return EINA_TRUE; 43 return EINA_TRUE;
diff --git a/src/tests/eo/interface/interface_main.c b/src/tests/eo/interface/interface_main.c
index 40936d4..a85f030 100644
--- a/src/tests/eo/interface/interface_main.c
+++ b/src/tests/eo/interface/interface_main.c
@@ -18,16 +18,21 @@ main(int argc, char *argv[])
18 18
19 Eo *obj = eo_add(SIMPLE_CLASS, NULL); 19 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
20 20
21 eo_do(obj, simple_a_set(1), simple_b_set(2)); 21 simple_a_set(obj, 1);
22 simple_b_set(obj, 2);
22 23
23 int a = 0, b = 0, sum = 0; 24 int a = 0, b = 0, sum = 0;
24 eo_do(obj, a = simple_a_get(), b = simple_b_get(), sum = interface_ab_sum_get()); 25 a = simple_a_get(obj);
26 b = simple_b_get(obj);
27 sum = interface_ab_sum_get(obj);
25 fail_if(sum != a + b); 28 fail_if(sum != a + b);
26 29
27 sum = 0; 30 sum = 0;
28 eo_do(obj, sum = interface_ab_sum_get(), sum = interface_ab_sum_get()); 31 sum = interface_ab_sum_get(obj);
32 sum = interface_ab_sum_get(obj);
29 fail_if(sum != a + b); 33 fail_if(sum != a + b);
30 eo_do(obj, sum = interface2_ab_sum_get2(), sum = interface2_ab_sum_get2()); 34 sum = interface2_ab_sum_get2(obj);
35 sum = interface2_ab_sum_get2(obj);
31 fail_if(sum != a + b + 1); 36 fail_if(sum != a + b + 1);
32 37
33 eo_unref(obj); 38 eo_unref(obj);
diff --git a/src/tests/eo/interface/interface_simple.c b/src/tests/eo/interface/interface_simple.c
index cad7f24..589274f 100644
--- a/src/tests/eo/interface/interface_simple.c
+++ b/src/tests/eo/interface/interface_simple.c
@@ -40,7 +40,8 @@ static int
40_ab_sum_get(Eo *obj, void *class_data EINA_UNUSED) 40_ab_sum_get(Eo *obj, void *class_data EINA_UNUSED)
41{ 41{
42 int a = 0, b = 0; 42 int a = 0, b = 0;
43 eo_do(obj, a = simple_a_get(), b = simple_b_get()); 43 a = simple_a_get(obj);
44 b = simple_b_get(obj);
44 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); 45 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
45 return a + b; 46 return a + b;
46} 47}
@@ -49,7 +50,8 @@ static int
49_ab_sum_get2(Eo *obj, void *class_data EINA_UNUSED) 50_ab_sum_get2(Eo *obj, void *class_data EINA_UNUSED)
50{ 51{
51 int a = 0, b = 0; 52 int a = 0, b = 0;
52 eo_do(obj, a = simple_a_get(), b = simple_b_get()); 53 a = simple_a_get(obj);
54 b = simple_b_get(obj);
53 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); 55 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
54 return a + b + 1; 56 return a + b + 1;
55} 57}
diff --git a/src/tests/eo/mixin/mixin_inherit.c b/src/tests/eo/mixin/mixin_inherit.c
index 8098c1c..b583bef 100644
--- a/src/tests/eo/mixin/mixin_inherit.c
+++ b/src/tests/eo/mixin/mixin_inherit.c
@@ -13,7 +13,7 @@ static int
13_a_get(Eo *obj, void *class_data EINA_UNUSED) 13_a_get(Eo *obj, void *class_data EINA_UNUSED)
14{ 14{
15 int ret = 0; 15 int ret = 0;
16 eo_do_super(obj, MY_CLASS, ret = simple_a_get()); 16 ret = simple_a_get(eo_super(obj, MY_CLASS));
17 printf("%s %d\n", __func__, ret); 17 printf("%s %d\n", __func__, ret);
18 18
19 return ret; 19 return ret;
diff --git a/src/tests/eo/mixin/mixin_main.c b/src/tests/eo/mixin/mixin_main.c
index 6ab6af2..d3c1dbf 100644
--- a/src/tests/eo/mixin/mixin_main.c
+++ b/src/tests/eo/mixin/mixin_main.c
@@ -20,13 +20,17 @@ main(int argc, char *argv[])
20 20
21 Eo *obj = eo_add(SIMPLE_CLASS, NULL); 21 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
22 22
23 eo_do(obj, simple_a_set(1), simple_b_set(2)); 23 simple_a_set(obj, 1);
24 simple_b_set(obj, 2);
24 25
25 int a = 0, b = 0, sum = 0; 26 int a = 0, b = 0, sum = 0;
26 eo_do(obj, a = simple_a_get(), b = simple_b_get(), sum = mixin_ab_sum_get()); 27 a = simple_a_get(obj);
28 b = simple_b_get(obj);
29 sum = mixin_ab_sum_get(obj);
27 fail_if(sum != a + b + 2); /* 2 for the two mixins... */ 30 fail_if(sum != a + b + 2); /* 2 for the two mixins... */
28 31
29 eo_do(obj, sum = mixin_ab_sum_get(), sum = mixin_ab_sum_get()); 32 sum = mixin_ab_sum_get(obj);
33 sum = mixin_ab_sum_get(obj);
30 34
31 Mixin2_Public_Data *pd2 = eo_data_scope_get(obj, MIXIN2_CLASS); 35 Mixin2_Public_Data *pd2 = eo_data_scope_get(obj, MIXIN2_CLASS);
32 fail_if(pd2->count != 6); 36 fail_if(pd2->count != 6);
@@ -37,7 +41,8 @@ main(int argc, char *argv[])
37 eo_unref(obj); 41 eo_unref(obj);
38 42
39 obj = eo_add(INHERIT_CLASS, NULL); 43 obj = eo_add(INHERIT_CLASS, NULL);
40 eo_do(obj, simple_a_set(5), a = simple_a_get()); 44 simple_a_set(obj, 5);
45 a = simple_a_get(obj);
41 printf("%d\n", a); 46 printf("%d\n", a);
42 fail_if(a != 5); 47 fail_if(a != 5);
43 48
diff --git a/src/tests/eo/mixin/mixin_mixin.c b/src/tests/eo/mixin/mixin_mixin.c
index d8569d4..427293e 100644
--- a/src/tests/eo/mixin/mixin_mixin.c
+++ b/src/tests/eo/mixin/mixin_mixin.c
@@ -12,7 +12,8 @@ static int
12_ab_sum_get(Eo *obj, void *class_data EINA_UNUSED) 12_ab_sum_get(Eo *obj, void *class_data EINA_UNUSED)
13{ 13{
14 int a = 0, b = 0; 14 int a = 0, b = 0;
15 eo_do(obj, a = simple_a_get(), b = simple_b_get()); 15 a = simple_a_get(obj);
16 b = simple_b_get(obj);
16 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); 17 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
17 return a + b; 18 return a + b;
18} 19}
@@ -20,13 +21,13 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED)
20static Eo * 21static Eo *
21_constructor(Eo *obj, void *class_data EINA_UNUSED) 22_constructor(Eo *obj, void *class_data EINA_UNUSED)
22{ 23{
23 return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 24 return eo_constructor(eo_super(obj, MY_CLASS));
24} 25}
25 26
26static void 27static void
27_destructor(Eo *obj, void *class_data EINA_UNUSED) 28_destructor(Eo *obj, void *class_data EINA_UNUSED)
28{ 29{
29 eo_do_super(obj, MY_CLASS, eo_destructor()); 30 eo_destructor(eo_super(obj, MY_CLASS));
30} 31}
31 32
32EAPI EO_FUNC_BODY(mixin_ab_sum_get, int, 0); 33EAPI EO_FUNC_BODY(mixin_ab_sum_get, int, 0);
diff --git a/src/tests/eo/mixin/mixin_mixin2.c b/src/tests/eo/mixin/mixin_mixin2.c
index 7aff72b..93f30f6 100644
--- a/src/tests/eo/mixin/mixin_mixin2.c
+++ b/src/tests/eo/mixin/mixin_mixin2.c
@@ -18,14 +18,15 @@ _ab_sum_get(Eo *obj, void *class_data)
18 Mixin2_Public_Data *pd = (Mixin2_Public_Data *) class_data; 18 Mixin2_Public_Data *pd = (Mixin2_Public_Data *) class_data;
19 int sum = 0; 19 int sum = 0;
20 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); 20 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
21 eo_do_super(obj, MY_CLASS, sum = mixin_ab_sum_get()); 21 sum = mixin_ab_sum_get(eo_super(obj, MY_CLASS));
22 22
23 ++sum; 23 ++sum;
24 pd->count += 2; 24 pd->count += 2;
25 25
26 { 26 {
27 int _a = 0, _b = 0; 27 int _a = 0, _b = 0;
28 eo_do(obj, _a = simple_a_get(), _b = simple_b_get()); 28 _a = simple_a_get(obj);
29 _b = simple_b_get(obj);
29 fail_if(sum != _a + _b + 1); 30 fail_if(sum != _a + _b + 1);
30 } 31 }
31 32
@@ -35,14 +36,14 @@ _ab_sum_get(Eo *obj, void *class_data)
35static Eo * 36static Eo *
36_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) 37_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
37{ 38{
38 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 39 obj = eo_constructor(eo_super(obj, MY_CLASS));
39 return obj; 40 return obj;
40} 41}
41 42
42static void 43static void
43_destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) 44_destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
44{ 45{
45 eo_do_super(obj, MY_CLASS, eo_destructor()); 46 eo_destructor(eo_super(obj, MY_CLASS));
46} 47}
47 48
48static Eo_Op_Description op_descs[] = { 49static Eo_Op_Description op_descs[] = {
diff --git a/src/tests/eo/mixin/mixin_mixin3.c b/src/tests/eo/mixin/mixin_mixin3.c
index d5c2ed7..2a946e4 100644
--- a/src/tests/eo/mixin/mixin_mixin3.c
+++ b/src/tests/eo/mixin/mixin_mixin3.c
@@ -18,14 +18,15 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED)
18 Mixin3_Public_Data *pd = (Mixin3_Public_Data *) class_data; 18 Mixin3_Public_Data *pd = (Mixin3_Public_Data *) class_data;
19 int sum = 0; 19 int sum = 0;
20 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__); 20 printf("%s %s\n", eo_class_name_get(MY_CLASS), __func__);
21 eo_do_super(obj, MY_CLASS, sum = mixin_ab_sum_get()); 21 sum = mixin_ab_sum_get(eo_super(obj, MY_CLASS));
22 22
23 ++sum; 23 ++sum;
24 pd->count += 3; 24 pd->count += 3;
25 25
26 { 26 {
27 int _a = 0, _b = 0; 27 int _a = 0, _b = 0;
28 eo_do(obj, _a = simple_a_get(), _b = simple_b_get()); 28 _a = simple_a_get(obj);
29 _b = simple_b_get(obj);
29 fail_if(sum != _a + _b + 2); 30 fail_if(sum != _a + _b + 2);
30 } 31 }
31 32
@@ -35,13 +36,13 @@ _ab_sum_get(Eo *obj, void *class_data EINA_UNUSED)
35static Eo * 36static Eo *
36_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) 37_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
37{ 38{
38 return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 39 return eo_constructor(eo_super(obj, MY_CLASS));
39} 40}
40 41
41static void 42static void
42_destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED) 43_destructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
43{ 44{
44 eo_do_super(obj, MY_CLASS, eo_destructor()); 45 eo_destructor(eo_super(obj, MY_CLASS));
45} 46}
46 47
47static Eo_Op_Description op_descs[] = { 48static Eo_Op_Description op_descs[] = {
diff --git a/src/tests/eo/signals/signals_main.c b/src/tests/eo/signals/signals_main.c
index 4fcfaef..5d40331 100644
--- a/src/tests/eo/signals/signals_main.c
+++ b/src/tests/eo/signals/signals_main.c
@@ -23,8 +23,8 @@ _a_changed_cb(void *data, const Eo_Event *event)
23 23
24 cb_count++; 24 cb_count++;
25 25
26 eo_do(event->obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _null_cb, (void *) 23423)); 26 eo_event_callback_priority_add(event->obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _null_cb, (void *) 23423);
27 eo_do(event->obj, eo_event_callback_del(EV_A_CHANGED, _null_cb, (void *) 23423)); 27 eo_event_callback_del(event->obj, EV_A_CHANGED, _null_cb, (void *) 23423);
28 28
29 /* Stop as we reached the 3rd one. */ 29 /* Stop as we reached the 3rd one. */
30 return (cb_count != 3); 30 return (cb_count != 3);
@@ -41,132 +41,132 @@ main(int argc, char *argv[])
41 Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS); 41 Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS);
42 42
43 /* The order of these two is undetermined. */ 43 /* The order of these two is undetermined. */
44 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2)); 44 eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2);
45 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1)); 45 eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1);
46 /* This will be called afterwards. */ 46 /* This will be called afterwards. */
47 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_DEFAULT, _a_changed_cb, (void *) 3)); 47 eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_DEFAULT, _a_changed_cb, (void *) 3);
48 /* This will never be called because the previous callback returns NULL. */ 48 /* This will never be called because the previous callback returns NULL. */
49 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_AFTER, _a_changed_cb, (void *) 4)); 49 eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_AFTER, _a_changed_cb, (void *) 4);
50 50
51 eo_do(obj, simple_a_set(1)); 51 simple_a_set(obj, 1);
52 52
53 fail_if(cb_count != 3); 53 fail_if(cb_count != 3);
54 54
55 eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 3)); 55 eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 3);
56 fail_if(pd->cb_count != 3); 56 fail_if(pd->cb_count != 3);
57 57
58 eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 12)); 58 eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 12);
59 fail_if(pd->cb_count != 3); 59 fail_if(pd->cb_count != 3);
60 60
61 eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 4)); 61 eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 4);
62 fail_if(pd->cb_count != 2); 62 fail_if(pd->cb_count != 2);
63 63
64 eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 2)); 64 eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 2);
65 fail_if(pd->cb_count != 1); 65 fail_if(pd->cb_count != 1);
66 66
67 eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 1)); 67 eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 1);
68 fail_if(pd->cb_count != 0); 68 fail_if(pd->cb_count != 0);
69 69
70 /* Freeze/thaw. */ 70 /* Freeze/thaw. */
71 int fcount = 0; 71 int fcount = 0;
72 cb_count = 0; 72 cb_count = 0;
73 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1)); 73 eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1);
74 fail_if(pd->cb_count != 1); 74 fail_if(pd->cb_count != 1);
75 75
76 eo_do(obj, fcount = eo_event_freeze_count_get()); 76 fcount = eo_event_freeze_count_get(obj);
77 fail_if(fcount != 0); 77 fail_if(fcount != 0);
78 78
79 eo_do(obj, eo_event_freeze()); 79 eo_event_freeze(obj);
80 eo_do(obj, fcount = eo_event_freeze_count_get()); 80 fcount = eo_event_freeze_count_get(obj);
81 fail_if(fcount != 1); 81 fail_if(fcount != 1);
82 82
83 eo_do(obj, eo_event_freeze()); 83 eo_event_freeze(obj);
84 eo_do(obj, fcount = eo_event_freeze_count_get()); 84 fcount = eo_event_freeze_count_get(obj);
85 fail_if(fcount != 2); 85 fail_if(fcount != 2);
86 86
87 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2)); 87 eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2);
88 fail_if(pd->cb_count != 2); 88 fail_if(pd->cb_count != 2);
89 89
90 eo_do(obj, simple_a_set(2)); 90 simple_a_set(obj, 2);
91 fail_if(cb_count != 0); 91 fail_if(cb_count != 0);
92 eo_do(obj, eo_event_thaw()); 92 eo_event_thaw(obj);
93 eo_do(obj, fcount = eo_event_freeze_count_get()); 93 fcount = eo_event_freeze_count_get(obj);
94 fail_if(fcount != 1); 94 fail_if(fcount != 1);
95 95
96 eo_do(obj, eo_event_thaw()); 96 eo_event_thaw(obj);
97 eo_do(obj, fcount = eo_event_freeze_count_get()); 97 fcount = eo_event_freeze_count_get(obj);
98 fail_if(fcount != 0); 98 fail_if(fcount != 0);
99 99
100 eo_do(obj, simple_a_set(3)); 100 simple_a_set(obj, 3);
101 fail_if(cb_count != 2); 101 fail_if(cb_count != 2);
102 102
103 cb_count = 0; 103 cb_count = 0;
104 eo_do(obj, eo_event_thaw()); 104 eo_event_thaw(obj);
105 eo_do(obj, fcount = eo_event_freeze_count_get()); 105 fcount = eo_event_freeze_count_get(obj);
106 fail_if(fcount != 0); 106 fail_if(fcount != 0);
107 107
108 eo_do(obj, eo_event_freeze()); 108 eo_event_freeze(obj);
109 eo_do(obj, fcount = eo_event_freeze_count_get()); 109 fcount = eo_event_freeze_count_get(obj);
110 fail_if(fcount != 1); 110 fail_if(fcount != 1);
111 111
112 eo_do(obj, simple_a_set(2)); 112 simple_a_set(obj, 2);
113 fail_if(cb_count != 0); 113 fail_if(cb_count != 0);
114 eo_do(obj, eo_event_thaw()); 114 eo_event_thaw(obj);
115 eo_do(obj, fcount = eo_event_freeze_count_get()); 115 fcount = eo_event_freeze_count_get(obj);
116 fail_if(fcount != 0); 116 fail_if(fcount != 0);
117 117
118 eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 1)); 118 eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 1);
119 fail_if(pd->cb_count != 1); 119 fail_if(pd->cb_count != 1);
120 eo_do(obj, eo_event_callback_del(EV_A_CHANGED, _a_changed_cb, (void *) 2)); 120 eo_event_callback_del(obj, EV_A_CHANGED, _a_changed_cb, (void *) 2);
121 fail_if(pd->cb_count != 0); 121 fail_if(pd->cb_count != 0);
122 122
123 /* Global Freeze/thaw. */ 123 /* Global Freeze/thaw. */
124 fcount = 0; 124 fcount = 0;
125 cb_count = 0; 125 cb_count = 0;
126 pd->cb_count = 0; 126 pd->cb_count = 0;
127 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1)); 127 eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 1);
128 fail_if(pd->cb_count != 1); 128 fail_if(pd->cb_count != 1);
129 129
130 eo_do(EO_CLASS, fcount = eo_event_global_freeze_count_get()); 130 fcount = eo_event_global_freeze_count_get(EO_CLASS);
131 fail_if(fcount != 0); 131 fail_if(fcount != 0);
132 132
133 eo_do(EO_CLASS, eo_event_global_freeze()); 133 eo_event_global_freeze(EO_CLASS);
134 eo_do(EO_CLASS, fcount = eo_event_global_freeze_count_get()); 134 fcount = eo_event_global_freeze_count_get(EO_CLASS);
135 fail_if(fcount != 1); 135 fail_if(fcount != 1);
136 136
137 eo_do(EO_CLASS, eo_event_global_freeze()); 137 eo_event_global_freeze(EO_CLASS);
138 eo_do(EO_CLASS, fcount = eo_event_global_freeze_count_get()); 138 fcount = eo_event_global_freeze_count_get(EO_CLASS);
139 fail_if(fcount != 2); 139 fail_if(fcount != 2);
140 140
141 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2)); 141 eo_event_callback_priority_add(obj, EV_A_CHANGED, EO_CALLBACK_PRIORITY_BEFORE, _a_changed_cb, (void *) 2);
142 fail_if(pd->cb_count != 2); 142 fail_if(pd->cb_count != 2);
143 143
144 eo_do(obj, simple_a_set(2)); 144 simple_a_set(obj, 2);
145 fail_if(cb_count != 0); 145 fail_if(cb_count != 0);
146 eo_do(EO_CLASS, eo_event_global_thaw()); 146 eo_event_global_thaw(EO_CLASS);
147 eo_do(EO_CLASS, fcount = eo_event_global_freeze_count_get()); 147 fcount = eo_event_global_freeze_count_get(EO_CLASS);
148 fail_if(fcount != 1); 148 fail_if(fcount != 1);
149 149
150 eo_do(EO_CLASS, eo_event_global_thaw()); 150 eo_event_global_thaw(EO_CLASS);
151 eo_do(EO_CLASS, fcount = eo_event_global_freeze_count_get()); 151 fcount = eo_event_global_freeze_count_get(EO_CLASS);
152 fail_if(fcount != 0); 152 fail_if(fcount != 0);
153 153
154 eo_do(obj, simple_a_set(3)); 154 simple_a_set(obj, 3);
155 fail_if(cb_count != 2); 155 fail_if(cb_count != 2);
156 156
157 cb_count = 0; 157 cb_count = 0;
158 eo_do(EO_CLASS, eo_event_global_thaw()); 158 eo_event_global_thaw(EO_CLASS);
159 eo_do(EO_CLASS, fcount = eo_event_global_freeze_count_get()); 159 fcount = eo_event_global_freeze_count_get(EO_CLASS);
160 fail_if(fcount != 0); 160 fail_if(fcount != 0);
161 161
162 eo_do(EO_CLASS, eo_event_global_freeze()); 162 eo_event_global_freeze(EO_CLASS);
163 eo_do(EO_CLASS, fcount = eo_event_global_freeze_count_get()); 163 fcount = eo_event_global_freeze_count_get(EO_CLASS);
164 fail_if(fcount != 1); 164 fail_if(fcount != 1);
165 165
166 eo_do(obj, simple_a_set(2)); 166 simple_a_set(obj, 2);
167 fail_if(cb_count != 0); 167 fail_if(cb_count != 0);
168 eo_do(EO_CLASS, eo_event_global_thaw()); 168 eo_event_global_thaw(EO_CLASS);
169 eo_do(EO_CLASS, fcount = eo_event_global_freeze_count_get()); 169 fcount = eo_event_global_freeze_count_get(EO_CLASS);
170 fail_if(fcount != 0); 170 fail_if(fcount != 0);
171 171
172 172
diff --git a/src/tests/eo/signals/signals_simple.c b/src/tests/eo/signals/signals_simple.c
index d3145e5..8a70f5f 100644
--- a/src/tests/eo/signals/signals_simple.c
+++ b/src/tests/eo/signals/signals_simple.c
@@ -23,7 +23,7 @@ _a_set(Eo *obj, void *class_data, int a)
23 pd->a = a; 23 pd->a = a;
24 printf("%s %d\n", __func__, pd->a); 24 printf("%s %d\n", __func__, pd->a);
25 25
26 eo_do(obj, eo_event_callback_call(EV_A_CHANGED, &pd->a)); 26 eo_event_callback_call(obj, EV_A_CHANGED, &pd->a);
27} 27}
28 28
29Eina_Bool 29Eina_Bool
@@ -59,12 +59,12 @@ _cb_deled(void *data, const Eo_Event *event)
59static Eo * 59static Eo *
60_constructor(Eo *obj, void *class_data EINA_UNUSED) 60_constructor(Eo *obj, void *class_data EINA_UNUSED)
61{ 61{
62 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 62 obj = eo_constructor(eo_super(obj, MY_CLASS));
63 63
64 eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_CALLBACK_ADD, _cb_added, NULL)); 64 eo_event_callback_add(obj, EO_BASE_EVENT_CALLBACK_ADD, _cb_added, NULL);
65 eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_CALLBACK_DEL, _cb_deled, NULL)); 65 eo_event_callback_add(obj, EO_BASE_EVENT_CALLBACK_DEL, _cb_deled, NULL);
66 66
67 eo_do(obj, eo_key_data_set("cb_count", NULL)); 67 eo_key_data_set(obj, "cb_count", NULL);
68 68
69 return obj; 69 return obj;
70} 70}
diff --git a/src/tests/eo/suite/eo_test_call_errors.c b/src/tests/eo/suite/eo_test_call_errors.c
index 48d8a55..551c58d 100644
--- a/src/tests/eo/suite/eo_test_call_errors.c
+++ b/src/tests/eo/suite/eo_test_call_errors.c
@@ -21,7 +21,7 @@ START_TEST(eo_pure_virtual_fct_call)
21 fail_if(!obj); 21 fail_if(!obj);
22 22
23 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'.");
24 eo_do(obj, simple_pure_virtual()); 24 simple_pure_virtual(obj);
25 fail_unless(ctx.did); 25 fail_unless(ctx.did);
26 26
27 eo_unref(obj); 27 eo_unref(obj);
@@ -39,7 +39,7 @@ START_TEST(eo_api_not_implemented_call)
39 fail_if(!obj); 39 fail_if(!obj);
40 40
41 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");
42 eo_do(obj, simple_no_implementation()); 42 simple_no_implementation(obj);
43 fail_unless(ctx.did); 43 fail_unless(ctx.did);
44 44
45 eo_unref(obj); 45 eo_unref(obj);
@@ -57,7 +57,7 @@ START_TEST(eo_op_not_found_in_super)
57 fail_if(!obj); 57 fail_if(!obj);
58 58
59 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'.");
60 eo_do_super(obj, SIMPLE_CLASS, simple_a_set(10)); 60 simple_a_set(eo_super(obj, SIMPLE_CLASS), 10);
61 fail_unless(ctx.did); 61 fail_unless(ctx.did);
62 62
63 eo_unref(obj); 63 eo_unref(obj);
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 83628f6..12c478f 100644
--- a/src/tests/eo/suite/eo_test_class_behaviour_errors.c
+++ b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
@@ -16,7 +16,7 @@ const Eo_Class *klass;
16 16
17static void _destructor_unref(Eo *obj, void *class_data EINA_UNUSED) 17static void _destructor_unref(Eo *obj, void *class_data EINA_UNUSED)
18{ 18{
19 eo_do_super(obj, klass, eo_destructor()); 19 eo_destructor(eo_super(obj, klass));
20 20
21 /* this triggers an eo stack overflow if not correctly protected */ 21 /* this triggers an eo stack overflow if not correctly protected */
22 eo_unref(obj); 22 eo_unref(obj);
diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index cb4cb72..1fe449a 100644
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -20,7 +20,7 @@ _a_set(Eo *obj EINA_UNUSED, void *class_data, int a)
20 printf("%s %d\n", eo_class_name_get(MY_CLASS), a); 20 printf("%s %d\n", eo_class_name_get(MY_CLASS), a);
21 pd->a = a; 21 pd->a = a;
22 22
23 eo_do(obj, eo_event_callback_call(EV_A_CHANGED, &pd->a)); 23 eo_event_callback_call(obj, EV_A_CHANGED, &pd->a);
24} 24}
25 25
26static int 26static int
@@ -67,7 +67,7 @@ _recursive(Eo *obj, void *class_data EINA_UNUSED, int n)
67 if (count < n) 67 if (count < n)
68 { 68 {
69 count++; 69 count++;
70 eo_do(obj, simple_recursive(n)); 70 simple_recursive(obj, n);
71 } 71 }
72 else 72 else
73 count = 0; 73 count = 0;
@@ -76,7 +76,7 @@ _recursive(Eo *obj, void *class_data EINA_UNUSED, int n)
76static void 76static void
77_dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, Eo_Dbg_Info *root) 77_dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, Eo_Dbg_Info *root)
78{ 78{
79 eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); 79 eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
80 Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, "Test list"); 80 Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, "Test list");
81 EO_DBG_INFO_APPEND(group, "Test", EINA_VALUE_TYPE_INT, 8); 81 EO_DBG_INFO_APPEND(group, "Test", EINA_VALUE_TYPE_INT, 8);
82} 82}
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index 5add8d3..4dd7f75 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -22,8 +22,8 @@ START_TEST(eo_simple)
22 22
23 obj = eo_add(SIMPLE_CLASS, NULL); 23 obj = eo_add(SIMPLE_CLASS, NULL);
24 fail_if(!obj); 24 fail_if(!obj);
25 eo_do(obj, eo_constructor()); 25 eo_constructor(obj);
26 eo_do(obj, eo_destructor()); 26 eo_destructor(obj);
27 eo_unref(obj); 27 eo_unref(obj);
28 28
29 eo_shutdown(); 29 eo_shutdown();
@@ -36,7 +36,7 @@ START_TEST(eo_stack)
36 Eo *obj = eo_add(SIMPLE_CLASS, NULL); 36 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
37 fail_if(!obj); 37 fail_if(!obj);
38 38
39 eo_do(obj, simple_recursive(123)); 39 simple_recursive(obj, 123);
40 40
41 eo_unref(obj); 41 eo_unref(obj);
42 42
@@ -103,25 +103,25 @@ START_TEST(eo_signals)
103 Eo *obj = eo_add(SIMPLE_CLASS, NULL); 103 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
104 Eina_Bool r; 104 Eina_Bool r;
105 105
106 eo_do(obj, eo_event_callback_add(EO_BASE_EVENT_CALLBACK_ADD, _eo_signals_cb_added_deled, callbacks)); 106 eo_event_callback_add(obj, EO_BASE_EVENT_CALLBACK_ADD, _eo_signals_cb_added_deled, callbacks);
107 eo_do(obj, r = eo_event_callback_add(EO_BASE_EVENT_CALLBACK_DEL, _eo_signals_cb_added_deled, callbacks)); 107 r = eo_event_callback_add(obj, EO_BASE_EVENT_CALLBACK_DEL, _eo_signals_cb_added_deled, callbacks);
108 fail_if(!r); 108 fail_if(!r);
109 eo_do(obj, eo_event_callback_array_priority_add(callbacks, -100, (void *) 1)); 109 eo_event_callback_array_priority_add(obj, callbacks, -100, (void *) 1);
110 eo_do(obj, eo_event_callback_array_add(callbacks, (void *) 3)); 110 eo_event_callback_array_add(obj, callbacks, (void *) 3);
111 eo_do(obj, r = eo_event_callback_array_priority_add(callbacks, -50, (void *) 2)); 111 r = eo_event_callback_array_priority_add(obj, callbacks, -50, (void *) 2);
112 fail_if(!r); 112 fail_if(!r);
113 eo_do(obj, simple_a_set(1)); 113 simple_a_set(obj, 1);
114 ck_assert_int_eq(_eo_signals_cb_flag, 0x3); 114 ck_assert_int_eq(_eo_signals_cb_flag, 0x3);
115 115
116 eo_do(obj, eo_event_callback_array_del(callbacks, (void *) 1)); 116 eo_event_callback_array_del(obj, callbacks, (void *) 1);
117 eo_do(obj, eo_event_callback_array_del(callbacks, (void *) 2)); 117 eo_event_callback_array_del(obj, callbacks, (void *) 2);
118 eo_do(obj, r = eo_event_callback_array_del(callbacks, (void *) 3)); 118 r = eo_event_callback_array_del(obj, callbacks, (void *) 3);
119 fail_if(!r); 119 fail_if(!r);
120 /* Try to delete something that doesn't exist. */ 120 /* Try to delete something that doesn't exist. */
121 eo_do(obj, r = eo_event_callback_array_del(callbacks, (void *) 4)); 121 r = eo_event_callback_array_del(obj, callbacks, (void *) 4);
122 fail_if(r); 122 fail_if(r);
123 _eo_signals_cb_flag = 0; 123 _eo_signals_cb_flag = 0;
124 eo_do(obj, simple_a_set(1)); 124 simple_a_set(obj, 1);
125 ck_assert_int_eq(_eo_signals_cb_flag, 0x0); 125 ck_assert_int_eq(_eo_signals_cb_flag, 0x0);
126 126
127 eo_unref(obj); 127 eo_unref(obj);
@@ -140,21 +140,21 @@ START_TEST(eo_signals)
140 140
141 /* Call Eo event with legacy and non-legacy callbacks. */ 141 /* Call Eo event with legacy and non-legacy callbacks. */
142 _eo_signals_cb_current = 0; 142 _eo_signals_cb_current = 0;
143 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED2, -1000, _eo_signals_a_changed_never, (void *) 1)); 143 eo_event_callback_priority_add(obj, EV_A_CHANGED2, -1000, _eo_signals_a_changed_never, (void *) 1);
144 eo_do(obj, eo_event_callback_priority_add(EV_A_CHANGED, -100, _eo_signals_a_changed_cb, (void *) 1)); 144 eo_event_callback_priority_add(obj, EV_A_CHANGED, -100, _eo_signals_a_changed_cb, (void *) 1);
145 eo_do(obj, eo_event_callback_add(a_desc, _eo_signals_a_changed_cb2, NULL)); 145 eo_event_callback_add(obj, a_desc, _eo_signals_a_changed_cb2, NULL);
146 eo_do(obj, simple_a_set(1)); 146 simple_a_set(obj, 1);
147 ck_assert_int_eq(_eo_signals_cb_flag, 0x3); 147 ck_assert_int_eq(_eo_signals_cb_flag, 0x3);
148 148
149 /* We don't need this one anymore. */ 149 /* We don't need this one anymore. */
150 eo_do(obj, r = eo_event_callback_del(EV_A_CHANGED2, _eo_signals_a_changed_never, (void *) 1)); 150 r = eo_event_callback_del(obj, EV_A_CHANGED2, _eo_signals_a_changed_never, (void *) 1);
151 fail_if(!r); 151 fail_if(!r);
152 152
153 /* Call legacy event with legacy and non-legacy callbacks. */ 153 /* Call legacy event with legacy and non-legacy callbacks. */
154 int a = 3; 154 int a = 3;
155 _eo_signals_cb_current = 0; 155 _eo_signals_cb_current = 0;
156 _eo_signals_cb_flag = 0; 156 _eo_signals_cb_flag = 0;
157 eo_do(obj, eo_event_callback_call(a_desc, &a)); 157 eo_event_callback_call(obj, a_desc, &a);
158 ck_assert_int_eq(_eo_signals_cb_flag, 0x3); 158 ck_assert_int_eq(_eo_signals_cb_flag, 0x3);
159 } 159 }
160 eo_unref(obj); 160 eo_unref(obj);
@@ -292,9 +292,9 @@ START_TEST(eo_composite_tests)
292 Eo *obj2 = eo_add(SIMPLE_CLASS, NULL); 292 Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
293 fail_if(!obj2); 293 fail_if(!obj2);
294 294
295 eo_do(obj, eo_composite_attach(obj2)); 295 eo_composite_attach(obj, obj2);
296 eo_do(obj2, eo_parent_set(NULL)); 296 eo_parent_set(obj2, NULL);
297 fail_if(eo_do_ret(obj2, tmp, eo_composite_part_is())); 297 fail_if(eo_composite_part_is(obj2));
298 298
299 eo_unref(obj2); 299 eo_unref(obj2);
300 eo_unref(obj); 300 eo_unref(obj);
@@ -312,13 +312,13 @@ _man_con(Eo *obj, void *data EINA_UNUSED, va_list *list EINA_UNUSED)
312{ 312{
313 if (_man_should_con) 313 if (_man_should_con)
314 eo_manual_free_set(obj, EINA_TRUE); 314 eo_manual_free_set(obj, EINA_TRUE);
315 return eo_do_super_ret(obj, cur_klass, obj, eo_constructor()); 315 return eo_constructor(eo_super(obj, cur_klass));
316} 316}
317 317
318static void 318static void
319_man_des(Eo *obj, void *data EINA_UNUSED, va_list *list EINA_UNUSED) 319_man_des(Eo *obj, void *data EINA_UNUSED, va_list *list EINA_UNUSED)
320{ 320{
321 eo_do_super(obj, cur_klass, eo_destructor()); 321 eo_destructor(eo_super(obj, cur_klass));
322 if (_man_should_des) 322 if (_man_should_des)
323 eo_manual_free_set(obj, EINA_FALSE); 323 eo_manual_free_set(obj, EINA_FALSE);
324} 324}
@@ -454,7 +454,7 @@ START_TEST(eo_refs)
454 obj2 = eo_ref(eo_add(SIMPLE_CLASS, obj)); 454 obj2 = eo_ref(eo_add(SIMPLE_CLASS, obj));
455 455
456 Eo *wref = NULL; 456 Eo *wref = NULL;
457 eo_do(obj2, eo_wref_add(&wref)); 457 eo_wref_add(obj2, &wref);
458 fail_if(!wref); 458 fail_if(!wref);
459 459
460 eo_unref(obj2); 460 eo_unref(obj2);
@@ -479,18 +479,18 @@ START_TEST(eo_refs)
479 obj2 = eo_ref(eo_add(SIMPLE_CLASS, obj)); 479 obj2 = eo_ref(eo_add(SIMPLE_CLASS, obj));
480 obj3 = eo_ref(eo_add(SIMPLE_CLASS, NULL)); 480 obj3 = eo_ref(eo_add(SIMPLE_CLASS, NULL));
481 481
482 eo_do(obj2, eo_parent_set(obj3)); 482 eo_parent_set(obj2, obj3);
483 eo_do(obj3, eo_parent_set(obj)); 483 eo_parent_set(obj3, obj);
484 ck_assert_int_eq(eo_ref_get(obj2), 2); 484 ck_assert_int_eq(eo_ref_get(obj2), 2);
485 ck_assert_int_eq(eo_ref_get(obj3), 2); 485 ck_assert_int_eq(eo_ref_get(obj3), 2);
486 486
487 eo_do(obj2, eo_parent_set(NULL)); 487 eo_parent_set(obj2, NULL);
488 eo_do(obj3, eo_parent_set(NULL)); 488 eo_parent_set(obj3, NULL);
489 ck_assert_int_eq(eo_ref_get(obj2), 1); 489 ck_assert_int_eq(eo_ref_get(obj2), 1);
490 ck_assert_int_eq(eo_ref_get(obj3), 1); 490 ck_assert_int_eq(eo_ref_get(obj3), 1);
491 491
492 eo_do(obj2, eo_parent_set(obj)); 492 eo_parent_set(obj2, obj);
493 eo_do(obj3, eo_parent_set(obj)); 493 eo_parent_set(obj3, obj);
494 ck_assert_int_eq(eo_ref_get(obj2), 1); 494 ck_assert_int_eq(eo_ref_get(obj2), 1);
495 ck_assert_int_eq(eo_ref_get(obj3), 1); 495 ck_assert_int_eq(eo_ref_get(obj3), 1);
496 496
@@ -522,14 +522,14 @@ START_TEST(eo_weak_reference)
522 Eo *obj = eo_add(SIMPLE_CLASS, NULL); 522 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
523 Eo *obj2 = eo_add(SIMPLE_CLASS, NULL); 523 Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
524 Eo *wref = NULL, *wref2 = NULL, *wref3 = NULL; 524 Eo *wref = NULL, *wref2 = NULL, *wref3 = NULL;
525 eo_do(obj, eo_wref_add(&wref)); 525 eo_wref_add(obj, &wref);
526 fail_if(!wref); 526 fail_if(!wref);
527 527
528 eo_unref(obj); 528 eo_unref(obj);
529 fail_if(wref); 529 fail_if(wref);
530 530
531 obj = eo_add(SIMPLE_CLASS, NULL); 531 obj = eo_add(SIMPLE_CLASS, NULL);
532 eo_do(obj, eo_wref_add(&wref)); 532 eo_wref_add(obj, &wref);
533 533
534 eo_ref(obj); 534 eo_ref(obj);
535 fail_if(!wref); 535 fail_if(!wref);
@@ -542,35 +542,41 @@ START_TEST(eo_weak_reference)
542 542
543 obj = eo_add(SIMPLE_CLASS, NULL); 543 obj = eo_add(SIMPLE_CLASS, NULL);
544 544
545 eo_do(obj, eo_wref_add(&wref)); 545 eo_wref_add(obj, &wref);
546 eo_do(obj, eo_wref_del(&wref)); 546 eo_wref_del(obj, &wref);
547 fail_if(wref); 547 fail_if(wref);
548 548
549 eo_do(obj, eo_wref_add(&wref)); 549 eo_wref_add(obj, &wref);
550 eo_do(obj2, eo_wref_del(&wref)); 550 eo_wref_del(obj2, &wref);
551 fail_if(!wref); 551 fail_if(!wref);
552 eo_wref_del_safe(&wref); 552 eo_wref_del_safe(&wref);
553 fail_if(wref); 553 fail_if(wref);
554 554
555 wref = obj; 555 wref = obj;
556 eo_do(obj, eo_wref_del(&wref)); 556 eo_wref_del(obj, &wref);
557 fail_if(wref); 557 fail_if(wref);
558 558
559 wref = wref2 = wref3 = NULL; 559 wref = wref2 = wref3 = NULL;
560 eo_do(obj, eo_wref_add(&wref), eo_wref_add(&wref2), eo_wref_add(&wref3)); 560 eo_wref_add(obj, &wref);
561 eo_wref_add(obj, &wref2);
562 eo_wref_add(obj, &wref3);
561 fail_if(!wref); 563 fail_if(!wref);
562 fail_if(!wref2); 564 fail_if(!wref2);
563 fail_if(!wref3); 565 fail_if(!wref3);
564 eo_do(obj, eo_wref_del(&wref), eo_wref_del(&wref2), eo_wref_del(&wref3)); 566 eo_wref_del(obj, &wref);
567 eo_wref_del(obj, &wref2);
568 eo_wref_del(obj, &wref3);
565 fail_if(wref); 569 fail_if(wref);
566 fail_if(wref2); 570 fail_if(wref2);
567 fail_if(wref3); 571 fail_if(wref3);
568 572
569 eo_do(obj, eo_wref_add(&wref2), eo_wref_add(&wref3)); 573 eo_wref_add(obj, &wref2);
574 eo_wref_add(obj, &wref3);
570 wref = obj; 575 wref = obj;
571 eo_do(obj, eo_wref_del(&wref)); 576 eo_wref_del(obj, &wref);
572 fail_if(wref); 577 fail_if(wref);
573 eo_do(obj, eo_wref_del(&wref2), eo_wref_del(&wref3)); 578 eo_wref_del(obj, &wref2);
579 eo_wref_del(obj, &wref3);
574 580
575 eo_unref(obj); 581 eo_unref(obj);
576 eo_unref(obj2); 582 eo_unref(obj2);
@@ -586,30 +592,30 @@ START_TEST(eo_generic_data)
586 Eo *obj = eo_add(SIMPLE_CLASS, NULL); 592 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
587 void *data = NULL; 593 void *data = NULL;
588 594
589 eo_do(obj, eo_key_data_set("test1", (void *) 1)); 595 eo_key_data_set(obj, "test1", (void *) 1);
590 eo_do(obj, data = eo_key_data_get("test1")); 596 data = eo_key_data_get(obj, "test1");
591 fail_if(1 != (intptr_t) data); 597 fail_if(1 != (intptr_t) data);
592 eo_do(obj, eo_key_data_del("test1")); 598 eo_key_data_del(obj, "test1");
593 eo_do(obj, data = eo_key_data_get("test1")); 599 data = eo_key_data_get(obj, "test1");
594 fail_if(data); 600 fail_if(data);
595 601
596 eo_do(obj, eo_key_data_set("test1", (void *) 1)); 602 eo_key_data_set(obj, "test1", (void *) 1);
597 eo_do(obj, eo_key_data_set("test2", (void *) 2)); 603 eo_key_data_set(obj, "test2", (void *) 2);
598 eo_do(obj, data = eo_key_data_get("test1")); 604 data = eo_key_data_get(obj, "test1");
599 fail_if(1 != (intptr_t) data); 605 fail_if(1 != (intptr_t) data);
600 eo_do(obj, data = eo_key_data_get("test2")); 606 data = eo_key_data_get(obj, "test2");
601 fail_if(2 != (intptr_t) data); 607 fail_if(2 != (intptr_t) data);
602 608
603 eo_do(obj, data = eo_key_data_get("test2")); 609 data = eo_key_data_get(obj, "test2");
604 fail_if(2 != (intptr_t) data); 610 fail_if(2 != (intptr_t) data);
605 eo_do(obj, eo_key_data_del("test2")); 611 eo_key_data_del(obj, "test2");
606 eo_do(obj, data = eo_key_data_get("test2")); 612 data = eo_key_data_get(obj, "test2");
607 fail_if(data); 613 fail_if(data);
608 614
609 eo_do(obj, data = eo_key_data_get("test1")); 615 data = eo_key_data_get(obj, "test1");
610 fail_if(1 != (intptr_t) data); 616 fail_if(1 != (intptr_t) data);
611 eo_do(obj, eo_key_data_del("test1")); 617 eo_key_data_del(obj, "test1");
612 eo_do(obj, data = eo_key_data_get("test1")); 618 data = eo_key_data_get(obj, "test1");
613 fail_if(data); 619 fail_if(data);
614 620
615 eo_unref(obj); 621 eo_unref(obj);
@@ -643,21 +649,22 @@ START_TEST(eo_magic_checks)
643 obj = eo_add(SIMPLE_CLASS, NULL); 649 obj = eo_add(SIMPLE_CLASS, NULL);
644 fail_if(!obj); 650 fail_if(!obj);
645 651
646 eo_do((Eo *) buf, simple_a_set(++i), a = simple_a_get()); 652 simple_a_set((Eo *) buf, ++i);
653 a = simple_a_get((Eo *) buf);
647 ck_assert_int_ne(i, a); 654 ck_assert_int_ne(i, a);
648 eo_do_super((Eo *) buf, SIMPLE_CLASS, simple_a_set(++i)); 655 simple_a_set(eo_super((Eo *) buf, SIMPLE_CLASS), ++i);
649 eo_do_super((Eo *) buf, SIMPLE_CLASS, a = simple_a_get()); 656 a = simple_a_get(eo_super((Eo *) buf, SIMPLE_CLASS));
650 ck_assert_int_ne(i, a); 657 ck_assert_int_ne(i, a);
651 eo_do_super(obj, (const Eo_Class *) buf, simple_a_set(++i)); 658 simple_a_set(eo_super(obj, (const Eo_Class *) buf), ++i);
652 eo_do_super(obj, (const Eo_Class *) buf, a = simple_a_get()); 659 a = simple_a_get(eo_super(obj, (const Eo_Class *) buf));
653 ck_assert_int_ne(i, a); 660 ck_assert_int_ne(i, a);
654 fail_if(eo_class_get((Eo *) buf)); 661 fail_if(eo_class_get((Eo *) buf));
655 fail_if(eo_class_name_get((Eo_Class*) buf)); 662 fail_if(eo_class_name_get((Eo_Class*) buf));
656 fail_if(eo_class_get(obj) != SIMPLE_CLASS); 663 fail_if(eo_class_get(obj) != SIMPLE_CLASS);
657 fail_if(eo_class_get(SIMPLE_CLASS) != EO_ABSTRACT_CLASS_CLASS); 664 fail_if(eo_class_get(SIMPLE_CLASS) != EO_ABSTRACT_CLASS_CLASS);
658 eo_do((Eo_Class *) buf, simple_a_set(1)); 665 simple_a_set((Eo_Class *) buf, 1);
659 eo_do_super((Eo_Class *) buf, SIMPLE_CLASS, simple_a_set(++i)); 666 simple_a_set(eo_super((Eo_Class *) buf, SIMPLE_CLASS), ++i);
660 eo_do_super(SIMPLE_CLASS, (Eo_Class *) buf, simple_a_set(++i)); 667 simple_a_set(eo_super(SIMPLE_CLASS, (Eo_Class *) buf), ++i);
661 fail_if(eo_class_new(NULL, (Eo_Class *) buf), NULL); 668 fail_if(eo_class_new(NULL, (Eo_Class *) buf), NULL);
662 669
663 eo_xref(obj, (Eo *) buf); 670 eo_xref(obj, (Eo *) buf);
@@ -674,28 +681,27 @@ START_TEST(eo_magic_checks)
674 681
675 fail_if(0 != eo_ref_get((Eo *) buf)); 682 fail_if(0 != eo_ref_get((Eo *) buf));
676 683
677 eo_do((Eo *) buf, 684 eo_wref_add((Eo *) buf, &wref);
678 eo_wref_add(&wref), 685 parent = eo_parent_get((Eo *) buf);
679 parent = eo_parent_get());
680 fail_if(wref); 686 fail_if(wref);
681 fail_if(parent); 687 fail_if(parent);
682 688
683 fail_if(eo_data_scope_get((Eo *) buf, SIMPLE_CLASS)); 689 fail_if(eo_data_scope_get((Eo *) buf, SIMPLE_CLASS));
684 690
685 eo_do(obj, eo_composite_attach((Eo *) buf)); 691 eo_composite_attach(obj, (Eo *) buf);
686 eo_do(obj, eo_composite_detach((Eo *) buf)); 692 eo_composite_detach(obj, (Eo *) buf);
687 eo_do((Eo *) buf, eo_composite_part_is()); 693 eo_composite_part_is((Eo *) buf);
688 694
689 eo_do(obj, eo_event_callback_forwarder_add(NULL, (Eo *) buf)); 695 eo_event_callback_forwarder_add(obj, NULL, (Eo *) buf);
690 eo_do(obj, eo_event_callback_forwarder_del(NULL, (Eo *) buf)); 696 eo_event_callback_forwarder_del(obj, NULL, (Eo *) buf);
691 697
692 eo_manual_free_set((Eo *) buf, EINA_TRUE); 698 eo_manual_free_set((Eo *) buf, EINA_TRUE);
693 eo_manual_free((Eo *) buf); 699 eo_manual_free((Eo *) buf);
694 eo_destructed_is((Eo *) buf); 700 eo_destructed_is((Eo *) buf);
695 701
696 obj2 = NULL; 702 obj2 = NULL;
697 eo_do(obj, eo_parent_set((Eo *) buf)); 703 eo_parent_set(obj, (Eo *) buf);
698 eo_do(obj, obj2 = eo_parent_get()); 704 obj2 = eo_parent_get(obj);
699 fail_if(obj2 && (obj2 == (Eo *) buf)); 705 fail_if(obj2 && (obj2 == (Eo *) buf));
700 706
701 eo_unref(obj); 707 eo_unref(obj);
@@ -761,11 +767,15 @@ START_TEST(eo_multiple_do)
761 Eina_Bool ca, cb, cc; 767 Eina_Bool ca, cb, cc;
762 768
763 ca = cb = cc = EINA_FALSE; 769 ca = cb = cc = EINA_FALSE;
764 eo_do(obj, ca = simple_a_print(), cb = multi_a_print(), cc = multi_a_print()); 770 ca = simple_a_print(obj);
771 cb = multi_a_print(obj);
772 cc = multi_a_print(obj);
765 fail_if(!(ca && cb && cc)); 773 fail_if(!(ca && cb && cc));
766 774
767 ca = cb = cc = EINA_FALSE; 775 ca = cb = cc = EINA_FALSE;
768 eo_do(klass, ca = simple_class_hi_print(), cb = multi_class_hi_print(), cc = multi_class_hi_print()); 776 ca = simple_class_hi_print(klass);
777 cb = multi_class_hi_print(klass);
778 cc = multi_class_hi_print(klass);
769 fail_if(!(ca && cb && cc)); 779 fail_if(!(ca && cb && cc));
770 780
771 eo_unref(obj); 781 eo_unref(obj);
@@ -780,27 +790,27 @@ START_TEST(eo_add_do_and_custom)
780 Eo *obj = NULL; 790 Eo *obj = NULL;
781 eo_init(); 791 eo_init();
782 792
783 obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor()); 793 obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor(eoid));
784 fail_if(!obj); 794 fail_if(!obj);
785 eo_unref(obj); 795 eo_unref(obj);
786 796
787 obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(7)); 797 obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(eoid, 7));
788 fail_if(!obj); 798 fail_if(!obj);
789 pd = eo_data_scope_get(obj, SIMPLE_CLASS); 799 pd = eo_data_scope_get(obj, SIMPLE_CLASS);
790 fail_if(pd->a != 7); 800 fail_if(pd->a != 7);
791 eo_unref(obj); 801 eo_unref(obj);
792 802
793 obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor(), simple_a_set(7)); 803 obj = eo_add(SIMPLE_CLASS, NULL, eo_constructor(eoid), simple_a_set(eoid, 7));
794 fail_if(!obj); 804 fail_if(!obj);
795 pd = eo_data_scope_get(obj, SIMPLE_CLASS); 805 pd = eo_data_scope_get(obj, SIMPLE_CLASS);
796 fail_if(pd->a != 7); 806 fail_if(pd->a != 7);
797 eo_unref(obj); 807 eo_unref(obj);
798 808
799 Eina_Bool finalized; 809 Eina_Bool finalized;
800 obj = eo_add(SIMPLE_CLASS, NULL, finalized = eo_finalized_get()); 810 obj = eo_add(SIMPLE_CLASS, NULL, finalized = eo_finalized_get(eoid));
801 fail_if(finalized); 811 fail_if(finalized);
802 812
803 eo_do(obj, finalized = eo_finalized_get()); 813 finalized = eo_finalized_get(obj);
804 fail_if(!finalized); 814 fail_if(!finalized);
805 eo_unref(obj); 815 eo_unref(obj);
806 816
@@ -940,7 +950,8 @@ START_TEST(eo_parts)
940 950
941 Eo *obj = eo_add(SIMPLE_CLASS, NULL); 951 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
942 952
943 eo_do(obj, simple_a_set(3), a = simple_a_get()); 953 simple_a_set(obj, 3);
954 a = simple_a_get(obj);
944 ck_assert_int_eq(a, 3); 955 ck_assert_int_eq(a, 3);
945 956
946 eo_do_part(obj, simple_part_get("test"), 957 eo_do_part(obj, simple_part_get("test"),
@@ -949,7 +960,8 @@ START_TEST(eo_parts)
949 ); 960 );
950 ck_assert_int_eq(a, 7); 961 ck_assert_int_eq(a, 7);
951 962
952 eo_do(obj, simple_a_set(3), a = simple_a_get()); 963 simple_a_set(obj, 3);
964 a = simple_a_get(obj);
953 ck_assert_int_eq(a, 3); 965 ck_assert_int_eq(a, 3);
954 966
955 /* Faking a call, just asserting NULL as the part to check default values. */ 967 /* Faking a call, just asserting NULL as the part to check default values. */
diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c
index 82a0b98..b25b00b 100644
--- a/src/tests/eo/suite/eo_test_threaded_calls.c
+++ b/src/tests/eo/suite/eo_test_threaded_calls.c
@@ -94,9 +94,10 @@ _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(v)); 97 obj = eo_add(THREAD_TEST_CLASS, NULL, thread_test_constructor(eoid, v));
98 98
99 eo_do(obj, thread_test_try_swap_stack(), v = thread_test_v_get()); 99 thread_test_try_swap_stack(obj);
100 v = thread_test_v_get(obj);
100 101
101 fail_if(EINA_LOCK_SUCCEED != eina_spinlock_release(&locks[1])); 102 fail_if(EINA_LOCK_SUCCEED != eina_spinlock_release(&locks[1]));
102 103
diff --git a/src/tests/eo/suite/eo_test_value.c b/src/tests/eo/suite/eo_test_value.c
index cbc7cd7..6162389 100644
--- a/src/tests/eo/suite/eo_test_value.c
+++ b/src/tests/eo/suite/eo_test_value.c
@@ -20,7 +20,7 @@ START_TEST(eo_value)
20 Eo *obj = eo_add(SIMPLE_CLASS, NULL); 20 Eo *obj = eo_add(SIMPLE_CLASS, NULL);
21 21
22 eo_dbg_info = EO_DBG_INFO_LIST_APPEND(NULL, "Root"); 22 eo_dbg_info = EO_DBG_INFO_LIST_APPEND(NULL, "Root");
23 eo_do(obj, eo_dbg_info_get(eo_dbg_info)); 23 eo_dbg_info_get(obj, eo_dbg_info);
24 fail_if(!eo_dbg_info); 24 fail_if(!eo_dbg_info);
25 ck_assert_str_eq(eo_dbg_info->name, "Root"); 25 ck_assert_str_eq(eo_dbg_info->name, "Root");
26 str = eina_value_to_string(&eo_dbg_info->value); 26 str = eina_value_to_string(&eo_dbg_info->value);