summaryrefslogtreecommitdiff
path: root/src/tests/edje
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-15 14:44:41 +0100
committerTom Hacohen <tom@stosb.com>2016-08-15 15:07:42 +0100
commite65aae994e72c1d3f8ac6b5360d3772f177b77ef (patch)
tree7ecaf136e45470635889191aded2b47057720a98 /src/tests/edje
parent35abb3c34d10a4826c98055fb85ecf93915e5ea8 (diff)
Eo: Finish the renaming of Eo to the EFL.
This renames all the rest of the API to the EFL namespace except for Eo_Event that will follow soon. Obviously breaks both API and ABI.
Diffstat (limited to 'src/tests/edje')
-rw-r--r--src/tests/edje/edje_test_edje.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index 00f989b9ea..c681e02b0f 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -252,7 +252,7 @@ START_TEST(edje_test_snapshot)
252 252
253 /* check value of no_render flag as seen from evas land */ 253 /* check value of no_render flag as seen from evas land */
254 sub = edje_object_part_object_get(obj, "snap"); 254 sub = edje_object_part_object_get(obj, "snap");
255 fail_if(!eo_isa(sub, EFL_CANVAS_SNAPSHOT_CLASS) && 255 fail_if(!efl_isa(sub, EFL_CANVAS_SNAPSHOT_CLASS) &&
256 !evas_object_image_snapshot_get(sub)); 256 !evas_object_image_snapshot_get(sub));
257 257
258 // TODO: Verify that evas snapshot actually works (and has a filter) 258 // TODO: Verify that evas snapshot actually works (and has a filter)
@@ -355,13 +355,13 @@ START_TEST(edje_test_swallows)
355 Evas *evas = EDJE_TEST_INIT_EVAS(); 355 Evas *evas = EDJE_TEST_INIT_EVAS();
356 Evas_Object *ly, *o1, *o2; 356 Evas_Object *ly, *o1, *o2;
357 357
358 ly = eo_add(EDJE_OBJECT_CLASS, evas); 358 ly = efl_add(EDJE_OBJECT_CLASS, evas);
359 fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group")); 359 fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group"));
360 360
361 fail_unless(edje_object_part_exists(ly, "swallow")); 361 fail_unless(edje_object_part_exists(ly, "swallow"));
362 362
363 363
364 o1 = eo_add(EDJE_OBJECT_CLASS, ly); 364 o1 = efl_add(EDJE_OBJECT_CLASS, ly);
365 fail_if(!edje_object_part_swallow(ly, "swallow", o1)); 365 fail_if(!edje_object_part_swallow(ly, "swallow", o1));
366 ck_assert_ptr_eq(efl_parent_get(o1), ly); 366 ck_assert_ptr_eq(efl_parent_get(o1), ly);
367 367
@@ -371,7 +371,7 @@ START_TEST(edje_test_swallows)
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(efl_parent_get(o1), ly); 372 ck_assert_ptr_eq(efl_parent_get(o1), ly);
373 373
374 o2 = eo_add(EDJE_OBJECT_CLASS, ly); 374 o2 = efl_add(EDJE_OBJECT_CLASS, ly);
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(efl_parent_get(o2), ly); 376 ck_assert_ptr_eq(efl_parent_get(o2), ly);
377 /* o1 is deleted at this point. */ 377 /* o1 is deleted at this point. */
@@ -386,13 +386,13 @@ START_TEST(edje_test_swallows_eoapi)
386 Evas *evas = EDJE_TEST_INIT_EVAS(); 386 Evas *evas = EDJE_TEST_INIT_EVAS();
387 Evas_Object *ly, *o1, *o2; 387 Evas_Object *ly, *o1, *o2;
388 388
389 ly = eo_add(EDJE_OBJECT_CLASS, evas); 389 ly = efl_add(EDJE_OBJECT_CLASS, evas);
390 fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group")); 390 fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group"));
391 391
392 fail_unless(edje_object_part_exists(ly, "swallow")); 392 fail_unless(edje_object_part_exists(ly, "swallow"));
393 393
394 394
395 o1 = eo_add(EDJE_OBJECT_CLASS, ly); 395 o1 = efl_add(EDJE_OBJECT_CLASS, ly);
396 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1)); 396 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1));
397 ck_assert_ptr_eq(efl_parent_get(o1), ly); 397 ck_assert_ptr_eq(efl_parent_get(o1), ly);
398 398
@@ -402,7 +402,7 @@ START_TEST(edje_test_swallows_eoapi)
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(efl_parent_get(o1), ly); 403 ck_assert_ptr_eq(efl_parent_get(o1), ly);
404 404
405 o2 = eo_add(EDJE_OBJECT_CLASS, ly); 405 o2 = efl_add(EDJE_OBJECT_CLASS, ly);
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(efl_parent_get(o2), ly); 407 ck_assert_ptr_eq(efl_parent_get(o2), ly);
408 /* o1 is deleted at this point. */ 408 /* o1 is deleted at this point. */
@@ -664,7 +664,7 @@ START_TEST(edje_test_table_eoapi)
664 for (k = 0; k < 2; k++) 664 for (k = 0; k < 2; k++)
665 { 665 {
666 i = l*2 + k; 666 i = l*2 + k;
667 sobjs[i] = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas); 667 sobjs[i] = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
668 fail_if(!sobjs[i]); 668 fail_if(!sobjs[i]);
669 efl_pack_grid(efl_part(obj, "table"), sobjs[i], k, l + 2, 1, 1); 669 efl_pack_grid(efl_part(obj, "table"), sobjs[i], k, l + 2, 1, 1);
670 } 670 }
@@ -698,7 +698,7 @@ START_TEST(edje_test_table_eoapi)
698 fail_if(rows != 2); 698 fail_if(rows != 2);
699 699
700 /* test multiple ops on a proxy object */ 700 /* test multiple ops on a proxy object */
701 proxy = eo_ref(efl_part(obj, "table")); 701 proxy = efl_ref(efl_part(obj, "table"));
702 fail_if(!proxy); 702 fail_if(!proxy);
703 fail_if(!efl_pack_clear(proxy)); 703 fail_if(!efl_pack_clear(proxy));
704 fail_if(efl_content_count(efl_part(obj, "table")) != 4); 704 fail_if(efl_content_count(efl_part(obj, "table")) != 4);