summaryrefslogtreecommitdiff
path: root/src/tests/edje
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2017-12-06 12:15:39 +0900
committerAmitesh Singh <amitesh.sh@samsung.com>2017-12-06 13:12:29 +0900
commit54ae9cc18b6c0fdb9a10f03ad2681587ca062c6c (patch)
tree0691dec1bd167d6e4f62a974543ae452ee16f9c2 /src/tests/edje
parentb3715d30bb50015d5fc423fee1adeab2ff8dbb8e (diff)
edje: rename Edje.Object to Efl.Canvas.Layout
Diffstat (limited to 'src/tests/edje')
-rw-r--r--src/tests/edje/edje_test_edje.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index a8dbbf3..6d54508 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -6,7 +6,7 @@
6#include <stdio.h> 6#include <stdio.h>
7 7
8#define EFL_GFX_FILTER_BETA 8#define EFL_GFX_FILTER_BETA
9#define EDJE_OBJECT_BETA 9#define EFL_CANVAS_LAYOUT_BETA
10 10
11#include <Eina.h> 11#include <Eina.h>
12#include <Edje.h> 12#include <Edje.h>
@@ -362,13 +362,13 @@ START_TEST(edje_test_swallows)
362 Evas *evas = EDJE_TEST_INIT_EVAS(); 362 Evas *evas = EDJE_TEST_INIT_EVAS();
363 Evas_Object *ly, *o1, *o2; 363 Evas_Object *ly, *o1, *o2;
364 364
365 ly = efl_add(EDJE_OBJECT_CLASS, evas); 365 ly = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas);
366 fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group")); 366 fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group"));
367 367
368 fail_unless(edje_object_part_exists(ly, "swallow")); 368 fail_unless(edje_object_part_exists(ly, "swallow"));
369 369
370 370
371 o1 = efl_add(EDJE_OBJECT_CLASS, ly); 371 o1 = efl_add(EFL_CANVAS_LAYOUT_CLASS, ly);
372 fail_if(!edje_object_part_swallow(ly, "swallow", o1)); 372 fail_if(!edje_object_part_swallow(ly, "swallow", o1));
373 ck_assert_ptr_eq(efl_parent_get(o1), ly); 373 ck_assert_ptr_eq(efl_parent_get(o1), ly);
374 374
@@ -378,7 +378,7 @@ START_TEST(edje_test_swallows)
378 fail_if(!edje_object_part_swallow(ly, "swallow", o1)); 378 fail_if(!edje_object_part_swallow(ly, "swallow", o1));
379 ck_assert_ptr_eq(efl_parent_get(o1), ly); 379 ck_assert_ptr_eq(efl_parent_get(o1), ly);
380 380
381 o2 = efl_add(EDJE_OBJECT_CLASS, ly); 381 o2 = efl_add(EFL_CANVAS_LAYOUT_CLASS, ly);
382 fail_if(!edje_object_part_swallow(ly, "swallow", o2)); 382 fail_if(!edje_object_part_swallow(ly, "swallow", o2));
383 ck_assert_ptr_eq(efl_parent_get(o2), ly); 383 ck_assert_ptr_eq(efl_parent_get(o2), ly);
384 /* o1 is deleted at this point. */ 384 /* o1 is deleted at this point. */
@@ -393,13 +393,13 @@ START_TEST(edje_test_swallows_eoapi)
393 Evas *evas = EDJE_TEST_INIT_EVAS(); 393 Evas *evas = EDJE_TEST_INIT_EVAS();
394 Evas_Object *ly, *o1, *o2; 394 Evas_Object *ly, *o1, *o2;
395 395
396 ly = efl_add(EDJE_OBJECT_CLASS, evas); 396 ly = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas);
397 fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group")); 397 fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group"));
398 398
399 fail_unless(edje_object_part_exists(ly, "swallow")); 399 fail_unless(edje_object_part_exists(ly, "swallow"));
400 400
401 401
402 o1 = efl_add(EDJE_OBJECT_CLASS, ly); 402 o1 = efl_add(EFL_CANVAS_LAYOUT_CLASS, ly);
403 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1)); 403 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1));
404 ck_assert_ptr_eq(efl_parent_get(o1), ly); 404 ck_assert_ptr_eq(efl_parent_get(o1), ly);
405 405
@@ -409,7 +409,7 @@ START_TEST(edje_test_swallows_eoapi)
409 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1)); 409 fail_if(!efl_content_set(efl_part(ly, "swallow"), o1));
410 ck_assert_ptr_eq(efl_parent_get(o1), ly); 410 ck_assert_ptr_eq(efl_parent_get(o1), ly);
411 411
412 o2 = efl_add(EDJE_OBJECT_CLASS, ly); 412 o2 = efl_add(EFL_CANVAS_LAYOUT_CLASS, ly);
413 fail_if(!efl_content_set(efl_part(ly, "swallow"), o2)); 413 fail_if(!efl_content_set(efl_part(ly, "swallow"), o2));
414 ck_assert_ptr_eq(efl_parent_get(o2), ly); 414 ck_assert_ptr_eq(efl_parent_get(o2), ly);
415 /* o1 is deleted at this point. */ 415 /* o1 is deleted at this point. */
@@ -433,7 +433,7 @@ START_TEST(edje_test_access)
433 fail_unless(edje_object_file_set(obj, test_layout_get("test_layout.edj"), "test_group")); 433 fail_unless(edje_object_file_set(obj, test_layout_get("test_layout.edj"), "test_group"));
434 434
435 /* eo api */ 435 /* eo api */
436 it = edje_obj_access_part_iterate(obj); 436 it = efl_canvas_layout_access_part_iterate(obj);
437 fail_if(!it); 437 fail_if(!it);
438 438
439 EINA_ITERATOR_FOREACH(it, name) 439 EINA_ITERATOR_FOREACH(it, name)
@@ -825,7 +825,7 @@ START_TEST(edje_test_message_send_eo)
825 825
826 evas = EDJE_TEST_INIT_EVAS(); 826 evas = EDJE_TEST_INIT_EVAS();
827 827
828 obj = efl_add(EDJE_OBJECT_CLASS, evas, 828 obj = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas,
829 efl_file_set(efl_added, test_layout_get("test_messages.edj"), "test_group")); 829 efl_file_set(efl_added, test_layout_get("test_messages.edj"), "test_group"));
830 830
831 // FIXME: EO API HERE 831 // FIXME: EO API HERE
@@ -882,7 +882,7 @@ START_TEST(edje_test_signals)
882 882
883 evas = EDJE_TEST_INIT_EVAS(); 883 evas = EDJE_TEST_INIT_EVAS();
884 884
885 obj = efl_add(EDJE_OBJECT_CLASS, evas, 885 obj = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas,
886 efl_file_set(efl_added, test_layout_get("test_signals.edj"), "level1"), 886 efl_file_set(efl_added, test_layout_get("test_signals.edj"), "level1"),
887 efl_gfx_size_set(efl_added, EINA_SIZE2D(320, 240)), 887 efl_gfx_size_set(efl_added, EINA_SIZE2D(320, 240)),
888 efl_gfx_visible_set(efl_added, 1)); 888 efl_gfx_visible_set(efl_added, 1));
@@ -925,7 +925,7 @@ START_TEST(edje_test_signal_callback_del_full)
925 925
926 evas = EDJE_TEST_INIT_EVAS(); 926 evas = EDJE_TEST_INIT_EVAS();
927 927
928 obj = efl_add(EDJE_OBJECT_CLASS, evas, 928 obj = efl_add(EFL_CANVAS_LAYOUT_CLASS, evas,
929 efl_file_set(efl_added, 929 efl_file_set(efl_added,
930 test_layout_get("test_signal_callback_del_full.edj"), "test"), 930 test_layout_get("test_signal_callback_del_full.edj"), "test"),
931 efl_gfx_size_set(efl_added, EINA_SIZE2D(320, 240)), 931 efl_gfx_size_set(efl_added, EINA_SIZE2D(320, 240)),