aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2018-06-25 11:29:10 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-06-25 11:32:33 -0400
commit9a9970ae6293653169254380430b70fa62324efb (patch)
tree1969ccbaf6a020538b347826beed8a4eb51d91b9
parentelementary_bin: Wrap calls to edje_object_part_object_get with edje_freeze/thaw (diff)
downloadefl-9a9970ae6293653169254380430b70fa62324efb.tar.gz
tests: Update edje test to wrap edje_object_part_object_get with
Summary: freeze/thaw @ref https://phab.enlightenment.org/T6884 Depends on https://phab.enlightenment.org/D6403 Reviewers: zmike, ManMower Reviewed By: zmike Subscribers: cedric, #committers Tags: #efl Maniphest Tasks: https://phab.enlightenment.org/T6884 Differential Revision: https://phab.enlightenment.org/D6404
-rw-r--r--src/tests/edje/edje_test_edje.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index 0f98e3cb8d..b8c8179436 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -176,19 +176,27 @@ EFL_START_TEST(edje_test_masking)
edje_object_part_geometry_get(obj, "background", &x, &y, &w, &h);
fail_if(x != 0 || y != 0 || w != 100 || h != 100);
+ edje_object_freeze(obj);
clip = edje_object_part_object_get(obj, "clip2");
+ edje_object_thaw(obj);
fail_if(!clip);
/* check value of no_render flag as seen from evas land */
+ edje_object_freeze(obj);
sub = edje_object_part_object_get(obj, "mask");
+ edje_object_thaw(obj);
fail_if(!efl_canvas_object_no_render_get(sub));
/* check that text has a clip (based on description.clip_to) */
+ edje_object_freeze(obj);
sub = edje_object_part_object_get(obj, "text");
+ edje_object_thaw(obj);
fail_if(!efl_canvas_object_clip_get(sub));
/* test description.clip_to override */
+ edje_object_freeze(obj);
sub = edje_object_part_object_get(obj, "noclip");
+ edje_object_thaw(obj);
clip2 = efl_canvas_object_clip_get(sub);
fail_if(clip != clip2);
@@ -211,17 +219,25 @@ EFL_START_TEST(edje_test_filters)
evas_object_resize(obj, 200, 200);
/* check value of no_render flag as seen from evas land */
+ edje_object_freeze(obj);
sub = edje_object_part_object_get(obj, "mask");
+ edje_object_thaw(obj);
fail_if(!efl_canvas_object_no_render_get(sub));
/* check no_render inheritance */
+ edje_object_freeze(obj);
sub = edje_object_part_object_get(obj, "mask2");
+ edje_object_thaw(obj);
fail_if(efl_canvas_object_no_render_get(sub));
+ edje_object_freeze(obj);
sub = edje_object_part_object_get(obj, "mask3");
+ edje_object_thaw(obj);
fail_if(!efl_canvas_object_no_render_get(sub));
/* text part: check filter status */
+ edje_object_freeze(obj);
text = edje_object_part_object_get(obj, "text");
+ edje_object_thaw(obj);
fail_if(!text);
efl_gfx_filter_program_get(text, &prg, &name);
@@ -251,7 +267,9 @@ EFL_START_TEST(edje_test_snapshot)
evas_object_resize(obj, 200, 200);
/* check value of no_render flag as seen from evas land */
+ edje_object_freeze(obj);
sub = edje_object_part_object_get(obj, "snap");
+ edje_object_thaw(obj);
fail_if(!efl_isa(sub, EFL_CANVAS_SNAPSHOT_CLASS) &&
!evas_object_image_snapshot_get(sub));
@@ -500,7 +518,9 @@ EFL_START_TEST(edje_test_box)
edje_object_part_box_insert_after(obj, "box", sobjs[4], sobjs[3]);
edje_object_part_box_insert_at(obj, "box", sobjs[2], 2);
+ edje_object_freeze(obj);
box = edje_object_part_object_get(obj, "box");
+ edje_object_thaw(obj);
it = evas_object_box_iterator_new(box);
i = 0;