X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-EffectsView.cpp;h=e7761e643dedd54935e484589abae328ff9ca6c3;hp=a6be47192ed41386cf7bd8abecc3049b0941cd97;hb=HEAD;hpb=3165015e71de120f15dcdd8079710d2abb85d53b

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp
index a6be471..811fc2f 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,12 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
 #include <sstream>
+
 #include <dali-toolkit-test-suite-utils.h>
+
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/effects-view/effects-view.h>
 
@@ -40,12 +42,16 @@ int UtcDaliEffectsViewNew(void)
   ToolkitTestApplication application;
 
   EffectsView view;
-  DALI_TEST_CHECK( !view );
+  DALI_TEST_CHECK(!view);
+
+  view = EffectsView::New(EffectsView::DROP_SHADOW);
+  DALI_TEST_CHECK(view);
 
-  view = EffectsView::New();
-  DALI_TEST_CHECK( view );
+  application.GetScene().Add(view);
 
-  Stage::GetCurrent().Add( view );
+  view.Reset();
+  view = EffectsView::New(EffectsView::EMBOSS);
+  DALI_TEST_CHECK(view);
 
   application.SendNotification();
   application.Render();
@@ -57,21 +63,21 @@ int UtcDaliEffectsViewCopyAndAssignment(void)
 {
   ToolkitTestApplication application;
 
-  EffectsView view = EffectsView::New();
-  DALI_TEST_CHECK( view );
+  EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
+  DALI_TEST_CHECK(view);
 
-  EffectsView copy( view );
-  DALI_TEST_CHECK( copy == view );
+  EffectsView copy(view);
+  DALI_TEST_CHECK(copy == view);
 
   EffectsView assign;
-  DALI_TEST_CHECK( !assign );
+  DALI_TEST_CHECK(!assign);
   assign = view;
-  DALI_TEST_CHECK( assign == view );
+  DALI_TEST_CHECK(assign == view);
 
   // Self assignment
   assign = assign;
-  DALI_TEST_CHECK( assign );
-  DALI_TEST_CHECK( assign == view );
+  DALI_TEST_CHECK(assign);
+  DALI_TEST_CHECK(assign == view);
 
   END_TEST;
 }
@@ -80,383 +86,316 @@ int UtcDaliEffectsViewDownCast(void)
 {
   ToolkitTestApplication application;
 
-  BaseHandle view = EffectsView::New();
-  DALI_TEST_CHECK( EffectsView::DownCast( view ) );
+  BaseHandle view = EffectsView::New(EffectsView::EMBOSS);
+  DALI_TEST_CHECK(EffectsView::DownCast(view));
 
   BaseHandle empty;
-  DALI_TEST_CHECK( ! EffectsView::DownCast( empty ) );
+  DALI_TEST_CHECK(!EffectsView::DownCast(empty));
 
   BaseHandle another = Actor::New();
-  DALI_TEST_CHECK( ! EffectsView::DownCast( another ) );
+  DALI_TEST_CHECK(!EffectsView::DownCast(another));
 
   END_TEST;
 }
 
-int UtcDaliEffectsViewSetGetTypeP(void)
+// Positive test case for a method
+int UtcDaliEffectsViewAddRemoveDropShadow(void)
 {
   ToolkitTestApplication application;
+  tet_infoline("UtcDaliEffectsViewAddRemoveDropShadow");
 
-  EffectsView view = EffectsView::New();
-  DALI_TEST_CHECK( view.GetType() == EffectsView::INVALID_TYPE );
+  EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
+  DALI_TEST_CHECK(view);
 
-  view.SetType( EffectsView::DROP_SHADOW );
-  DALI_TEST_CHECK( view.GetType() == EffectsView::DROP_SHADOW );
+  Actor actor = Actor::New();
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
 
-  view.SetType( EffectsView::EMBOSS );
-  DALI_TEST_CHECK( view.GetType() == EffectsView::EMBOSS );
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
+  view.Add(actor);
+  application.GetScene().Add(view);
 
-  END_TEST;
-}
+  DALI_TEST_CHECK(actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
+  DALI_TEST_CHECK(actor.GetParent());
+  DALI_TEST_CHECK(actor.GetParent() != view);
 
-int UtcDaliEffectsViewSetTypeN(void)
-{
-  ToolkitTestApplication application;
-
-  EffectsView view;
-  try
-  {
-    view.SetType( EffectsView::DROP_SHADOW );
-    DALI_TEST_CHECK( false ); // Should not get here
-  }
-  catch( ... )
-  {
-    DALI_TEST_CHECK( true );
-  }
+  view.Remove(actor);
 
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
   END_TEST;
 }
 
-int UtcDaliEffectsViewGetTypeN(void)
+int UtcDaliEffectsViewAddRemoveEmboss(void)
 {
   ToolkitTestApplication application;
+  tet_infoline("UtcDaliEffectsViewAddRemoveEmboss");
 
-  EffectsView view;
-  try
-  {
-    EffectsView::EffectType type = view.GetType();
-    (void) type;
-    DALI_TEST_CHECK( false ); // Should not get here
-  }
-  catch( ... )
-  {
-    DALI_TEST_CHECK( true );
-  }
-
-  END_TEST;
-}
+  tet_infoline("Checking number of render tasks = 1");
+  application.SendNotification();
+  application.Render();
+  Integration::Scene stage = application.GetScene();
+  DALI_TEST_EQUALS(stage.GetRenderTaskList().GetTaskCount(), 1, TEST_LOCATION);
 
-int UtcDaliEffectsViewEnableP(void)
-{
-  ToolkitTestApplication application;
+  tet_infoline("Create effects view");
 
-  EffectsView view = EffectsView::New();
-  Stage stage = Stage::GetCurrent();
-  DALI_TEST_CHECK( stage.GetRenderTaskList().GetTaskCount() == 1 );
+  EffectsView view = EffectsView::New(EffectsView::EMBOSS);
+  Vector3     offsetSet(2.f, 3.f, 4.f);
+  Vector4     colorSet(0.2f, 0.3f, 0.4f, 0.5f);
+  view.SetProperty(EffectsView::Property::EFFECT_OFFSET, offsetSet);
+  view.SetProperty(EffectsView::Property::EFFECT_COLOR, colorSet);
+  Vector3   offsetAnimate(4.f, 6.f, 8.f);
+  float     durationSeconds(0.05f);
+  Animation animation = Animation::New(durationSeconds);
+  animation.AnimateTo(Property(view, EffectsView::Property::EFFECT_OFFSET), offsetAnimate);
+  animation.Play();
 
-  view.Enable();
-  DALI_TEST_CHECK( stage.GetRenderTaskList().GetTaskCount() > 1 );
+  DALI_TEST_CHECK(view);
 
-  END_TEST;
-}
+  Actor actor = Actor::New();
+  actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
 
-int UtcDaliEffectsViewEnableN(void)
-{
-  ToolkitTestApplication application;
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
 
-  EffectsView view;
-  try
-  {
-    view.Enable();
-    DALI_TEST_CHECK( false ); // Should not get here
-  }
-  catch( ... )
-  {
-    DALI_TEST_CHECK( true );
-  }
+  view.Add(actor);
+  view.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
 
-  END_TEST;
-}
+  stage.Add(view);
 
-int UtcDaliEffectsViewDisableP(void)
-{
-  ToolkitTestApplication application;
+  DALI_TEST_CHECK(actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
 
-  EffectsView view = EffectsView::New();
-  Stage stage = Stage::GetCurrent();
-  DALI_TEST_CHECK( stage.GetRenderTaskList().GetTaskCount() == 1 );
+  application.SendNotification();
+  application.Render();
 
-  view.Enable();
-  DALI_TEST_CHECK( stage.GetRenderTaskList().GetTaskCount() > 1 );
+  tet_infoline("Removing view from stage disables view");
+  stage.Remove(view);
 
-  view.Disable();
-  DALI_TEST_CHECK( stage.GetRenderTaskList().GetTaskCount() == 1 );
+  tet_infoline("Checking number of render tasks = 1");
+  DALI_TEST_EQUALS(stage.GetRenderTaskList().GetTaskCount(), 1, TEST_LOCATION);
 
-  END_TEST;
-}
+  tet_infoline("Adding view to stage again re-enables view");
+  stage.Add(view);
 
-int UtcDaliEffectsViewDisableN(void)
-{
-  ToolkitTestApplication application;
+  tet_infoline("Removing view from stage disables view");
+  DALI_TEST_GREATER(stage.GetRenderTaskList().GetTaskCount(), 1u, TEST_LOCATION);
+  stage.Remove(view);
+  view.Reset();
 
-  EffectsView view;
-  try
-  {
-    view.Disable();
-    DALI_TEST_CHECK( false ); // Should not get here
-  }
-  catch( ... )
-  {
-    DALI_TEST_CHECK( true );
-  }
+  tet_infoline("Checking number of render tasks = 1");
+  DALI_TEST_EQUALS(stage.GetRenderTaskList().GetTaskCount(), 1, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliEffectsViewRefreshP(void)
+int UtcDaliEffectsViewGetTypeP(void)
 {
   ToolkitTestApplication application;
 
-  EffectsView view = EffectsView::New();
-  try
-  {
-    view.Refresh();
-    DALI_TEST_CHECK( true );
-  }
-  catch( ... )
-  {
-    DALI_TEST_CHECK( false ); // Should not get here!
-  }
+  EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
+  DALI_TEST_CHECK(view.GetType() == EffectsView::DROP_SHADOW);
+
+  view.Reset();
+  view = EffectsView::New(EffectsView::EMBOSS);
+  DALI_TEST_CHECK(view.GetType() == EffectsView::EMBOSS);
 
   END_TEST;
 }
 
-int UtcDaliEffectsViewRefreshN(void)
+int UtcDaliEffectsViewOnStage(void)
 {
   ToolkitTestApplication application;
 
-  EffectsView view;
-  try
-  {
-    view.Refresh();
-    DALI_TEST_CHECK( false ); // Should not get here
-  }
-  catch( ... )
-  {
-    DALI_TEST_CHECK( true );
-  }
+  EffectsView view = EffectsView::New(EffectsView::EMBOSS);
+  view.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  Integration::Scene stage = application.GetScene();
+  DALI_TEST_CHECK(stage.GetRenderTaskList().GetTaskCount() == 1);
+
+  stage.Add(view);
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_CHECK(stage.GetRenderTaskList().GetTaskCount() > 1);
 
   END_TEST;
 }
 
-int UtcDaliEffectsViewSetPixelFormatP(void)
+int UtcDaliEffectsViewOffStage(void)
 {
   ToolkitTestApplication application;
 
-  EffectsView view = EffectsView::New();
-  try
-  {
-    view.SetPixelFormat( Pixel::RGBA8888 );
-    DALI_TEST_CHECK( true );
-  }
-  catch( ... )
-  {
-    DALI_TEST_CHECK( false ); // Should not get here!
-  }
+  EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
+  view.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
+  Integration::Scene stage = application.GetScene();
+  DALI_TEST_CHECK(stage.GetRenderTaskList().GetTaskCount() == 1);
+
+  stage.Add(view);
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_CHECK(stage.GetRenderTaskList().GetTaskCount() > 1);
+
+  stage.Remove(view);
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_CHECK(stage.GetRenderTaskList().GetTaskCount() == 1);
 
   END_TEST;
 }
 
-int UtcDaliEffectsViewSetPixelFormatN(void)
+int UtcDaliEffectsViewRefreshP(void)
 {
   ToolkitTestApplication application;
 
-  EffectsView view;
+  EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
   try
   {
-    view.SetPixelFormat( Pixel::RGBA8888 );
-    DALI_TEST_CHECK( false ); // Should not get here
+    view.Refresh();
+    DALI_TEST_CHECK(true);
   }
-  catch( ... )
+  catch(...)
   {
-    DALI_TEST_CHECK( true );
+    DALI_TEST_CHECK(false); // Should not get here!
   }
 
   END_TEST;
 }
 
-int UtcDaliEffectsViewSetGetOutputImage(void)
-{
-  ToolkitTestApplication application;
-
-  EffectsView view = EffectsView::New();
-  FrameBufferImage image = FrameBufferImage::New();
-  DALI_TEST_CHECK( image );
-
-  view.SetOutputImage( image );
-  DALI_TEST_CHECK( view.GetOutputImage() == image );
-
-  // Replace with another image
-  FrameBufferImage image2 = FrameBufferImage::New();
-  DALI_TEST_CHECK( image2 );
-  view.SetOutputImage( image2 );
-  DALI_TEST_CHECK( view.GetOutputImage() == image2 );
-
-  // Remove output image
-  view.SetOutputImage( FrameBufferImage() );
-  DALI_TEST_CHECK( ! view.GetOutputImage() );
-
-  END_TEST;
-}
-
-int UtcDaliEffectsViewSetOutputImageN(void)
+int UtcDaliEffectsViewRefreshN(void)
 {
   ToolkitTestApplication application;
 
   EffectsView view;
   try
   {
-    view.SetOutputImage( FrameBufferImage::New() );
-    DALI_TEST_CHECK( false ); // Should not get here
+    view.Refresh();
+    DALI_TEST_CHECK(false); // Should not get here
   }
-  catch( ... )
+  catch(...)
   {
-    DALI_TEST_CHECK( true );
+    DALI_TEST_CHECK(true);
   }
 
   END_TEST;
 }
 
-int UtcDaliEffectsViewGetOutputImageN(void)
+int UtcDaliEffectsViewSetPixelFormatP(void)
 {
   ToolkitTestApplication application;
 
-  EffectsView view;
+  EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
   try
   {
-    FrameBufferImage image = view.GetOutputImage();
-    (void)image;
-    DALI_TEST_CHECK( false ); // Should not get here
+    view.SetPixelFormat(Pixel::RGBA8888);
+    DALI_TEST_CHECK(true);
   }
-  catch( ... )
+  catch(...)
   {
-    DALI_TEST_CHECK( true );
+    DALI_TEST_CHECK(false); // Should not get here!
   }
 
   END_TEST;
 }
 
-int UtcDaliEffectsViewGetEffectSizePropertyIndexP(void)
-{
-  ToolkitTestApplication application;
-
-  EffectsView view = EffectsView::New();
-  DALI_TEST_CHECK( Property::INVALID_INDEX != view.GetEffectSizePropertyIndex() );
-
-  END_TEST;
-}
-
-int UtcDaliEffectsViewGetEffectSizePropertyIndexN(void)
+int UtcDaliEffectsViewSetPixelFormatN(void)
 {
   ToolkitTestApplication application;
 
   EffectsView view;
   try
   {
-    Property::Index index = view.GetEffectSizePropertyIndex();
-    (void)index;
-    DALI_TEST_CHECK( false ); // Should not get here
+    view.SetPixelFormat(Pixel::RGBA8888);
+    DALI_TEST_CHECK(false); // Should not get here
   }
-  catch( ... )
+  catch(...)
   {
-    DALI_TEST_CHECK( true );
+    DALI_TEST_CHECK(true);
   }
 
   END_TEST;
 }
 
-int UtcDaliEffectsViewGetEffectStrengthPropertyIndexP(void)
+int UtcDaliEffectsViewSizeProperty(void)
 {
   ToolkitTestApplication application;
 
-  EffectsView view = EffectsView::New();
-  DALI_TEST_CHECK( Property::INVALID_INDEX != view.GetEffectStrengthPropertyIndex() );
-
-  END_TEST;
-}
+  EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
 
-int UtcDaliEffectsViewGetEffectStrengthPropertyIndexN(void)
-{
-  ToolkitTestApplication application;
+  Property::Index idx = view.GetPropertyIndex("effectSize");
+  DALI_TEST_EQUALS(idx, (Property::Index)EffectsView::Property::EFFECT_SIZE, TEST_LOCATION);
 
-  EffectsView view;
-  try
-  {
-    Property::Index index = view.GetEffectStrengthPropertyIndex();
-    (void)index;
-    DALI_TEST_CHECK( false ); // Should not get here
-  }
-  catch( ... )
-  {
-    DALI_TEST_CHECK( true );
-  }
+  view.SetProperty(idx, 5);
+  Property::Value value = view.GetProperty(EffectsView::Property::EFFECT_SIZE);
+  int             size;
+  DALI_TEST_CHECK(value.Get(size));
+  DALI_TEST_CHECK(size == 5);
 
   END_TEST;
 }
 
-int UtcDaliEffectsViewGetEffectOffsetPropertyIndexP(void)
+int UtcDaliEffectsViewOffsetProperty(void)
 {
   ToolkitTestApplication application;
 
-  EffectsView view = EffectsView::New();
-  DALI_TEST_CHECK( Property::INVALID_INDEX != view.GetEffectOffsetPropertyIndex() );
+  EffectsView view = EffectsView::New(EffectsView::EMBOSS);
+  application.GetScene().Add(view);
 
-  END_TEST;
-}
+  Property::Value value = view.GetProperty(EffectsView::Property::EFFECT_OFFSET);
+  Vector3         offsetValue;
+  DALI_TEST_CHECK(value.Get(offsetValue));
+  DALI_TEST_EQUALS(offsetValue, Vector3::ZERO, TEST_LOCATION);
 
-int UtcDaliEffectsViewGetEffectOffsetPropertyIndexN(void)
-{
-  ToolkitTestApplication application;
+  Vector3 offsetSet(2.f, 3.f, 4.f);
+  view.SetProperty(EffectsView::Property::EFFECT_OFFSET, offsetSet);
+  application.SendNotification();
+  application.Render(0);
+  value = view.GetProperty(EffectsView::Property::EFFECT_OFFSET);
+  value.Get(offsetValue);
+  DALI_TEST_EQUALS(offsetValue, offsetSet, TEST_LOCATION);
+
+  Vector3   offsetAnimate(4.f, 6.f, 8.f);
+  float     durationSeconds(0.05f);
+  Animation animation = Animation::New(durationSeconds);
+  animation.AnimateTo(Property(view, EffectsView::Property::EFFECT_OFFSET), offsetAnimate);
+  animation.Play();
+  application.SendNotification();
+  application.Render(static_cast<unsigned int>(durationSeconds * 1000.0f) + 1u /*just beyond the animation duration*/);
 
-  EffectsView view;
-  try
-  {
-    Property::Index index = view.GetEffectOffsetPropertyIndex();
-    (void)index;
-    DALI_TEST_CHECK( false ); // Should not get here
-  }
-  catch( ... )
-  {
-    DALI_TEST_CHECK( true );
-  }
+  value = view.GetCurrentProperty(EffectsView::Property::EFFECT_OFFSET);
+  value.Get(offsetValue);
+  DALI_TEST_EQUALS(offsetValue, offsetAnimate, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliEffectsViewGetEffectColorPropertyIndexP(void)
+int UtcDaliEffectsViewColorProperty(void)
 {
   ToolkitTestApplication application;
 
-  EffectsView view = EffectsView::New();
-  DALI_TEST_CHECK( Property::INVALID_INDEX != view.GetEffectColorPropertyIndex() );
+  EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
+  application.GetScene().Add(view);
 
-  END_TEST;
-}
+  Property::Value value = view.GetProperty(EffectsView::Property::EFFECT_COLOR);
+  Vector4         colorValue;
+  DALI_TEST_CHECK(value.Get(colorValue));
+  DALI_TEST_EQUALS(colorValue, Color::WHITE, TEST_LOCATION);
 
-int UtcDaliEffectsViewGetEffectColorPropertyIndexN(void)
-{
-  ToolkitTestApplication application;
+  Vector4 colorSet(0.2f, 0.3f, 0.4f, 0.5f);
+  view.SetProperty(EffectsView::Property::EFFECT_COLOR, colorSet);
+  application.SendNotification();
+  application.Render(0);
+  value = view.GetProperty(EffectsView::Property::EFFECT_COLOR);
+  value.Get(colorValue);
+  DALI_TEST_EQUALS(colorValue, colorSet, TEST_LOCATION);
+
+  Vector4   colorAnimate(0.5f, 0.6f, 0.8f, 1.f);
+  float     durationSeconds(0.05f);
+  Animation animation = Animation::New(durationSeconds);
+  animation.AnimateTo(Property(view, EffectsView::Property::EFFECT_COLOR), colorAnimate);
+  animation.Play();
+  application.SendNotification();
+  application.Render(static_cast<unsigned int>(durationSeconds * 1000.0f) + 1u /*just beyond the animation duration*/);
 
-  EffectsView view;
-  try
-  {
-    Property::Index index = view.GetEffectColorPropertyIndex();
-    (void)index;
-    DALI_TEST_CHECK( false ); // Should not get here
-  }
-  catch( ... )
-  {
-    DALI_TEST_CHECK( true );
-  }
+  value = view.GetCurrentProperty(EffectsView::Property::EFFECT_COLOR);
+  value.Get(colorValue);
+  DALI_TEST_EQUALS(colorValue, colorAnimate, TEST_LOCATION);
 
   END_TEST;
 }
@@ -465,12 +404,12 @@ int UtcDaliEffectsViewGetSetBackgroundColor(void)
 {
   ToolkitTestApplication application;
 
-  EffectsView view = EffectsView::New();
-  view.SetBackgroundColor( Color::RED );
-  DALI_TEST_CHECK( Color::RED == view.GetBackgroundColor() );
+  EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
+  view.SetBackgroundColor(Color::RED);
+  DALI_TEST_CHECK(Color::RED == view.GetBackgroundColor());
 
-  view.SetBackgroundColor( Color::YELLOW );
-  DALI_TEST_CHECK( Color::YELLOW == view.GetBackgroundColor() );
+  view.SetBackgroundColor(Color::YELLOW);
+  DALI_TEST_CHECK(Color::YELLOW == view.GetBackgroundColor());
 
   END_TEST;
 }
@@ -482,12 +421,12 @@ int UtcDaliEffectsViewSetBackgroundColorN(void)
   EffectsView view;
   try
   {
-    view.SetBackgroundColor( Color::RED );
-    DALI_TEST_CHECK( false ); // Should not get here
+    view.SetBackgroundColor(Color::RED);
+    DALI_TEST_CHECK(false); // Should not get here
   }
-  catch( ... )
+  catch(...)
   {
-    DALI_TEST_CHECK( true );
+    DALI_TEST_CHECK(true);
   }
 
   END_TEST;
@@ -502,11 +441,11 @@ int UtcDaliEffectsViewGetBackgroundColorN(void)
   {
     Vector4 color = view.GetBackgroundColor();
     (void)color;
-    DALI_TEST_CHECK( false ); // Should not get here
+    DALI_TEST_CHECK(false); // Should not get here
   }
-  catch( ... )
+  catch(...)
   {
-    DALI_TEST_CHECK( true );
+    DALI_TEST_CHECK(true);
   }
 
   END_TEST;
@@ -516,25 +455,22 @@ int UtcDaliEffectsViewSetRefreshOnDemandP(void)
 {
   ToolkitTestApplication application;
 
-  EffectsView view = EffectsView::New();
-  FrameBufferImage image = FrameBufferImage::New();
-  view.SetOutputImage( image );
-  view.Enable();
+  EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
+  view.SetProperty(Actor::Property::SIZE, Vector2(100.f, 100.f));
 
-  Stage stage = Stage::GetCurrent();
-  stage.Add( view );
+  Integration::Scene stage = application.GetScene();
+  stage.Add(view);
+  application.SendNotification();
+  application.Render();
 
   RenderTaskList renderTaskList = stage.GetRenderTaskList();
-  DALI_TEST_CHECK( renderTaskList.GetTask( 1 ).GetRefreshRate() == RenderTask::REFRESH_ALWAYS );
-  DALI_TEST_CHECK( renderTaskList.GetTask( 2 ).GetRefreshRate() == RenderTask::REFRESH_ALWAYS );
+  DALI_TEST_CHECK(renderTaskList.GetTask(1).GetRefreshRate() == RenderTask::REFRESH_ALWAYS);
 
-  view.SetRefreshOnDemand( true );
-  DALI_TEST_CHECK( renderTaskList.GetTask( 1 ).GetRefreshRate() == RenderTask::REFRESH_ONCE );
-  DALI_TEST_CHECK( renderTaskList.GetTask( 2 ).GetRefreshRate() == RenderTask::REFRESH_ONCE );
+  view.SetRefreshOnDemand(true);
+  DALI_TEST_CHECK(renderTaskList.GetTask(1).GetRefreshRate() == RenderTask::REFRESH_ONCE);
 
-  view.SetRefreshOnDemand( false );
-  DALI_TEST_CHECK( renderTaskList.GetTask( 1 ).GetRefreshRate() == RenderTask::REFRESH_ALWAYS );
-  DALI_TEST_CHECK( renderTaskList.GetTask( 2 ).GetRefreshRate() == RenderTask::REFRESH_ALWAYS );
+  view.SetRefreshOnDemand(false);
+  DALI_TEST_CHECK(renderTaskList.GetTask(1).GetRefreshRate() == RenderTask::REFRESH_ALWAYS);
 
   END_TEST;
 }
@@ -546,12 +482,12 @@ int UtcDaliEffectsViewSetRefreshOnDemandN(void)
   EffectsView view;
   try
   {
-    view.SetRefreshOnDemand( false );
-    DALI_TEST_CHECK( false ); // Should not get here
+    view.SetRefreshOnDemand(false);
+    DALI_TEST_CHECK(false); // Should not get here
   }
-  catch( ... )
+  catch(...)
   {
-    DALI_TEST_CHECK( true );
+    DALI_TEST_CHECK(true);
   }
 
   END_TEST;
@@ -560,47 +496,39 @@ int UtcDaliEffectsViewSetRefreshOnDemandN(void)
 int UtcDaliEffectsViewSizeSet(void)
 {
   ToolkitTestApplication application;
-  Stage stage = Stage::GetCurrent();
+  Integration::Scene     stage = application.GetScene();
 
   {
-    EffectsView view = EffectsView::New();
-    view.SetSize( 200.0f, 200.0f, 0.0f );
-    stage.Add( view );
-    view.Enable();
-    application.SendNotification();
-    application.Render();
-    view.Disable();
+    EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
+    view.SetProperty(Actor::Property::SIZE, Vector3(200.0f, 200.0f, 0.0f));
+    stage.Add(view);
     application.SendNotification();
     application.Render();
-
-    DALI_TEST_EQUALS( view.GetCurrentSize(), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
+    DALI_TEST_EQUALS(view.GetCurrentProperty<Vector3>(Actor::Property::SIZE), Vector3(200.0f, 200.0f, 0.0f), TEST_LOCATION);
   }
 
   {
-    EffectsView view = EffectsView::New();
-    view.SetOutputImage( FrameBufferImage::New( 200, 200 ) );
-    view.SetType( EffectsView::EMBOSS );
-    view.SetSize( 200.0f, 200.0f, 0.0f );
-    stage.Add( view );
+    EffectsView view = EffectsView::New(EffectsView::EMBOSS);
+    view.SetProperty(Actor::Property::SIZE, Vector3(200.0f, 200.0f, 0.0f));
+    stage.Add(view);
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( view.GetCurrentSize(), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
+    DALI_TEST_EQUALS(view.GetCurrentProperty<Vector3>(Actor::Property::SIZE), Vector3(200.0f, 200.0f, 0.0f), TEST_LOCATION);
   }
 
   {
-    EffectsView view = EffectsView::New();
-    view.SetType( EffectsView::DROP_SHADOW );
-    view.SetSize( 200.0f, 200.0f, 0.0f );
-    stage.Add( view );
+    EffectsView view = EffectsView::New(EffectsView::DROP_SHADOW);
+    view.SetProperty(Actor::Property::SIZE, Vector3(200.0f, 200.0f, 0.0f));
+    stage.Add(view);
     application.SendNotification();
     application.Render();
 
-    stage.Remove( view );
+    stage.Remove(view);
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( view.GetCurrentSize(), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
+    DALI_TEST_EQUALS(view.GetCurrentProperty<Vector3>(Actor::Property::SIZE), Vector3(200.0f, 200.0f, 0.0f), TEST_LOCATION);
   }
 
   END_TEST;
@@ -611,16 +539,16 @@ int UtcDaliEffectsViewTypeRegistry(void)
   ToolkitTestApplication application;
 
   TypeRegistry typeRegistry = TypeRegistry::Get();
-  DALI_TEST_CHECK( typeRegistry );
+  DALI_TEST_CHECK(typeRegistry);
 
-  TypeInfo typeInfo = typeRegistry.GetTypeInfo( "EffectsView" );
-  DALI_TEST_CHECK( typeInfo );
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("EffectsView");
+  DALI_TEST_CHECK(typeInfo);
 
   BaseHandle handle = typeInfo.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
-  EffectsView view = EffectsView::DownCast( handle );
-  DALI_TEST_CHECK( view );
+  EffectsView view = EffectsView::DownCast(handle);
+  DALI_TEST_CHECK(view);
 
   END_TEST;
 }