summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-06-21 15:45:31 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-06-21 16:13:04 +0900
commit269fc4f7a643358ac943b5454bafc14b5d14836c (patch)
treef9de7a7420359da4b589d5ec3e72d9706225efa9 /src/tests
parentdfe7e8892a547220979076832cd61fa613443e40 (diff)
evas: Remove common interface and use provider_find
Evas.Common_Interface not only had a bad name, it also wasn't in line with how we can get a loop object, for instance. Use eo_provider_find in each implementing class.
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/edje/edje_test_edje.c8
-rw-r--r--src/tests/elementary/elm_test_layout.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index e3dfd65489..1a62a8daef 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -366,7 +366,7 @@ START_TEST(edje_test_swallows)
366 ck_assert_ptr_eq(eo_parent_get(o1), ly); 366 ck_assert_ptr_eq(eo_parent_get(o1), ly);
367 367
368 edje_object_part_unswallow(ly, o1); 368 edje_object_part_unswallow(ly, o1);
369 ck_assert_ptr_eq(eo_parent_get(o1), evas_common_evas_get(o1)); 369 ck_assert_ptr_eq(eo_parent_get(o1), evas_object_evas_get(o1));
370 370
371 fail_if(!edje_object_part_swallow(ly, "swallow", o1)); 371 fail_if(!edje_object_part_swallow(ly, "swallow", o1));
372 ck_assert_ptr_eq(eo_parent_get(o1), ly); 372 ck_assert_ptr_eq(eo_parent_get(o1), ly);
@@ -375,7 +375,7 @@ START_TEST(edje_test_swallows)
375 fail_if(!edje_object_part_swallow(ly, "swallow", o2)); 375 fail_if(!edje_object_part_swallow(ly, "swallow", o2));
376 ck_assert_ptr_eq(eo_parent_get(o2), ly); 376 ck_assert_ptr_eq(eo_parent_get(o2), ly);
377 /* o1 is deleted at this point. */ 377 /* o1 is deleted at this point. */
378 ck_assert_ptr_eq(eo_parent_get(o1), evas_common_evas_get(o1)); 378 ck_assert_ptr_eq(eo_parent_get(o1), evas_object_evas_get(o1));
379 379
380 EDJE_TEST_FREE_EVAS(); 380 EDJE_TEST_FREE_EVAS();
381} 381}
@@ -397,7 +397,7 @@ START_TEST(edje_test_swallows_eoapi)
397 ck_assert_ptr_eq(eo_parent_get(o1), ly); 397 ck_assert_ptr_eq(eo_parent_get(o1), ly);
398 398
399 efl_content_remove(ly, o1); 399 efl_content_remove(ly, o1);
400 ck_assert_ptr_eq(eo_parent_get(o1), evas_common_evas_get(o1)); 400 ck_assert_ptr_eq(eo_parent_get(o1), evas_object_evas_get(o1));
401 401
402 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1)); 402 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1));
403 ck_assert_ptr_eq(eo_parent_get(o1), ly); 403 ck_assert_ptr_eq(eo_parent_get(o1), ly);
@@ -406,7 +406,7 @@ START_TEST(edje_test_swallows_eoapi)
406 fail_if(!efl_content_set(efl_part(ly, "swallow"), o2)); 406 fail_if(!efl_content_set(efl_part(ly, "swallow"), o2));
407 ck_assert_ptr_eq(eo_parent_get(o2), ly); 407 ck_assert_ptr_eq(eo_parent_get(o2), ly);
408 /* o1 is deleted at this point. */ 408 /* o1 is deleted at this point. */
409 ck_assert_ptr_eq(eo_parent_get(o1), evas_common_evas_get(o1)); 409 ck_assert_ptr_eq(eo_parent_get(o1), evas_object_evas_get(o1));
410 410
411 EDJE_TEST_FREE_EVAS(); 411 EDJE_TEST_FREE_EVAS();
412} 412}
diff --git a/src/tests/elementary/elm_test_layout.c b/src/tests/elementary/elm_test_layout.c
index 7c0ba94e33..f4f9b0d7fb 100644
--- a/src/tests/elementary/elm_test_layout.c
+++ b/src/tests/elementary/elm_test_layout.c
@@ -42,7 +42,7 @@ START_TEST(elm_layout_swallows)
42 ck_assert_ptr_eq(eo_parent_get(bt), ly); 42 ck_assert_ptr_eq(eo_parent_get(bt), ly);
43 43
44 bt = efl_content_unset(efl_part(ly, "element1")); 44 bt = efl_content_unset(efl_part(ly, "element1"));
45 ck_assert_ptr_eq(eo_parent_get(bt), evas_common_evas_get(bt)); 45 ck_assert_ptr_eq(eo_parent_get(bt), evas_object_evas_get(bt));
46 46
47 fail_if(!efl_content_set(efl_part(ly, "element1"), bt)); 47 fail_if(!efl_content_set(efl_part(ly, "element1"), bt));
48 ck_assert_ptr_eq(eo_parent_get(bt), ly); 48 ck_assert_ptr_eq(eo_parent_get(bt), ly);
@@ -51,7 +51,7 @@ START_TEST(elm_layout_swallows)
51 fail_if(!efl_content_set(efl_part(ly, "element1"), bt2)); 51 fail_if(!efl_content_set(efl_part(ly, "element1"), bt2));
52 ck_assert_ptr_eq(eo_parent_get(bt2), ly); 52 ck_assert_ptr_eq(eo_parent_get(bt2), ly);
53 /* bt is deleted at this point. */ 53 /* bt is deleted at this point. */
54 ck_assert_ptr_eq(eo_parent_get(bt), evas_common_evas_get(bt)); 54 ck_assert_ptr_eq(eo_parent_get(bt), evas_object_evas_get(bt));
55 55
56 elm_shutdown(); 56 elm_shutdown();
57} 57}