aboutsummaryrefslogtreecommitdiffstats
path: root/src/tests/eo/function_overrides/function_overrides_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests/eo/function_overrides/function_overrides_main.c')
-rw-r--r--src/tests/eo/function_overrides/function_overrides_main.c35
1 files changed, 18 insertions, 17 deletions
diff --git a/src/tests/eo/function_overrides/function_overrides_main.c b/src/tests/eo/function_overrides/function_overrides_main.c
index 920595c077..f0ea600bb5 100644
--- a/src/tests/eo/function_overrides/function_overrides_main.c
+++ b/src/tests/eo/function_overrides/function_overrides_main.c
@@ -18,57 +18,58 @@ main(int argc, char *argv[])
eo_init();
Eina_Bool called = EINA_FALSE;
- Eo *obj = eo_add(INHERIT2_CLASS, NULL);
+ Eo *obj;
+ eo_add(obj, INHERIT2_CLASS, NULL);
- eo_do(obj, simple_a_set(1));
+ eo_do(obj, simple_a_set(obj, 1));
Simple_Public_Data *pd = eo_data_scope_get(obj, SIMPLE_CLASS);
fail_if(pd->a != 2);
eo_unref(obj);
- obj = eo_add(INHERIT3_CLASS, NULL);
+ eo_add(obj, INHERIT3_CLASS, NULL);
- eo_do(obj, simple_a_set(1));
+ eo_do(obj, simple_a_set(obj, 1));
pd = eo_data_scope_get(obj, SIMPLE_CLASS);
fail_if(pd->a != 3);
eo_unref(obj);
- obj = eo_add(INHERIT2_CLASS, NULL);
- eo_do(obj, called = inherit2_print());
+ eo_add(obj, INHERIT2_CLASS, NULL);
+ eo_do(obj, called = inherit2_print(obj));
fail_if(!called);
- eo_do(obj, called = inherit2_print(), called = inherit2_print());
+ eo_do(obj, called = inherit2_print(obj), called = inherit2_print(obj));
fail_if(!called);
eo_unref(obj);
- obj = eo_add(SIMPLE_CLASS, NULL);
- eo_do(obj, called = inherit2_print());
+ eo_add(obj, SIMPLE_CLASS, NULL);
+ eo_do(obj, called = inherit2_print(obj));
fail_if(called);
#ifdef EO_DEBUG
- eo_do(obj, called = simple_class_print());
+ eo_do(obj, called = simple_class_print(obj));
fail_if(called);
#endif
- eo_do(SIMPLE_CLASS, called = simple_class_print());
+ eo_do(SIMPLE_CLASS, called = simple_class_print(obj));
fail_if(!called);
- eo_do(INHERIT_CLASS, called = simple_class_print());
+ eo_do(INHERIT_CLASS, called = simple_class_print(obj));
fail_if(!called);
- eo_do(INHERIT2_CLASS, called = simple_class_print());
+ eo_do(INHERIT2_CLASS, called = simple_class_print(obj));
fail_if(!called);
- eo_do(INHERIT3_CLASS, called = simple_class_print());
+ eo_do(INHERIT3_CLASS, called = simple_class_print(obj));
fail_if(!called);
#ifdef EO_DEBUG
- eo_do(SIMPLE_CLASS, called = simple_a_print());
+ eo_do(SIMPLE_CLASS, called = simple_a_print(obj));
fail_if(called);
#endif
- eo_do_super(obj, SIMPLE_CLASS, eo_constructor());
- eo_do_super(obj, SIMPLE_CLASS, eo_destructor());
+ eo_super_eo_constructor(SIMPLE_CLASS, obj);
+ eo_super_eo_destructor(SIMPLE_CLASS, obj);
eo_unref(obj);