edje/elm: update edje test to wrap edje_object_part_object_get with freeze/thaw

Change-Id: I6803be3f510bbedc76b1ed18eae565bf5dc9457d

diff --git a/TC/edje/edje_object/utc_edje_object_part_object_name_get.c b/TC/edje/edje_object/utc_edje_object_part_object_name_get.c
index 415b66ad7189179d49371d80e3433b723e66eff0..b9adc0735e3f0f62fcfa58c9019ed8a567942ef3 100644 (file)
--- a/TC/edje/edje_object/utc_edje_object_part_object_name_get.c
+++ b/TC/edje/edje_object/utc_edje_object_part_object_name_get.c
@@ -101,7 +101,10 @@ START_TEST(utc_edje_object_part_object_name_get_p)
    evas_object_show(edje_obj);
    ecore_evas_data_set(ee, "edje_obj", edje_obj);
 
+   edje_object_freeze(edje_obj);
    obj = edje_object_part_object_get(edje_obj, part);
+   edje_object_thaw(edje_obj);
+
    if (!obj)
      {
         evas_object_del(edje_obj);

diff --git a/TC/elementary/elm_object/utc_elm_access_object.c b/TC/elementary/elm_object/utc_elm_access_object.c
index 72a8081b3a238485cb7aae9ee875e669242143e4..81c4e46f609660e2b86bb6c69e2a6d8c0fac8c84 100644 (file)
--- a/TC/elementary/elm_object/utc_elm_access_object.c
+++ b/TC/elementary/elm_object/utc_elm_access_object.c
@@ -83,8 +83,13 @@ START_TEST(utc_elm_access_object_p)
    Evas_Object *obj = NULL;
    Evas_Object *reg_obj = NULL;
    Evas_Object *res = NULL;
+   Evas_Object *edje_obj;
+
+   edje_obj = elm_layout_edje_get(lay);
+   edje_object_freeze(edje_obj);
+   obj = (Evas_Object *)edje_object_part_object_get(edje_obj, PART_NAME);
+   edje_object_thaw(edje_obj);
 
-   obj = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(lay), PART_NAME);
    if (obj == NULL)
      {
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);

diff --git a/TC/elementary/theme/utc_elm_theme_extension_mmap.c b/TC/elementary/theme/utc_elm_theme_extension_mmap.c
index 4b59e0d6d1dbe21cb10225347c47e76335540d5e..778fc2c97d13218c9c9c3b25634fd5e8427526e5 100644 (file)
--- a/TC/elementary/theme/utc_elm_theme_extension_mmap.c
+++ b/TC/elementary/theme/utc_elm_theme_extension_mmap.c
@@ -89,7 +89,7 @@ teardown(void)
  */
 START_TEST(utc_elm_theme_extension_mmap_p)
 {
-
+   Evas_Object *edje_obj;
    Evas_Object *box = elm_box_add(main_win);
    evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_win_resize_object_add(main_win, box);
@@ -100,7 +100,11 @@ START_TEST(utc_elm_theme_extension_mmap_p)
    elm_box_pack_end(box, btn);
    evas_object_show(btn);
 
-   Evas_Object *part = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(btn), "border123");
+   edje_obj = elm_layout_edje_get(btn);
+   edje_object_freeze(edje_obj);
+   Evas_Object *part = (Evas_Object *)edje_object_part_object_get(edje_obj, "border123");
+   edje_object_thaw(edje_obj);
+
    if (part)
      {
         elm_theme_extension_mmap_del(NULL, file);
@@ -115,6 +119,7 @@ START_TEST(utc_elm_theme_extension_mmap_p)
    elm_box_pack_end(box, btn);
    evas_object_show(btn);
 
+   //don't need freeze/thaw for getting color information.
    part = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(btn), "border123");
    if (!part)
      {
@@ -132,7 +137,11 @@ START_TEST(utc_elm_theme_extension_mmap_p)
 
    elm_theme_extension_mmap_del(NULL, file);
 
-   part = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(btn), "border123");
+   edje_obj = elm_layout_edje_get(btn);
+   edje_object_freeze(edje_obj);
+   part = (Evas_Object *)edje_object_part_object_get(edje_obj, "border123");
+   edje_object_thaw(edje_obj);
+
    if (part)
      {
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
@@ -148,6 +157,7 @@ START_TEST(utc_elm_theme_extension_mmap_p)
    elm_box_pack_end(box, btn_theme);
    evas_object_show(btn_theme);
 
+   //don't need freeze/thaw for getting color information.
    part = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(btn_theme), "border123");
    if (!part)
      {
@@ -171,7 +181,11 @@ START_TEST(utc_elm_theme_extension_mmap_p)
    elm_box_pack_end(box, btn);
    evas_object_show(btn);
 
-   part = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(btn), "border123");
+   edje_obj = elm_layout_edje_get(btn);
+   edje_object_freeze(edje_obj);
+   part = (Evas_Object *)edje_object_part_object_get(edje_obj, "border123");
+   edje_object_thaw(edje_obj);
+
    if (part)
      {
         elm_theme_extension_mmap_del(theme, file);
@@ -187,7 +201,11 @@ START_TEST(utc_elm_theme_extension_mmap_p)
    elm_box_pack_end(box, btn);
    evas_object_show(btn);
 
-   part = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(btn), "border123");
+   edje_obj = elm_layout_edje_get(btn);
+   edje_object_freeze(edje_obj);
+   part = (Evas_Object *)edje_object_part_object_get(edje_obj, "border123");
+   edje_object_thaw(edje_obj);
+
    if (part)
      {
         elm_theme_free(theme);

diff --git a/TC/elementary/theme/utc_elm_theme_overlay_mmap.c b/TC/elementary/theme/utc_elm_theme_overlay_mmap.c
index e52b5e284ac9c065bbfd81f1fef5e8e0f4fca40c..6fba13980b6791fbccfab8a7d75e1727a94850ca 100644 (file)
--- a/TC/elementary/theme/utc_elm_theme_overlay_mmap.c
+++ b/TC/elementary/theme/utc_elm_theme_overlay_mmap.c
@@ -88,6 +88,7 @@ teardown(void)
  */
 START_TEST(utc_elm_theme_overlay_mmap_p)
 {
+   Evas_Object *edje_obj;
 
    Evas_Object *box = elm_box_add(main_win);
    evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -99,7 +100,11 @@ START_TEST(utc_elm_theme_overlay_mmap_p)
    elm_box_pack_end(box, btn1);
    evas_object_show(btn1);
 
-   Evas_Object *part = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(btn1), "border123");
+   edje_obj = elm_layout_edje_get(btn1);
+   edje_object_freeze(edje_obj);
+   Evas_Object *part = (Evas_Object *)edje_object_part_object_get(edje_obj, "border123");
+   edje_object_thaw(edje_obj);
+
    if (part)
      {
         elm_theme_overlay_mmap_del(NULL, file);
@@ -114,7 +119,11 @@ START_TEST(utc_elm_theme_overlay_mmap_p)
    elm_box_pack_end(box, btn2);
    evas_object_show(btn2);
 
-   part = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(btn2), "border123");
+   edje_obj = elm_layout_edje_get(btn2);
+   edje_object_freeze(edje_obj);
+   part = (Evas_Object *)edje_object_part_object_get(edje_obj, "border123");
+   edje_object_thaw(edje_obj);
+
    if (!part)
      {
         elm_theme_overlay_mmap_del(NULL, file);
@@ -123,13 +132,21 @@ START_TEST(utc_elm_theme_overlay_mmap_p)
 
    elm_theme_overlay_mmap_del(NULL, file);
 
-   part = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(btn1), "border123");
+   edje_obj = elm_layout_edje_get(btn1);
+   edje_object_freeze(edje_obj);
+   part = (Evas_Object *)edje_object_part_object_get(edje_obj, "border123");
+   edje_object_thaw(edje_obj);
+
    if (part)
      {
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
      }
 
-   part = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(btn2), "border123");
+   edje_obj = elm_layout_edje_get(btn2);
+   edje_object_freeze(edje_obj);
+   part = (Evas_Object *)edje_object_part_object_get(edje_obj, "border123");
+   edje_object_thaw(edje_obj);
+
    if (part)
      {
         ck_abort_msg("[TEST_FAIL]:: %s[%d] : Test has failed..", __FILE__, __LINE__);
@@ -144,7 +161,11 @@ START_TEST(utc_elm_theme_overlay_mmap_p)
    elm_box_pack_end(box, btn1);
    evas_object_show(btn1);
 
-   part = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(btn1), "border123");
+   edje_obj = elm_layout_edje_get(btn1);
+   edje_object_freeze(edje_obj);
+   part = (Evas_Object *)edje_object_part_object_get(edje_obj, "border123");
+   edje_object_thaw(edje_obj);
+
    if (part)
      {
         elm_theme_overlay_mmap_del(theme, file);
@@ -159,7 +180,11 @@ START_TEST(utc_elm_theme_overlay_mmap_p)
    elm_box_pack_end(box, btn2);
    evas_object_show(btn2);
 
-   part = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(btn2), "border123");
+   edje_obj = elm_layout_edje_get(btn2);
+   edje_object_freeze(edje_obj);
+   part = (Evas_Object *)edje_object_part_object_get(edje_obj, "border123");
+   edje_object_thaw(edje_obj);
+
    if (!part)
      {
         elm_theme_overlay_mmap_del(theme, file);
@@ -176,7 +201,11 @@ START_TEST(utc_elm_theme_overlay_mmap_p)
    elm_box_pack_end(box, btn2);
    evas_object_show(btn2);
 
-   part = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(btn2), "border123");
+   edje_obj = elm_layout_edje_get(btn2);
+   edje_object_freeze(edje_obj);
+   part = (Evas_Object *)edje_object_part_object_get(edje_obj, "border123");
+   edje_object_thaw(edje_obj);
+
    if (part)
      {
         elm_theme_free(theme);