aboutsummaryrefslogtreecommitdiffstats
path: root/src/tests/eo/composite_objects/composite_objects_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests/eo/composite_objects/composite_objects_main.c')
-rw-r--r--src/tests/eo/composite_objects/composite_objects_main.c37
1 files changed, 19 insertions, 18 deletions
diff --git a/src/tests/eo/composite_objects/composite_objects_main.c b/src/tests/eo/composite_objects/composite_objects_main.c
index 6f78c9b114..c70ecd37e2 100644
--- a/src/tests/eo/composite_objects/composite_objects_main.c
+++ b/src/tests/eo/composite_objects/composite_objects_main.c
@@ -33,50 +33,51 @@ main(int argc, char *argv[])
(void) argv;
eo_init();
- Eo *obj = eo_add(COMP_CLASS, NULL);
- eo_do(obj, eo_event_callback_add(EV_A_CHANGED, _a_changed_cb, NULL));
+ Eo *obj;
+ eo_add(obj, COMP_CLASS, NULL);
+ eo_do(obj, eo_event_callback_add(obj, EV_A_CHANGED, _a_changed_cb, NULL));
fail_if(!eo_isa(obj, COMP_CLASS));
fail_if(!eo_isa(obj, SIMPLE_CLASS));
int a = 0;
cb_called = EINA_FALSE;
- eo_do(obj, simple_a_set(1));
+ eo_do(obj, simple_a_set(obj, 1));
fail_if(!cb_called);
/* Test functions from all across the chain. */
cb_called = EINA_FALSE;
- eo_do(obj, simple_a_set1(1));
+ eo_do(obj, simple_a_set1(obj, 1));
fail_if(!cb_called);
cb_called = EINA_FALSE;
- eo_do(obj, simple_a_set15(1));
+ eo_do(obj, simple_a_set15(obj, 1));
fail_if(!cb_called);
cb_called = EINA_FALSE;
- eo_do(obj, simple_a_set32(1));
+ eo_do(obj, simple_a_set32(obj, 1));
fail_if(!cb_called);
- eo_do(obj, a = simple_a_get());
+ eo_do(obj, a = simple_a_get(obj));
fail_if(a != 1);
/* disable the callback forwarder, and fail if it's still called. */
Eo *simple = NULL;
- eo_do(obj, simple = eo_key_data_get("simple-obj"));
+ eo_do(obj, simple = eo_key_data_get(obj, "simple-obj"));
eo_ref(simple);
- eo_do(simple, eo_event_callback_forwarder_del(EV_A_CHANGED, obj));
+ eo_do(simple, eo_event_callback_forwarder_del(obj, EV_A_CHANGED, obj));
cb_called = EINA_FALSE;
- eo_do(obj, simple_a_set(2));
+ eo_do(obj, simple_a_set(obj, 2));
fail_if(cb_called);
- fail_if(!eo_do_ret(simple, tmp,eo_composite_part_is()));
- fail_if(!eo_do_ret(obj, tmp,eo_composite_detach(simple)));
- fail_if(eo_do_ret(obj, tmp,eo_composite_detach(simple)));
- fail_if(eo_do_ret(simple, tmp,eo_composite_part_is()));
- fail_if(!eo_do_ret(obj, tmp,eo_composite_attach(simple)));
- fail_if(!eo_do_ret(simple, tmp,eo_composite_part_is()));
- fail_if(eo_do_ret(obj, tmp,eo_composite_attach(simple)));
+ fail_if(!eo_do_ret(simple, tmp,eo_composite_part_is(simple)));
+ fail_if(!eo_do_ret(obj, tmp,eo_composite_detach(obj, simple)));
+ fail_if(eo_do_ret(obj, tmp,eo_composite_detach(obj, simple)));
+ fail_if(eo_do_ret(simple, tmp,eo_composite_part_is(simple)));
+ fail_if(!eo_do_ret(obj, tmp,eo_composite_attach(obj, simple)));
+ fail_if(!eo_do_ret(simple, tmp,eo_composite_part_is(simple)));
+ fail_if(eo_do_ret(obj, tmp,eo_composite_attach(obj, simple)));
- fail_if(eo_do_ret(simple, tmp,eo_composite_attach(obj)));
+ fail_if(eo_do_ret(simple, tmp,eo_composite_attach(simple, obj)));
eo_unref(simple);
eo_unref(obj);