e_view : add eo data to e_view

  - In order to replace the evas_object with e_view,
  - it is temporarily provided for parts that have not yet been implemented.

Change-Id: I0ce28e64b329b47a8f376077ff80bc20473b6b2b
Signed-off-by: jinbong.lee <jinbong.lee@samsung.com>

diff --git a/src/bin/core/e_view.c b/src/bin/core/e_view.c
index 377b71d03bb94224855451a57ae3c9da44d6910b..5d3d90a185e7f2b7230f9f40138ae7566de67540 100644 (file)
--- a/src/bin/core/e_view.c
+++ b/src/bin/core/e_view.c
@@ -82,7 +82,10 @@ _view_destroy(E_View *view)
 
    e_view_name_set(view, NULL);
    if (view->eo)
-     evas_object_data_del(view->eo, "e_view");
+     {
+        evas_object_data_del(view->eo, "e_view");
+        evas_object_data_del(view->eo, "evasobj");
+     }
 
    wl_list_remove(&view->link);
 
@@ -233,7 +236,14 @@ e_view_init(E_View *view, E_View_Type type, E_View_Impl *impl, Evas_Object *eo,
    _e_view_events_init(view);
 
    if (eo)
-     evas_object_data_set(eo, "e_view", view);
+     {
+        evas_object_data_set(eo, "e_view", view);
+
+        // In order to replace evas_object with e_view,
+        // it is temporarily provided for parts that have not yet been implemented.
+        evas_object_data_set(eo, "evasobj", eo);
+     }
+
 
    if (parent)
      {

diff --git a/tests/tc-e_view.cpp b/tests/tc-e_view.cpp
index 4f3d788646dbcb31cbe7c2aa6872955bae8756b0..cc6cd7665c2cec40a7bd6cd0ae4ff56e2cbbc468 100644 (file)
--- a/tests/tc-e_view.cpp
+++ b/tests/tc-e_view.cpp
@@ -35,7 +35,8 @@ TEST_F(EViewTest, Test_E_View_Init_Without_Parent)
    Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
    E_View view;
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+       .Times(AnyNumber());
    e_view_init(&view, E_VIEW_TYPE_RECT, &e_view_impl, obj, NULL);
    EXPECT_EQ(view.eo, obj);
    EXPECT_EQ(view.type, E_VIEW_TYPE_RECT);
@@ -64,7 +65,8 @@ TEST_F(EViewTest, Test_E_View_Init_With_Normal_Parent)
    Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
    E_View view;
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_move(obj, PARENT_X, PARENT_Y)).Times(1);
    e_view_init(&view, E_VIEW_TYPE_RECT, &e_view_impl, obj, &parent);
    EXPECT_EQ(view.eo, obj);
@@ -93,11 +95,13 @@ TEST_F(EViewTest, Test_E_View_Destroy_With_Null_Callback)
    Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
    E_View view;
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    e_view_init(&view, E_VIEW_TYPE_RECT, &e_view_impl, obj, NULL);
 
    destroyed = 0;
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(&view);
    EXPECT_NE(destroyed, 1);
 
@@ -113,11 +117,13 @@ TEST_F(EViewTest, Test_E_View_Destroy_With_Valid_Callback)
    Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
    E_View view;
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    e_view_init(&view, E_VIEW_TYPE_RECT, &e_view_impl, obj, NULL);
 
    destroyed = 0;
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(&view);
    EXPECT_EQ(destroyed, 1);
 
@@ -210,10 +216,12 @@ TEST_F(EViewTest, Test_E_View_Place_Above)
    Evas_Object *obj_sibling = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
 
    E_View view, sibling;
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj_view, &parent);
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    EXPECT_CALL(*evasMock, evas_object_stack_above(_, _));
    e_view_init(&sibling, E_VIEW_TYPE_RECT, NULL, obj_sibling, &parent);
@@ -248,10 +256,12 @@ TEST_F(EViewTest, Test_E_View_Place_Above_With_Tree)
    Evas_Object *obj_view2 = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
 
    E_View view1, view2;
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    e_view_init(&view1, E_VIEW_TYPE_RECT, NULL, obj_view1, &tree1);
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    EXPECT_CALL(*evasMock, evas_object_stack_above(_, _));
    e_view_init(&view2, E_VIEW_TYPE_RECT, NULL, obj_view2, &tree2);
@@ -303,10 +313,12 @@ TEST_F(EViewTest, Test_E_View_Place_Below)
    Evas_Object *obj_sibling = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
 
    E_View view, sibling;
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    e_view_init(&sibling, E_VIEW_TYPE_RECT, NULL, obj_sibling, &parent);
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    EXPECT_CALL(*evasMock, evas_object_stack_above(_, _));
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj_view, &parent);
@@ -348,14 +360,17 @@ TEST_F(EViewTest, Test_E_View_Raise_To_Top)
    Evas_Object *obj_sibling_top = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
 
    E_View view, sibling_mid, sibling_top;
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj_view, &parent);
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    EXPECT_CALL(*evasMock, evas_object_stack_above(_, _));
    e_view_init(&sibling_mid, E_VIEW_TYPE_RECT, NULL, obj_sibling_mid, &parent);
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    EXPECT_CALL(*evasMock, evas_object_stack_above(_, _));
    e_view_init(&sibling_top, E_VIEW_TYPE_RECT, NULL, obj_sibling_top, &parent);
@@ -403,14 +418,17 @@ TEST_F(EViewTest, Test_E_View_Lower_To_Bottom)
    Evas_Object *obj_sibling_bottom = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
 
    E_View view, sibling_mid, sibling_bottom;
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    e_view_init(&sibling_bottom, E_VIEW_TYPE_RECT, NULL, obj_sibling_bottom, &parent);
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    EXPECT_CALL(*evasMock, evas_object_stack_above(_, _));
    e_view_init(&sibling_mid, E_VIEW_TYPE_RECT, NULL, obj_sibling_mid, &parent);
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    EXPECT_CALL(*evasMock, evas_object_stack_above(_, _));
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj_view, &parent);
@@ -497,7 +515,8 @@ TEST_F(EViewTest, Test_E_View_Position_Set_Get)
 
    E_View view1;
    Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_move(obj, 100 + 50, 40 + 30))
       .Times(1);
    e_view_init(&view1, E_VIEW_TYPE_RECT, NULL, obj, &tree2);
@@ -524,7 +543,8 @@ TEST_F(EViewTest, Test_E_View_Render_Op_Set_Get)
 {
    Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
    E_View view;
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
 
    EXPECT_CALL(*evasMock, evas_object_render_op_set(obj, EVAS_RENDER_COPY))
@@ -543,7 +563,8 @@ TEST_F(EViewTest, Test_E_View_Color_Set_Get)
 {
    Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
    E_View view;
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    e_view_init(&view, E_VIEW_TYPE_TREE, NULL, obj, NULL);
 
    int red = 255;
@@ -577,7 +598,8 @@ TEST_F(EViewTest, Test_E_View_Data_Set_Get_Del)
 {
    Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
    E_View view;
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
 
    const char key[] = "e_view_test";
@@ -606,12 +628,14 @@ TEST_F(EViewTest, Test_E_View_Clip_Set)
 {
    Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
    E_View view;
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
 
    Evas_Object *clipper_obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
    E_View clipper;
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    e_view_init(&clipper, E_VIEW_TYPE_RECT, NULL, clipper_obj, NULL);
 
    EXPECT_CALL(*evasMock, evas_object_clip_set(obj, clipper_obj))
@@ -626,12 +650,14 @@ TEST_F(EViewTest, Test_E_View_Clip_Set_With_Clipper_Other_Than_Rect_Or_Image)
 {
    Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
    E_View view;
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
 
    Evas_Object *clipper_obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
    E_View clipper;
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    e_view_init(&clipper, E_VIEW_TYPE_TREE, NULL, clipper_obj, NULL);
 
    EXPECT_CALL(*evasMock, evas_object_clip_set(obj, clipper_obj))
@@ -646,7 +672,8 @@ TEST_F(EViewTest, Test_E_View_Clip_Unset)
 {
    Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
    E_View view;
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
 
    EXPECT_CALL(*evasMock, evas_object_clip_set(obj, nullptr))
@@ -661,7 +688,8 @@ TEST_F(EViewTest, Test_E_View_Freeze_Events_Set)
 {
    Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
    E_View view;
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
 
    EXPECT_CALL(*evasMock, evas_object_freeze_events_set(obj, EINA_TRUE))
@@ -679,7 +707,8 @@ TEST_F(EViewTest, Test_E_View_Repeat_Events_Set)
 {
    Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
    E_View view;
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
 
    EXPECT_CALL(*evasMock, evas_object_repeat_events_set(obj, EINA_TRUE))
@@ -700,7 +729,8 @@ TEST_F(EViewTest, Test_E_View_Show)
 
    Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
    E_View view;
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, &tree);
 
@@ -723,7 +753,8 @@ TEST_F(EViewTest, Test_E_View_Hide)
 
    Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
    E_View view;
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, &tree);
 
@@ -887,7 +918,8 @@ TEST_F(EViewTest, Test_E_View_Map_Enable_Set_Get)
 {
    E_View view;
    Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
 
    EXPECT_ABORT(e_view_map_enable_get(NULL));
@@ -924,7 +956,8 @@ TEST_F(EViewTest, Test_E_View_Visible_Get)
    E_View view;
    Evas_Object obj;
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, &obj, NULL);
    ASSERT_EQ(e_view_visible_get(&view), false);
 
@@ -1031,14 +1064,17 @@ TEST_F(EViewTest, DISABLED_Test_E_View_Reparent_With_Evas_Object)
     */
    E_View view1, view2, view3;
    Evas_Object v1_obj, v2_obj, v3_obj;
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    e_view_init(&view1, E_VIEW_TYPE_RECT, NULL, &v1_obj, &parent1);
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _)).Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_stack_above(&v2_obj, &v1_obj));
    e_view_init(&view2, E_VIEW_TYPE_RECT, NULL, &v2_obj, &parent1);
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _)).Times(AnyNumber());
    e_view_init(&view3, E_VIEW_TYPE_RECT, NULL, &v3_obj, &parent2);
 
@@ -1086,7 +1122,8 @@ TEST_F(EViewTest, Test_E_View_Pass_Events_Set_Get)
 {
    E_View view;
    Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
 
    EXPECT_CALL(*evasMock, evas_object_pass_events_set(obj, true))

diff --git a/tests/tc-e_view_event.cpp b/tests/tc-e_view_event.cpp
index 9f7361008e81db78866c965f374871e69b97ee8f..13bb131c3e14b215d8e8cda6a8b752b73531255c 100644 (file)
--- a/tests/tc-e_view_event.cpp
+++ b/tests/tc-e_view_event.cpp
@@ -45,17 +45,20 @@ public:
       EXPECT_CALL(*evasMock, evas_object_stack_above(_, _))
          .Times(AnyNumber());
 
-      EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+      EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+         .Times(AnyNumber());
       e_view_init(&view1, E_VIEW_TYPE_RECT, NULL, &obj1, &tree1);
       view1.x = 100;
       view1.y = 200;
 
-      EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+      EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+         .Times(AnyNumber());
       e_view_init(&view2, E_VIEW_TYPE_RECT, NULL, &obj2, &tree2);
       view2.x = 300;
       view2.y = 400;
 
-      EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+      EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+         .Times(AnyNumber());
       e_view_init(&view3, E_VIEW_TYPE_RECT, NULL, &obj3, &tree2);
       view3.x = 500;
       view3.y = 600;

diff --git a/tests/tc-e_view_image.cpp b/tests/tc-e_view_image.cpp
index e002290e9eaafebbb7ffa934d984f28743885075..fef192d18b6c2b99183c9834b6704fc345429411 100755 (executable)
--- a/tests/tc-e_view_image.cpp
+++ b/tests/tc-e_view_image.cpp
@@ -42,7 +42,8 @@ TEST_F(EViewImageTest, Test_E_View_Image_Create)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -51,7 +52,8 @@ TEST_F(EViewImageTest, Test_E_View_Image_Create)
    EXPECT_NE(view, nullptr);
 
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -64,7 +66,8 @@ TEST_F(EViewImageTest, Test_e_view_image_view_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -81,7 +84,8 @@ TEST_F(EViewImageTest, Test_e_view_image_view_get)
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -94,7 +98,8 @@ TEST_F(EViewImageTest, Test_e_view_image_alpha_set_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -120,7 +125,8 @@ TEST_F(EViewImageTest, Test_e_view_image_alpha_set_get)
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -133,7 +139,8 @@ TEST_F(EViewImageTest, Test_e_view_image_animated_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -155,7 +162,8 @@ TEST_F(EViewImageTest, Test_e_view_image_animated_get)
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -168,7 +176,8 @@ TEST_F(EViewImageTest, Test_e_vew_image_animated_frame_set_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -189,7 +198,8 @@ TEST_F(EViewImageTest, Test_e_vew_image_animated_frame_set_get)
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -202,7 +212,8 @@ TEST_F(EViewImageTest, Test_e_view_image_animated_frame_count_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -220,7 +231,8 @@ TEST_F(EViewImageTest, Test_e_view_image_animated_frame_count_get)
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -233,7 +245,8 @@ TEST_F(EViewImageTest, Test_e_view_image_animated_frame_duration_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -252,7 +265,8 @@ TEST_F(EViewImageTest, Test_e_view_image_animated_frame_duration_get)
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -265,7 +279,8 @@ TEST_F(EViewImageTest, Test_e_view_image_border_center_fill_set_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -310,10 +325,11 @@ TEST_F(EViewImageTest, Test_e_view_image_border_center_fill_set_get)
 
    ret = e_view_image_border_center_fill_get(image);
    EXPECT_EQ(fill_mode, ret);
-   
+
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -326,7 +342,8 @@ TEST_F(EViewImageTest, Test_e_view_image_border_set_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -340,7 +357,7 @@ TEST_F(EViewImageTest, Test_e_view_image_border_set_get)
 
    EXPECT_CALL(*evasMock, evas_object_image_border_set(obj, l, r, t, b))
       .Times(1);
-   
+
    e_view_image_border_set(image, l, r, t, b);
 
    int ret_l, ret_r, ret_t, ret_b;
@@ -350,7 +367,7 @@ TEST_F(EViewImageTest, Test_e_view_image_border_set_get)
                       SetArgPointee<2>(r),
                       SetArgPointee<3>(t),
                       SetArgPointee<4>(b)));
-   
+
    e_view_image_border_get(image, &ret_l, &ret_r, &ret_t, &ret_b);
    EXPECT_EQ(l, ret_l);
    EXPECT_EQ(r, ret_r);
@@ -359,10 +376,11 @@ TEST_F(EViewImageTest, Test_e_view_image_border_set_get)
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
-   
+
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_colorspace_set_get)
@@ -373,7 +391,8 @@ TEST_F(EViewImageTest, Test_e_view_image_colorspace_set_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -382,21 +401,22 @@ TEST_F(EViewImageTest, Test_e_view_image_colorspace_set_get)
    // test code start
    EXPECT_CALL(*evasMock, evas_object_image_colorspace_set(obj, EVAS_COLORSPACE_GRY8))
       .Times(1);
-   
+
    e_view_image_colorspace_set(image, E_VIEW_COLORSPACE_GRY8);
 
    EXPECT_CALL(*evasMock, evas_object_image_colorspace_get(obj))
       .Times(1)
       .WillOnce(Return(EVAS_COLORSPACE_GRY8));
-   
+
    E_View_Colorspace ret = e_view_image_colorspace_get(image);
    EXPECT_EQ(ret, E_VIEW_COLORSPACE_GRY8);
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
-   free(obj);  
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_data_copy_set)
@@ -407,7 +427,8 @@ TEST_F(EViewImageTest, Test_e_view_image_data_copy_set)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -424,7 +445,8 @@ TEST_F(EViewImageTest, Test_e_view_image_data_copy_set)
    free(data);
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -437,7 +459,8 @@ TEST_F(EViewImageTest, Test_e_view_image_data_set_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -456,13 +479,14 @@ TEST_F(EViewImageTest, Test_e_view_image_data_set_get)
    EXPECT_CALL(*evasMock, evas_object_image_data_get(obj, EINA_TRUE))
       .Times(1)
       .WillOnce(Return(data));
-   
+
    void* ret = e_view_image_data_get(image, EINA_TRUE);
    EXPECT_EQ(ret, data);
    free(data);
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -475,7 +499,8 @@ TEST_F(EViewImageTest, Test_e_view_image_data_update_add)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -484,12 +509,13 @@ TEST_F(EViewImageTest, Test_e_view_image_data_update_add)
    // test code start
    EXPECT_CALL(*evasMock, evas_object_image_data_update_add(obj, 10, 20, 100, 200))
       .Times(1);
-   
+
    e_view_image_data_update_add(image, 10, 20, 100, 200);
-   
+
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -502,7 +528,8 @@ TEST_F(EViewImageTest, Test_e_view_image_file_set_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -514,7 +541,7 @@ TEST_F(EViewImageTest, Test_e_view_image_file_set_get)
 
    EXPECT_CALL(*evasMock, evas_object_image_file_set(obj, file, key))
       .Times(1);
-   
+
    e_view_image_file_set(image, file, key);
 
    char *ret_file;
@@ -523,14 +550,15 @@ TEST_F(EViewImageTest, Test_e_view_image_file_set_get)
       .Times(1)
       .WillOnce(DoAll(SetArgPointee<1>(file),
                       SetArgPointee<2>(key)));
-   
+
    e_view_image_file_get(image, (const char**)&ret_file, (const char**)&ret_key);
    EXPECT_EQ(ret_file, file);
    EXPECT_EQ(ret_key, key);
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -543,7 +571,8 @@ TEST_F(EViewImageTest, Test_e_view_image_fill_set_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -575,7 +604,8 @@ TEST_F(EViewImageTest, Test_e_view_image_fill_set_get)
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -588,7 +618,8 @@ TEST_F(EViewImageTest, Test_e_view_image_filled_set_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -617,7 +648,8 @@ TEST_F(EViewImageTest, Test_e_view_image_filled_set_get)
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -630,7 +662,8 @@ TEST_F(EViewImageTest, Test_e_view_image_load_error_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -640,13 +673,14 @@ TEST_F(EViewImageTest, Test_e_view_image_load_error_get)
    EXPECT_CALL(*evasMock, evas_object_image_load_error_get(obj))
       .Times(1)
       .WillOnce(Return(EVAS_LOAD_ERROR_NONE));
-   
+
    E_View_Load_Error ret = e_view_image_load_error_get(image);
    EXPECT_EQ(ret, E_VIEW_LOAD_ERROR_NONE);
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -659,7 +693,9 @@ TEST_F(EViewImageTest, Test_e_view_image_load_size_set_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
+
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -670,7 +706,7 @@ TEST_F(EViewImageTest, Test_e_view_image_load_size_set_get)
    int h = 20;
    EXPECT_CALL(*evasMock, evas_object_image_load_size_set(obj, w, h))
       .Times(1);
-   
+
    e_view_image_load_size_set(image, w, h);
 
    int ret_w, ret_h;
@@ -685,7 +721,8 @@ TEST_F(EViewImageTest, Test_e_view_image_load_size_set_get)
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -698,7 +735,8 @@ TEST_F(EViewImageTest, Test_e_view_image_native_surface_set_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -731,7 +769,8 @@ TEST_F(EViewImageTest, Test_e_view_image_native_surface_set_get)
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -744,7 +783,9 @@ TEST_F(EViewImageTest, Test_e_view_image_pixels_dirty_set_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
+
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -760,7 +801,7 @@ TEST_F(EViewImageTest, Test_e_view_image_pixels_dirty_set_get)
       .Times(2)
       .WillOnce(Return(EINA_TRUE))
       .WillOnce(Return(EINA_FALSE));
-   
+
    Eina_Bool ret_dirty;
    ret_dirty = e_view_image_pixels_dirty_get(image);
    EXPECT_EQ(ret_dirty, EINA_TRUE);
@@ -769,7 +810,8 @@ TEST_F(EViewImageTest, Test_e_view_image_pixels_dirty_set_get)
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -790,7 +832,8 @@ TEST_F(EViewImageTest, Test_e_view_image_pixels_get_callback_set)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -807,7 +850,8 @@ TEST_F(EViewImageTest, Test_e_view_image_pixels_get_callback_set)
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -820,7 +864,8 @@ TEST_F(EViewImageTest, Test_e_view_image_pixels_noti_callback_set)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -837,7 +882,8 @@ TEST_F(EViewImageTest, Test_e_view_image_pixels_noti_callback_set)
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -850,7 +896,8 @@ TEST_F(EViewImageTest, Test_e_view_image_smooth_scale_set_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -860,14 +907,14 @@ TEST_F(EViewImageTest, Test_e_view_image_smooth_scale_set_get)
    Eina_Bool smooth_scale = 0;
    EXPECT_CALL(*evasMock, evas_object_image_smooth_scale_set(obj, smooth_scale))
       .Times(1);
-   
+
    e_view_image_smooth_scale_set(image, smooth_scale);
 
    EXPECT_CALL(*evasMock, evas_object_image_smooth_scale_get(obj))
       .Times(2)
       .WillOnce(Return(EINA_TRUE))
       .WillOnce(Return(EINA_FALSE));
-   
+
    Eina_Bool ret_smooth_scale;
    ret_smooth_scale = e_view_image_smooth_scale_get(image);
    EXPECT_EQ(ret_smooth_scale, EINA_TRUE);
@@ -877,7 +924,8 @@ TEST_F(EViewImageTest, Test_e_view_image_smooth_scale_set_get)
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -890,7 +938,8 @@ TEST_F(EViewImageTest, Test_e_view_image_size_set_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -899,7 +948,7 @@ TEST_F(EViewImageTest, Test_e_view_image_size_set_get)
    // test code start
    int w = 120, h = 240;
    EXPECT_CALL(*evasMock, evas_object_image_size_set(obj, w, h))
-      .Times(1);       
+      .Times(1);
    e_view_image_size_set(image, w, h);
 
    int ret_w, ret_h;
@@ -913,7 +962,8 @@ TEST_F(EViewImageTest, Test_e_view_image_size_set_get)
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -926,7 +976,8 @@ TEST_F(EViewImageTest, Test_e_view_image_source_set_get)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -938,10 +989,11 @@ TEST_F(EViewImageTest, Test_e_view_image_source_set_get)
       .WillOnce(Return(source_obj));
 
    // test code start
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
-   EXPECT_CALL(*evasMock, evas_object_stack_above(_, _));      
+   EXPECT_CALL(*evasMock, evas_object_stack_above(_, _));
    E_View_Image *img_source = e_view_image_create(this->tree);
    E_View *view_source = e_view_image_view_get(img_source);
    EXPECT_CALL(*evasMock, evas_object_image_source_set(obj, source_obj))
@@ -958,7 +1010,7 @@ TEST_F(EViewImageTest, Test_e_view_image_source_set_get)
       .Times(2)
       .WillOnce(Return(EINA_TRUE))
       .WillOnce(Return(EINA_FALSE));
-   
+
    ret = e_view_image_source_unset(image);
    EXPECT_EQ(ret, EINA_TRUE);
    ret = e_view_image_source_unset(image);
@@ -968,11 +1020,13 @@ TEST_F(EViewImageTest, Test_e_view_image_source_set_get)
    EXPECT_EQ(ret_img_source, nullptr);
 
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view_source);
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(source_obj);
    free(obj);
@@ -986,7 +1040,8 @@ TEST_F(EViewImageTest, Test_e_view_image_save)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -1010,7 +1065,8 @@ TEST_F(EViewImageTest, Test_e_view_image_save)
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -1023,7 +1079,8 @@ TEST_F(EViewImageTest, Test_e_view_image_preload)
       .Times(1)
       .WillOnce(Return(obj));
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Image *image = e_view_image_create(this->tree);
@@ -1042,7 +1099,8 @@ TEST_F(EViewImageTest, Test_e_view_image_preload)
 
    // end of test code
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }

diff --git a/tests/tc-e_view_layout.cpp b/tests/tc-e_view_layout.cpp
index b126194b6e6a4b848c014ef3b740eb6f38fc355c..928afba810f9693f657e9203e4790b5e8e4c008e 100644 (file)
--- a/tests/tc-e_view_layout.cpp
+++ b/tests/tc-e_view_layout.cpp
@@ -47,11 +47,13 @@ TEST_F(EViewLayoutTest, Test_E_View_Layout_Create)
    EXPECT_CALL(*evasMock, evas_object_move(obj, _, _))
       .Times(2);
    EXPECT_CALL(*evasMock, evas_object_color_set(obj, color[0], color[1], color[2], color[3]));
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    E_View_Layout *layout = e_view_layout_create(this->tree);
    EXPECT_NE(layout, nullptr);
 
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_del(_));
    e_view_layout_destroy(layout);
    free(obj);
@@ -71,7 +73,8 @@ TEST_F(EViewLayoutTest, Test_E_View_Layout_Pack_UnPack)
       .Times(2);
    EXPECT_CALL(*evasMock, evas_object_color_set(obj, color[0], color[1], color[2], color[3]));
    EXPECT_CALL(*evasMock, evas_object_data_get(_, _));
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    E_View_Layout *layout = e_view_layout_create(this->tree);
 
    EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
@@ -97,14 +100,16 @@ TEST_F(EViewLayoutTest, Test_E_View_Layout_Pack_UnPack)
 
    EXPECT_CALL(*evasMock, evas_object_data_get(_, _))
       .Times(AnyNumber());
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_layout_unpack(childView);
 
    EXPECT_CALL(*evasMock, evas_object_del(_));
    e_view_destroy(childView);
 
    EXPECT_CALL(*evasMock, evas_object_data_get(_, _));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_del(_));
    e_view_layout_destroy(layout);
    free(obj);
@@ -123,12 +128,14 @@ TEST_F(EViewLayoutTest, Test_E_View_Layout_Virtual_Size_Set)
    EXPECT_CALL(*evasMock, evas_object_move(obj, _, _))
       .Times(2);
    EXPECT_CALL(*evasMock, evas_object_color_set(obj, color[0], color[1], color[2], color[3]));
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    E_View_Layout *layout = e_view_layout_create(this->tree);
 
    e_view_layout_virtual_size_set(layout, 100, 200);
 
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_del(_));
    e_view_layout_destroy(layout);
    free(obj);
@@ -148,7 +155,8 @@ TEST_F(EViewLayoutTest, Test_E_View_Layout_Children_Move)
       .Times(2);
    EXPECT_CALL(*evasMock, evas_object_color_set(obj, color[0], color[1], color[2], color[3]));
    EXPECT_CALL(*evasMock, evas_object_data_get(_, _));
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    E_View_Layout *layout = e_view_layout_create(this->tree);
 
    EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
@@ -178,14 +186,16 @@ TEST_F(EViewLayoutTest, Test_E_View_Layout_Children_Move)
 
    EXPECT_CALL(*evasMock, evas_object_data_get(_, _))
       .Times(AnyNumber());
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_layout_unpack(childView);
 
    EXPECT_CALL(*evasMock, evas_object_del(_));
    e_view_destroy(childView);
 
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_layout_destroy(layout);
    free(obj);
    free(obj2);
@@ -205,7 +215,8 @@ TEST_F(EViewLayoutTest, Test_E_View_Layout_Children_Resize)
       .Times(2);
    EXPECT_CALL(*evasMock, evas_object_color_set(obj, color[0], color[1], color[2], color[3]));
    EXPECT_CALL(*evasMock, evas_object_data_get(_, _));
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    E_View_Layout *layout = e_view_layout_create(this->tree);
 
    EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
@@ -235,14 +246,16 @@ TEST_F(EViewLayoutTest, Test_E_View_Layout_Children_Resize)
 
    EXPECT_CALL(*evasMock, evas_object_data_get(_, _))
       .Times(AnyNumber());
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_layout_unpack(childView);
 
    EXPECT_CALL(*evasMock, evas_object_del(_));
    e_view_destroy(childView);
 
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_layout_destroy(layout);
    free(obj);
    free(obj2);
@@ -262,7 +275,8 @@ TEST_F(EViewLayoutTest, Test_E_View_Layout_Children_Raise)
       .Times(2);
    EXPECT_CALL(*evasMock, evas_object_color_set(obj, color[0], color[1], color[2], color[3]));
    EXPECT_CALL(*evasMock, evas_object_data_get(_, _));
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    E_View_Layout *layout = e_view_layout_create(this->tree);
 
    EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
@@ -292,14 +306,16 @@ TEST_F(EViewLayoutTest, Test_E_View_Layout_Children_Raise)
 
    EXPECT_CALL(*evasMock, evas_object_data_get(_, _))
       .Times(AnyNumber());
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_layout_unpack(childView);
 
    EXPECT_CALL(*evasMock, evas_object_del(_));
    e_view_destroy(childView);
 
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_layout_destroy(layout);
    free(obj);
    free(obj2);

diff --git a/tests/tc-e_view_rect.cpp b/tests/tc-e_view_rect.cpp
index 3067f2002fe7ffbabcb31d0d8fe9c8c58081d352..0c99ce6003797b96074733fcb5193d7744748bad 100644 (file)
--- a/tests/tc-e_view_rect.cpp
+++ b/tests/tc-e_view_rect.cpp
@@ -49,7 +49,8 @@ TEST_F(EViewRectTest, Test_E_View_Rect_Create)
    EXPECT_CALL(*evasMock, evas_object_color_set(obj, color[0], color[1], color[2], color[3]))
       .Times(1);
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Rect *rect = e_view_rect_create(this->tree, width, height, color);
@@ -58,7 +59,8 @@ TEST_F(EViewRectTest, Test_E_View_Rect_Create)
    EXPECT_NE(view, nullptr);
 
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _)); 
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -77,7 +79,8 @@ TEST_F(EViewRectTest, Test_E_View_Rect_Size_Set_Get)
    EXPECT_CALL(*evasMock, evas_object_color_set(obj, 10, 20, 30, 40))
       .Times(1);
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Rect *rect = e_view_rect_create(this->tree, 123, 456, color);
@@ -100,7 +103,8 @@ TEST_F(EViewRectTest, Test_E_View_Rect_Size_Set_Get)
    EXPECT_EQ(height,123);
 
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _)); 
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -122,7 +126,8 @@ TEST_F(EViewRectTest, Test_E_View_Rect_Try_From_View)
    EXPECT_CALL(*evasMock, evas_object_color_set(obj, color[0], color[1], color[2], color[3]))
       .Times(1);
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Rect *rect = e_view_rect_create(this->tree, width, height, color);
@@ -132,7 +137,8 @@ TEST_F(EViewRectTest, Test_E_View_Rect_Try_From_View)
    EXPECT_EQ(rect_from_view, rect);
 
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -153,7 +159,8 @@ TEST_F(EViewRectTest, Test_E_View_Rect_Color_Set_Get)
    EXPECT_CALL(*evasMock, evas_object_color_set(obj, color[0], color[1], color[2], color[3]))
       .Times(1);
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+     .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Rect *rect = e_view_rect_create(this->tree, width, height, color);
@@ -184,7 +191,8 @@ TEST_F(EViewRectTest, Test_E_View_Rect_Color_Set_Get)
    EXPECT_EQ(alpha, a);
 
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }

diff --git a/tests/tc-e_view_text.cpp b/tests/tc-e_view_text.cpp
index 1f8fb5b56df0e606612ba3631952b84b6524d012..58bbb1fe3ced00091e24300e0ce162d0de279b92 100644 (file)
--- a/tests/tc-e_view_text.cpp
+++ b/tests/tc-e_view_text.cpp
@@ -49,7 +49,8 @@ TEST_F(EViewTextTest, Test_E_View_Text_Create)
    EXPECT_CALL(*evasMock, evas_object_color_set(obj, color[0], color[1], color[2], color[3]))
       .Times(1);
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Text *text = e_view_text_create(this->tree, width, height, color);
@@ -58,7 +59,8 @@ TEST_F(EViewTextTest, Test_E_View_Text_Create)
    EXPECT_NE(view, nullptr);
 
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _)); 
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -77,7 +79,8 @@ TEST_F(EViewTextTest, Test_E_View_Text_Size_Set_Get)
    EXPECT_CALL(*evasMock, evas_object_color_set(obj, 10, 20, 30, 40))
       .Times(1);
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Text *text = e_view_text_create(this->tree, 123, 456, color);
@@ -100,7 +103,8 @@ TEST_F(EViewTextTest, Test_E_View_Text_Size_Set_Get)
    EXPECT_EQ(height,123);
 
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _)); 
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -122,7 +126,8 @@ TEST_F(EViewTextTest, Test_E_View_Text_Try_From_View)
    EXPECT_CALL(*evasMock, evas_object_color_set(obj, color[0], color[1], color[2], color[3]))
       .Times(1);
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Text *text = e_view_text_create(this->tree, width, height, color);
@@ -132,7 +137,8 @@ TEST_F(EViewTextTest, Test_E_View_Text_Try_From_View)
    EXPECT_EQ(text_from_view, text);
 
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -153,7 +159,8 @@ TEST_F(EViewTextTest, Test_E_View_Text_Color_Set_Get)
    EXPECT_CALL(*evasMock, evas_object_color_set(obj, color[0], color[1], color[2], color[3]))
       .Times(1);
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Text *text = e_view_text_create(this->tree, width, height, color);
@@ -184,7 +191,8 @@ TEST_F(EViewTextTest, Test_E_View_Text_Color_Set_Get)
    EXPECT_EQ(alpha, a);
 
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -205,7 +213,8 @@ TEST_F(EViewTextTest, Test_E_View_Text_Font_Set_Get)
    EXPECT_CALL(*evasMock, evas_object_color_set(obj, color[0], color[1], color[2], color[3]))
       .Times(1);
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Text *text = e_view_text_create(this->tree, width, height, color);
@@ -231,7 +240,8 @@ TEST_F(EViewTextTest, Test_E_View_Text_Font_Set_Get)
    EXPECT_EQ(size, ret_s);
 
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }
@@ -252,7 +262,8 @@ TEST_F(EViewTextTest, Test_E_View_Text_Text_Set_Get)
    EXPECT_CALL(*evasMock, evas_object_color_set(obj, color[0], color[1], color[2], color[3]))
       .Times(1);
 
-   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _))
+      .Times(AnyNumber());
    EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
    EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
    E_View_Text *text = e_view_text_create(this->tree, width, height, color);
@@ -274,7 +285,8 @@ TEST_F(EViewTextTest, Test_E_View_Text_Text_Set_Get)
    EXPECT_EQ(sentence, ret_s);
 
    EXPECT_CALL(*evasMock, evas_object_del(_));
-   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _))
+     .Times(AnyNumber());
    e_view_destroy(view);
    free(obj);
 }