summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/ecore/ecore_test_ecore_audio.c28
-rw-r--r--src/tests/edje/edje_test_edje.c6
-rw-r--r--src/tests/elementary/elm_test_atspi.c2
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c2
-rw-r--r--src/tests/eo/children/children_main.c6
-rw-r--r--src/tests/eo/suite/eo_test_class_behaviour_errors.c4
-rw-r--r--src/tests/eo/suite/eo_test_general.c21
-rw-r--r--src/tests/evas/evas_test_image.c6
-rw-r--r--src/tests/evas/evas_test_mesh.c4
9 files changed, 39 insertions, 40 deletions
diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index 0240903e0b..e3410ae573 100644
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -83,8 +83,8 @@ START_TEST(ecore_test_ecore_audio_obj_pulse)
83 ecore_main_loop_begin(); 83 ecore_main_loop_begin();
84 fail_if(pulse_context_failed); 84 fail_if(pulse_context_failed);
85 85
86 eo_del(out); 86 eo_unref(out);
87 eo_del(in); 87 eo_unref(in);
88} 88}
89END_TEST 89END_TEST
90#endif 90#endif
@@ -100,7 +100,7 @@ static Eina_Bool
100_idle_del(void *data) 100_idle_del(void *data)
101{ 101{
102 Eo *in = data; 102 Eo *in = data;
103 eo_del(in); 103 eo_unref(in);
104 ecore_idler_add(_quit, NULL); 104 ecore_idler_add(_quit, NULL);
105 105
106 return EINA_FALSE; 106 return EINA_FALSE;
@@ -218,8 +218,8 @@ START_TEST(ecore_test_ecore_audio_obj_tone)
218 218
219 ecore_main_loop_begin(); 219 ecore_main_loop_begin();
220 220
221 eo_del(in); 221 eo_unref(in);
222 eo_del(out); 222 eo_unref(out);
223 223
224 //TODO: Compare and fail 224 //TODO: Compare and fail
225 ecore_file_remove(TESTS_BUILD_DIR"/tmp.wav"); 225 ecore_file_remove(TESTS_BUILD_DIR"/tmp.wav");
@@ -308,8 +308,8 @@ START_TEST(ecore_test_ecore_audio_obj_sndfile)
308 308
309 ecore_main_loop_begin(); 309 ecore_main_loop_begin();
310 310
311 eo_del(in); 311 eo_unref(in);
312 eo_del(out); 312 eo_unref(out);
313 313
314 //TODO: Compare and fail 314 //TODO: Compare and fail
315 ecore_file_remove(TESTS_BUILD_DIR"/tmp.wav"); 315 ecore_file_remove(TESTS_BUILD_DIR"/tmp.wav");
@@ -361,20 +361,20 @@ START_TEST(ecore_test_ecore_audio_obj_in_out)
361 fail_if(eina_list_count(in3) != 2); 361 fail_if(eina_list_count(in3) != 2);
362 fail_if(eina_list_data_get(in3) != in); 362 fail_if(eina_list_data_get(in3) != in);
363 363
364 eo_del(in2); 364 eo_unref(in2);
365 365
366 in3 = ecore_audio_obj_out_inputs_get(out); 366 in3 = ecore_audio_obj_out_inputs_get(out);
367 367
368 fail_if(eina_list_count(in3) != 1); 368 fail_if(eina_list_count(in3) != 1);
369 fail_if(eina_list_data_get(in3) != in); 369 fail_if(eina_list_data_get(in3) != in);
370 370
371 eo_del(out); 371 eo_unref(out);
372 372
373 out2 = ecore_audio_obj_in_output_get(in); 373 out2 = ecore_audio_obj_in_output_get(in);
374 374
375 fail_if(out2); 375 fail_if(out2);
376 376
377 eo_del(in); 377 eo_unref(in);
378} 378}
379END_TEST 379END_TEST
380 380
@@ -433,8 +433,8 @@ START_TEST(ecore_test_ecore_audio_obj_vio)
433 433
434 ecore_main_loop_begin(); 434 ecore_main_loop_begin();
435 435
436 eo_del(out); 436 eo_unref(out);
437 eo_del(in); 437 eo_unref(in);
438} 438}
439END_TEST 439END_TEST
440 440
@@ -533,7 +533,7 @@ START_TEST(ecore_test_ecore_audio_obj_in)
533 fail_if(buf[i] != 0x00); 533 fail_if(buf[i] != 0x00);
534 } 534 }
535 535
536 eo_del(in); 536 eo_unref(in);
537} 537}
538END_TEST 538END_TEST
539 539
@@ -581,7 +581,7 @@ START_TEST(ecore_test_ecore_audio_obj)
581 volume = ecore_audio_obj_volume_get(obj); 581 volume = ecore_audio_obj_volume_get(obj);
582 fail_if(volume != 0.5); 582 fail_if(volume != 0.5);
583 583
584 eo_del(obj); 584 eo_unref(obj);
585 } 585 }
586 586
587} 587}
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index bcd36f1385..9e0ddfaf43 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -714,7 +714,7 @@ START_TEST(edje_test_table_eoapi)
714 714
715 i = eo_ref_get(table); 715 i = eo_ref_get(table);
716 fail_if(i != 1); 716 fail_if(i != 1);
717 eo_del(table); 717 eo_unref(table);
718 718
719 /* this will generate eo errors */ 719 /* this will generate eo errors */
720 k = eo_ref_get(table); 720 k = eo_ref_get(table);
@@ -733,7 +733,7 @@ START_TEST(edje_test_table_eoapi)
733 fail_if(eo_ref_get(other) != 1); 733 fail_if(eo_ref_get(other) != 1);
734 734
735 /* delete edje and verify proxy died */ 735 /* delete edje and verify proxy died */
736 eo_del(obj); 736 eo_unref(obj);
737 737
738 /* this will generate eo errors */ 738 /* this will generate eo errors */
739 fail_if(eo_ref_get(table) > 0); 739 fail_if(eo_ref_get(table) > 0);
@@ -752,7 +752,7 @@ START_TEST(edje_test_table_eoapi)
752 fail_if(!table); 752 fail_if(!table);
753 eo_ref(table); 753 eo_ref(table);
754 fflush(stderr); 754 fflush(stderr);
755 eo_del(obj); 755 eo_unref(obj);
756 /* note: obj has > 0 refs because evas likes to keep objects around a bit */ 756 /* note: obj has > 0 refs because evas likes to keep objects around a bit */
757 fail_if(eo_ref_get(table) > 1); 757 fail_if(eo_ref_get(table) > 1);
758 758
diff --git a/src/tests/elementary/elm_test_atspi.c b/src/tests/elementary/elm_test_atspi.c
index 82c1564e37..2b39efc554 100644
--- a/src/tests/elementary/elm_test_atspi.c
+++ b/src/tests/elementary/elm_test_atspi.c
@@ -438,7 +438,7 @@ START_TEST (elm_atspi_relationship_remove)
438 /* Test if relationship is implicity removed when object is deleted */ 438 /* Test if relationship is implicity removed when object is deleted */
439 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); 439 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg);
440 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_bg); 440 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_bg);
441 eo_del(g_bg); 441 eo_unref(g_bg);
442 set = elm_interface_atspi_accessible_relation_set_get(g_btn); 442 set = elm_interface_atspi_accessible_relation_set_get(g_btn);
443 443
444 rel_to = rel_from = NULL; 444 rel_to = rel_from = NULL;
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index c1d55a571d..e372e2cbac 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -97,7 +97,7 @@ main_signal_exit(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *ev EINA_
97 EINA_LIST_FREE(video_objs, o) 97 EINA_LIST_FREE(video_objs, o)
98 { 98 {
99 emotion_object_last_position_save(o); 99 emotion_object_last_position_save(o);
100 eo_del(o); 100 eo_unref(o);
101 } 101 }
102 return EINA_TRUE; 102 return EINA_TRUE;
103} 103}
diff --git a/src/tests/eo/children/children_main.c b/src/tests/eo/children/children_main.c
index 9d30277333..ba6f6a285e 100644
--- a/src/tests/eo/children/children_main.c
+++ b/src/tests/eo/children/children_main.c
@@ -40,7 +40,7 @@ main(int argc, char *argv[])
40 40
41 eina_iterator_free(iter); 41 eina_iterator_free(iter);
42 42
43 eo_del(child2); 43 eo_unref(child2);
44 44
45 iter = eo_children_iterator_new(parent); 45 iter = eo_children_iterator_new(parent);
46 fail_if(!iter); 46 fail_if(!iter);
@@ -52,7 +52,7 @@ main(int argc, char *argv[])
52 eina_iterator_free(iter); 52 eina_iterator_free(iter);
53 53
54 54
55 eo_del(child1); 55 eo_unref(child1);
56 56
57 iter = eo_children_iterator_new(parent); 57 iter = eo_children_iterator_new(parent);
58 fail_if(!iter); 58 fail_if(!iter);
@@ -62,7 +62,7 @@ main(int argc, char *argv[])
62 eina_iterator_free(iter); 62 eina_iterator_free(iter);
63 63
64 64
65 eo_del(child3); 65 eo_unref(child3);
66 66
67 iter = eo_children_iterator_new(parent); 67 iter = eo_children_iterator_new(parent);
68 fail_if(iter); 68 fail_if(iter);
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 12c478f454..8533b3105e 100644
--- a/src/tests/eo/suite/eo_test_class_behaviour_errors.c
+++ b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
@@ -81,8 +81,8 @@ START_TEST(eo_destructor_double_del)
81 fail_if(!obj); 81 fail_if(!obj);
82 82
83 TEST_EO_ERROR("_eo_unref", "Object %p already destructed."); 83 TEST_EO_ERROR("_eo_unref", "Object %p already destructed.");
84 eo_del(obj); 84 eo_unref(obj);
85 eo_del(obj); 85 eo_unref(obj);
86 86
87 eina_log_print_cb_set(eina_log_print_cb_stderr, NULL); 87 eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
88 88
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index accc9c0351..b2de49d2be 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -310,11 +310,11 @@ START_TEST(eo_composite_tests)
310 fail_if(!eo_composite_part_is(obj2)); 310 fail_if(!eo_composite_part_is(obj2));
311 311
312 /* Check that a deletion of a child detaches from the parent. */ 312 /* Check that a deletion of a child detaches from the parent. */
313 eo_del(obj2); 313 eo_unref(obj2);
314 fail_if(!eo_composite_attach(obj3, obj)); 314 fail_if(!eo_composite_attach(obj3, obj));
315 315
316 /* Check that a deletion of the parent detaches the child. */ 316 /* Check that a deletion of the parent detaches the child. */
317 eo_del(obj3); 317 eo_unref(obj3);
318 fail_if(eo_composite_part_is(obj)); 318 fail_if(eo_composite_part_is(obj));
319 319
320 eo_unref(obj); 320 eo_unref(obj);
@@ -514,9 +514,9 @@ START_TEST(eo_refs)
514 ck_assert_int_eq(eo_ref_get(obj2), 1); 514 ck_assert_int_eq(eo_ref_get(obj2), 1);
515 ck_assert_int_eq(eo_ref_get(obj3), 1); 515 ck_assert_int_eq(eo_ref_get(obj3), 1);
516 516
517 eo_del(obj); 517 eo_unref(obj);
518 eo_del(obj2); 518 eo_unref(obj2);
519 eo_del(obj3); 519 eo_unref(obj3);
520 520
521 /* Just check it doesn't seg atm. */ 521 /* Just check it doesn't seg atm. */
522 obj = eo_add(SIMPLE_CLASS, NULL); 522 obj = eo_add(SIMPLE_CLASS, NULL);
@@ -528,7 +528,7 @@ START_TEST(eo_refs)
528 obj2 = eo_add(SIMPLE_CLASS, obj); 528 obj2 = eo_add(SIMPLE_CLASS, obj);
529 eo_unref(obj2); 529 eo_unref(obj2);
530 eo_ref(obj2); 530 eo_ref(obj2);
531 eo_del(obj2); 531 eo_unref(obj2);
532 eo_unref(obj); 532 eo_unref(obj);
533 533
534 eo_shutdown(); 534 eo_shutdown();
@@ -743,7 +743,6 @@ START_TEST(eo_magic_checks)
743 743
744 eo_ref((Eo *) buf); 744 eo_ref((Eo *) buf);
745 eo_unref((Eo *) buf); 745 eo_unref((Eo *) buf);
746 eo_del((Eo *) buf);
747 746
748 eo_isa((Eo *) buf, SIMPLE_CLASS); 747 eo_isa((Eo *) buf, SIMPLE_CLASS);
749 eo_isa(obj, (Eo_Class *) buf); 748 eo_isa(obj, (Eo_Class *) buf);
@@ -1056,7 +1055,7 @@ START_TEST(eo_del_intercept)
1056 fail_if(!obj); 1055 fail_if(!obj);
1057 fail_if(!eo_isa(obj, klass)); 1056 fail_if(!eo_isa(obj, klass));
1058 eo_del_intercept_set(obj, _del_intercept); 1057 eo_del_intercept_set(obj, _del_intercept);
1059 eo_del(obj); 1058 eo_unref(obj);
1060 fail_if(!intercepted); 1059 fail_if(!intercepted);
1061 fail_if(eo_isa(obj, klass)); 1060 fail_if(eo_isa(obj, klass));
1062 1061
@@ -1116,7 +1115,7 @@ START_TEST(eo_name)
1116 objtmp = eo_name_find(obj, "*mple:joe"); 1115 objtmp = eo_name_find(obj, "*mple:joe");
1117 fail_if(objtmp != obj2); 1116 fail_if(objtmp != obj2);
1118 1117
1119 eo_del(obj); 1118 eo_unref(obj);
1120 1119
1121 eo_shutdown(); 1120 eo_shutdown();
1122} 1121}
@@ -1146,7 +1145,7 @@ START_TEST(eo_comment)
1146 comment = eo_comment_get(obj); 1145 comment = eo_comment_get(obj);
1147 fail_if(NULL != comment); 1146 fail_if(NULL != comment);
1148 1147
1149 eo_del(obj); 1148 eo_unref(obj);
1150 1149
1151 eo_shutdown(); 1150 eo_shutdown();
1152} 1151}
@@ -1163,7 +1162,7 @@ START_TEST(eo_rec_interface)
1163 objtmp = eo_provider_find(obj2, SEARCHABLE_CLASS); 1162 objtmp = eo_provider_find(obj2, SEARCHABLE_CLASS);
1164 fail_if(objtmp != s); 1163 fail_if(objtmp != s);
1165 1164
1166 eo_del(obj); 1165 eo_unref(obj);
1167 1166
1168 eo_shutdown(); 1167 eo_shutdown();
1169} 1168}
diff --git a/src/tests/evas/evas_test_image.c b/src/tests/evas/evas_test_image.c
index 7f90754872..1408525dc4 100644
--- a/src/tests/evas/evas_test_image.c
+++ b/src/tests/evas/evas_test_image.c
@@ -638,16 +638,16 @@ START_TEST(evas_object_image_defaults)
638 fail_if(evas_object_image_filled_get(o)); 638 fail_if(evas_object_image_filled_get(o));
639 evas_object_image_fill_get(o, &x, &y, &w, &h); 639 evas_object_image_fill_get(o, &x, &y, &w, &h);
640 fail_if(x || y || w || h); 640 fail_if(x || y || w || h);
641 eo_del(o); 641 eo_unref(o);
642 642
643 o = evas_object_image_filled_add(e); 643 o = evas_object_image_filled_add(e);
644 fail_if(!evas_object_image_filled_get(o)); 644 fail_if(!evas_object_image_filled_get(o));
645 eo_del(o); 645 eo_unref(o);
646 646
647 /* test eo defaults */ 647 /* test eo defaults */
648 o = eo_add(EVAS_IMAGE_CLASS, e); 648 o = eo_add(EVAS_IMAGE_CLASS, e);
649 fail_if(!efl_gfx_fill_auto_get(o)); 649 fail_if(!efl_gfx_fill_auto_get(o));
650 eo_del(o); 650 eo_unref(o);
651 651
652 evas_free(e); 652 evas_free(e);
653 evas_shutdown(); 653 evas_shutdown();
diff --git a/src/tests/evas/evas_test_mesh.c b/src/tests/evas/evas_test_mesh.c
index aba8a0bfc8..9dea211c04 100644
--- a/src/tests/evas/evas_test_mesh.c
+++ b/src/tests/evas/evas_test_mesh.c
@@ -65,8 +65,8 @@
65 fail_if(!set_ok); \ 65 fail_if(!set_ok); \
66 res = _compare_meshes(mesh, mesh2); \ 66 res = _compare_meshes(mesh, mesh2); \
67 fail_if(res == 1); \ 67 fail_if(res == 1); \
68 eo_del(mesh2); \ 68 eo_unref(mesh2); \
69 eo_del(mesh); \ 69 eo_unref(mesh); \
70 unlink(buffer); \ 70 unlink(buffer); \
71 } 71 }
72 72