Update e_view_test 78/317878/1
authorjinbong.lee <jinbong.lee@samsung.com>
Thu, 19 Sep 2024 10:49:39 +0000 (19:49 +0900)
committerTizen Window System <tizen.windowsystem@gmail.com>
Fri, 20 Sep 2024 02:48:16 +0000 (11:48 +0900)
  - apply getting e_view from evas_object
  - remove G_MOCK Warning related with EXPECT_CALL

Change-Id: I748241f7b3d029b42e05e031a761db0fb6066d75

tests/evas_wrapper.cpp
tests/evas_wrapper_intern.h
tests/tc-e_canvas.cpp
tests/tc-e_view.cpp
tests/tc-e_view_event.cpp
tests/tc-e_view_image.cpp
tests/tc-e_view_rect.cpp

index cca006195c2b50564485ed9392948d786f2a238e..798c37baf992b1d9db3244499fa4debb6b5d4bfc 100644 (file)
@@ -5,17 +5,17 @@ EvasMock *evasMock;
 
 void evas_object_del(Evas_Object *obj)
 {
-       evasMock->evas_object_del(obj);
+   evasMock->evas_object_del(obj);
 }
 
 void evas_object_stack_above(Evas_Object *obj, Evas_Object *above)
 {
-    evasMock->evas_object_stack_above(obj, above);
+   evasMock->evas_object_stack_above(obj, above);
 }
 
 void evas_object_stack_below(Evas_Object *obj, Evas_Object *below)
 {
-    evasMock->evas_object_stack_below(obj, below);
+   evasMock->evas_object_stack_below(obj, below);
 }
 
 void evas_object_raise(Evas_Object *obj)
@@ -30,309 +30,309 @@ void evas_object_lower(Evas_Object *obj)
 
 void evas_object_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a)
 {
-       evasMock->evas_object_color_get(obj, r, g, b, a);
+   evasMock->evas_object_color_get(obj, r, g, b, a);
 }
 
 void evas_object_color_set(Evas_Object *obj, int r, int g, int b, int a)
 {
-       evasMock->evas_object_color_set(obj, r, g, b, a);
+   evasMock->evas_object_color_set(obj, r, g, b, a);
 }
 
 void evas_object_geometry_get(Evas_Object *obj, int *x, int *y, int *width, int *height)
 {
-       evasMock->evas_object_geometry_get(obj, x, y, width, height);
+   evasMock->evas_object_geometry_get(obj, x, y, width, height);
 }
 
 void evas_object_geometry_set(Evas_Object *obj, int x, int y, int width, int height)
 {
-       evasMock->evas_object_geometry_set(obj, x, y, width, height);
+   evasMock->evas_object_geometry_set(obj, x, y, width, height);
 }
 
 Evas_Render_Op evas_object_render_op_get(const Evas_Object *obj)
 {
-       return evasMock->evas_object_render_op_get(obj);
+   return evasMock->evas_object_render_op_get(obj);
 }
 
 void evas_object_render_op_set(Evas_Object *obj, Evas_Render_Op render_op)
 {
-       evasMock->evas_object_render_op_set(obj, render_op);
+   evasMock->evas_object_render_op_set(obj, render_op);
 }
 
 void evas_object_data_set(Evas_Object *obj, const char *key, const void *data)
 {
-       evasMock->evas_object_data_set(obj, key, data);
+   evasMock->evas_object_data_set(obj, key, data);
 }
 
 void *evas_object_data_get(const Evas_Object *obj, const char *key)
 {
-       return evasMock->evas_object_data_get(obj, key);
+   return evasMock->evas_object_data_get(obj, key);
 }
 
 void *evas_object_data_del(Evas_Object *obj, const char *key)
 {
-       return evasMock->evas_object_data_del(obj, key);
+   return evasMock->evas_object_data_del(obj, key);
 }
 
 void evas_object_clip_set(Evas_Object *obj, Evas_Object *clip)
 {
-       evasMock->evas_object_clip_set(obj, clip);
+   evasMock->evas_object_clip_set(obj, clip);
 }
 
 void evas_object_freeze_events_set(Evas_Object *obj, Eina_Bool freeze)
 {
-       evasMock->evas_object_freeze_events_set(obj, freeze);
+   evasMock->evas_object_freeze_events_set(obj, freeze);
 }
 
 void evas_object_repeat_events_set(Evas_Object *obj, Eina_Bool repeat)
 {
-       evasMock->evas_object_repeat_events_set(obj, repeat);
+   evasMock->evas_object_repeat_events_set(obj, repeat);
 }
 
 void evas_object_move(Evas_Object *obj, int x, int y)
 {
-       evasMock->evas_object_move(obj, x, y);
+   evasMock->evas_object_move(obj, x, y);
 }
 
 void evas_object_show(Evas_Object *obj)
 {
-       evasMock->evas_object_show(obj);
+   evasMock->evas_object_show(obj);
 }
 
 void evas_object_hide(Evas_Object *obj)
 {
-       evasMock->evas_object_hide(obj);
+   evasMock->evas_object_hide(obj);
 }
 
 void evas_object_resize(Evas_Object *obj, int w, int h)
 {
-       evasMock->evas_object_resize(obj, w, h);
+   evasMock->evas_object_resize(obj, w, h);
 }
 
 void evas_object_map_enable_get(const Evas_Object *obj)
 {
-       evasMock->evas_object_map_enable_get(obj);
+   evasMock->evas_object_map_enable_get(obj);
 }
 
 void evas_object_map_enable_set(Evas_Object *obj, Eina_Bool enabled)
 {
-       evasMock->evas_object_map_enable_set(obj, enabled);
+   evasMock->evas_object_map_enable_set(obj, enabled);
 }
 
 Evas_Object * evas_object_rectangle_add(Evas *evas)
 {
-       return evasMock->evas_object_rectangle_add(evas);
+   return evasMock->evas_object_rectangle_add(evas);
 }
 
 Evas_Object* evas_object_image_add(Evas *e)
 {
-       return evasMock->evas_object_image_add(e);
+   return evasMock->evas_object_image_add(e);
 }
 
 void evas_object_image_alpha_set(Evas_Object *obj, Eina_Bool alpha)
 {
-       evasMock->evas_object_image_alpha_set(obj, alpha);
+   evasMock->evas_object_image_alpha_set(obj, alpha);
 }
 
 Eina_Bool evas_object_image_alpha_get(const Evas_Object *obj)
 {
-       return evasMock->evas_object_image_alpha_get(obj);
+   return evasMock->evas_object_image_alpha_get(obj);
 }
 
 Eina_Bool evas_object_image_animated_get(const Evas_Object *obj)
 {
-       return evasMock->evas_object_image_animated_get(obj);
+   return evasMock->evas_object_image_animated_get(obj);
 }
 
 void evas_object_image_animated_frame_set(Evas_Object *obj, int frame_index)
 {
-       evasMock->evas_object_image_animated_frame_set(obj, frame_index);
+   evasMock->evas_object_image_animated_frame_set(obj, frame_index);
 }
 
 int evas_object_image_animated_frame_get(Evas_Object *obj)
 {
-       return evasMock->evas_object_image_animated_frame_get(obj);
+   return evasMock->evas_object_image_animated_frame_get(obj);
 }
 
 int evas_object_image_animated_frame_count_get(const Evas_Object *obj)
 {
-       return evasMock->evas_object_image_animated_frame_count_get(obj);
+   return evasMock->evas_object_image_animated_frame_count_get(obj);
 }
 
 double evas_object_image_animated_frame_duration_get(const Evas_Object *obj, int start_frame, int frame_num)
 {
-       return evasMock->evas_object_image_animated_frame_duration_get(obj, start_frame, frame_num);
+   return evasMock->evas_object_image_animated_frame_duration_get(obj, start_frame, frame_num);
 }
 
 void evas_object_image_border_center_fill_set(Evas_Object *obj, Evas_Border_Fill_Mode fill)
 {
-       evasMock->evas_object_image_border_center_fill_set(obj, fill);
+   evasMock->evas_object_image_border_center_fill_set(obj, fill);
 }
 
 Evas_Border_Fill_Mode evas_object_image_border_center_fill_get(const Evas_Object *obj)
 {
-       return evasMock->evas_object_image_border_center_fill_get(obj);
+   return evasMock->evas_object_image_border_center_fill_get(obj);
 }
 
 void evas_object_image_border_set(Evas_Object *obj, int l, int r, int t, int b)
 {
-       evasMock->evas_object_image_border_set(obj, l, r, t, b);
+   evasMock->evas_object_image_border_set(obj, l, r, t, b);
 }
 
 void evas_object_image_border_get(const Evas_Object *obj, int *l, int *r, int *t, int *b)
 {
-       evasMock->evas_object_image_border_get(obj, l, r, t, b);
+   evasMock->evas_object_image_border_get(obj, l, r, t, b);
 }
 
 void evas_object_image_colorspace_set(Evas_Object *obj, Evas_Colorspace cspace)
 {
-       evasMock->evas_object_image_colorspace_set(obj,cspace);
+   evasMock->evas_object_image_colorspace_set(obj,cspace);
 }
 
 Evas_Colorspace evas_object_image_colorspace_get(const Evas_Object *obj)
 {
-       return evasMock->evas_object_image_colorspace_get(obj);
+   return evasMock->evas_object_image_colorspace_get(obj);
 }
 
 void evas_object_image_data_copy_set(Evas_Object *obj, void *data)
 {
-       evasMock->evas_object_image_data_copy_set(obj, data);
+   evasMock->evas_object_image_data_copy_set(obj, data);
 }
 
 void evas_object_image_data_set(Evas_Object *obj, void *data)
 {
-       evasMock->evas_object_image_data_set(obj, data);
+   evasMock->evas_object_image_data_set(obj, data);
 }
 
 void *evas_object_image_data_get(const Evas_Object *obj, Eina_Bool for_writing)
 {
-       return evasMock->evas_object_image_data_get(obj, for_writing);
+   return evasMock->evas_object_image_data_get(obj, for_writing);
 }
 
 void evas_object_image_data_update_add(Evas_Object *obj, int x, int y, int w, int h)
 {
-       evasMock->evas_object_image_data_update_add(obj, x, y, w, h);
+   evasMock->evas_object_image_data_update_add(obj, x, y, w, h);
 }
 
 void evas_object_image_file_set(Evas_Object *obj, const char *file, const char *key)
 {
-       evasMock->evas_object_image_file_set(obj, file, key);
+   evasMock->evas_object_image_file_set(obj, file, key);
 }
 
 void evas_object_image_file_get(const Evas_Object *obj, const char **file, const char **key)
 {
-       evasMock->evas_object_image_file_get(obj, file, key);
+   evasMock->evas_object_image_file_get(obj, file, key);
 }
 
 void evas_object_image_fill_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
 {
-       evasMock->evas_object_image_fill_set(obj, x, y, w, h);
+   evasMock->evas_object_image_fill_set(obj, x, y, w, h);
 }
 
 void evas_object_image_fill_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
 {
-       evasMock->evas_object_image_fill_get(obj, x, y, w, h);
+   evasMock->evas_object_image_fill_get(obj, x, y, w, h);
 }
 
 void evas_object_image_filled_set(Evas_Object *obj, Eina_Bool filled)
 {
-       evasMock->evas_object_image_filled_set(obj, filled);
+   evasMock->evas_object_image_filled_set(obj, filled);
 }
 
 Eina_Bool evas_object_image_filled_get(const Evas_Object *obj)
 {
-       return evasMock->evas_object_image_filled_get(obj);
+   return evasMock->evas_object_image_filled_get(obj);
 }
 
 Evas_Load_Error evas_object_image_load_error_get(const Evas_Object *obj)
 {
-       return evasMock->evas_object_image_load_error_get(obj);
+   return evasMock->evas_object_image_load_error_get(obj);
 }
 
 void evas_object_image_load_size_set(Evas_Object *obj, int w, int h)
 {
-       evasMock->evas_object_image_load_size_set(obj, w, h);
+   evasMock->evas_object_image_load_size_set(obj, w, h);
 }
 
 void evas_object_image_load_size_get(const Evas_Object *obj, int *w, int *h)
 {
-       evasMock->evas_object_image_load_size_get(obj, w, h);
+   evasMock->evas_object_image_load_size_get(obj, w, h);
 }
 
 void evas_object_image_native_surface_set(Evas_Object *obj, Evas_Native_Surface *surf)
 {
-       evasMock->evas_object_image_native_surface_set(obj, surf);
+   evasMock->evas_object_image_native_surface_set(obj, surf);
 }
 
 Evas_Native_Surface *evas_object_image_native_surface_get(const Evas_Object *obj)
 {
-       return evasMock->evas_object_image_native_surface_get(obj);
+   return evasMock->evas_object_image_native_surface_get(obj);
 }
 
 void evas_object_image_pixels_dirty_set(Evas_Object *obj, Eina_Bool dirty)
 {
-       evasMock->evas_object_image_pixels_dirty_set(obj, dirty);
+   evasMock->evas_object_image_pixels_dirty_set(obj, dirty);
 }
 
 Eina_Bool evas_object_image_pixels_dirty_get(const Evas_Object *obj)
 {
-       return evasMock->evas_object_image_pixels_dirty_get(obj);
+   return evasMock->evas_object_image_pixels_dirty_get(obj);
 }
 
 void evas_object_image_pixels_get_callback_set(Evas_Object *obj, Evas_Object_Image_Pixels_Get_Cb func, void *data)
 {
-       evasMock->evas_object_image_pixels_get_callback_set(obj, func, data);
-       func(data, obj);
+   evasMock->evas_object_image_pixels_get_callback_set(obj, func, data);
+   func(data, obj);
 }
 
 void evas_object_image_pixels_noti_callback_set(Evas_Object *obj, Evas_Object_Image_Pixels_Get_Cb func, void *data)
 {
-       evasMock->evas_object_image_pixels_noti_callback_set(obj, func, data);
-       func(data, obj);
+   evasMock->evas_object_image_pixels_noti_callback_set(obj, func, data);
+   func(data, obj);
 }
 
 void evas_object_image_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth_scale)
 {
-       evasMock->evas_object_image_smooth_scale_set(obj, smooth_scale);
+   evasMock->evas_object_image_smooth_scale_set(obj, smooth_scale);
 }
 
 Eina_Bool evas_object_image_smooth_scale_get(const Evas_Object *obj)
 {
-       return evasMock->evas_object_image_smooth_scale_get(obj);
+   return evasMock->evas_object_image_smooth_scale_get(obj);
 }
 
 void evas_object_image_size_set(Evas_Object *obj, int w, int h)
 {
-       evasMock->evas_object_image_size_set(obj, w, h);
+   evasMock->evas_object_image_size_set(obj, w, h);
 }
 
 void evas_object_image_size_get(const Evas_Object *obj, int *w, int *h)
 {
-       evasMock->evas_object_image_size_get(obj, w, h);
+   evasMock->evas_object_image_size_get(obj, w, h);
 }
 
 Eina_Bool evas_object_image_source_set(Evas_Object *obj, Evas_Object *src)
 {
-       return evasMock->evas_object_image_source_set(obj, src);
+   return evasMock->evas_object_image_source_set(obj, src);
 }
 
 Evas_Object *evas_object_image_source_get(const Evas_Object *obj)
 {
-       return evasMock->evas_object_image_source_get(obj);
+   return evasMock->evas_object_image_source_get(obj);
 }
 
 Eina_Bool evas_object_image_source_unset(Evas_Object *obj)
 {
-       return evasMock->evas_object_image_source_unset(obj);
+   return evasMock->evas_object_image_source_unset(obj);
 }
 
 Eina_Bool evas_object_image_save(const Evas_Object *obj, const char *file, const char *key, const char *flags)
 {
-       return evasMock->evas_object_image_save(obj, file, key, flags);
+   return evasMock->evas_object_image_save(obj, file, key, flags);
 }
 
 void evas_object_image_preload(Evas_Object *obj, Eina_Bool cancel)
 {
-       evasMock->evas_object_image_preload(obj, cancel);
+   evasMock->evas_object_image_preload(obj, cancel);
 }
 
 Evas_Map *evas_map_new(int count)
@@ -462,12 +462,12 @@ void evas_map_direct_render_set(Evas_Map *m, Eina_Bool direct_render)
 
 void evas_object_event_callback_add(Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func, const void *data)
 {
-       evasMock->evas_object_event_callback_add(obj, type, func, data);
+   evasMock->evas_object_event_callback_add(obj, type, func, data);
 }
 
 void *evas_object_event_callback_del(Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func)
 {
-       return evasMock->evas_object_event_callback_del(obj, type, func);
+   return evasMock->evas_object_event_callback_del(obj, type, func);
 }
 
 void evas_object_pass_events_set(Evas_Object *obj, Eina_Bool set)
@@ -482,10 +482,10 @@ Eina_Bool evas_object_pass_events_get(Evas_Object *obj)
 
 char *efl_gfx_filter_program_set(Evas_Object *obj, const char *code, const char *name)
 {
-       return evasMock->efl_gfx_filter_program_set(obj, code, name);
+   return evasMock->efl_gfx_filter_program_set(obj, code, name);
 }
 
 void evas_object_layer_set(Evas_Object *obj, short layer)
 {
-       return evasMock->evas_object_layer_set(obj, layer);
+   return evasMock->evas_object_layer_set(obj, layer);
 }
index 91376776b529d96e8997f92ba3c0a7ac891475f9..f927e2bba2f0642caec842c2f02c1b5bf9db06be 100755 (executable)
@@ -134,86 +134,86 @@ struct _Evas_Smart
 
 typedef enum
 {
-  EVAS_CALLBACK_MOUSE_IN = 0, /**< Mouse In Event */
-  EVAS_CALLBACK_MOUSE_OUT, /**< Mouse Out Event */
-  EVAS_CALLBACK_MOUSE_DOWN, /**< Mouse Button Down Event */
-  EVAS_CALLBACK_MOUSE_UP, /**< Mouse Button Up Event */
-  EVAS_CALLBACK_MOUSE_MOVE, /**< Mouse Move Event */
-  EVAS_CALLBACK_MOUSE_WHEEL, /**< Mouse Wheel Event */
-  EVAS_CALLBACK_MULTI_DOWN, /**< Multi-touch Down Event */
-  EVAS_CALLBACK_MULTI_UP, /**< Multi-touch Up Event */
-  EVAS_CALLBACK_MULTI_MOVE, /**< Multi-touch Move Event */
-  EVAS_CALLBACK_FREE, /**< Object Being Freed (Called after Del) */
-  EVAS_CALLBACK_KEY_DOWN, /**< Key Press Event */
-  EVAS_CALLBACK_KEY_UP, /**< Key Release Event */
-  EVAS_CALLBACK_FOCUS_IN, /**< Focus In Event */
-  EVAS_CALLBACK_FOCUS_OUT, /**< Focus Out Event */
-  EVAS_CALLBACK_SHOW, /**< Show Event */
-  EVAS_CALLBACK_HIDE, /**< Hide Event */
-  EVAS_CALLBACK_MOVE, /**< Move Event */
-  EVAS_CALLBACK_RESIZE, /**< Resize Event */
-  EVAS_CALLBACK_RESTACK, /**< Restack Event */
-  EVAS_CALLBACK_DEL, /**< Object Being Deleted (called before Free) */
-  EVAS_CALLBACK_HOLD, /**< Events go on/off hold */
-  EVAS_CALLBACK_CHANGED_SIZE_HINTS, /**< Size hints changed event */
-  EVAS_CALLBACK_IMAGE_PRELOADED, /**< Image has been preloaded */
-  EVAS_CALLBACK_CANVAS_FOCUS_IN, /**< Canvas got focus as a whole */
-  EVAS_CALLBACK_CANVAS_FOCUS_OUT, /**< Canvas lost focus as a whole */
-  EVAS_CALLBACK_RENDER_FLUSH_PRE, /**< Called after render update regions have
-                                   * been calculated, but only if update regions exist */
-  EVAS_CALLBACK_RENDER_FLUSH_POST, /**< Called after render update regions have
-                                    * been sent to the display server, but only
-                                    * if update regions existed for the most recent frame */
-  EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN, /**< Canvas object got focus */
-  EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT, /**< Canvas object lost focus */
-  EVAS_CALLBACK_IMAGE_UNLOADED, /**< Image data has been unloaded (by some mechanism in Evas that throw out original image data) */
-  EVAS_CALLBACK_RENDER_PRE, /**< Called just before rendering starts on the canvas target. @since 1.2 */
-  EVAS_CALLBACK_RENDER_POST, /**< Called just after rendering stops on the canvas target. @since 1.2 */
-  EVAS_CALLBACK_IMAGE_RESIZE, /**< Image size is changed. @since 1.8 */
-  EVAS_CALLBACK_DEVICE_CHANGED, /**< Devices added, removed or changed on canvas. @since 1.8 */
-  EVAS_CALLBACK_AXIS_UPDATE, /**< Input device changed value on some axis. @since 1.13 */
-  EVAS_CALLBACK_CANVAS_VIEWPORT_RESIZE, /**< Canvas viewport resized. @since 1.15 */
-  EVAS_CALLBACK_LAST /**< Sentinel value to indicate last enum field during
-                      * iteration */
+   EVAS_CALLBACK_MOUSE_IN = 0, /**< Mouse In Event */
+   EVAS_CALLBACK_MOUSE_OUT, /**< Mouse Out Event */
+   EVAS_CALLBACK_MOUSE_DOWN, /**< Mouse Button Down Event */
+   EVAS_CALLBACK_MOUSE_UP, /**< Mouse Button Up Event */
+   EVAS_CALLBACK_MOUSE_MOVE, /**< Mouse Move Event */
+   EVAS_CALLBACK_MOUSE_WHEEL, /**< Mouse Wheel Event */
+   EVAS_CALLBACK_MULTI_DOWN, /**< Multi-touch Down Event */
+   EVAS_CALLBACK_MULTI_UP, /**< Multi-touch Up Event */
+   EVAS_CALLBACK_MULTI_MOVE, /**< Multi-touch Move Event */
+   EVAS_CALLBACK_FREE, /**< Object Being Freed (Called after Del) */
+   EVAS_CALLBACK_KEY_DOWN, /**< Key Press Event */
+   EVAS_CALLBACK_KEY_UP, /**< Key Release Event */
+   EVAS_CALLBACK_FOCUS_IN, /**< Focus In Event */
+   EVAS_CALLBACK_FOCUS_OUT, /**< Focus Out Event */
+   EVAS_CALLBACK_SHOW, /**< Show Event */
+   EVAS_CALLBACK_HIDE, /**< Hide Event */
+   EVAS_CALLBACK_MOVE, /**< Move Event */
+   EVAS_CALLBACK_RESIZE, /**< Resize Event */
+   EVAS_CALLBACK_RESTACK, /**< Restack Event */
+   EVAS_CALLBACK_DEL, /**< Object Being Deleted (called before Free) */
+   EVAS_CALLBACK_HOLD, /**< Events go on/off hold */
+   EVAS_CALLBACK_CHANGED_SIZE_HINTS, /**< Size hints changed event */
+   EVAS_CALLBACK_IMAGE_PRELOADED, /**< Image has been preloaded */
+   EVAS_CALLBACK_CANVAS_FOCUS_IN, /**< Canvas got focus as a whole */
+   EVAS_CALLBACK_CANVAS_FOCUS_OUT, /**< Canvas lost focus as a whole */
+   EVAS_CALLBACK_RENDER_FLUSH_PRE, /**< Called after render update regions have
+                                    * been calculated, but only if update regions exist */
+   EVAS_CALLBACK_RENDER_FLUSH_POST, /**< Called after render update regions have
+                                     * been sent to the display server, but only
+                                     * if update regions existed for the most recent frame */
+   EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN, /**< Canvas object got focus */
+   EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT, /**< Canvas object lost focus */
+   EVAS_CALLBACK_IMAGE_UNLOADED, /**< Image data has been unloaded (by some mechanism in Evas that throw out original image data) */
+   EVAS_CALLBACK_RENDER_PRE, /**< Called just before rendering starts on the canvas target. @since 1.2 */
+   EVAS_CALLBACK_RENDER_POST, /**< Called just after rendering stops on the canvas target. @since 1.2 */
+   EVAS_CALLBACK_IMAGE_RESIZE, /**< Image size is changed. @since 1.8 */
+   EVAS_CALLBACK_DEVICE_CHANGED, /**< Devices added, removed or changed on canvas. @since 1.8 */
+   EVAS_CALLBACK_AXIS_UPDATE, /**< Input device changed value on some axis. @since 1.13 */
+   EVAS_CALLBACK_CANVAS_VIEWPORT_RESIZE, /**< Canvas viewport resized. @since 1.15 */
+   EVAS_CALLBACK_LAST /**< Sentinel value to indicate last enum field during
+                       * iteration */
 } Evas_Callback_Type;
 
 typedef void      (*Evas_Object_Event_Cb)(void *data, Evas *e, Evas_Object *obj, void *event_info);  /**< Evas object event callback function signature */
 
 typedef enum
 {
-  EVAS_BORDER_FILL_NONE = 0, /**< Image's center region is @b not to be rendered */
-  EVAS_BORDER_FILL_DEFAULT = 1, /**< Image's center region is to be @b blended
-                                 * with objects underneath it, if it has
-                                 * transparency. This is the default behavior
-                                 * for image objects */
-  EVAS_BORDER_FILL_SOLID = 2 /**< Image's center region is to be made solid,
-                              * even if it has transparency on it */
+   EVAS_BORDER_FILL_NONE = 0, /**< Image's center region is @b not to be rendered */
+   EVAS_BORDER_FILL_DEFAULT = 1, /**< Image's center region is to be @b blended
+                                  * with objects underneath it, if it has
+                                  * transparency. This is the default behavior
+                                  * for image objects */
+   EVAS_BORDER_FILL_SOLID = 2 /**< Image's center region is to be made solid,
+                               * even if it has transparency on it */
 } Evas_Border_Fill_Mode;
 
 typedef enum _Emile_Colorspace
 {
-  EMILE_COLORSPACE_ARGB8888,/**< ARGB 32 bits per pixel, high-byte is Alpha, accessed 1 32bit word at a time */
-  EMILE_COLORSPACE_YCBCR422P601_PL, /**< YCbCr 4:2:2 Planar, ITU.BT-601 specifications. The data pointed to is just an array of row pointer, pointing to the Y rows, then the Cb, then Cr rows */
-  EMILE_COLORSPACE_YCBCR422P709_PL, /**< YCbCr 4:2:2 Planar, ITU.BT-709 specifications. The data pointed to is just an array of row pointer, pointing to the Y rows, then the Cb, then Cr rows */
-  EMILE_COLORSPACE_RGB565_A5P, /**< 16bit rgb565 + Alpha plane at end - 5 bits of the 8 being used per alpha byte */
-  EMILE_COLORSPACE_GRY8 = 4,
-  EMILE_COLORSPACE_YCBCR422601_PL, /**<  YCbCr 4:2:2, ITU.BT-601 specifications. The data pointed to is just an array of row pointer, pointing to line of Y,Cb,Y,Cr bytes */
-  EMILE_COLORSPACE_YCBCR420NV12601_PL, /**< YCbCr 4:2:0, ITU.BT-601 specification. The data pointed to is just an array of row pointer, pointing to the Y rows, then the Cb,Cr rows. */
-  EMILE_COLORSPACE_YCBCR420TM12601_PL, /**< YCbCr 4:2:0, ITU.BT-601 specification. The data pointed to is just an array of tiled row pointer, pointing to the Y rows, then the Cb,Cr rows. */
-  EMILE_COLORSPACE_AGRY88 = 8, /**< AY 8bits Alpha and 8bits Grey, accessed 1 16bits at a time */
-  EMILE_COLORSPACE_ETC1 = 9, /**< OpenGL ETC1 encoding of RGB texture (4 bit per pixel) @since 1.10 */
-  EMILE_COLORSPACE_RGB8_ETC2 = 10, /**< OpenGL GL_COMPRESSED_RGB8_ETC2 texture compression format (4 bit per pixel) @since 1.10 */
-  EMILE_COLORSPACE_RGBA8_ETC2_EAC = 11,        /**< OpenGL GL_COMPRESSED_RGBA8_ETC2_EAC texture compression format, supports alpha (8 bit per pixel) @since 1.10 */
-  EMILE_COLORSPACE_ETC1_ALPHA = 12, /**< ETC1 with alpha support using two planes: ETC1 RGB and ETC1 grey for alpha @since 1.11 */
-  EMILE_COLORSPACE_RGB_S3TC_DXT1 = 13, /**< OpenGL COMPRESSED_RGB_S3TC_DXT1_EXT format with RGB only. @since 1.11 */
-  EMILE_COLORSPACE_RGBA_S3TC_DXT1 = 14,        /**< OpenGL COMPRESSED_RGBA_S3TC_DXT1_EXT format with RGBA punchthrough. @since 1.11 */
-  EMILE_COLORSPACE_RGBA_S3TC_DXT2 = 15,        /**< DirectDraw DXT2 format with premultiplied RGBA. Not supported by OpenGL itself. @since 1.11 */
-  EMILE_COLORSPACE_RGBA_S3TC_DXT3 = 16,        /**< OpenGL COMPRESSED_RGBA_S3TC_DXT3_EXT format with RGBA. @since 1.11 */
-  EMILE_COLORSPACE_RGBA_S3TC_DXT4 = 17,        /**< DirectDraw DXT4 format with premultiplied RGBA. Not supported by OpenGL itself. @since 1.11 */
-  EMILE_COLORSPACE_RGBA_S3TC_DXT5 = 18,        /**< OpenGL COMPRESSED_RGBA_S3TC_DXT5_EXT format with RGBA. @since 1.11 */
-  //TIZEN_ONLY(20200224): add EMILE_COLORSPACE_PALETTE for fixing warning
-  EMILE_COLORSPACE_PALETTE = 19
-  //
+   EMILE_COLORSPACE_ARGB8888,/**< ARGB 32 bits per pixel, high-byte is Alpha, accessed 1 32bit word at a time */
+   EMILE_COLORSPACE_YCBCR422P601_PL, /**< YCbCr 4:2:2 Planar, ITU.BT-601 specifications. The data pointed to is just an array of row pointer, pointing to the Y rows, then the Cb, then Cr rows */
+   EMILE_COLORSPACE_YCBCR422P709_PL, /**< YCbCr 4:2:2 Planar, ITU.BT-709 specifications. The data pointed to is just an array of row pointer, pointing to the Y rows, then the Cb, then Cr rows */
+   EMILE_COLORSPACE_RGB565_A5P, /**< 16bit rgb565 + Alpha plane at end - 5 bits of the 8 being used per alpha byte */
+   EMILE_COLORSPACE_GRY8 = 4,
+   EMILE_COLORSPACE_YCBCR422601_PL, /**<  YCbCr 4:2:2, ITU.BT-601 specifications. The data pointed to is just an array of row pointer, pointing to line of Y,Cb,Y,Cr bytes */
+   EMILE_COLORSPACE_YCBCR420NV12601_PL, /**< YCbCr 4:2:0, ITU.BT-601 specification. The data pointed to is just an array of row pointer, pointing to the Y rows, then the Cb,Cr rows. */
+   EMILE_COLORSPACE_YCBCR420TM12601_PL, /**< YCbCr 4:2:0, ITU.BT-601 specification. The data pointed to is just an array of tiled row pointer, pointing to the Y rows, then the Cb,Cr rows. */
+   EMILE_COLORSPACE_AGRY88 = 8, /**< AY 8bits Alpha and 8bits Grey, accessed 1 16bits at a time */
+   EMILE_COLORSPACE_ETC1 = 9, /**< OpenGL ETC1 encoding of RGB texture (4 bit per pixel) @since 1.10 */
+   EMILE_COLORSPACE_RGB8_ETC2 = 10, /**< OpenGL GL_COMPRESSED_RGB8_ETC2 texture compression format (4 bit per pixel) @since 1.10 */
+   EMILE_COLORSPACE_RGBA8_ETC2_EAC = 11,       /**< OpenGL GL_COMPRESSED_RGBA8_ETC2_EAC texture compression format, supports alpha (8 bit per pixel) @since 1.10 */
+   EMILE_COLORSPACE_ETC1_ALPHA = 12, /**< ETC1 with alpha support using two planes: ETC1 RGB and ETC1 grey for alpha @since 1.11 */
+   EMILE_COLORSPACE_RGB_S3TC_DXT1 = 13,        /**< OpenGL COMPRESSED_RGB_S3TC_DXT1_EXT format with RGB only. @since 1.11 */
+   EMILE_COLORSPACE_RGBA_S3TC_DXT1 = 14,       /**< OpenGL COMPRESSED_RGBA_S3TC_DXT1_EXT format with RGBA punchthrough. @since 1.11 */
+   EMILE_COLORSPACE_RGBA_S3TC_DXT2 = 15,       /**< DirectDraw DXT2 format with premultiplied RGBA. Not supported by OpenGL itself. @since 1.11 */
+   EMILE_COLORSPACE_RGBA_S3TC_DXT3 = 16,       /**< OpenGL COMPRESSED_RGBA_S3TC_DXT3_EXT format with RGBA. @since 1.11 */
+   EMILE_COLORSPACE_RGBA_S3TC_DXT4 = 17,       /**< DirectDraw DXT4 format with premultiplied RGBA. Not supported by OpenGL itself. @since 1.11 */
+   EMILE_COLORSPACE_RGBA_S3TC_DXT5 = 18,       /**< OpenGL COMPRESSED_RGBA_S3TC_DXT5_EXT format with RGBA. @since 1.11 */
+   //TIZEN_ONLY(20200224): add EMILE_COLORSPACE_PALETTE for fixing warning
+   EMILE_COLORSPACE_PALETTE = 19
+   //
 } Emile_Colorspace;
 
 typedef Emile_Colorspace Evas_Colorspace;
@@ -330,12 +330,12 @@ typedef struct _Evas_Native_Surface
 
 typedef enum
 {
-  EVAS_RENDER_BLEND = 0, /**< Default render operation: d = d*(1-sa) + s. The
-                          * object will be merged onto the bottom objects using
-                          * simple alpha compositing (a over b). */
-  EVAS_RENDER_COPY = 2, /**< Copy mode, d = s. The object's pixels will replace
-                         * everything that was below, effectively hiding them.
-                         */
+   EVAS_RENDER_BLEND = 0, /**< Default render operation: d = d*(1-sa) + s. The
+                           * object will be merged onto the bottom objects using
+                           * simple alpha compositing (a over b). */
+   EVAS_RENDER_COPY = 2, /**< Copy mode, d = s. The object's pixels will replace
+                          * everything that was below, effectively hiding them.
+                          */
 } Evas_Render_Op;
 
 
index f3079b4a91fcbb7b023a4aedc5b2170d22cf2235..83ce13fb9dc0b39388711ef4994431da4f720833 100644 (file)
@@ -4,18 +4,22 @@
 #include "src/bin/core/e_view_intern.h"
 #include "e_canvas.h"
 
+using ::testing::AnyNumber;
+
 class ECanvasTest : public ::testing::Test
 {
 protected:
-       Evas *evas;
+   Evas *evas;
 
-       void SetUp(void) override {
-                this->evas = reinterpret_cast<Evas *>(malloc(sizeof(Evas)));
-       }
+   void SetUp(void) override {
+      evasMock = new EvasMock();
+      this->evas = reinterpret_cast<Evas *>(malloc(sizeof(Evas)));
+   }
 
-       void TearDown(void) override {
-                free(this->evas);
-       }
+   void TearDown(void) override {
+      free(this->evas);
+      delete evasMock;
+   }
 };
 
 void evas_event_callback_add(Evas *e, Evas_Callback_Type type, Evas_Event_Cb func, const void *data)
@@ -42,8 +46,8 @@ TEST_F(ECanvasTest, Test_E_Canvas_Layer_Tree_Get)
 
    /* Check if all expected layers have been created */
    for (int layer = E_CANVAS_LAYER_BOTTOM; layer <= E_CANVAS_LAYER_MAX; layer++) {
-               E_View_Tree *tree = e_canvas_layer_view_tree_get(canvas, static_cast<E_Canvas_Layer>(layer));
-               ASSERT_NE(tree, nullptr);
+      E_View_Tree *tree = e_canvas_layer_view_tree_get(canvas, static_cast<E_Canvas_Layer>(layer));
+      ASSERT_NE(tree, nullptr);
    }
 
    e_canvas_destroy(canvas);
@@ -76,7 +80,7 @@ TEST_F(ECanvasTest, Test_E_Canvas_Destroy_Listener)
    ASSERT_NE(canvas, nullptr);
 
    struct wl_listener destroy = {
-               .notify = canvas_handle_destroy,
+      .notify = canvas_handle_destroy,
    };
    e_canvas_destroy_listener_add(canvas, &destroy);
 
@@ -90,7 +94,7 @@ TEST_F(ECanvasTest, Test_E_Canvas_Render_Listener_Family_Test)
    ASSERT_NE(canvas, nullptr);
 
    struct wl_listener listener = {
-               .notify = NULL,
+      .notify = NULL,
    };
    e_canvas_render_pre_listener_add(canvas, &listener);
    e_canvas_render_post_listener_add(canvas, &listener);
@@ -116,22 +120,18 @@ canvas_tree_for_each_test_cb(E_View *view, int sx, int sy, void *user_data)
 
 TEST_F(ECanvasTest, Test_E_Canvas_Tree_For_Each)
 {
-   evasMock = new EvasMock();
-
    E_Canvas *canvas = e_canvas_create(this->evas);
    ASSERT_NE(canvas, nullptr);
 
    E_Canvas_For_Each_Data data = {
-        .expect_layer_index = E_CANVAS_LAYER_BOTTOM,
+      .expect_layer_index = E_CANVAS_LAYER_BOTTOM,
    };
    for (int layer = E_CANVAS_LAYER_BOTTOM; layer <= E_CANVAS_LAYER_MAX; layer++) {
-        E_View_Tree *tree = e_canvas_layer_view_tree_get(canvas, static_cast<E_Canvas_Layer>(layer));
-        e_view_init(&data.views[layer], E_VIEW_TYPE_RECT, NULL, NULL, tree);
+      E_View_Tree *tree = e_canvas_layer_view_tree_get(canvas, static_cast<E_Canvas_Layer>(layer));
+      e_view_init(&data.views[layer], E_VIEW_TYPE_RECT, NULL, NULL, tree);
    }
 
    e_canvas_tree_for_each(canvas, canvas_tree_for_each_test_cb, &data);
-
-   delete evasMock;
 }
 
 static void
@@ -144,47 +144,37 @@ canvas_tree_for_each_reverse_test_cb(E_View *view, int sx, int sy, void *user_da
 
 TEST_F(ECanvasTest, Test_E_Canvas_Tree_For_Each_Reverse)
 {
-   evasMock = new EvasMock();
-
    E_Canvas *canvas = e_canvas_create(this->evas);
    ASSERT_NE(canvas, nullptr);
 
    E_Canvas_For_Each_Data data = {
-        .expect_layer_index = E_CANVAS_LAYER_MAX,
+      .expect_layer_index = E_CANVAS_LAYER_MAX,
    };
    for (int layer = E_CANVAS_LAYER_BOTTOM; layer <= E_CANVAS_LAYER_MAX; layer++) {
-        E_View_Tree *tree = e_canvas_layer_view_tree_get(canvas, static_cast<E_Canvas_Layer>(layer));
-        e_view_init(&data.views[layer], E_VIEW_TYPE_RECT, NULL, NULL, tree);
+      E_View_Tree *tree = e_canvas_layer_view_tree_get(canvas, static_cast<E_Canvas_Layer>(layer));
+      e_view_init(&data.views[layer], E_VIEW_TYPE_RECT, NULL, NULL, tree);
    }
 
    e_canvas_tree_for_each_reverse(canvas, canvas_tree_for_each_reverse_test_cb, &data);
-
-   delete evasMock;
 }
 
 TEST_F(ECanvasTest, Test_E_Canvas_Layer_Find)
 {
-   evasMock = new EvasMock();
-
    E_Canvas *canvas = e_canvas_create(this->evas);
    ASSERT_NE(canvas, nullptr);
 
    E_Canvas_For_Each_Data data = {
-        .expect_layer_index = E_CANVAS_LAYER_MAX,
+      .expect_layer_index = E_CANVAS_LAYER_MAX,
    };
    for (int layer = E_CANVAS_LAYER_BOTTOM; layer < E_CANVAS_LAYER_MAX; layer++) {
-        E_View_Tree *tree = e_canvas_layer_view_tree_get(canvas, static_cast<E_Canvas_Layer>(layer));
-        e_view_init(&data.views[layer], E_VIEW_TYPE_RECT, NULL, NULL, tree);
-        ASSERT_EQ(e_canvas_layer_find(canvas, &data.views[layer]), layer);
+      E_View_Tree *tree = e_canvas_layer_view_tree_get(canvas, static_cast<E_Canvas_Layer>(layer));
+      e_view_init(&data.views[layer], E_VIEW_TYPE_RECT, NULL, NULL, tree);
+      ASSERT_EQ(e_canvas_layer_find(canvas, &data.views[layer]), layer);
    }
-
-   delete evasMock;
 }
 
 TEST_F(ECanvasTest, Test_E_Canvas_Top_Get)
 {
-   evasMock = new EvasMock();
-
    E_Canvas *canvas = e_canvas_create(this->evas);
    ASSERT_NE(canvas, nullptr);
    ASSERT_EQ(e_canvas_top_get(canvas), nullptr);
@@ -198,8 +188,6 @@ TEST_F(ECanvasTest, Test_E_Canvas_Top_Get)
 
 TEST_F(ECanvasTest, Test_E_Canvas_Bottom_Get)
 {
-   evasMock = new EvasMock();
-
    E_Canvas *canvas = e_canvas_create(this->evas);
    ASSERT_NE(canvas, nullptr);
    ASSERT_EQ(e_canvas_bottom_get(canvas), nullptr);
index 49856c133bcb637437417f510611936306113508..5a91d40f4071c213d28ea62a07ec3957e025012b 100644 (file)
@@ -11,111 +11,116 @@ using ::testing::Return;
 using ::testing::_;
 using ::testing::SetArgPointee;
 using ::testing::DoAll;
+using ::testing::AnyNumber;
 
 class EViewTest : public ::testing::Test
 {
 public:
-       void SetUp(void) override {
-       }
+   void SetUp(void) override {
+      evasMock = new EvasMock();
+   }
 
-       void TearDown(void) override {
-       }
+   void TearDown(void) override {
+      delete evasMock;
+   }
 };
 
-TEST(EViewTest, Test_E_View_Init_Without_Parent)
+TEST_F(EViewTest, Test_E_View_Init_Without_Parent)
 {
-       E_View_Impl e_view_impl = {
-               .destroy = NULL,
-       };
+   E_View_Impl e_view_impl = {
+      .destroy = NULL,
+   };
 
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       E_View view;
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   E_View view;
 
-       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);
-       EXPECT_EQ(view.impl, &e_view_impl);
-       EXPECT_EQ(view.parent, nullptr);
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   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);
+   EXPECT_EQ(view.impl, &e_view_impl);
+   EXPECT_EQ(view.parent, nullptr);
 
-       free(obj);
+   free(obj);
 }
 
-TEST(EViewTest, Test_E_View_Init_With_Normal_Parent)
+TEST_F(EViewTest, Test_E_View_Init_With_Normal_Parent)
 {
-       evasMock = new EvasMock();
-
-       E_View_Impl e_view_impl = {
-               .destroy = NULL,
-       };
-
-       E_View_Tree parent;
+   E_View_Impl e_view_impl = {
+      .destroy = NULL,
+   };
 
-       e_view_tree_init(&parent, NULL, NULL);
-       EXPECT_EQ(wl_list_length(&(parent.children)), 0);
-       EXPECT_EQ(parent.view.parent, nullptr);
+   E_View_Tree parent;
 
-       const int PARENT_X = 10, PARENT_Y = 20;
-       parent.view.x = PARENT_X;
-       parent.view.y = PARENT_Y;
+   e_view_tree_init(&parent, NULL, NULL);
+   EXPECT_EQ(wl_list_length(&(parent.children)), 0);
+   EXPECT_EQ(parent.view.parent, nullptr);
 
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       E_View view;
+   const int PARENT_X = 10, PARENT_Y = 20;
+   parent.view.x = PARENT_X;
+   parent.view.y = PARENT_Y;
 
-       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);
-       EXPECT_EQ(view.type, E_VIEW_TYPE_RECT);
-       EXPECT_EQ(view.impl, &e_view_impl);
-       EXPECT_EQ(view.parent, &parent);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   E_View view;
 
-       EXPECT_EQ(wl_list_length(&(parent.children)), 1);
-       EXPECT_EQ(parent.children.next, &(view.link));
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   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);
+   EXPECT_EQ(view.type, E_VIEW_TYPE_RECT);
+   EXPECT_EQ(view.impl, &e_view_impl);
+   EXPECT_EQ(view.parent, &parent);
 
-       free(obj);
+   EXPECT_EQ(wl_list_length(&(parent.children)), 1);
+   EXPECT_EQ(parent.children.next, &(view.link));
 
-       delete evasMock;
+   free(obj);
 }
 
 static int destroyed;
 static void view_destroy(E_View *view)
 {
-       destroyed++;
+   destroyed++;
 }
 
-TEST(EViewTest, Test_E_View_Destroy_With_Null_Callback)
+TEST_F(EViewTest, Test_E_View_Destroy_With_Null_Callback)
 {
-       E_View_Impl e_view_impl = {
-               .destroy = NULL,
-       };
+   E_View_Impl e_view_impl = {
+      .destroy = NULL,
+   };
 
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       E_View view;
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   E_View view;
 
-       e_view_init(&view, E_VIEW_TYPE_RECT, &e_view_impl, obj, NULL);
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   e_view_init(&view, E_VIEW_TYPE_RECT, &e_view_impl, obj, NULL);
 
-       destroyed = 0;
-       e_view_destroy(&view);
-       EXPECT_NE(destroyed, 1);
+   destroyed = 0;
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(&view);
+   EXPECT_NE(destroyed, 1);
 
-       free(obj);
+   free(obj);
 }
 
-TEST(EViewTest, Test_E_View_Destroy_With_Valid_Callback)
+TEST_F(EViewTest, Test_E_View_Destroy_With_Valid_Callback)
 {
-       E_View_Impl e_view_impl = {
-               .destroy = view_destroy,
-       };
+   E_View_Impl e_view_impl = {
+      .destroy = view_destroy,
+   };
 
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       E_View view;
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   E_View view;
 
-       e_view_init(&view, E_VIEW_TYPE_RECT, &e_view_impl, obj, NULL);
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   e_view_init(&view, E_VIEW_TYPE_RECT, &e_view_impl, obj, NULL);
 
-       destroyed = 0;
-       e_view_destroy(&view);
-       EXPECT_EQ(destroyed, 1);
+   destroyed = 0;
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(&view);
+   EXPECT_EQ(destroyed, 1);
 
-       free(obj);
+   free(obj);
 }
 
 typedef struct
@@ -131,799 +136,777 @@ cb_view_destroy(struct wl_listener *listener, void *data)
    td->called = true;
 }
 
-TEST(EViewTest, Test_E_View_Destroy_Listener_Add)
+TEST_F(EViewTest, Test_E_View_Destroy_Listener_Add)
 {
    E_View view;
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
 
    E_View_Destroy_Listener_Test_Data td = {
-        .listener = {
-             .notify = cb_view_destroy,
-        },
-        .called = false,
+      .listener = {
+         .notify = cb_view_destroy,
+      },
+      .called = false,
    };
    e_view_destroy_listener_add(&view, &td.listener);
    e_view_destroy(&view);
    ASSERT_EQ(td.called, true);
 }
 
-TEST(EViewTest, Test_E_View_Tree_Destroy)
+TEST_F(EViewTest, Test_E_View_Tree_Destroy)
 {
-       E_View_Impl e_view_impl = {
-               .destroy = view_destroy,
-       };
+   E_View_Impl e_view_impl = {
+      .destroy = view_destroy,
+   };
 
-       E_View_Tree tree;
-       e_view_tree_init(&tree, NULL, NULL);
+   E_View_Tree tree;
+   e_view_tree_init(&tree, NULL, NULL);
 
-       E_View view1, view2;
-       e_view_init(&view1, E_VIEW_TYPE_RECT, &e_view_impl, NULL, &tree);
-       e_view_init(&view2, E_VIEW_TYPE_RECT, &e_view_impl, NULL, &tree);
+   E_View view1, view2;
+   e_view_init(&view1, E_VIEW_TYPE_RECT, &e_view_impl, NULL, &tree);
+   e_view_init(&view2, E_VIEW_TYPE_RECT, &e_view_impl, NULL, &tree);
 
-       destroyed = 0;
-       e_view_destroy(&tree.view);
-       EXPECT_EQ(destroyed, 2);
+   destroyed = 0;
+   e_view_destroy(&tree.view);
+   EXPECT_EQ(destroyed, 2);
 }
 
-TEST(EViewTest, Test_E_View_Place_Above_With_Same_View)
+TEST_F(EViewTest, Test_E_View_Place_Above_With_Same_View)
 {
-       E_View view;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
+   E_View view;
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
 
-       EXPECT_ABORT(e_view_place_above(&view, &view));
+   EXPECT_ABORT(e_view_place_above(&view, &view));
 }
 
-TEST(EViewTest, Test_E_View_Place_Above_With_Null_Parent)
+TEST_F(EViewTest, Test_E_View_Place_Above_With_Null_Parent)
 {
-       E_View view, sibling;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
-       e_view_init(&sibling, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
+   E_View view, sibling;
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
+   e_view_init(&sibling, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
 
-       EXPECT_ABORT(e_view_place_above(&view, &sibling));
+   EXPECT_ABORT(e_view_place_above(&view, &sibling));
 }
 
-TEST(EViewTest, Test_E_View_Place_Above_With_Different_Parent)
+TEST_F(EViewTest, Test_E_View_Place_Above_With_Different_Parent)
 {
-       E_View_Tree view_parent, sibling_parent;
-       e_view_tree_init(&view_parent, NULL, NULL);
-       e_view_tree_init(&sibling_parent, NULL, NULL);
+   E_View_Tree view_parent, sibling_parent;
+   e_view_tree_init(&view_parent, NULL, NULL);
+   e_view_tree_init(&sibling_parent, NULL, NULL);
 
-       E_View view, sibling;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, &view_parent);
-       e_view_init(&sibling, E_VIEW_TYPE_RECT, NULL, NULL, &sibling_parent);
+   E_View view, sibling;
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, &view_parent);
+   e_view_init(&sibling, E_VIEW_TYPE_RECT, NULL, NULL, &sibling_parent);
 
-       EXPECT_ABORT(e_view_place_above(&view, &sibling));
+   EXPECT_ABORT(e_view_place_above(&view, &sibling));
 }
 
-TEST(EViewTest, Test_E_View_Place_Above)
+TEST_F(EViewTest, Test_E_View_Place_Above)
 {
-       evasMock = new EvasMock();
-
-       E_View_Tree parent;
-       e_view_tree_init(&parent, NULL, NULL);
-
-       Evas_Object *obj_view = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       Evas_Object *obj_sibling = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   E_View_Tree parent;
+   e_view_tree_init(&parent, NULL, NULL);
 
-       E_View view, sibling;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj_view, &parent);
-       e_view_init(&sibling, E_VIEW_TYPE_RECT, NULL, obj_sibling, &parent);
+   Evas_Object *obj_view = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   Evas_Object *obj_sibling = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
 
-       EXPECT_EQ(parent.children.next, &(view.link));
-       EXPECT_NE(view.link.prev, &(sibling.link));
+   E_View view, sibling;
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   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_move(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_stack_above(_, _));
+   e_view_init(&sibling, E_VIEW_TYPE_RECT, NULL, obj_sibling, &parent);
 
-       EXPECT_CALL(*evasMock, evas_object_stack_above(obj_view, obj_sibling))
-               .Times(1);
-       e_view_place_above(&view, &sibling);
+   EXPECT_EQ(parent.children.next, &(view.link));
+   EXPECT_NE(view.link.prev, &(sibling.link));
 
-       EXPECT_EQ(view.link.prev, &(sibling.link));
+   EXPECT_CALL(*evasMock, evas_object_stack_above(obj_view, obj_sibling))
+      .Times(1);
+   e_view_place_above(&view, &sibling);
 
-       EXPECT_CALL(*evasMock, evas_object_stack_above(obj_view, obj_sibling))
-               .Times(1);
-       e_view_place_above(&view, &sibling);
+   EXPECT_EQ(view.link.prev, &(sibling.link));
 
-       free(obj_sibling);
-       free(obj_view);
+   EXPECT_CALL(*evasMock, evas_object_stack_above(obj_view, obj_sibling))
+      .Times(1);
+   e_view_place_above(&view, &sibling);
 
-       delete evasMock;
+   free(obj_sibling);
+   free(obj_view);
 }
 
-TEST(EViewTest, Test_E_View_Place_Above_With_Tree)
+TEST_F(EViewTest, Test_E_View_Place_Above_With_Tree)
 {
-       evasMock = new EvasMock();
-
-       E_View_Tree root;
-       e_view_tree_init(&root, NULL, NULL);
-
-       E_View_Tree tree1, tree2;
-       e_view_tree_init(&tree1, NULL, &root);
-       e_view_tree_init(&tree2, NULL, &root);
-
-       Evas_Object *obj_view1 = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       Evas_Object *obj_view2 = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       E_View view1, view2;
-       e_view_init(&view1, E_VIEW_TYPE_RECT, NULL, obj_view1, &tree1);
-       e_view_init(&view2, E_VIEW_TYPE_RECT, NULL, obj_view2, &tree2);
-
-       EXPECT_CALL(*evasMock, evas_object_stack_above(obj_view1, obj_view2))
-               .Times(1);
-       e_view_place_above(&tree1.view, &tree2.view);
-
-       free(obj_view1);
-       free(obj_view2);
+   E_View_Tree root;
+   e_view_tree_init(&root, NULL, NULL);
+
+   E_View_Tree tree1, tree2;
+   e_view_tree_init(&tree1, NULL, &root);
+   e_view_tree_init(&tree2, NULL, &root);
+
+   Evas_Object *obj_view1 = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   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_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_move(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_stack_above(_, _));
+   e_view_init(&view2, E_VIEW_TYPE_RECT, NULL, obj_view2, &tree2);
+
+   EXPECT_CALL(*evasMock, evas_object_stack_above(obj_view1, obj_view2))
+      .Times(1);
+   e_view_place_above(&tree1.view, &tree2.view);
 
-       delete evasMock;
+   free(obj_view1);
+   free(obj_view2);
 }
 
-TEST(EViewTest, Test_E_View_Place_Below_With_Same_View)
+TEST_F(EViewTest, Test_E_View_Place_Below_With_Same_View)
 {
-       E_View view;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
+   E_View view;
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
 
-       EXPECT_ABORT(e_view_place_below(&view, &view));
+   EXPECT_ABORT(e_view_place_below(&view, &view));
 }
 
-TEST(EViewTest, Test_E_View_Place_Below_With_Null_Parent)
+TEST_F(EViewTest, Test_E_View_Place_Below_With_Null_Parent)
 {
-       E_View view, sibling;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
-       e_view_init(&sibling, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
+   E_View view, sibling;
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
+   e_view_init(&sibling, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
 
-       EXPECT_ABORT(e_view_place_below(&view, &sibling));
+   EXPECT_ABORT(e_view_place_below(&view, &sibling));
 }
 
-TEST(EViewTest, Test_E_View_Place_Below_With_Different_Parent)
+TEST_F(EViewTest, Test_E_View_Place_Below_With_Different_Parent)
 {
-       E_View_Tree view_parent, sibling_parent;
-       e_view_tree_init(&view_parent, NULL, NULL);
-       e_view_tree_init(&sibling_parent, NULL, NULL);
+   E_View_Tree view_parent, sibling_parent;
+   e_view_tree_init(&view_parent, NULL, NULL);
+   e_view_tree_init(&sibling_parent, NULL, NULL);
 
-       E_View view, sibling;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, &view_parent);
-       e_view_init(&sibling, E_VIEW_TYPE_RECT, NULL, NULL, &sibling_parent);
+   E_View view, sibling;
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, &view_parent);
+   e_view_init(&sibling, E_VIEW_TYPE_RECT, NULL, NULL, &sibling_parent);
 
-       EXPECT_ABORT(e_view_place_below(&view, &sibling));
+   EXPECT_ABORT(e_view_place_below(&view, &sibling));
 }
 
-TEST(EViewTest, Test_E_View_Place_Below)
+TEST_F(EViewTest, Test_E_View_Place_Below)
 {
-       evasMock = new EvasMock();
-
-       E_View_Tree parent;
-       e_view_tree_init(&parent, NULL, NULL);
-
-       Evas_Object *obj_view = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       Evas_Object *obj_sibling = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   E_View_Tree parent;
+   e_view_tree_init(&parent, NULL, NULL);
 
-       E_View view, sibling;
-       e_view_init(&sibling, E_VIEW_TYPE_RECT, NULL, obj_sibling, &parent);
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj_view, &parent);
+   Evas_Object *obj_view = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   Evas_Object *obj_sibling = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
 
-       EXPECT_EQ(parent.children.next, &(sibling.link));
-       EXPECT_NE(view.link.next, &(view.link));
+   E_View view, sibling;
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   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_move(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_stack_above(_, _));
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj_view, &parent);
 
-       EXPECT_CALL(*evasMock, evas_object_stack_below(obj_view, obj_sibling))
-               .Times(1);
-       e_view_place_below(&view, &sibling);
+   EXPECT_EQ(parent.children.next, &(sibling.link));
+   EXPECT_NE(view.link.next, &(view.link));
 
-       EXPECT_EQ(view.link.next, &(sibling.link));
+   EXPECT_CALL(*evasMock, evas_object_stack_below(obj_view, obj_sibling))
+      .Times(1);
+   e_view_place_below(&view, &sibling);
 
-       EXPECT_CALL(*evasMock, evas_object_stack_below(obj_view, obj_sibling))
-               .Times(1);
-       e_view_place_below(&view, &sibling);
+   EXPECT_EQ(view.link.next, &(sibling.link));
 
-       EXPECT_EQ(view.link.next, &(sibling.link));
+   EXPECT_CALL(*evasMock, evas_object_stack_below(obj_view, obj_sibling))
+      .Times(1);
+   e_view_place_below(&view, &sibling);
 
-       free(obj_sibling);
-       free(obj_view);
+   EXPECT_EQ(view.link.next, &(sibling.link));
 
-       delete evasMock;
+   free(obj_sibling);
+   free(obj_view);
 }
 
-TEST(EViewTest, Test_E_View_Raise_To_Top_Without_Parent)
+TEST_F(EViewTest, Test_E_View_Raise_To_Top_Without_Parent)
 {
-       E_View view;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
+   E_View view;
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
 
-       EXPECT_ABORT(e_view_raise_to_top(&view));
+   EXPECT_ABORT(e_view_raise_to_top(&view));
 }
 
-TEST(EViewTest, Test_E_View_Raise_To_Top)
+TEST_F(EViewTest, Test_E_View_Raise_To_Top)
 {
-       evasMock = new EvasMock();
+   E_View_Tree parent;
+   e_view_tree_init(&parent, NULL, NULL);
 
-       E_View_Tree parent;
-       e_view_tree_init(&parent, NULL, NULL);
+   Evas_Object *obj_view = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   Evas_Object *obj_sibling_mid = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   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_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_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_move(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_stack_above(_, _));
+   e_view_init(&sibling_top, E_VIEW_TYPE_RECT, NULL, obj_sibling_top, &parent);
+
+   /* view -> sibling_mid -> sibling_top */
+   EXPECT_EQ(parent.children.next, &(view.link));
+   EXPECT_EQ(view.link.next, &sibling_mid.link);
+   EXPECT_EQ(sibling_mid.link.next, &sibling_top.link);
+
+   EXPECT_CALL(*evasMock, evas_object_raise(obj_view))
+      .Times(1);
+   e_view_raise_to_top(&view);
 
-       Evas_Object *obj_view = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       Evas_Object *obj_sibling_mid = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       Evas_Object *obj_sibling_top = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   EXPECT_EQ(parent.children.prev, &(view.link));
 
-       E_View view, sibling_mid, sibling_top;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj_view, &parent);
-       e_view_init(&sibling_mid, E_VIEW_TYPE_RECT, NULL, obj_sibling_mid, &parent);
-       e_view_init(&sibling_top, E_VIEW_TYPE_RECT, NULL, obj_sibling_top, &parent);
+   /* sibling_mid -> sibling_top -> view */
+   EXPECT_EQ(parent.children.next, &(sibling_mid.link));
+   EXPECT_EQ(sibling_mid.link.next, &sibling_top.link);
+   EXPECT_EQ(sibling_top.link.next, &view.link);
 
-       /* view -> sibling_mid -> sibling_top */
-       EXPECT_EQ(parent.children.next, &(view.link));
-       EXPECT_EQ(view.link.next, &sibling_mid.link);
-       EXPECT_EQ(sibling_mid.link.next, &sibling_top.link);
+   EXPECT_CALL(*evasMock, evas_object_raise(obj_view))
+      .Times(0);
+   e_view_raise_to_top(&view);
 
-       EXPECT_CALL(*evasMock, evas_object_raise(obj_view))
-               .Times(1);
-       e_view_raise_to_top(&view);
+   free(obj_sibling_top);
+   free(obj_sibling_mid);
+   free(obj_view);
+}
 
-       EXPECT_EQ(parent.children.prev, &(view.link));
+TEST_F(EViewTest, Test_E_View_Lower_To_Bottom_Without_Parent)
+{
+   E_View view;
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
 
-       /* sibling_mid -> sibling_top -> view */
-       EXPECT_EQ(parent.children.next, &(sibling_mid.link));
-       EXPECT_EQ(sibling_mid.link.next, &sibling_top.link);
-       EXPECT_EQ(sibling_top.link.next, &view.link);
+   EXPECT_ABORT(e_view_lower_to_bottom(&view));
+}
 
-       EXPECT_CALL(*evasMock, evas_object_raise(obj_view))
-               .Times(0);
-       e_view_raise_to_top(&view);
+TEST_F(EViewTest, Test_E_View_Lower_To_Bottom)
+{
+   E_View_Tree parent;
+   e_view_tree_init(&parent, NULL, NULL);
 
-       free(obj_sibling_top);
-       free(obj_sibling_mid);
-       free(obj_view);
+   Evas_Object *obj_view = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   Evas_Object *obj_sibling_mid = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   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_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_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_move(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_stack_above(_, _));
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj_view, &parent);
+
+   /* sibling_bottom -> sibling_mid -> view */
+   EXPECT_EQ(parent.children.next, &(sibling_bottom.link));
+   EXPECT_EQ(sibling_bottom.link.next, &sibling_mid.link);
+   EXPECT_EQ(sibling_mid.link.next, &view.link);
+
+   EXPECT_CALL(*evasMock, evas_object_lower(obj_view))
+      .Times(1);
+   e_view_lower_to_bottom(&view);
 
-       delete evasMock;
+   /* view -> sibling_bottom -> sibling_mid */
+   EXPECT_EQ(parent.children.next, &(view.link));
+   EXPECT_EQ(view.link.next, &sibling_bottom.link);
+   EXPECT_EQ(sibling_bottom.link.next, &sibling_mid.link);
+
+   EXPECT_CALL(*evasMock, evas_object_lower(obj_view))
+      .Times(0);
+   e_view_lower_to_bottom(&view);
+
+   free(obj_sibling_bottom);
+   free(obj_sibling_mid);
+   free(obj_view);
 }
 
-TEST(EViewTest, Test_E_View_Lower_To_Bottom_Without_Parent)
+TEST_F(EViewTest, Test_E_View_Coords_Get)
 {
-       E_View view;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
+   /*          root
+    *         /
+    *      tree1 (50, 40)
+    *    /
+    *   tree2 (100, 30)
+    *  /
+    * view1 (75, 20)
+    */
+   E_View_Tree root, tree1, tree2;
+   e_view_tree_init(&root, NULL, NULL);
+
+   e_view_tree_init(&tree1, NULL, &root);
+   tree1.view.x = 50;
+   tree1.view.y = 40;
+
+   e_view_tree_init(&tree2, NULL, &tree1);
+   tree2.view.x = 100;
+   tree2.view.y = 30;
 
-       EXPECT_ABORT(e_view_lower_to_bottom(&view));
+   E_View view1;
+   e_view_init(&view1, E_VIEW_TYPE_RECT, NULL, NULL, &tree2);
+   view1.x = 75;
+   view1.y = 20;
+
+   int lx = 0, ly = 0;
+   e_view_coords_get(&view1, &lx, &ly);
+
+   EXPECT_EQ(50 + 100 + 75, lx);
+   EXPECT_EQ(40 + 30 + 20, ly);
 }
 
-TEST(EViewTest, Test_E_View_Lower_To_Bottom)
+TEST_F(EViewTest, Test_E_View_Position_Set_Get)
 {
-       evasMock = new EvasMock();
+   /*          root
+    *         /
+    *      tree1 (50, 40)
+    *    /
+    *   tree2 (100, 30)
+    *  /
+    * view1 (75, 20)
+    */
+   E_View_Tree root, tree1, tree2;
+   e_view_tree_init(&root, NULL, NULL);
+   e_view_position_set(&root.view, 0, 0);
 
-       E_View_Tree parent;
-       e_view_tree_init(&parent, NULL, NULL);
+   e_view_tree_init(&tree1, NULL, &root);
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _))
+      .Times(0);
+   e_view_position_set(&tree1.view, 50, 40);
 
-       Evas_Object *obj_view = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       Evas_Object *obj_sibling_mid = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       Evas_Object *obj_sibling_bottom = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   e_view_tree_init(&tree2, NULL, &tree1);
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _))
+      .Times(0);
+   e_view_position_set(&tree2.view, 100, 30);
 
-       E_View view, sibling_mid, sibling_bottom;
-       e_view_init(&sibling_bottom, E_VIEW_TYPE_RECT, NULL, obj_sibling_bottom, &parent);
-       e_view_init(&sibling_mid, E_VIEW_TYPE_RECT, NULL, obj_sibling_mid, &parent);
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj_view, &parent);
+   E_View view1;
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_move(obj, 100 + 50, 40 + 30))
+      .Times(1);
+   e_view_init(&view1, E_VIEW_TYPE_RECT, NULL, obj, &tree2);
 
-       /* sibling_bottom -> sibling_mid -> view */
-       EXPECT_EQ(parent.children.next, &(sibling_bottom.link));
-       EXPECT_EQ(sibling_bottom.link.next, &sibling_mid.link);
-       EXPECT_EQ(sibling_mid.link.next, &view.link);
+   EXPECT_CALL(*evasMock, evas_object_move(obj, 50 + 100 + 75, 40 + 30 + 20))
+      .Times(1);
+   e_view_position_set(&view1, 75, 20);
 
-       EXPECT_CALL(*evasMock, evas_object_lower(obj_view))
-               .Times(1);
-       e_view_lower_to_bottom(&view);
+   EXPECT_CALL(*evasMock, evas_object_move(obj, -10 + 100 + 75, -20 + 30 + 20))
+      .Times(1);
+   e_view_position_set(&tree1.view, -10, -20);
 
-       /* view -> sibling_bottom -> sibling_mid */
-       EXPECT_EQ(parent.children.next, &(view.link));
-       EXPECT_EQ(view.link.next, &sibling_bottom.link);
-       EXPECT_EQ(sibling_bottom.link.next, &sibling_mid.link);
+   int x, y;
 
-       EXPECT_CALL(*evasMock, evas_object_lower(obj_view))
-               .Times(0);
-       e_view_lower_to_bottom(&view);
+   e_view_position_get(&view1, &x, &y);
 
-       free(obj_sibling_bottom);
-       free(obj_sibling_mid);
-       free(obj_view);
+   EXPECT_EQ(75, x);
+   EXPECT_EQ(20, y);
 
-       delete evasMock;
+   free(obj);
 }
 
-TEST(EViewTest, Test_E_View_Coords_Get)
+TEST_F(EViewTest, Test_E_View_Render_Op_Set_Get)
 {
-       /*          root
-        *         /
-        *      tree1 (50, 40)
-        *    /
-        *   tree2 (100, 30)
-        *  /
-        * view1 (75, 20)
-        */
-       E_View_Tree root, tree1, tree2;
-       e_view_tree_init(&root, NULL, NULL);
-
-       e_view_tree_init(&tree1, NULL, &root);
-       tree1.view.x = 50;
-       tree1.view.y = 40;
-
-       e_view_tree_init(&tree2, NULL, &tree1);
-       tree2.view.x = 100;
-       tree2.view.y = 30;
-
-       E_View view1;
-       e_view_init(&view1, E_VIEW_TYPE_RECT, NULL, NULL, &tree2);
-       view1.x = 75;
-       view1.y = 20;
-
-       int lx = 0, ly = 0;
-       e_view_coords_get(&view1, &lx, &ly);
-
-       EXPECT_EQ(50 + 100 + 75, lx);
-       EXPECT_EQ(40 + 30 + 20, ly);
-}
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   E_View view;
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
 
-TEST(EViewTest, Test_E_View_Position_Set_Get)
-{
-       evasMock = new EvasMock();
-
-       /*          root
-        *         /
-        *      tree1 (50, 40)
-        *    /
-        *   tree2 (100, 30)
-        *  /
-        * view1 (75, 20)
-        */
-       E_View_Tree root, tree1, tree2;
-       e_view_tree_init(&root, NULL, NULL);
-       e_view_position_set(&root.view, 0, 0);
-
-       e_view_tree_init(&tree1, NULL, &root);
-       EXPECT_CALL(*evasMock, evas_object_move(_, _, _))
-               .Times(0);
-       e_view_position_set(&tree1.view, 50, 40);
-
-       e_view_tree_init(&tree2, NULL, &tree1);
-       EXPECT_CALL(*evasMock, evas_object_move(_, _, _))
-               .Times(0);
-       e_view_position_set(&tree2.view, 100, 30);
-
-       E_View view1;
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       EXPECT_CALL(*evasMock, evas_object_move(obj, 100 + 50, 40 + 30))
-               .Times(1);
-       e_view_init(&view1, E_VIEW_TYPE_RECT, NULL, obj, &tree2);
-
-       EXPECT_CALL(*evasMock, evas_object_move(obj, 50 + 100 + 75, 40 + 30 + 20))
-               .Times(1);
-       e_view_position_set(&view1, 75, 20);
-
-       EXPECT_CALL(*evasMock, evas_object_move(obj, -10 + 100 + 75, -20 + 30 + 20))
-               .Times(1);
-       e_view_position_set(&tree1.view, -10, -20);
-
-       int x, y;
-
-       e_view_position_get(&view1, &x, &y);
-
-       EXPECT_EQ(75, x);
-       EXPECT_EQ(20, y);
-
-       free(obj);
-       delete evasMock;
+   EXPECT_CALL(*evasMock, evas_object_render_op_set(obj, EVAS_RENDER_COPY))
+      .Times(1);
+   e_view_render_op_set(&view, E_VIEW_RENDER_COPY);
+
+   EXPECT_CALL(*evasMock, evas_object_render_op_get(obj))
+      .Times(1)
+      .WillOnce(Return(EVAS_RENDER_COPY));
+   EXPECT_EQ(E_VIEW_RENDER_COPY, e_view_render_op_get(&view));
+
+   free(obj);
 }
 
-TEST(EViewTest, Test_E_View_Render_Op_Set_Get)
+TEST_F(EViewTest, Test_E_View_Color_Set_Get)
 {
-       evasMock = new EvasMock();
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   E_View view;
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   e_view_init(&view, E_VIEW_TYPE_TREE, NULL, obj, NULL);
 
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       E_View view;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
+   int red = 255;
+   int green = 128;
+   int blue = 64;
+   int alpha = 32;
 
-       EXPECT_CALL(*evasMock, evas_object_render_op_set(obj, EVAS_RENDER_COPY))
-               .Times(1);
-       e_view_render_op_set(&view, E_VIEW_RENDER_COPY);
+   EXPECT_CALL(*evasMock, evas_object_color_set(obj, red, green, blue, alpha))
+      .Times(1);
 
-       EXPECT_CALL(*evasMock, evas_object_render_op_get(obj))
-               .Times(1)
-               .WillOnce(Return(EVAS_RENDER_COPY));
-       EXPECT_EQ(E_VIEW_RENDER_COPY, e_view_render_op_get(&view));
+   e_view_color_set(&view, red, green, blue, alpha);
 
-       free(obj);
-       delete evasMock;
-}
+   int r, g, b, a;
+   EXPECT_CALL(*evasMock, evas_object_color_get(obj, &r, &g, &b, &a))
+      .Times(1)
+      .WillOnce(DoAll(SetArgPointee<1>(red),
+                      SetArgPointee<2>(green),
+                      SetArgPointee<3>(blue),
+                      SetArgPointee<4>(alpha)));
 
-TEST(EViewTest, Test_E_View_Color_Set_Get)
-{
-       evasMock = new EvasMock();
-
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       E_View view;
-       e_view_init(&view, E_VIEW_TYPE_TREE, NULL, obj, NULL);
-
-       int red = 255;
-       int green = 128;
-       int blue = 64;
-       int alpha = 32;
-
-       EXPECT_CALL(*evasMock, evas_object_color_set(obj, red, green, blue, alpha))
-               .Times(1);
-
-       e_view_color_set(&view, red, green, blue, alpha);
-
-       int r, g, b, a;
-       EXPECT_CALL(*evasMock, evas_object_color_get(obj, &r, &g, &b, &a))
-               .Times(1)
-               .WillOnce(DoAll(SetArgPointee<1>(red),
-                                               SetArgPointee<2>(green),
-                                               SetArgPointee<3>(blue),
-                                               SetArgPointee<4>(alpha)));
-
-       e_view_color_get(&view, &r, &g, &b, &a);
-       EXPECT_EQ(red, r);
-       EXPECT_EQ(green, g);
-       EXPECT_EQ(blue, b);
-       EXPECT_EQ(alpha, a);
-
-       free(obj);
-       delete evasMock;
+   e_view_color_get(&view, &r, &g, &b, &a);
+   EXPECT_EQ(red, r);
+   EXPECT_EQ(green, g);
+   EXPECT_EQ(blue, b);
+   EXPECT_EQ(alpha, a);
+
+   free(obj);
 }
 
-TEST(EViewTest, Test_E_View_Data_Set_Get_Del)
+TEST_F(EViewTest, Test_E_View_Data_Set_Get_Del)
 {
-       evasMock = new EvasMock();
-
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       E_View view;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   E_View view;
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
 
-       const char key[] = "e_view";
-       EXPECT_CALL(*evasMock, evas_object_data_set(obj, key, &view)).Times(1);
+   const char key[] = "e_view_test";
+   EXPECT_CALL(*evasMock, evas_object_data_set(obj, key, &view)).Times(1);
 
-       e_view_data_set(&view, key, &view);
+   e_view_data_set(&view, key, &view);
 
-       EXPECT_CALL(*evasMock, evas_object_data_get(obj, key))
-               .Times(1)
-               .WillOnce(Return(&view));
+   EXPECT_CALL(*evasMock, evas_object_data_get(obj, key))
+      .Times(1)
+      .WillOnce(Return(&view));
 
-       void *data = e_view_data_get(&view, key);
-       EXPECT_EQ(&view, data);
+   void *data = e_view_data_get(&view, key);
+   EXPECT_EQ(&view, data);
 
-       EXPECT_CALL(*evasMock, evas_object_data_del(obj, key))
-               .Times(1)
-               .WillOnce(Return(&view));
+   EXPECT_CALL(*evasMock, evas_object_data_del(obj, key))
+      .Times(1)
+      .WillOnce(Return(&view));
 
-       void *del_data = e_view_data_del(&view, key);
-       EXPECT_EQ(&view, del_data);
+   void *del_data = e_view_data_del(&view, key);
+   EXPECT_EQ(&view, del_data);
 
-       free(obj);
-       delete evasMock;
+   free(obj);
 }
 
-TEST(EViewTest, Test_E_View_Clip_Set)
+TEST_F(EViewTest, Test_E_View_Clip_Set)
 {
-       evasMock = new EvasMock();
-
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       E_View view;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
-
-       Evas_Object *clipper_obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       E_View clipper;
-       e_view_init(&clipper, E_VIEW_TYPE_RECT, NULL, clipper_obj, NULL);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   E_View view;
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
 
-       EXPECT_CALL(*evasMock, evas_object_clip_set(obj, clipper_obj))
-               .Times(1);
-       e_view_clip_set(&view, &clipper);
+   Evas_Object *clipper_obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   E_View clipper;
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   e_view_init(&clipper, E_VIEW_TYPE_RECT, NULL, clipper_obj, NULL);
 
-       free(clipper_obj);
-       free(obj);
+   EXPECT_CALL(*evasMock, evas_object_clip_set(obj, clipper_obj))
+      .Times(1);
+   e_view_clip_set(&view, &clipper);
 
-       delete evasMock;
+   free(clipper_obj);
+   free(obj);
 }
 
-TEST(EViewTest, Test_E_View_Clip_Set_With_Clipper_Other_Than_Rect_Or_Image)
+TEST_F(EViewTest, Test_E_View_Clip_Set_With_Clipper_Other_Than_Rect_Or_Image)
 {
-       evasMock = new EvasMock();
-
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       E_View view;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
-
-       Evas_Object *clipper_obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       E_View clipper;
-       e_view_init(&clipper, E_VIEW_TYPE_TREE, NULL, clipper_obj, NULL);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   E_View view;
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
 
-       EXPECT_CALL(*evasMock, evas_object_clip_set(obj, clipper_obj))
-               .Times(0);
-       e_view_clip_set(&view, &clipper);
+   Evas_Object *clipper_obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   E_View clipper;
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   e_view_init(&clipper, E_VIEW_TYPE_TREE, NULL, clipper_obj, NULL);
 
-       free(clipper_obj);
-       free(obj);
+   EXPECT_CALL(*evasMock, evas_object_clip_set(obj, clipper_obj))
+      .Times(0);
+   e_view_clip_set(&view, &clipper);
 
-       delete evasMock;
+   free(clipper_obj);
+   free(obj);
 }
 
-TEST(EViewTest, Test_E_View_Clip_Unset)
+TEST_F(EViewTest, Test_E_View_Clip_Unset)
 {
-       evasMock = new EvasMock();
-
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       E_View view;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
-
-       EXPECT_CALL(*evasMock, evas_object_clip_set(obj, nullptr))
-               .Times(1);
-       e_view_clip_unset(&view);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   E_View view;
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
 
-       free(obj);
+   EXPECT_CALL(*evasMock, evas_object_clip_set(obj, nullptr))
+      .Times(1);
+   e_view_clip_unset(&view);
 
-       delete evasMock;
+   free(obj);
 }
 
 
-TEST(EViewTest, Test_E_View_Freeze_Events_Set)
+TEST_F(EViewTest, Test_E_View_Freeze_Events_Set)
 {
-       evasMock = new EvasMock();
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   E_View view;
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
 
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       E_View view;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
+   EXPECT_CALL(*evasMock, evas_object_freeze_events_set(obj, EINA_TRUE))
+      .Times(1);
+   e_view_freeze_events_set(&view, true);
 
-       EXPECT_CALL(*evasMock, evas_object_freeze_events_set(obj, EINA_TRUE))
-               .Times(1);
-       e_view_freeze_events_set(&view, true);
+   EXPECT_CALL(*evasMock, evas_object_freeze_events_set(obj, EINA_FALSE))
+      .Times(1);
+   e_view_freeze_events_set(&view, false);
 
-       EXPECT_CALL(*evasMock, evas_object_freeze_events_set(obj, EINA_FALSE))
-               .Times(1);
-       e_view_freeze_events_set(&view, false);
+   free(obj);
+}
 
-       free(obj);
+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(_, _, _));
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
+
+   EXPECT_CALL(*evasMock, evas_object_repeat_events_set(obj, EINA_TRUE))
+      .Times(1);
+   e_view_repeat_events_set(&view, true);
+
+   EXPECT_CALL(*evasMock, evas_object_repeat_events_set(obj, EINA_FALSE))
+      .Times(1);
+   e_view_repeat_events_set(&view, false);
 
-       delete evasMock;
+   free(obj);
 }
 
-TEST(EViewTest, Test_E_View_Repeat_Events_Set)
+TEST_F(EViewTest, Test_E_View_Show)
 {
-       evasMock = new EvasMock();
-
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       E_View view;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
+   E_View_Tree tree;
+   e_view_tree_init(&tree, NULL, NULL);
 
-       EXPECT_CALL(*evasMock, evas_object_repeat_events_set(obj, EINA_TRUE))
-               .Times(1);
-       e_view_repeat_events_set(&view, true);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   E_View view;
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, &tree);
 
-       EXPECT_CALL(*evasMock, evas_object_repeat_events_set(obj, EINA_FALSE))
-               .Times(1);
-       e_view_repeat_events_set(&view, false);
+   EXPECT_CALL(*evasMock, evas_object_show(obj))
+      .Times(0);
+   e_view_show(&view);
 
-       free(obj);
+   EXPECT_CALL(*evasMock, evas_object_show(obj))
+      .Times(1);
+   e_view_show(&tree.view);
 
-       delete evasMock;
+   free(obj);
 }
 
-TEST(EViewTest, Test_E_View_Show)
+TEST_F(EViewTest, Test_E_View_Hide)
 {
-       evasMock = new EvasMock();
+   E_View_Tree tree;
+   e_view_tree_init(&tree, NULL, NULL);
+   e_view_show(&tree.view);
 
-       E_View_Tree tree;
-       e_view_tree_init(&tree, NULL, NULL);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   E_View view;
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, &tree);
 
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       E_View view;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, &tree);
+   EXPECT_CALL(*evasMock, evas_object_show(obj))
+      .Times(1);
+   e_view_show(&view);
 
-       EXPECT_CALL(*evasMock, evas_object_show(obj))
-               .Times(0);
-       e_view_show(&view);
+   EXPECT_CALL(*evasMock, evas_object_hide(obj))
+      .Times(1);
+   e_view_hide(&view);
 
-       EXPECT_CALL(*evasMock, evas_object_show(obj))
-               .Times(1);
-       e_view_show(&tree.view);
+   EXPECT_CALL(*evasMock, evas_object_show(obj))
+      .Times(1);
+   e_view_show(&view);
 
-       free(obj);
+   EXPECT_CALL(*evasMock, evas_object_hide(obj))
+      .Times(1);
+   e_view_hide(&tree.view);
 
-       delete evasMock;
+   free(obj);
 }
 
-TEST(EViewTest, Test_E_View_Hide)
+TEST_F(EViewTest, Test_E_View_Root_Get)
 {
-       evasMock = new EvasMock();
-
-       E_View_Tree tree;
-       e_view_tree_init(&tree, NULL, NULL);
-       e_view_show(&tree.view);
+   Evas *evas = reinterpret_cast<Evas *>(malloc(sizeof(Evas)));
+   E_Canvas *canvas = e_canvas_create(evas);
+   E_View_Tree *tree = e_canvas_layer_view_tree_get(canvas, E_CANVAS_LAYER_BOTTOM);
 
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       E_View view;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, &tree);
+   E_View view;
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, tree);
 
-       EXPECT_CALL(*evasMock, evas_object_show(obj))
-               .Times(1);
-       e_view_show(&view);
+   E_Canvas *root = e_view_root_get(&view);
+   ASSERT_EQ(root, canvas);
+}
 
-       EXPECT_CALL(*evasMock, evas_object_hide(obj))
-               .Times(1);
-       e_view_hide(&view);
+TEST_F(EViewTest, Test_E_View_Above_Get)
+{
+   /*          root
+    *         /    \
+    *      tree1   tree2
+    *    /      \       \
+    *   view1   view2   view3
+    */
+   E_View_Tree root, tree1, tree2;
+   e_view_tree_init(&root, NULL, NULL);
+   e_view_tree_init(&tree1, NULL, &root);
+   e_view_tree_init(&tree2, NULL, &root);
 
-       EXPECT_CALL(*evasMock, evas_object_show(obj))
-               .Times(1);
-       e_view_show(&view);
+   E_View view1, view2;
+   e_view_init(&view1, E_VIEW_TYPE_RECT, NULL, NULL, &tree1);
+   e_view_init(&view2, E_VIEW_TYPE_RECT, NULL, NULL, &tree1);
 
-       EXPECT_CALL(*evasMock, evas_object_hide(obj))
-               .Times(1);
-       e_view_hide(&tree.view);
+   E_View view3;
+   e_view_init(&view3, E_VIEW_TYPE_RECT, NULL, NULL, &tree2);
 
-       free(obj);
+   E_View *above = e_view_above_get(&view1);
+   ASSERT_EQ(above, &view2);
 
-       delete evasMock;
+   above = e_view_above_get(above);
+   ASSERT_EQ(above, &view3);
 }
 
-TEST(EViewTest, Test_E_View_Root_Get)
+TEST_F(EViewTest, Test_E_View_Below_Get)
 {
-       evasMock = new EvasMock();
+   /*          root
+    *         /    \
+    *      tree1   tree2
+    *    /        /     \
+    *   view1   view2   view3
+    */
+   E_View_Tree root, tree1, tree2;
+   e_view_tree_init(&root, NULL, NULL);
+   e_view_tree_init(&tree1, NULL, &root);
+   e_view_tree_init(&tree2, NULL, &root);
 
-       Evas *evas = reinterpret_cast<Evas *>(malloc(sizeof(Evas)));
-       E_Canvas *canvas = e_canvas_create(evas);
-       E_View_Tree *tree = e_canvas_layer_view_tree_get(canvas, E_CANVAS_LAYER_BOTTOM);
+   E_View view1;
+   e_view_init(&view1, E_VIEW_TYPE_RECT, NULL, NULL, &tree1);
 
-       E_View view;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, tree);
+   E_View view2, view3;
+   e_view_init(&view2, E_VIEW_TYPE_RECT, NULL, NULL, &tree2);
+   e_view_init(&view3, E_VIEW_TYPE_RECT, NULL, NULL, &tree2);
 
-       E_Canvas *root = e_view_root_get(&view);
-       ASSERT_EQ(root, canvas);
-}
+   E_View *below = e_view_below_get(&view3);
+   ASSERT_EQ(below, &view2);
 
-TEST(EViewTest, Test_E_View_Above_Get)
-{
-       /*          root
-        *         /    \
-        *      tree1   tree2
-        *    /      \       \
-        *   view1   view2   view3
-        */
-       E_View_Tree root, tree1, tree2;
-       e_view_tree_init(&root, NULL, NULL);
-       e_view_tree_init(&tree1, NULL, &root);
-       e_view_tree_init(&tree2, NULL, &root);
-
-       E_View view1, view2;
-       e_view_init(&view1, E_VIEW_TYPE_RECT, NULL, NULL, &tree1);
-       e_view_init(&view2, E_VIEW_TYPE_RECT, NULL, NULL, &tree1);
-
-       E_View view3;
-       e_view_init(&view3, E_VIEW_TYPE_RECT, NULL, NULL, &tree2);
-
-       E_View *above = e_view_above_get(&view1);
-       ASSERT_EQ(above, &view2);
-
-       above = e_view_above_get(above);
-       ASSERT_EQ(above, &view3);
-}
-
-TEST(EViewTest, Test_E_View_Below_Get)
-{
-       /*          root
-        *         /    \
-        *      tree1   tree2
-        *    /        /     \
-        *   view1   view2   view3
-        */
-       E_View_Tree root, tree1, tree2;
-       e_view_tree_init(&root, NULL, NULL);
-       e_view_tree_init(&tree1, NULL, &root);
-       e_view_tree_init(&tree2, NULL, &root);
-
-       E_View view1;
-       e_view_init(&view1, E_VIEW_TYPE_RECT, NULL, NULL, &tree1);
-
-       E_View view2, view3;
-       e_view_init(&view2, E_VIEW_TYPE_RECT, NULL, NULL, &tree2);
-       e_view_init(&view3, E_VIEW_TYPE_RECT, NULL, NULL, &tree2);
-
-       E_View *below = e_view_below_get(&view3);
-       ASSERT_EQ(below, &view2);
-
-       below = e_view_below_get(below);
-       ASSERT_EQ(below, &view1);
+   below = e_view_below_get(below);
+   ASSERT_EQ(below, &view1);
 }
 
 static void view_iterator(E_View *view, int lx, int ly, void *user_data)
 {
-       int x = 0, y = 0;
-       e_view_coords_get(view, &x, &y);
+   int x = 0, y = 0;
+   e_view_coords_get(view, &x, &y);
 
-       EXPECT_EQ(x, lx);
-       EXPECT_EQ(y, ly);
+   EXPECT_EQ(x, lx);
+   EXPECT_EQ(y, ly);
 }
 
-TEST(EViewTest, Test_E_View_For_Each_View)
+TEST_F(EViewTest, Test_E_View_For_Each_View)
 {
-       evasMock = new EvasMock();
-
-       /*                   root (1, 2)
-        *              /                 \
-        *      tree1(10, 20)           tree2(30, 40)
-        *         /                   /            \
-        *   view1(100, 200)   view2(300, 400)   view3(500, 600)
-        */
-       E_View_Tree root, tree1, tree2;
-       int lx = 1, ly = 2;
-       e_view_tree_init(&root, NULL, NULL);
-       e_view_position_set(&root.view, lx, ly);
-       e_view_tree_init(&tree1, NULL, &root);
-       e_view_position_set(&tree1.view, 10, 20);
-       e_view_tree_init(&tree2, NULL, &root);
-       e_view_position_set(&tree2.view, 30, 40);
-
-       E_View view1;
-       e_view_init(&view1, E_VIEW_TYPE_RECT, NULL, NULL, &tree1);
-       view1.x = 100;
-       view1.y = 200;
-
-       E_View view2, view3;
-       e_view_init(&view2, E_VIEW_TYPE_RECT, NULL, NULL, &tree2);
-       view2.x = 300;
-       view2.y = 400;
-
-       e_view_init(&view3, E_VIEW_TYPE_RECT, NULL, NULL, &tree2);
-       view2.x = 500;
-       view2.y = 600;
-
-       e_view_for_each_view(&root.view, view_iterator, NULL);
-
-       delete evasMock;
+   /*                   root (1, 2)
+    *              /                 \
+    *      tree1(10, 20)           tree2(30, 40)
+    *         /                   /            \
+    *   view1(100, 200)   view2(300, 400)   view3(500, 600)
+    */
+   E_View_Tree root, tree1, tree2;
+   int lx = 1, ly = 2;
+   e_view_tree_init(&root, NULL, NULL);
+   e_view_position_set(&root.view, lx, ly);
+   e_view_tree_init(&tree1, NULL, &root);
+   e_view_position_set(&tree1.view, 10, 20);
+   e_view_tree_init(&tree2, NULL, &root);
+   e_view_position_set(&tree2.view, 30, 40);
+
+   E_View view1;
+   e_view_init(&view1, E_VIEW_TYPE_RECT, NULL, NULL, &tree1);
+   view1.x = 100;
+   view1.y = 200;
+
+   E_View view2, view3;
+   e_view_init(&view2, E_VIEW_TYPE_RECT, NULL, NULL, &tree2);
+   view2.x = 300;
+   view2.y = 400;
+
+   e_view_init(&view3, E_VIEW_TYPE_RECT, NULL, NULL, &tree2);
+   view2.x = 500;
+   view2.y = 600;
+
+   e_view_for_each_view(&root.view, view_iterator, NULL);
 }
 
-TEST(EViewTest, Test_E_View_Name_Set_Get)
+TEST_F(EViewTest, Test_E_View_Name_Set_Get)
 {
-       E_View view;
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
+   E_View view;
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
 
-       EXPECT_ABORT(e_view_name_get(NULL));
-       EXPECT_STREQ(nullptr, e_view_name_get(&view));
+   EXPECT_ABORT(e_view_name_get(NULL));
+   EXPECT_STREQ(nullptr, e_view_name_get(&view));
 
-       e_view_name_set(NULL, NULL);
-       EXPECT_STREQ(nullptr, e_view_name_get(&view));
+   e_view_name_set(NULL, NULL);
+   EXPECT_STREQ(nullptr, e_view_name_get(&view));
 
-       e_view_name_set(&view, "view_test_obj");
-       EXPECT_STREQ("view_test_obj", e_view_name_get(&view));
+   e_view_name_set(&view, "view_test_obj");
+   EXPECT_STREQ("view_test_obj", e_view_name_get(&view));
 
-       e_view_name_set(&view, "change_name");
-       EXPECT_STREQ("change_name", e_view_name_get(&view));
+   e_view_name_set(&view, "change_name");
+   EXPECT_STREQ("change_name", e_view_name_get(&view));
 
-       /* remove name */
-       e_view_name_set(&view, NULL);
-       EXPECT_STREQ(nullptr, e_view_name_get(&view));
+   /* remove name */
+   e_view_name_set(&view, NULL);
+   EXPECT_STREQ(nullptr, e_view_name_get(&view));
 
-       e_view_name_set(&view, "view_destroy");
-       e_view_destroy(&view);
+   e_view_name_set(&view, "view_destroy");
+   e_view_destroy(&view);
 
-       EXPECT_STREQ(nullptr, e_view_name_get(&view));
+   EXPECT_STREQ(nullptr, e_view_name_get(&view));
 }
 
-TEST(EViewTest, Test_E_View_Map_Enable_Set_Get)
+TEST_F(EViewTest, Test_E_View_Map_Enable_Set_Get)
 {
-       evasMock = new EvasMock();
-
-       E_View view;
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
+   E_View view;
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
 
-       EXPECT_ABORT(e_view_map_enable_get(NULL));
+   EXPECT_ABORT(e_view_map_enable_get(NULL));
 
-       EXPECT_CALL(*evasMock, evas_object_map_enable_set(_, _))
-               .Times(0);
-       e_view_map_enable_set(NULL, true);
+   EXPECT_CALL(*evasMock, evas_object_map_enable_set(_, _))
+      .Times(0);
+   e_view_map_enable_set(NULL, true);
 
-       EXPECT_CALL(*evasMock, evas_object_map_enable_set(obj, true))
-               .Times(1);
-       e_view_map_enable_set(&view, true);
+   EXPECT_CALL(*evasMock, evas_object_map_enable_set(obj, true))
+      .Times(1);
+   e_view_map_enable_set(&view, true);
 
-       EXPECT_CALL(*evasMock, evas_object_map_enable_get(obj))
-               .Times(1);
-       e_view_map_enable_get(&view);
+   EXPECT_CALL(*evasMock, evas_object_map_enable_get(obj))
+      .Times(1);
+   e_view_map_enable_get(&view);
 
-       free(obj);
-       delete evasMock;
+   free(obj);
 }
 
-TEST(EViewTest, Test_E_View_Parent_Get)
+TEST_F(EViewTest, Test_E_View_Parent_Get)
 {
    E_View_Tree parent;
 
@@ -935,51 +918,48 @@ TEST(EViewTest, Test_E_View_Parent_Get)
    ASSERT_EQ(e_view_parent_get(&view), &parent);
 }
 
-TEST(EViewTest, Test_E_View_Visible_Get)
+TEST_F(EViewTest, Test_E_View_Visible_Get)
 {
    E_View view;
    Evas_Object obj;
-   evasMock = new EvasMock();
 
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, &obj, NULL);
    ASSERT_EQ(e_view_visible_get(&view), false);
 
    EXPECT_CALL(*evasMock, evas_object_show(&obj))
-               .Times(1);
+      .Times(1);
    e_view_show(&view);
    ASSERT_EQ(e_view_visible_get(&view), true);
-
-   delete evasMock;
 }
 
-TEST(EViewTest, Test_E_View_Map_Set_Get)
+TEST_F(EViewTest, Test_E_View_Map_Set_Get)
 {
-   evasMock = new EvasMock();
-
    E_View view;
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
    ASSERT_EQ(e_view_map_get(&view), nullptr);
 
    Evas_Map map_obj;
    ON_CALL(*evasMock, evas_map_new(4)).WillByDefault(Return(&map_obj));
+   EXPECT_CALL(*evasMock, evas_map_new(_));
+   EXPECT_CALL(*evasMock, evas_map_direct_render_set(_, _));
    E_Map *map = e_map_new();
 
    Evas_Map dup_map_obj;
    ON_CALL(*evasMock, evas_map_dup(&map_obj)).WillByDefault(Return(&dup_map_obj));
+   EXPECT_CALL(*evasMock, evas_map_dup(_));
    e_view_map_set(&view, map);
    ASSERT_NE(e_view_map_get(&view), nullptr);
+   EXPECT_CALL(*evasMock, evas_map_free(_));
    e_map_free(map);
 
+   EXPECT_CALL(*evasMock, evas_map_free(_));
    e_view_map_set(&view, NULL);
    ASSERT_EQ(e_view_map_get(&view), nullptr);
-
-   delete evasMock;
 }
 
-TEST(EViewTest, Test_E_View_Reparent)
+TEST_F(EViewTest, Test_E_View_Reparent)
 {
-   evasMock = new EvasMock();
-
    E_View_Tree parent1, parent2;
    e_view_tree_init(&parent1, NULL, NULL);
    e_view_tree_init(&parent2, NULL, NULL);
@@ -1007,26 +987,18 @@ TEST(EViewTest, Test_E_View_Reparent)
    ASSERT_EQ(e_view_parent_get(&view), &parent2);
    ASSERT_EQ(parent2.children.next, &view.link);
    ASSERT_EQ(wl_list_empty(&parent1.children), true);
-
-   delete evasMock;
 }
 
-TEST(EViewTest, Test_E_View_Reparent_With_Null_Parent)
+TEST_F(EViewTest, Test_E_View_Reparent_With_Null_Parent)
 {
-   evasMock = new EvasMock();
-
    E_View view;
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
 
    EXPECT_ABORT(e_view_reparent(&view, NULL));
-
-   delete evasMock;
 }
 
-TEST(EViewTest, Test_E_View_Reparent_With_Invalid_Parent)
+TEST_F(EViewTest, Test_E_View_Reparent_With_Invalid_Parent)
 {
-   evasMock = new EvasMock();
-
    E_View_Tree parent1, parent2;
    e_view_tree_init(&parent1, NULL, NULL);
    e_view_tree_init(&parent2, NULL, &parent1);
@@ -1043,14 +1015,10 @@ TEST(EViewTest, Test_E_View_Reparent_With_Invalid_Parent)
 
    /* Cannot reparent a view with one of its descendants */
    EXPECT_ABORT(e_view_reparent(&parent1.view, &parent2));
-
-   delete evasMock;
 }
 
-TEST(EViewTest, Test_E_View_Reparent_With_Evas_Object)
+TEST_F(EViewTest, Test_E_View_Reparent_With_Evas_Object)
 {
-   evasMock = new EvasMock();
-
    E_View_Tree parent1, parent2;
    e_view_tree_init(&parent1, NULL, NULL);
    e_view_tree_init(&parent2, NULL, NULL);
@@ -1062,8 +1030,15 @@ TEST(EViewTest, 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_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_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_move(_, _, _)).Times(AnyNumber());
    e_view_init(&view3, E_VIEW_TYPE_RECT, NULL, &v3_obj, &parent2);
 
    /*
@@ -1104,16 +1079,13 @@ TEST(EViewTest, Test_E_View_Reparent_With_Evas_Object)
     */
    EXPECT_CALL(*evasMock, evas_object_stack_below(&v3_obj, &v1_obj)).Times(1);
    e_view_reparent(&view3, &parent1);
-
-   delete evasMock;
 }
 
-TEST(EViewTest, Test_E_View_Pass_Events_Set_Get)
+TEST_F(EViewTest, Test_E_View_Pass_Events_Set_Get)
 {
-   evasMock = new EvasMock();
-
    E_View view;
    Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, obj, NULL);
 
    EXPECT_CALL(*evasMock, evas_object_pass_events_set(obj, true))
@@ -1125,24 +1097,23 @@ TEST(EViewTest, Test_E_View_Pass_Events_Set_Get)
    e_view_pass_events_get(&view);
 
    free(obj);
-   delete evasMock;
 }
 
-TEST(EViewTest, Test_E_View_Layer_Index_Get)
+TEST_F(EViewTest, Test_E_View_Layer_Index_Get)
 {
    Evas evas;
    E_Canvas *canvas = e_canvas_create(&evas);
 
    E_View views[E_CANVAS_LAYER_MAX + 1];
    for (int layer = E_CANVAS_LAYER_BOTTOM; layer <= E_CANVAS_LAYER_MAX; layer++) {
-        E_View_Tree *tree = e_canvas_layer_view_tree_get(canvas, static_cast<E_Canvas_Layer>(layer));
-        E_View *view = &views[layer];
-        e_view_init(view, E_VIEW_TYPE_RECT, NULL, NULL, tree);
-        ASSERT_EQ(e_view_layer_index_get(view), static_cast<E_Canvas_Layer>(layer));
+      E_View_Tree *tree = e_canvas_layer_view_tree_get(canvas, static_cast<E_Canvas_Layer>(layer));
+      E_View *view = &views[layer];
+      e_view_init(view, E_VIEW_TYPE_RECT, NULL, NULL, tree);
+      ASSERT_EQ(e_view_layer_index_get(view), static_cast<E_Canvas_Layer>(layer));
    }
 }
 
-TEST(EViewTest, Test_E_View_Layer_Index_Get_With_Invalid_View)
+TEST_F(EViewTest, Test_E_View_Layer_Index_Get_With_Invalid_View)
 {
    E_View view;
    e_view_init(&view, E_VIEW_TYPE_RECT, NULL, NULL, NULL);
index 7fd52baee24da0829c07b766827abc63070ebc83..9f7361008e81db78866c965f374871e69b97ee8f 100644 (file)
@@ -24,213 +24,216 @@ using ::testing::AnyNumber;
 class EViewEventTest : public ::testing::Test
 {
 public:
-       Evas_Object obj1, obj2, obj3;
-       E_View_Tree root, tree1, tree2;
-       E_View view1, view2, view3;
-
-       void SetUp(void) override {
-               evasMock = new EvasMock();
-
-               e_view_tree_init(&root, NULL, NULL);
-               e_view_position_set(&root.view, 0, 0);
-
-               e_view_tree_init(&tree1, NULL, &root);
-               e_view_position_set(&tree1.view, 10,20);
-
-               e_view_tree_init(&tree2, NULL, &root);
-               e_view_position_set(&tree2.view, 30, 40);
-
-               EXPECT_CALL(*evasMock, evas_object_move(_, _, _))
-                       .Times(AnyNumber());
-               EXPECT_CALL(*evasMock, evas_object_stack_above(_, _))
-                       .Times(AnyNumber());
-
-               e_view_init(&view1, E_VIEW_TYPE_RECT, NULL, &obj1, &tree1);
-               view1.x = 100;
-               view1.y = 200;
-
-               e_view_init(&view2, E_VIEW_TYPE_RECT, NULL, &obj2, &tree2);
-               view2.x = 300;
-               view2.y = 400;
-
-               e_view_init(&view3, E_VIEW_TYPE_RECT, NULL, &obj3, &tree2);
-               view3.x = 500;
-               view3.y = 600;
-       }
-
-       void TearDown(void) override {
-               delete evasMock;
-       }
+   Evas_Object obj1, obj2, obj3;
+   E_View_Tree root, tree1, tree2;
+   E_View view1, view2, view3;
+
+   void SetUp(void) override {
+      evasMock = new EvasMock();
+
+      e_view_tree_init(&root, NULL, NULL);
+      e_view_position_set(&root.view, 0, 0);
+
+      e_view_tree_init(&tree1, NULL, &root);
+      e_view_position_set(&tree1.view, 10,20);
+
+      e_view_tree_init(&tree2, NULL, &root);
+      e_view_position_set(&tree2.view, 30, 40);
+
+      EXPECT_CALL(*evasMock, evas_object_move(_, _, _))
+         .Times(AnyNumber());
+      EXPECT_CALL(*evasMock, evas_object_stack_above(_, _))
+         .Times(AnyNumber());
+
+      EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+      e_view_init(&view1, E_VIEW_TYPE_RECT, NULL, &obj1, &tree1);
+      view1.x = 100;
+      view1.y = 200;
+
+      EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+      e_view_init(&view2, E_VIEW_TYPE_RECT, NULL, &obj2, &tree2);
+      view2.x = 300;
+      view2.y = 400;
+
+      EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+      e_view_init(&view3, E_VIEW_TYPE_RECT, NULL, &obj3, &tree2);
+      view3.x = 500;
+      view3.y = 600;
+   }
+
+   void TearDown(void) override {
+      delete evasMock;
+   }
 };
 
 typedef struct test_container
 {
-       E_View *view;
-       struct wl_listener listener;
+   E_View *view;
+   struct wl_listener listener;
 } test_container;
 
 static bool show_notify_callback_1_called = false;
 static void
 _show_notify_callback_1(struct wl_listener *listener, void *data)
 {
-       E_View_Event_Callback_Data *callback_data = (E_View_Event_Callback_Data *)data;
+   E_View_Event_Callback_Data *callback_data = (E_View_Event_Callback_Data *)data;
 
-       test_container *container = wl_container_of(listener, container, listener);
-       ASSERT_NE(nullptr, container);
-       EXPECT_EQ(container->view, callback_data->view);
-       EXPECT_EQ(nullptr, callback_data->event_info);
-       EXPECT_EQ(true, callback_data->view->visible);
+   test_container *container = wl_container_of(listener, container, listener);
+   ASSERT_NE(nullptr, container);
+   EXPECT_EQ(container->view, callback_data->view);
+   EXPECT_EQ(nullptr, callback_data->event_info);
+   EXPECT_EQ(true, callback_data->view->visible);
 
-       show_notify_callback_1_called = true;
+   show_notify_callback_1_called = true;
 }
 
 static bool show_notify_callback_2_called = false;
 static void
 _show_notify_callback_2(struct wl_listener *listener, void *data)
 {
-       E_View_Event_Callback_Data *callback_data = (E_View_Event_Callback_Data *)data;
+   E_View_Event_Callback_Data *callback_data = (E_View_Event_Callback_Data *)data;
 
-       test_container *container = wl_container_of(listener, container, listener);
-       ASSERT_NE(nullptr, container);
-       EXPECT_EQ(container->view, callback_data->view);
-       EXPECT_EQ(nullptr, callback_data->event_info);
-       EXPECT_EQ(true, callback_data->view->visible);
+   test_container *container = wl_container_of(listener, container, listener);
+   ASSERT_NE(nullptr, container);
+   EXPECT_EQ(container->view, callback_data->view);
+   EXPECT_EQ(nullptr, callback_data->event_info);
+   EXPECT_EQ(true, callback_data->view->visible);
 
-       show_notify_callback_2_called = true;
+   show_notify_callback_2_called = true;
 }
 
 TEST_F(EViewEventTest, Test_E_View_Event_Show_Callback_Add_Del)
 {
-       this->root.view.visible = true;
-       this->tree1.view.visible = true;
+   this->root.view.visible = true;
+   this->tree1.view.visible = true;
 
-       test_container *container = (test_container *)malloc(sizeof(test_container));
-       ASSERT_NE(nullptr, container);
+   test_container *container = (test_container *)malloc(sizeof(test_container));
+   ASSERT_NE(nullptr, container);
 
-       container->view = &this->view1;
-       container->listener.notify = _show_notify_callback_1;
+   container->view = &this->view1;
+   container->listener.notify = _show_notify_callback_1;
 
-       Evas_Object_Event_Cb callback = e_view_event_callback_get(E_VIEW_SHOW);
-       ASSERT_NE(nullptr, callback);
+   Evas_Object_Event_Cb callback = e_view_event_callback_get(E_VIEW_SHOW);
+   ASSERT_NE(nullptr, callback);
 
-       EXPECT_CALL(*evasMock, evas_object_event_callback_add(&this->obj1, EVAS_CALLBACK_SHOW, _, &this->view1))
-               .Times(1);
+   EXPECT_CALL(*evasMock, evas_object_event_callback_add(&this->obj1, EVAS_CALLBACK_SHOW, _, &this->view1))
+      .Times(1);
 
-       e_view_event_listener_add(&this->view1, E_VIEW_SHOW, &container->listener);
+   e_view_event_listener_add(&this->view1, E_VIEW_SHOW, &container->listener);
 
-       ASSERT_NE(1, wl_list_empty(&this->view1.signals[E_VIEW_SHOW].listener_list));
+   ASSERT_NE(1, wl_list_empty(&this->view1.signals[E_VIEW_SHOW].listener_list));
 
-       ON_CALL(*evasMock, evas_object_show(&this->obj1))
-               .WillByDefault([this, callback] {
-                       callback(&this->view1, NULL, &this->obj1, NULL);
-               });
-       EXPECT_CALL(*evasMock, evas_object_show(&this->obj1))
-               .Times(1)
-               .WillOnce(DoDefault());
-       e_view_show(&this->view1);
+   ON_CALL(*evasMock, evas_object_show(&this->obj1))
+      .WillByDefault([this, callback] {
+         callback(&this->view1, NULL, &this->obj1, NULL);
+      });
+   EXPECT_CALL(*evasMock, evas_object_show(&this->obj1))
+      .Times(1)
+      .WillOnce(DoDefault());
+   e_view_show(&this->view1);
 
-       EXPECT_TRUE(show_notify_callback_1_called);
+   EXPECT_TRUE(show_notify_callback_1_called);
 
-       /* reset */
-       this->view1.visible = false;
-       show_notify_callback_1_called = false;
+   /* reset */
+   this->view1.visible = false;
+   show_notify_callback_1_called = false;
 
-       EXPECT_CALL(*evasMock, evas_object_event_callback_del(&this->obj1, EVAS_CALLBACK_SHOW, _))
-               .Times(1);
+   EXPECT_CALL(*evasMock, evas_object_event_callback_del(&this->obj1, EVAS_CALLBACK_SHOW, _))
+      .Times(1);
 
-       e_view_event_listener_del(&this->view1, E_VIEW_SHOW, &container->listener);
+   e_view_event_listener_del(&this->view1, E_VIEW_SHOW, &container->listener);
 
-       ASSERT_EQ(1, wl_list_empty(&this->view1.signals[E_VIEW_SHOW].listener_list));
+   ASSERT_EQ(1, wl_list_empty(&this->view1.signals[E_VIEW_SHOW].listener_list));
 
-       EXPECT_CALL(*evasMock, evas_object_show(&this->obj1))
-               .Times(1)
-               .WillOnce(DoDefault());
-       e_view_show(&this->view1);
+   EXPECT_CALL(*evasMock, evas_object_show(&this->obj1))
+      .Times(1)
+      .WillOnce(DoDefault());
+   e_view_show(&this->view1);
 
-       EXPECT_FALSE(show_notify_callback_1_called);
+   EXPECT_FALSE(show_notify_callback_1_called);
 }
 
 TEST_F(EViewEventTest, Test_E_View_Event_Show_Callback_Multiple_Add_Del)
 {
-       this->root.view.visible = true;
-       this->tree1.view.visible = true;
-       show_notify_callback_1_called = false;
-       show_notify_callback_2_called = false;
-
-       test_container *container_1 = (test_container *)malloc(sizeof(test_container));
-       ASSERT_NE(nullptr, container_1);
-       container_1->view = &this->view1;
-       container_1->listener.notify = _show_notify_callback_1;
-
-       test_container *container_2 = (test_container *)malloc(sizeof(test_container));
-       ASSERT_NE(nullptr, container_2);
-       container_2->view = &this->view1;
-       container_2->listener.notify = _show_notify_callback_2;
-
-       Evas_Object_Event_Cb callback = e_view_event_callback_get(E_VIEW_SHOW);
-       ASSERT_NE(nullptr, callback);
-
-       EXPECT_CALL(*evasMock, evas_object_event_callback_add(&this->obj1, EVAS_CALLBACK_SHOW, _, &this->view1))
-               .Times(1);
-       e_view_event_listener_add(&this->view1, E_VIEW_SHOW, &container_1->listener);
-
-       ASSERT_NE(1, wl_list_empty(&this->view1.signals[E_VIEW_SHOW].listener_list));
-
-       EXPECT_CALL(*evasMock, evas_object_event_callback_add(&this->obj1, EVAS_CALLBACK_SHOW, _, &this->view1))
-               .Times(0);
-       e_view_event_listener_add(&this->view1, E_VIEW_SHOW, &container_2->listener);
-
-       ASSERT_NE(1, wl_list_empty(&this->view1.signals[E_VIEW_SHOW].listener_list));
-
-       ON_CALL(*evasMock, evas_object_show(&this->obj1))
-               .WillByDefault([this, callback] {
-                       callback(&this->view1, NULL, &this->obj1, NULL);
-               });
-       EXPECT_CALL(*evasMock, evas_object_show(&this->obj1))
-               .Times(1)
-               .WillOnce(DoDefault());
-       e_view_show(&this->view1);
-
-       EXPECT_TRUE(show_notify_callback_1_called);
-       EXPECT_TRUE(show_notify_callback_2_called);
-
-       /* reset */
-       this->view1.visible = false;
-       show_notify_callback_1_called = false;
-       show_notify_callback_1_called = false;
-
-       EXPECT_CALL(*evasMock, evas_object_event_callback_del(&this->obj1, EVAS_CALLBACK_SHOW, _))
-               .Times(0);
-
-       /* delete listener 1 */
-       e_view_event_listener_del(&this->view1, E_VIEW_SHOW, &container_1->listener);
-       ASSERT_NE(1, wl_list_empty(&this->view1.signals[E_VIEW_SHOW].listener_list));
-
-       EXPECT_CALL(*evasMock, evas_object_show(&this->obj1))
-               .Times(1)
-               .WillOnce(DoDefault());
-       e_view_show(&this->view1);
-
-       EXPECT_FALSE(show_notify_callback_1_called);
-       EXPECT_TRUE(show_notify_callback_2_called);
-
-       /* reset */
-       this->view1.visible = false;
-       show_notify_callback_1_called = false;
-       show_notify_callback_2_called = false;
-
-       EXPECT_CALL(*evasMock, evas_object_event_callback_del(&this->obj1, EVAS_CALLBACK_SHOW, _))
-               .Times(1);
-
-       /* delete listener 2 */
-       e_view_event_listener_del(&this->view1, E_VIEW_SHOW, &container_2->listener);
-       ASSERT_EQ(1, wl_list_empty(&this->view1.signals[E_VIEW_SHOW].listener_list));
-
-       EXPECT_CALL(*evasMock, evas_object_show(&this->obj1))
-               .Times(1)
-               .WillOnce(DoDefault());
-       e_view_show(&this->view1);
-
-       EXPECT_FALSE(show_notify_callback_1_called);
-       EXPECT_FALSE(show_notify_callback_2_called);
+   this->root.view.visible = true;
+   this->tree1.view.visible = true;
+   show_notify_callback_1_called = false;
+   show_notify_callback_2_called = false;
+
+   test_container *container_1 = (test_container *)malloc(sizeof(test_container));
+   ASSERT_NE(nullptr, container_1);
+   container_1->view = &this->view1;
+   container_1->listener.notify = _show_notify_callback_1;
+
+   test_container *container_2 = (test_container *)malloc(sizeof(test_container));
+   ASSERT_NE(nullptr, container_2);
+   container_2->view = &this->view1;
+   container_2->listener.notify = _show_notify_callback_2;
+
+   Evas_Object_Event_Cb callback = e_view_event_callback_get(E_VIEW_SHOW);
+   ASSERT_NE(nullptr, callback);
+
+   EXPECT_CALL(*evasMock, evas_object_event_callback_add(&this->obj1, EVAS_CALLBACK_SHOW, _, &this->view1))
+      .Times(1);
+   e_view_event_listener_add(&this->view1, E_VIEW_SHOW, &container_1->listener);
+
+   ASSERT_NE(1, wl_list_empty(&this->view1.signals[E_VIEW_SHOW].listener_list));
+
+   EXPECT_CALL(*evasMock, evas_object_event_callback_add(&this->obj1, EVAS_CALLBACK_SHOW, _, &this->view1))
+      .Times(0);
+   e_view_event_listener_add(&this->view1, E_VIEW_SHOW, &container_2->listener);
+
+   ASSERT_NE(1, wl_list_empty(&this->view1.signals[E_VIEW_SHOW].listener_list));
+
+   ON_CALL(*evasMock, evas_object_show(&this->obj1))
+      .WillByDefault([this, callback] {
+         callback(&this->view1, NULL, &this->obj1, NULL);
+      });
+   EXPECT_CALL(*evasMock, evas_object_show(&this->obj1))
+      .Times(1)
+      .WillOnce(DoDefault());
+   e_view_show(&this->view1);
+
+   EXPECT_TRUE(show_notify_callback_1_called);
+   EXPECT_TRUE(show_notify_callback_2_called);
+
+   /* reset */
+   this->view1.visible = false;
+   show_notify_callback_1_called = false;
+   show_notify_callback_1_called = false;
+
+   EXPECT_CALL(*evasMock, evas_object_event_callback_del(&this->obj1, EVAS_CALLBACK_SHOW, _))
+      .Times(0);
+
+   /* delete listener 1 */
+   e_view_event_listener_del(&this->view1, E_VIEW_SHOW, &container_1->listener);
+   ASSERT_NE(1, wl_list_empty(&this->view1.signals[E_VIEW_SHOW].listener_list));
+
+   EXPECT_CALL(*evasMock, evas_object_show(&this->obj1))
+      .Times(1)
+      .WillOnce(DoDefault());
+   e_view_show(&this->view1);
+
+   EXPECT_FALSE(show_notify_callback_1_called);
+   EXPECT_TRUE(show_notify_callback_2_called);
+
+   /* reset */
+   this->view1.visible = false;
+   show_notify_callback_1_called = false;
+   show_notify_callback_2_called = false;
+
+   EXPECT_CALL(*evasMock, evas_object_event_callback_del(&this->obj1, EVAS_CALLBACK_SHOW, _))
+      .Times(1);
+
+   /* delete listener 2 */
+   e_view_event_listener_del(&this->view1, E_VIEW_SHOW, &container_2->listener);
+   ASSERT_EQ(1, wl_list_empty(&this->view1.signals[E_VIEW_SHOW].listener_list));
+
+   EXPECT_CALL(*evasMock, evas_object_show(&this->obj1))
+      .Times(1)
+      .WillOnce(DoDefault());
+   e_view_show(&this->view1);
+
+   EXPECT_FALSE(show_notify_callback_1_called);
+   EXPECT_FALSE(show_notify_callback_2_called);
 }
index 6c89d14a315ea3a63862901d417af50c0121b1c4..13a3c91620c7cc6d81d2d4d9ea82de5949e6d58a 100755 (executable)
@@ -9,924 +9,1038 @@ using ::testing::Return;
 using ::testing::_;
 using ::testing::SetArgPointee;
 using ::testing::DoAll;
+using ::testing::AnyNumber;
 
 class EViewImageTest : public ::testing::Test
 {
 public:
-       Evas *evas;
-       E_Canvas *canvas;
-       E_View_Tree *tree;
-
-       void SetUp(void) override {
-                evasMock = new EvasMock();
-                this->evas = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-                this->canvas = e_canvas_create(this->evas);
-                this->tree = e_canvas_layer_view_tree_get(this->canvas, E_CANVAS_LAYER_BOTTOM);
-       }
-
-       void TearDown(void) override {
-                e_canvas_destroy(this->canvas);
-                free(this->evas);
-                delete evasMock;
-       }
+   Evas *evas;
+   E_Canvas *canvas;
+   E_View_Tree *tree;
+
+   void SetUp(void) override {
+      evasMock = new EvasMock();
+      this->evas = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+      this->canvas = e_canvas_create(this->evas);
+      this->tree = e_canvas_layer_view_tree_get(this->canvas, E_CANVAS_LAYER_BOTTOM);
+   }
+
+   void TearDown(void) override {
+      e_canvas_destroy(this->canvas);
+      free(this->evas);
+      delete evasMock;
+   }
 };
 
 TEST_F(EViewImageTest, Test_E_View_Image_Create)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       EXPECT_CALL(*evasMock, evas_object_image_add(_))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-    E_View_Image *image = e_view_image_create(this->tree);
-       EXPECT_NE(image, nullptr);
-       E_View *view = e_view_image_view_get(image);
-       EXPECT_NE(view, nullptr);
-
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   EXPECT_CALL(*evasMock, evas_object_image_add(_))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   EXPECT_NE(image, nullptr);
+   E_View *view = e_view_image_view_get(image);
+   EXPECT_NE(view, nullptr);
+
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_view_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
-
-       // test code start
-
-       E_View_Image *image_from_view = e_view_image_try_from_view(view);
-       EXPECT_EQ(image_from_view, image);
-       E_View *parent_view = e_view_tree_view_get(this->tree);
-       EXPECT_NE(parent_view, nullptr);
-       E_View_Image *parent_image_from_view = e_view_image_try_from_view(parent_view);
-       EXPECT_EQ(parent_image_from_view, nullptr);
-
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
+
+   // test code start
+
+   E_View_Image *image_from_view = e_view_image_try_from_view(view);
+   EXPECT_EQ(image_from_view, image);
+   E_View *parent_view = e_view_tree_view_get(this->tree);
+   EXPECT_NE(parent_view, nullptr);
+   E_View_Image *parent_image_from_view = e_view_image_try_from_view(parent_view);
+   EXPECT_EQ(parent_image_from_view, nullptr);
+
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_alpha_set_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
 
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
 
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
 
-       // test code start
+   // test code start
 
-       EXPECT_CALL(*evasMock, evas_object_image_alpha_set(obj, EINA_TRUE))
-               .Times(1);
+   EXPECT_CALL(*evasMock, evas_object_image_alpha_set(obj, EINA_TRUE))
+      .Times(1);
 
-       e_view_image_alpha_set(image, EINA_TRUE);
+   e_view_image_alpha_set(image, EINA_TRUE);
 
-       EXPECT_CALL(*evasMock, evas_object_image_alpha_get(obj))
-               .Times(2)
-               .WillOnce(Return(EINA_TRUE))
-               .WillOnce(Return(EINA_FALSE));
+   EXPECT_CALL(*evasMock, evas_object_image_alpha_get(obj))
+      .Times(2)
+      .WillOnce(Return(EINA_TRUE))
+      .WillOnce(Return(EINA_FALSE));
 
-       Eina_Bool ret = e_view_image_alpha_get(image);
-       EXPECT_EQ(ret, EINA_TRUE);
+   Eina_Bool ret = e_view_image_alpha_get(image);
+   EXPECT_EQ(ret, EINA_TRUE);
 
-       ret = e_view_image_alpha_get(image);
-       EXPECT_EQ(ret, EINA_FALSE);
+   ret = e_view_image_alpha_get(image);
+   EXPECT_EQ(ret, EINA_FALSE);
 
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_animated_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
 
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
 
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
 
-       // test code start
+   // test code start
 
-       EXPECT_CALL(*evasMock, evas_object_image_animated_get(obj))
-               .WillOnce(Return(EINA_TRUE));
+   EXPECT_CALL(*evasMock, evas_object_image_animated_get(obj))
+      .WillOnce(Return(EINA_TRUE));
 
-       Eina_Bool ret = e_view_image_animated_get(image);
-       EXPECT_EQ(ret, EINA_TRUE);
+   Eina_Bool ret = e_view_image_animated_get(image);
+   EXPECT_EQ(ret, EINA_TRUE);
 
-       EXPECT_CALL(*evasMock, evas_object_image_animated_get(obj))
-               .WillOnce(Return(EINA_FALSE));
+   EXPECT_CALL(*evasMock, evas_object_image_animated_get(obj))
+      .WillOnce(Return(EINA_FALSE));
 
-       ret = e_view_image_animated_get(image);
-       EXPECT_EQ(ret, EINA_FALSE);
+   ret = e_view_image_animated_get(image);
+   EXPECT_EQ(ret, EINA_FALSE);
 
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_vew_image_animated_frame_set_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
 
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
 
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
 
-       // test code start
-       int frame = 3;
+   // test code start
+   int frame = 3;
 
-       EXPECT_CALL(*evasMock, evas_object_image_animated_frame_set(obj, frame))
-               .Times(1);
-       e_view_image_animated_frame_set(image, frame);
+   EXPECT_CALL(*evasMock, evas_object_image_animated_frame_set(obj, frame))
+      .Times(1);
+   e_view_image_animated_frame_set(image, frame);
 
-       EXPECT_CALL(*evasMock, evas_object_image_animated_frame_get(obj))
-               .WillOnce(Return(frame));
+   EXPECT_CALL(*evasMock, evas_object_image_animated_frame_get(obj))
+      .WillOnce(Return(frame));
 
-       int ret = e_view_image_animated_frame_get(image);
-       EXPECT_EQ(ret, frame);
+   int ret = e_view_image_animated_frame_get(image);
+   EXPECT_EQ(ret, frame);
 
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_animated_frame_count_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
 
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
 
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
 
 
-       // test code start
-       int frame = 3;
+   // test code start
+   int frame = 3;
 
-       EXPECT_CALL(*evasMock, evas_object_image_animated_frame_get(obj))
-               .WillOnce(Return(frame));
+   EXPECT_CALL(*evasMock, evas_object_image_animated_frame_get(obj))
+      .WillOnce(Return(frame));
 
-       int ret = e_view_image_animated_frame_get(image);
-       EXPECT_EQ(ret, frame);
+   int ret = e_view_image_animated_frame_get(image);
+   EXPECT_EQ(ret, frame);
 
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_animated_frame_duration_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
-
-       // test code start
-       double duration = 3.0;
-       int start_frame = 1;
-       int frame_num = 3;
-
-       EXPECT_CALL(*evasMock, evas_object_image_animated_frame_duration_get(obj, start_frame, frame_num))
-               .WillOnce(Return(duration));
-
-       double ret = e_view_image_animated_frame_duration_get(image, start_frame, frame_num);
-       EXPECT_EQ(ret, duration);
-
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
+
+   // test code start
+   double duration = 3.0;
+   int start_frame = 1;
+   int frame_num = 3;
+
+   EXPECT_CALL(*evasMock, evas_object_image_animated_frame_duration_get(obj, start_frame, frame_num))
+      .WillOnce(Return(duration));
+
+   double ret = e_view_image_animated_frame_duration_get(image, start_frame, frame_num);
+   EXPECT_EQ(ret, duration);
+
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_border_center_fill_set_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
 
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
 
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
 
-       // test code start
-       E_View_Border_Fill_Mode fill_mode = E_VIEW_BORDER_FILL_NONE;
-       EXPECT_CALL(*evasMock, evas_object_image_border_center_fill_set(obj, EVAS_BORDER_FILL_NONE))
-               .Times(1);
+   // test code start
+   E_View_Border_Fill_Mode fill_mode = E_VIEW_BORDER_FILL_NONE;
+   EXPECT_CALL(*evasMock, evas_object_image_border_center_fill_set(obj, EVAS_BORDER_FILL_NONE))
+      .Times(1);
 
-       e_view_image_border_center_fill_set(image, fill_mode);
+   e_view_image_border_center_fill_set(image, fill_mode);
 
-       EXPECT_CALL(*evasMock, evas_object_image_border_center_fill_get(obj))
-               .Times(1)
-               .WillOnce(Return(EVAS_BORDER_FILL_NONE));
+   EXPECT_CALL(*evasMock, evas_object_image_border_center_fill_get(obj))
+      .Times(1)
+      .WillOnce(Return(EVAS_BORDER_FILL_NONE));
 
-       E_View_Border_Fill_Mode ret = e_view_image_border_center_fill_get(image);
-       EXPECT_EQ(fill_mode, ret);
+   E_View_Border_Fill_Mode ret = e_view_image_border_center_fill_get(image);
+   EXPECT_EQ(fill_mode, ret);
 
-       fill_mode = E_VIEW_BORDER_FILL_DEFAULT;
-       EXPECT_CALL(*evasMock, evas_object_image_border_center_fill_set(obj, EVAS_BORDER_FILL_DEFAULT))
-               .Times(1);
+   fill_mode = E_VIEW_BORDER_FILL_DEFAULT;
+   EXPECT_CALL(*evasMock, evas_object_image_border_center_fill_set(obj, EVAS_BORDER_FILL_DEFAULT))
+      .Times(1);
 
-       e_view_image_border_center_fill_set(image, fill_mode);
+   e_view_image_border_center_fill_set(image, fill_mode);
 
-       EXPECT_CALL(*evasMock, evas_object_image_border_center_fill_get(obj))
-               .Times(1)
-               .WillOnce(Return(EVAS_BORDER_FILL_DEFAULT));
+   EXPECT_CALL(*evasMock, evas_object_image_border_center_fill_get(obj))
+      .Times(1)
+      .WillOnce(Return(EVAS_BORDER_FILL_DEFAULT));
 
-       ret = e_view_image_border_center_fill_get(image);
-       EXPECT_EQ(fill_mode, ret);
+   ret = e_view_image_border_center_fill_get(image);
+   EXPECT_EQ(fill_mode, ret);
 
-       fill_mode = E_VIEW_BORDER_FILL_SOLID;
-       EXPECT_CALL(*evasMock, evas_object_image_border_center_fill_set(obj, EVAS_BORDER_FILL_SOLID))
-               .Times(1);
+   fill_mode = E_VIEW_BORDER_FILL_SOLID;
+   EXPECT_CALL(*evasMock, evas_object_image_border_center_fill_set(obj, EVAS_BORDER_FILL_SOLID))
+      .Times(1);
 
-       e_view_image_border_center_fill_set(image, fill_mode);
+   e_view_image_border_center_fill_set(image, fill_mode);
 
-       EXPECT_CALL(*evasMock, evas_object_image_border_center_fill_get(obj))
-               .Times(1)
-               .WillOnce(Return(EVAS_BORDER_FILL_SOLID));
+   EXPECT_CALL(*evasMock, evas_object_image_border_center_fill_get(obj))
+      .Times(1)
+      .WillOnce(Return(EVAS_BORDER_FILL_SOLID));
 
-       ret = e_view_image_border_center_fill_get(image);
-       EXPECT_EQ(fill_mode, ret);
-       
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   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(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_border_set_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
-
-       // test code start
-       int l = 10;
-       int r = 20;
-       int t = 30;
-       int b = 40;
-
-       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;
-       EXPECT_CALL(*evasMock, evas_object_image_border_get(obj, &ret_l, &ret_r, &ret_t, &ret_b))
-               .Times(1)
-               .WillOnce(DoAll(SetArgPointee<1>(l),
-                                               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);
-       EXPECT_EQ(t, ret_t);
-       EXPECT_EQ(b, ret_b);
-
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
-       
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
+
+   // test code start
+   int l = 10;
+   int r = 20;
+   int t = 30;
+   int b = 40;
+
+   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;
+   EXPECT_CALL(*evasMock, evas_object_image_border_get(obj, &ret_l, &ret_r, &ret_t, &ret_b))
+      .Times(1)
+      .WillOnce(DoAll(SetArgPointee<1>(l),
+                      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);
+   EXPECT_EQ(t, ret_t);
+   EXPECT_EQ(b, ret_b);
+
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
+   
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_colorspace_set_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
-
-       // 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(_));
-       e_view_destroy(view);
-       free(obj);      
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
+
+   // 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(_, _));
+   e_view_destroy(view);
+   free(obj);  
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_data_copy_set)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
-
-       // test code start
-       // raw data copy is needed width, height, colorspace is must be setted.
-       // this is just test evas's function is called or not
-       void* data = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       EXPECT_CALL(*evasMock, evas_object_image_data_copy_set(obj, data))
-               .Times(1);
-
-       e_view_image_data_copy_set(image, data);
-       free(data);
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
+
+   // test code start
+   // raw data copy is needed width, height, colorspace is must be setted.
+   // this is just test evas's function is called or not
+   void* data = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   EXPECT_CALL(*evasMock, evas_object_image_data_copy_set(obj, data))
+      .Times(1);
+
+   e_view_image_data_copy_set(image, data);
+   free(data);
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_data_set_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
-
-       // test code start
-       // test code start
-       // raw data copy is needed width, height, colorspace is must be setted.
-       // this is just test evas's function is called or not
-       void* data = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       EXPECT_CALL(*evasMock, evas_object_image_data_set(obj, data))
-               .Times(1);
-
-       e_view_image_data_set(image, data);
-
-       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(_));
-       e_view_destroy(view);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
+
+   // test code start
+   // test code start
+   // raw data copy is needed width, height, colorspace is must be setted.
+   // this is just test evas's function is called or not
+   void* data = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   EXPECT_CALL(*evasMock, evas_object_image_data_set(obj, data))
+      .Times(1);
+
+   e_view_image_data_set(image, data);
+
+   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(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_data_update_add)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
-
-       // 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(_));
-       e_view_destroy(view);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
+
+   // 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(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_file_set_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
-
-       // test code start
-       const char file[] = "temp.txt";
-       const char key[] = "key0";
-
-       EXPECT_CALL(*evasMock, evas_object_image_file_set(obj, file, key))
-               .Times(1);
-       
-       e_view_image_file_set(image, file, key);
-
-       char *ret_file;
-       char *ret_key;
-       EXPECT_CALL(*evasMock, evas_object_image_file_get(obj, _, _))
-               .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(_));
-       e_view_destroy(view);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
+
+   // test code start
+   const char file[] = "temp.txt";
+   const char key[] = "key0";
+
+   EXPECT_CALL(*evasMock, evas_object_image_file_set(obj, file, key))
+      .Times(1);
+   
+   e_view_image_file_set(image, file, key);
+
+   char *ret_file;
+   char *ret_key;
+   EXPECT_CALL(*evasMock, evas_object_image_file_get(obj, _, _))
+      .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(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_fill_set_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
-
-       // test code start
-       int x = 10;
-       int y = 20;
-       int w = 30;
-       int h = 40;
-       EXPECT_CALL(*evasMock, evas_object_image_fill_set(obj, x, y, w, h))
-               .Times(1);
-
-       e_view_image_fill_set(image, x, y, w, h);
-
-       int ret_x, ret_y, ret_w, ret_h;
-       EXPECT_CALL(*evasMock, evas_object_image_fill_get(obj, &ret_x, &ret_y, &ret_w, &ret_h))
-               .Times(1)
-               .WillOnce(DoAll(SetArgPointee<1>(x),
-                                               SetArgPointee<2>(y),
-                                               SetArgPointee<3>(w),
-                                               SetArgPointee<4>(h)));
-
-       e_view_image_fill_get(image, &ret_x, &ret_y, &ret_w, &ret_h);
-       EXPECT_EQ(ret_x, x);
-       EXPECT_EQ(ret_y, y);
-       EXPECT_EQ(ret_w, w);
-       EXPECT_EQ(ret_h, h);
-
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
+
+   // test code start
+   int x = 10;
+   int y = 20;
+   int w = 30;
+   int h = 40;
+   EXPECT_CALL(*evasMock, evas_object_image_fill_set(obj, x, y, w, h))
+      .Times(1);
+
+   e_view_image_fill_set(image, x, y, w, h);
+
+   int ret_x, ret_y, ret_w, ret_h;
+   EXPECT_CALL(*evasMock, evas_object_image_fill_get(obj, &ret_x, &ret_y, &ret_w, &ret_h))
+      .Times(1)
+      .WillOnce(DoAll(SetArgPointee<1>(x),
+                      SetArgPointee<2>(y),
+                      SetArgPointee<3>(w),
+                      SetArgPointee<4>(h)));
+
+   e_view_image_fill_get(image, &ret_x, &ret_y, &ret_w, &ret_h);
+   EXPECT_EQ(ret_x, x);
+   EXPECT_EQ(ret_y, y);
+   EXPECT_EQ(ret_w, w);
+   EXPECT_EQ(ret_h, h);
+
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_filled_set_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
 
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
 
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
 
-       // test code start
-       EXPECT_CALL(*evasMock, evas_object_image_filled_set(obj, EINA_TRUE))
-               .Times(1);
+   // test code start
+   EXPECT_CALL(*evasMock, evas_object_image_filled_set(obj, EINA_TRUE))
+      .Times(1);
 
-       e_view_image_filled_set(image, EINA_TRUE);
+   e_view_image_filled_set(image, EINA_TRUE);
 
-       EXPECT_CALL(*evasMock, evas_object_image_filled_get(obj))
-               .Times(1)
-               .WillOnce(Return(EINA_TRUE));
+   EXPECT_CALL(*evasMock, evas_object_image_filled_get(obj))
+      .Times(1)
+      .WillOnce(Return(EINA_TRUE));
 
-       Eina_Bool ret;
-       ret = e_view_image_filled_get(image);
-       EXPECT_EQ(ret, EINA_TRUE);
+   Eina_Bool ret;
+   ret = e_view_image_filled_get(image);
+   EXPECT_EQ(ret, EINA_TRUE);
 
-       EXPECT_CALL(*evasMock, evas_object_image_filled_get(obj))
-               .Times(1)
-               .WillOnce(Return(EINA_FALSE));
+   EXPECT_CALL(*evasMock, evas_object_image_filled_get(obj))
+      .Times(1)
+      .WillOnce(Return(EINA_FALSE));
 
-       ret = e_view_image_filled_get(image);
-       EXPECT_EQ(ret, EINA_FALSE);
+   ret = e_view_image_filled_get(image);
+   EXPECT_EQ(ret, EINA_FALSE);
 
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_load_error_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
-
-       // test code start
-       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(_));
-       e_view_destroy(view);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
+
+   // test code start
+   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(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_load_size_set_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
-
-       // test code start
-       int w = 10;
-       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;
-       EXPECT_CALL(*evasMock, evas_object_image_load_size_get(obj, &ret_w, &ret_h))
-               .Times(1)
-               .WillOnce(DoAll(SetArgPointee<1>(w),
-                                               SetArgPointee<2>(h)));
-
-       e_view_image_load_size_get(image, &ret_w, &ret_h);
-       EXPECT_EQ(ret_w, w);
-       EXPECT_EQ(ret_h, h);
-
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
+
+   // test code start
+   int w = 10;
+   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;
+   EXPECT_CALL(*evasMock, evas_object_image_load_size_get(obj, &ret_w, &ret_h))
+      .Times(1)
+      .WillOnce(DoAll(SetArgPointee<1>(w),
+                      SetArgPointee<2>(h)));
+
+   e_view_image_load_size_get(image, &ret_w, &ret_h);
+   EXPECT_EQ(ret_w, w);
+   EXPECT_EQ(ret_h, h);
+
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_native_surface_set_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
 
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
 
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
 
-       // test code start
-       E_View_Native_Surface surf;
-       surf.version = EVAS_NATIVE_SURFACE_VERSION;
-       surf.type = E_VIEW_NATIVE_SURFACE_NONE;
+   // test code start
+   E_View_Native_Surface surf;
+   surf.version = EVAS_NATIVE_SURFACE_VERSION;
+   surf.type = E_VIEW_NATIVE_SURFACE_NONE;
 
-       EXPECT_CALL(*evasMock, evas_object_image_native_surface_set(obj, _))
-               .Times(1);
+   EXPECT_CALL(*evasMock, evas_object_image_native_surface_set(obj, _))
+      .Times(1);
 
-       e_view_image_native_surface_set(image, &surf);
+   e_view_image_native_surface_set(image, &surf);
 
-       E_View_Native_Surface *ret = e_view_image_native_surface_get(image);
-       EXPECT_EQ(ret, nullptr);
+   E_View_Native_Surface *ret = e_view_image_native_surface_get(image);
+   EXPECT_EQ(ret, nullptr);
 
-       surf.version = EVAS_NATIVE_SURFACE_VERSION;
-       surf.type = E_VIEW_NATIVE_SURFACE_WL;
-       surf.data.wl.legacy_buffer = nullptr;
+   surf.version = EVAS_NATIVE_SURFACE_VERSION;
+   surf.type = E_VIEW_NATIVE_SURFACE_WL;
+   surf.data.wl.legacy_buffer = nullptr;
 
-       EXPECT_CALL(*evasMock, evas_object_image_native_surface_set(obj, _))
-               .Times(1);
+   EXPECT_CALL(*evasMock, evas_object_image_native_surface_set(obj, _))
+      .Times(1);
 
-       e_view_image_native_surface_set(image, &surf);
+   e_view_image_native_surface_set(image, &surf);
 
-       ret = e_view_image_native_surface_get(image);
-       EXPECT_NE(ret, nullptr);
+   ret = e_view_image_native_surface_get(image);
+   EXPECT_NE(ret, nullptr);
 
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_pixels_dirty_set_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
-
-       // test code start
-       Eina_Bool dirty = EINA_FALSE;
-       EXPECT_CALL(*evasMock, evas_object_image_pixels_dirty_set(obj, dirty))
-               .Times(1);
-       e_view_image_pixels_dirty_set(image, dirty);
-
-       EXPECT_CALL(*evasMock, evas_object_image_pixels_dirty_get(obj))
-               .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);
-       ret_dirty = e_view_image_pixels_dirty_get(image);
-       EXPECT_EQ(ret_dirty, EINA_FALSE);
-
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
+
+   // test code start
+   Eina_Bool dirty = EINA_FALSE;
+   EXPECT_CALL(*evasMock, evas_object_image_pixels_dirty_set(obj, dirty))
+      .Times(1);
+   e_view_image_pixels_dirty_set(image, dirty);
+
+   EXPECT_CALL(*evasMock, evas_object_image_pixels_dirty_get(obj))
+      .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);
+   ret_dirty = e_view_image_pixels_dirty_get(image);
+   EXPECT_EQ(ret_dirty, EINA_FALSE);
+
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 static void *cb_data;
 static void *cb_image;
 static void cb_pixel_get(void *data, E_View_Image *image)
 {
-       EXPECT_EQ(data, cb_data);
-       EXPECT_EQ(image, cb_image);
+   EXPECT_EQ(data, cb_data);
+   EXPECT_EQ(image, cb_image);
 };
 
 TEST_F(EViewImageTest, Test_e_view_image_pixels_get_callback_set)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
-
-       // test code start
-       int data = 2;
-       cb_data = (void*)&data;
-       cb_image = image;
-       EXPECT_CALL(*evasMock, evas_object_image_pixels_get_callback_set(obj, _, _))
-               .Times(1);
-
-       e_view_image_pixels_get_callback_set(image, &cb_pixel_get, cb_data);
-
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
+
+   // test code start
+   int data = 2;
+   cb_data = (void*)&data;
+   cb_image = image;
+   EXPECT_CALL(*evasMock, evas_object_image_pixels_get_callback_set(obj, _, _))
+      .Times(1);
+
+   e_view_image_pixels_get_callback_set(image, &cb_pixel_get, cb_data);
+
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_pixels_noti_callback_set)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
-
-       // test code start
-       int data = 2;
-       cb_data = (void*)&data;
-       cb_image = image;
-       EXPECT_CALL(*evasMock, evas_object_image_pixels_noti_callback_set(obj, _, _))
-               .Times(1);
-
-       e_view_image_pixels_noti_callback_set(image, &cb_pixel_get, cb_data);
-
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
+
+   // test code start
+   int data = 2;
+   cb_data = (void*)&data;
+   cb_image = image;
+   EXPECT_CALL(*evasMock, evas_object_image_pixels_noti_callback_set(obj, _, _))
+      .Times(1);
+
+   e_view_image_pixels_noti_callback_set(image, &cb_pixel_get, cb_data);
+
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_smooth_scale_set_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
-
-       // test code start
-       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);
-
-       ret_smooth_scale = e_view_image_smooth_scale_get(image);
-       EXPECT_EQ(ret_smooth_scale, EINA_FALSE);
-
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
+
+   // test code start
+   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);
+
+   ret_smooth_scale = e_view_image_smooth_scale_get(image);
+   EXPECT_EQ(ret_smooth_scale, EINA_FALSE);
+
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_size_set_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
-
-       // test code start
-       int w = 120, h = 240;
-       EXPECT_CALL(*evasMock, evas_object_image_size_set(obj, w, h))
-               .Times(1);      
-       e_view_image_size_set(image, w, h);
-
-       int ret_w, ret_h;
-       EXPECT_CALL(*evasMock, evas_object_image_size_get(obj, &ret_w, &ret_h))
-               .Times(1)
-               .WillOnce(DoAll(SetArgPointee<1>(w),
-                                               SetArgPointee<2>(h)));
-       e_view_image_size_get(image, &ret_w, &ret_h);
-       EXPECT_EQ(w, ret_w);
-       EXPECT_EQ(h, ret_h);
-
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
+
+   // test code start
+   int w = 120, h = 240;
+   EXPECT_CALL(*evasMock, evas_object_image_size_set(obj, w, h))
+      .Times(1);       
+   e_view_image_size_set(image, w, h);
+
+   int ret_w, ret_h;
+   EXPECT_CALL(*evasMock, evas_object_image_size_get(obj, &ret_w, &ret_h))
+      .Times(1)
+      .WillOnce(DoAll(SetArgPointee<1>(w),
+                      SetArgPointee<2>(h)));
+   e_view_image_size_get(image, &ret_w, &ret_h);
+   EXPECT_EQ(w, ret_w);
+   EXPECT_EQ(h, ret_h);
+
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_source_set_get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
-
-       Evas_Object *source_obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(source_obj));
-
-       // test code start
-       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))
-               .Times(1)
-               .WillOnce(Return(EINA_TRUE));
-
-       Eina_Bool ret = e_view_image_source_set(image, img_source);
-       EXPECT_EQ(ret, EINA_TRUE);
-
-       E_View_Image * ret_img_source = e_view_image_source_get(image);
-       EXPECT_EQ(ret_img_source, img_source);
-
-       EXPECT_CALL(*evasMock, evas_object_image_source_unset(obj))
-               .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);
-       EXPECT_EQ(ret, EINA_FALSE);
-
-       ret_img_source = e_view_image_source_get(image);
-       EXPECT_EQ(ret_img_source, nullptr);
-
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view_source);
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(source_obj);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
+
+   Evas_Object *source_obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(source_obj));
+
+   // test code start
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   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))
+      .Times(1)
+      .WillOnce(Return(EINA_TRUE));
+
+   Eina_Bool ret = e_view_image_source_set(image, img_source);
+   EXPECT_EQ(ret, EINA_TRUE);
+
+   E_View_Image * ret_img_source = e_view_image_source_get(image);
+   EXPECT_EQ(ret_img_source, img_source);
+
+   EXPECT_CALL(*evasMock, evas_object_image_source_unset(obj))
+      .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);
+   EXPECT_EQ(ret, EINA_FALSE);
+
+   ret_img_source = e_view_image_source_get(image);
+   EXPECT_EQ(ret_img_source, nullptr);
+
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view_source);
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(source_obj);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_save)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
-
-       // test code start
-       const char file[] = "file.jpg";
-       const char key[] = "key";
-       const char flags[] = "compress=0 quality=100";
-
-       EXPECT_CALL(*evasMock, evas_object_image_save(obj, _, _, _))
-               .Times(2)
-               .WillOnce(Return(EINA_TRUE))
-               .WillOnce(Return(EINA_FALSE));
-
-       Eina_Bool ret;
-       ret = e_view_image_save(image, file, key, flags);
-       EXPECT_EQ(ret, EINA_TRUE);
-       ret = e_view_image_save(image, file, key, flags);
-       EXPECT_EQ(ret, EINA_FALSE);
-
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
+
+   // test code start
+   const char file[] = "file.jpg";
+   const char key[] = "key";
+   const char flags[] = "compress=0 quality=100";
+
+   EXPECT_CALL(*evasMock, evas_object_image_save(obj, _, _, _))
+      .Times(2)
+      .WillOnce(Return(EINA_TRUE))
+      .WillOnce(Return(EINA_FALSE));
+
+   Eina_Bool ret;
+   ret = e_view_image_save(image, file, key, flags);
+   EXPECT_EQ(ret, EINA_TRUE);
+   ret = e_view_image_save(image, file, key, flags);
+   EXPECT_EQ(ret, EINA_FALSE);
+
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewImageTest, Test_e_view_image_preload)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
 
-       EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
+   EXPECT_CALL(*evasMock, evas_object_image_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
 
-    E_View_Image *image = e_view_image_create(this->tree);
-       E_View *view = e_view_image_view_get(image);
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   EXPECT_CALL(*evasMock, evas_object_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Image *image = e_view_image_create(this->tree);
+   E_View *view = e_view_image_view_get(image);
 
-       // test code start
-       EXPECT_CALL(*evasMock, evas_object_image_preload(obj, EINA_TRUE))
-               .Times(1);
+   // test code start
+   EXPECT_CALL(*evasMock, evas_object_image_preload(obj, EINA_TRUE))
+      .Times(1);
 
-       e_view_image_preload(image, EINA_TRUE);
+   e_view_image_preload(image, EINA_TRUE);
 
-       EXPECT_CALL(*evasMock, evas_object_image_preload(obj, EINA_FALSE))
-               .Times(1);
+   EXPECT_CALL(*evasMock, evas_object_image_preload(obj, EINA_FALSE))
+      .Times(1);
 
-       e_view_image_preload(image, EINA_FALSE);
+   e_view_image_preload(image, EINA_FALSE);
 
-       // end of test code
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   // end of test code
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
index 7985ba57508a5db563accb7961b64b55f212eb5b..8fbe5ba54245e520b88116f560490da2afb424ae 100644 (file)
@@ -9,164 +9,181 @@ using ::testing::Return;
 using ::testing::_;
 using ::testing::SetArgPointee;
 using ::testing::DoAll;
+using ::testing::AnyNumber;
 
 class EViewRectTest : public ::testing::Test
 {
 protected:
-       Evas *evas;
-       E_Canvas *canvas;
-       E_View_Tree *tree;
-
-       void SetUp(void) override {
-                evasMock = new EvasMock();
-                this->evas = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-                this->canvas = e_canvas_create(this->evas);
-                this->tree = e_canvas_layer_view_tree_get(this->canvas, E_CANVAS_LAYER_BOTTOM);
-       }
-
-       void TearDown(void) override {
-                e_canvas_destroy(this->canvas);
-                free(this->evas);
-                delete evasMock;
-       }
+   Evas *evas;
+   E_Canvas *canvas;
+   E_View_Tree *tree;
+
+   void SetUp(void) override {
+       evasMock = new EvasMock();
+       this->evas = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+       this->canvas = e_canvas_create(this->evas);
+       this->tree = e_canvas_layer_view_tree_get(this->canvas, E_CANVAS_LAYER_BOTTOM);
+   }
+
+   void TearDown(void) override {
+       e_canvas_destroy(this->canvas);
+       free(this->evas);
+       delete evasMock;
+   }
 };
 
 TEST_F(EViewRectTest, Test_E_View_Rect_Create)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       int width = 123, height = 456;
-       int color[4] = { 10, 20, 30, 40 };
-       EXPECT_CALL(*evasMock, evas_object_rectangle_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-       EXPECT_CALL(*evasMock, evas_object_resize(obj, width, height))
-               .Times(1);
-
-       EXPECT_CALL(*evasMock, evas_object_color_set(obj, color[0], color[1], color[2], color[3]))
-               .Times(1);
-
-       E_View_Rect *rect = e_view_rect_create(this->tree, width, height, color);
-       EXPECT_NE(rect, nullptr);
-       E_View *view = e_view_rect_view_get(rect);
-       EXPECT_NE(view, nullptr);
-
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   int width = 123, height = 456;
+   int color[4] = { 10, 20, 30, 40 };
+   EXPECT_CALL(*evasMock, evas_object_rectangle_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_resize(obj, width, height))
+      .Times(1);
+
+   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_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Rect *rect = e_view_rect_create(this->tree, width, height, color);
+   EXPECT_NE(rect, nullptr);
+   E_View *view = e_view_rect_view_get(rect);
+   EXPECT_NE(view, nullptr);
+
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _)); 
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewRectTest, Test_E_View_Rect_Size_Set_Get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(1);
-
-       int color[4] = { 10, 20, 30, 40 };
-       ON_CALL(*evasMock, evas_object_rectangle_add(this->evas)).WillByDefault(Return(obj));
-
-       EXPECT_CALL(*evasMock, evas_object_rectangle_add(this->evas))
-               .Times(1);
-       EXPECT_CALL(*evasMock, evas_object_resize(obj, 123, 456))
-               .Times(1);
-       EXPECT_CALL(*evasMock, evas_object_color_set(obj, 10, 20, 30, 40))
-               .Times(1);
-
-       E_View_Rect *rect = e_view_rect_create(this->tree, 123, 456, color);
-       ASSERT_NE(rect, nullptr);
-       E_View *view = e_view_rect_view_get(rect);
-
-       EXPECT_CALL(*evasMock, evas_object_resize(obj, _, _))
-               .Times(0);
-       e_view_rect_size_set(rect, 123, 456);
-       int width, height;
-       e_view_rect_size_get(rect, &width, &height);
-       EXPECT_EQ(width,123);
-       EXPECT_EQ(height,456);
-
-       EXPECT_CALL(*evasMock, evas_object_resize(obj, 456, 123))
-               .Times(1);
-       e_view_rect_size_set(rect, 456, 123);
-       e_view_rect_size_get(rect, &width, &height);
-       EXPECT_EQ(width,456);
-       EXPECT_EQ(height,123);
-
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(1);
+
+   int color[4] = { 10, 20, 30, 40 };
+   ON_CALL(*evasMock, evas_object_rectangle_add(this->evas)).WillByDefault(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_rectangle_add(this->evas))
+      .Times(1);
+   EXPECT_CALL(*evasMock, evas_object_resize(obj, 123, 456))
+      .Times(1);
+   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_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Rect *rect = e_view_rect_create(this->tree, 123, 456, color);
+   ASSERT_NE(rect, nullptr);
+   E_View *view = e_view_rect_view_get(rect);
+
+   EXPECT_CALL(*evasMock, evas_object_resize(obj, _, _))
+      .Times(0);
+   e_view_rect_size_set(rect, 123, 456);
+   int width, height;
+   e_view_rect_size_get(rect, &width, &height);
+   EXPECT_EQ(width,123);
+   EXPECT_EQ(height,456);
+
+   EXPECT_CALL(*evasMock, evas_object_resize(obj, 456, 123))
+      .Times(1);
+   e_view_rect_size_set(rect, 456, 123);
+   e_view_rect_size_get(rect, &width, &height);
+   EXPECT_EQ(width,456);
+   EXPECT_EQ(height,123);
+
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _)); 
+   e_view_destroy(view);
+   free(obj);
 }
 
 
 TEST_F(EViewRectTest, Test_E_View_Rect_Try_From_View)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
 
-       int width = 123, height = 456;
-       int color[4] = { 10, 20, 30, 40 };
-       EXPECT_CALL(*evasMock, evas_object_rectangle_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
+   int width = 123, height = 456;
+   int color[4] = { 10, 20, 30, 40 };
+   EXPECT_CALL(*evasMock, evas_object_rectangle_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
 
-       EXPECT_CALL(*evasMock, evas_object_resize(obj, width, height))
-               .Times(1);
+   EXPECT_CALL(*evasMock, evas_object_resize(obj, width, height))
+      .Times(1);
 
-       EXPECT_CALL(*evasMock, evas_object_color_set(obj, color[0], color[1], color[2], color[3]))
-               .Times(1);
+   EXPECT_CALL(*evasMock, evas_object_color_set(obj, color[0], color[1], color[2], color[3]))
+      .Times(1);
 
-       E_View_Rect *rect = e_view_rect_create(this->tree, width, height, color);
-       E_View *view = e_view_rect_view_get(rect);
+   EXPECT_CALL(*evasMock, evas_object_data_set(_, _, _));
+   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);
+   E_View *view = e_view_rect_view_get(rect);
 
-       E_View_Rect *rect_from_view = e_view_rect_try_from_view(view);
-       EXPECT_EQ(rect_from_view, rect);
+   E_View_Rect *rect_from_view = e_view_rect_try_from_view(view);
+   EXPECT_EQ(rect_from_view, rect);
 
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }
 
 TEST_F(EViewRectTest, Test_E_View_Rect_Color_Set_Get)
 {
-       Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
-
-       int width = 123, height = 456;
-       int color[4] = { 10, 20, 30, 40 };
-       EXPECT_CALL(*evasMock, evas_object_rectangle_add(this->evas))
-               .Times(1)
-               .WillOnce(Return(obj));
-
-       EXPECT_CALL(*evasMock, evas_object_resize(obj, width, height))
-               .Times(1);
-
-       EXPECT_CALL(*evasMock, evas_object_color_set(obj, color[0], color[1], color[2], color[3]))
-               .Times(1);
-
-       E_View_Rect *rect = e_view_rect_create(this->tree, width, height, color);
-       E_View *view = e_view_rect_view_get(rect);
-
-       int red = 255;
-       int green = 128;
-       int blue = 64;
-       int alpha = 32;
-
-       EXPECT_CALL(*evasMock, evas_object_color_set(obj, red, green, blue, alpha))
-               .Times(1);
-
-       e_view_rect_color_set(rect, red, green, blue, alpha);
-
-       int r, g, b, a;
-       EXPECT_CALL(*evasMock, evas_object_color_get(obj, &r, &g, &b, &a))
-               .Times(1)
-               .WillOnce(DoAll(SetArgPointee<1>(red),
-                                               SetArgPointee<2>(green),
-                                               SetArgPointee<3>(blue),
-                                               SetArgPointee<4>(alpha)));
-
-       e_view_rect_color_get(rect, &r, &g, &b, &a);
-       EXPECT_EQ(red, r);
-       EXPECT_EQ(green, g);
-       EXPECT_EQ(blue, b);
-       EXPECT_EQ(alpha, a);
-
-       EXPECT_CALL(*evasMock, evas_object_del(_));
-       e_view_destroy(view);
-       free(obj);
+   Evas_Object *obj = (Evas_Object *)malloc(EVAS_OBJECT_SIZE);
+
+   int width = 123, height = 456;
+   int color[4] = { 10, 20, 30, 40 };
+   EXPECT_CALL(*evasMock, evas_object_rectangle_add(this->evas))
+      .Times(1)
+      .WillOnce(Return(obj));
+
+   EXPECT_CALL(*evasMock, evas_object_resize(obj, width, height))
+      .Times(1);
+
+   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_layer_set(_, _));
+   EXPECT_CALL(*evasMock, evas_object_move(_, _, _));
+   E_View_Rect *rect = e_view_rect_create(this->tree, width, height, color);
+   E_View *view = e_view_rect_view_get(rect);
+
+   int red = 255;
+   int green = 128;
+   int blue = 64;
+   int alpha = 32;
+
+   EXPECT_CALL(*evasMock, evas_object_color_set(obj, red, green, blue, alpha))
+      .Times(1);
+
+   e_view_rect_color_set(rect, red, green, blue, alpha);
+
+   int r, g, b, a;
+   EXPECT_CALL(*evasMock, evas_object_color_get(obj, &r, &g, &b, &a))
+      .Times(1)
+      .WillOnce(DoAll(SetArgPointee<1>(red),
+                      SetArgPointee<2>(green),
+                      SetArgPointee<3>(blue),
+                      SetArgPointee<4>(alpha)));
+
+   e_view_rect_color_get(rect, &r, &g, &b, &a);
+   EXPECT_EQ(red, r);
+   EXPECT_EQ(green, g);
+   EXPECT_EQ(blue, b);
+   EXPECT_EQ(alpha, a);
+
+   EXPECT_CALL(*evasMock, evas_object_del(_));
+   EXPECT_CALL(*evasMock, evas_object_data_del(_, _));
+   e_view_destroy(view);
+   free(obj);
 }