From 7bb8afe4f9bcfe3a86fdf3b1cdfea083c1b68164 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Wed, 13 Jul 2016 16:17:16 -0700 Subject: [PATCH] eo: fix tests after renaming. --- src/tests/eo/suite/eo_test_general.c | 72 ++++++++++++++-------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c index ea94823f53..08480667fb 100644 --- a/src/tests/eo/suite/eo_test_general.c +++ b/src/tests/eo/suite/eo_test_general.c @@ -732,54 +732,54 @@ START_TEST(eo_generic_data) - eo_key_obj_set(obj, "test1", obj2); - objtmp = eo_key_obj_get(obj, "test1"); + eo_key_ref_set(obj, "test1", obj2); + objtmp = eo_key_ref_get(obj, "test1"); fail_if(obj2 != objtmp); - eo_key_obj_set(obj, "test1", NULL); - objtmp = eo_key_obj_get(obj, "test1"); + eo_key_ref_set(obj, "test1", NULL); + objtmp = eo_key_ref_get(obj, "test1"); fail_if(objtmp); - eo_key_obj_set(obj, "test1", obj2); + eo_key_ref_set(obj, "test1", obj2); fail_if(eo_ref_get(obj2) != 2); - eo_key_obj_set(obj, "test2", obj3); + eo_key_ref_set(obj, "test2", obj3); fail_if(eo_ref_get(obj3) != 2); - objtmp = eo_key_obj_get(obj, "test1"); + objtmp = eo_key_ref_get(obj, "test1"); fail_if(obj2 != objtmp); - objtmp = eo_key_obj_get(obj, "test2"); + objtmp = eo_key_ref_get(obj, "test2"); fail_if(obj3 != objtmp); - data = eo_key_obj_get(obj, "test2"); + data = eo_key_ref_get(obj, "test2"); fail_if(obj3 != objtmp); - eo_key_obj_set(obj, "test2", NULL); + eo_key_ref_set(obj, "test2", NULL); fail_if(eo_ref_get(obj3) != 1); - objtmp = eo_key_obj_get(obj, "test2"); + objtmp = eo_key_ref_get(obj, "test2"); fail_if(objtmp); - objtmp = eo_key_obj_get(obj, "test1"); + objtmp = eo_key_ref_get(obj, "test1"); fail_if(obj2 != objtmp); - eo_key_obj_set(obj, "test1", NULL); + eo_key_ref_set(obj, "test1", NULL); fail_if(eo_ref_get(obj2) != 1); - objtmp = eo_key_obj_get(obj, "test1"); + objtmp = eo_key_ref_get(obj, "test1"); fail_if(objtmp); - eo_key_obj_set(obj, "test1", obj2); - eo_key_obj_set(obj, "test2", obj3); + eo_key_ref_set(obj, "test1", obj2); + eo_key_ref_set(obj, "test2", obj3); eo_del(obj2); eo_del(obj2); eo_del(obj3); eo_del(obj3); - objtmp = eo_key_obj_get(obj, "test1"); + objtmp = eo_key_ref_get(obj, "test1"); fail_if(objtmp); - objtmp = eo_key_obj_get(obj, "test2"); + objtmp = eo_key_ref_get(obj, "test2"); fail_if(objtmp); @@ -787,52 +787,52 @@ START_TEST(eo_generic_data) obj2 = eo_add(SIMPLE_CLASS, NULL); obj3 = eo_add(SIMPLE_CLASS, NULL); - eo_key_obj_weak_set(obj, "test1", obj2); - objtmp = eo_key_obj_weak_get(obj, "test1"); + eo_key_wref_set(obj, "test1", obj2); + objtmp = eo_key_wref_get(obj, "test1"); fail_if(obj2 != objtmp); - eo_key_obj_weak_set(obj, "test1", NULL); - objtmp = eo_key_obj_weak_get(obj, "test1"); + eo_key_wref_set(obj, "test1", NULL); + objtmp = eo_key_wref_get(obj, "test1"); fail_if(objtmp); - eo_key_obj_weak_set(obj, "test1", obj2); + eo_key_wref_set(obj, "test1", obj2); fail_if(eo_ref_get(obj2) != 1); - eo_key_obj_weak_set(obj, "test2", obj3); + eo_key_wref_set(obj, "test2", obj3); fail_if(eo_ref_get(obj3) != 1); - objtmp = eo_key_obj_weak_get(obj, "test1"); + objtmp = eo_key_wref_get(obj, "test1"); fail_if(obj2 != objtmp); - objtmp = eo_key_obj_weak_get(obj, "test2"); + objtmp = eo_key_wref_get(obj, "test2"); fail_if(obj3 != objtmp); - data = eo_key_obj_weak_get(obj, "test2"); + data = eo_key_wref_get(obj, "test2"); fail_if(obj3 != objtmp); - eo_key_obj_weak_set(obj, "test2", NULL); + eo_key_wref_set(obj, "test2", NULL); fail_if(eo_ref_get(obj3) != 1); - objtmp = eo_key_obj_weak_get(obj, "test2"); + objtmp = eo_key_wref_get(obj, "test2"); fail_if(objtmp); - objtmp = eo_key_obj_weak_get(obj, "test1"); + objtmp = eo_key_wref_get(obj, "test1"); fail_if(obj2 != objtmp); - eo_key_obj_weak_set(obj, "test1", NULL); + eo_key_wref_set(obj, "test1", NULL); fail_if(eo_ref_get(obj2) != 1); - objtmp = eo_key_obj_weak_get(obj, "test1"); + objtmp = eo_key_wref_get(obj, "test1"); fail_if(objtmp); - eo_key_obj_weak_set(obj, "test1", obj2); - eo_key_obj_weak_set(obj, "test2", obj3); + eo_key_wref_set(obj, "test1", obj2); + eo_key_wref_set(obj, "test2", obj3); eo_del(obj2); eo_del(obj3); - objtmp = eo_key_obj_weak_get(obj, "test1"); + objtmp = eo_key_wref_get(obj, "test1"); fail_if(objtmp); - objtmp = eo_key_obj_weak_get(obj, "test2"); + objtmp = eo_key_wref_get(obj, "test2"); fail_if(objtmp);