tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=70537370a1116a92e8a2caef13672cbcf8398ecf
commit 70537370a1116a92e8a2caef13672cbcf8398ecf Author: Tom Hacohen <t...@stosb.com> Date: Fri Apr 15 17:45:52 2016 +0100 Edje tests: Add parent upadting tests to edje. --- src/Makefile_Edje.am | 2 ++ src/tests/edje/data/test_swallows.edc | 23 +++++++++++++++++++++++ src/tests/edje/edje_test_edje.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am index b811642..54bf1ce 100644 --- a/src/Makefile_Edje.am +++ b/src/Makefile_Edje.am @@ -254,6 +254,7 @@ tests/edje/data/test_filters.edc \ tests/edje/data/test_snapshot.edc \ tests/edje/data/test_size_class.edc \ tests/edje/data/test_color_class.edc \ +tests/edje/data/test_swallows.edc \ tests/edje/data/filter.lua @@ -297,6 +298,7 @@ EDJE_TEST_FILES = tests/edje/data/test_layout.edj \ tests/edje/data/test_filters.edj \ tests/edje/data/test_snapshot.edj \ tests/edje/data/test_size_class.edj \ + tests/edje/data/test_swallows.edj \ tests/edje/data/test_color_class.edj noinst_DATA += $(EDJE_TEST_FILES) diff --git a/src/tests/edje/data/test_swallows.edc b/src/tests/edje/data/test_swallows.edc new file mode 100644 index 0000000..b1b9e91 --- /dev/null +++ b/src/tests/edje/data/test_swallows.edc @@ -0,0 +1,23 @@ +collections { + group { + name: "test_group"; + + parts { + part { + name: "swallow"; + type: SWALLOW; + + description { + state: "default" 0.0; + + rel1 { + relative: 0.0 0.0; + } + rel2 { + relative: 1.0 1.0; + } + } + } + } + } +} diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c index 8a3d645..658f115 100644 --- a/src/tests/edje/edje_test_edje.c +++ b/src/tests/edje/edje_test_edje.c @@ -350,6 +350,37 @@ START_TEST(edje_test_color_class) } END_TEST +START_TEST(edje_test_swallows) +{ + Evas *evas = EDJE_TEST_INIT_EVAS(); + Evas_Object *ly, *o1, *o2; + + ly = eo_add(EDJE_OBJECT_CLASS, evas); + fail_unless(edje_object_file_set(ly, test_layout_get("test_swallows.edj"), "test_group")); + + fail_unless(edje_object_part_exists(ly, "swallow")); + + + o1 = eo_add(EDJE_OBJECT_CLASS, ly); + fail_if(!edje_obj_part_swallow(ly, "swallow", o1)); + ck_assert_ptr_eq(eo_parent_get(o1), ly); + + edje_obj_part_unswallow(ly, o1); + ck_assert_ptr_eq(eo_parent_get(o1), evas_common_evas_get(o1)); + + fail_if(!edje_obj_part_swallow(ly, "swallow", o1)); + ck_assert_ptr_eq(eo_parent_get(o1), ly); + + o2 = eo_add(EDJE_OBJECT_CLASS, ly); + fail_if(!edje_obj_part_swallow(ly, "swallow", o2)); + ck_assert_ptr_eq(eo_parent_get(o2), ly); + /* o1 is deleted at this point. */ + ck_assert_ptr_eq(eo_parent_get(o1), evas_common_evas_get(o1)); + + EDJE_TEST_FREE_EVAS(); +} +END_TEST + void edje_test_edje(TCase *tc) { tcase_add_test(tc, edje_test_edje_init); @@ -363,4 +394,5 @@ void edje_test_edje(TCase *tc) tcase_add_test(tc, edje_test_snapshot); tcase_add_test(tc, edje_test_size_class); tcase_add_test(tc, edje_test_color_class); + tcase_add_test(tc, edje_test_swallows); } --