projects / platform / core / uifw / dali-toolkit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[dali_2.3.19] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / utc-Dali-CubeTransitionEffect.cpp
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp
index 8d8cefb..5ae3379 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.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,40 +15,39 @@
  *
  */
 
-#include <iostream>
 #include <stdlib.h>
+#include <iostream>
+
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/transition-effects/cube-transition-effect.h>
+
 #include <dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h>
+#include <dali-toolkit/devel-api/transition-effects/cube-transition-effect.h>
 #include <dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.h>
 #include <dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h>
-#include <dali/public-api/images/buffer-image.h>
 #include <dali/devel-api/adaptor-framework/image-loading.h>
 #include <dali/devel-api/adaptor-framework/pixel-buffer.h>
 
-
 using namespace Dali;
 using namespace Dali::Toolkit;
 
-
 namespace
 {
-const unsigned int NUM_ROWS = 16;
+const unsigned int NUM_ROWS    = 16;
 const unsigned int NUM_COLUMNS = 10;
-const Vector2 VIEW_AREA_SIZE( 480.0f, 800.0f );
-const float TRANSITION_DURATION = 0.5f;
-const float CUBE_DISPLACEMENT = 55.f;
-const Vector2 PAN_POSITION1( VIEW_AREA_SIZE.x * 0.75f, VIEW_AREA_SIZE.y * 0.25f );
-const Vector2 PAN_DISPLACEMENT1( -5.f, 5.f );
-const Vector2 PAN_POSITION2( VIEW_AREA_SIZE.x * 0.25f, VIEW_AREA_SIZE.y * 0.75f );
-const Vector2 PAN_DISPLACEMENT2( 5.f, 5.f );
-const Vector4 FULL_BRIGHTNESS(1.f,1.f,1.f,1.f);
-const Vector4 HALF_BRIGHTNESS(0.5f, 0.5f, 0.5f, 1.f);
-const int RENDER_FRAME_INTERVAL = 16;
-static const float FLT_EPISILON = 0.0001f;
-static const float EPISILON = 0.05f;
-const float TRANSITION_BEFORE_END_DURATION = TRANSITION_DURATION - 0.05f;
+const Vector2      VIEW_AREA_SIZE(480.0f, 800.0f);
+const float        TRANSITION_DURATION = 0.5f;
+const float        CUBE_DISPLACEMENT   = 55.f;
+const Vector2      PAN_POSITION1(VIEW_AREA_SIZE.x * 0.75f, VIEW_AREA_SIZE.y * 0.25f);
+const Vector2      PAN_DISPLACEMENT1(-5.f, 5.f);
+const Vector2      PAN_POSITION2(VIEW_AREA_SIZE.x * 0.25f, VIEW_AREA_SIZE.y * 0.75f);
+const Vector2      PAN_DISPLACEMENT2(5.f, 5.f);
+const Vector4      FULL_BRIGHTNESS(1.f, 1.f, 1.f, 1.f);
+const Vector4      HALF_BRIGHTNESS(0.5f, 0.5f, 0.5f, 1.f);
+const int          RENDER_FRAME_INTERVAL          = 16;
+static const float FLT_EPISILON                   = 0.0001f;
+static const float EPISILON                       = 0.05f;
+const float        TRANSITION_BEFORE_END_DURATION = TRANSITION_DURATION - 0.05f;
 
 static bool gObjectCreatedCallBackCalled;
 static void TestCallback(BaseHandle handle)
@@ -63,33 +62,31 @@ static void TestCallback(BaseHandle handle)
  */
 void Wait(ToolkitTestApplication& application, float durationToPass)
 {
-  int duration = static_cast<int>(durationToPass*1000.f);
+  int duration = static_cast<int>(durationToPass * 1000.f);
   // wait 2 more frames to compensate the two frames used by the image waiting for the loading succeeded signal
-  for(int i = 0; i <=  duration/RENDER_FRAME_INTERVAL+2 ; i++)
+  for(int i = 0; i <= duration / RENDER_FRAME_INTERVAL + 2; i++)
   {
     application.SendNotification();
     application.Render(RENDER_FRAME_INTERVAL);
   }
 }
 
-
-
 //Callback class to test whether transition completed signal is emitted when the transition animation is finished
 class TransitionCompletedCallback : public Dali::ConnectionTracker
 {
 public:
-  TransitionCompletedCallback( bool& signalReceived, CubeTransitionEffect& effect, Texture& image )
-  : mSignalVerified( signalReceived ),
-    mCurrentEffect( effect ),
-    mActorTransitTo( image )
+  TransitionCompletedCallback(bool& signalReceived, CubeTransitionEffect& effect, Texture& image)
+  : mSignalVerified(signalReceived),
+    mCurrentEffect(effect),
+    mActorTransitTo(image)
   {
   }
 
-  void Callback( CubeTransitionEffect effect, Texture image )
+  void Callback(CubeTransitionEffect effect, Texture image)
   {
-    tet_infoline( "Verifying TransitionCompletedSignal" );
+    tet_infoline("Verifying TransitionCompletedSignal");
 
-    if( mCurrentEffect == effect && mActorTransitTo == image )
+    if(mCurrentEffect == effect && mActorTransitTo == image)
     {
       mSignalVerified = true;
     }
@@ -100,15 +97,13 @@ public:
     mSignalVerified = false;
   }
 
-  bool&                  mSignalVerified;
-  CubeTransitionEffect&  mCurrentEffect;
-  Texture&               mActorTransitTo;
+  bool&                 mSignalVerified;
+  CubeTransitionEffect& mCurrentEffect;
+  Texture&              mActorTransitTo;
 };
 
 } // namespace
 
-
-
 void cube_transition_effect_startup(void)
 {
   test_return_value = TET_UNDEF;
@@ -126,26 +121,26 @@ int UtcDaliCubeTransitionWaveEffectNew(void)
 
   CubeTransitionEffect waveEffect;
 
-  DALI_TEST_CHECK( !waveEffect );
+  DALI_TEST_CHECK(!waveEffect);
 
-  waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetSize( VIEW_AREA_SIZE );
+  waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
 
-  DALI_TEST_CHECK( waveEffect );
+  DALI_TEST_CHECK(waveEffect);
 
   waveEffect.Reset();
 
   //Additional check to ensure object is created by checking if it's registered
-  ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  ObjectRegistry registry = application.GetCore().GetObjectRegistry();
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
-    CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-    waveEffect.SetSize( VIEW_AREA_SIZE );
+    CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+    waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
   END_TEST;
 }
 
@@ -156,56 +151,56 @@ int UtcDaliCubeTransitionCrossEffectNew(void)
 
   CubeTransitionEffect crossEffect;
 
-  DALI_TEST_CHECK( !crossEffect );
+  DALI_TEST_CHECK(!crossEffect);
 
-  crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-  crossEffect.SetSize( VIEW_AREA_SIZE );
+  crossEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+  crossEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
 
-  DALI_TEST_CHECK( crossEffect );
+  DALI_TEST_CHECK(crossEffect);
 
   crossEffect.Reset();
 
   //Additional check to ensure object is created by checking if it's registered
-  ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  ObjectRegistry registry = application.GetCore().GetObjectRegistry();
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
-    CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-    crossEffect.SetSize( VIEW_AREA_SIZE );
+    CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+    crossEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
   END_TEST;
 }
 
 int UtcDaliCubeTransitionFoldEffectNew(void)
 {
   ToolkitTestApplication application;
-  tet_infoline( " UtcDaliCubeTransitionFoldEffectNew " );
+  tet_infoline(" UtcDaliCubeTransitionFoldEffectNew ");
 
   CubeTransitionEffect foldEffect;
 
-  DALI_TEST_CHECK( !foldEffect );
+  DALI_TEST_CHECK(!foldEffect);
 
-  foldEffect = CubeTransitionFoldEffect::New( NUM_ROWS, NUM_COLUMNS );
-  foldEffect.SetSize( VIEW_AREA_SIZE );
+  foldEffect = CubeTransitionFoldEffect::New(NUM_ROWS, NUM_COLUMNS);
+  foldEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
 
-  DALI_TEST_CHECK( foldEffect );
+  DALI_TEST_CHECK(foldEffect);
 
   foldEffect.Reset();
 
   //Additional check to ensure object is created by checking if it is registered
-  ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  ObjectRegistry registry = application.GetCore().GetObjectRegistry();
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
-    CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New( NUM_ROWS, NUM_COLUMNS );
-    foldEffect.SetSize( VIEW_AREA_SIZE );
+    CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New(NUM_ROWS, NUM_COLUMNS);
+    foldEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
   END_TEST;
 }
 
@@ -214,20 +209,20 @@ int UtcDaliCubeTransitionEffectSetGetTransitionDuration(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionEffectSetGetTransitionDuration ");
 
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetTransitionDuration( TRANSITION_DURATION );
-  waveEffect.SetSize( VIEW_AREA_SIZE );
-  DALI_TEST_EQUALS( TRANSITION_DURATION, waveEffect.GetTransitionDuration(), TEST_LOCATION );
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetTransitionDuration(TRANSITION_DURATION);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  DALI_TEST_EQUALS(TRANSITION_DURATION, waveEffect.GetTransitionDuration(), TEST_LOCATION);
 
-  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-  crossEffect.SetTransitionDuration( TRANSITION_DURATION );
-  crossEffect.SetSize( VIEW_AREA_SIZE );
-  DALI_TEST_EQUALS( TRANSITION_DURATION, crossEffect.GetTransitionDuration(), TEST_LOCATION );
+  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+  crossEffect.SetTransitionDuration(TRANSITION_DURATION);
+  crossEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  DALI_TEST_EQUALS(TRANSITION_DURATION, crossEffect.GetTransitionDuration(), TEST_LOCATION);
 
-  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New( NUM_ROWS, NUM_COLUMNS );
-  foldEffect.SetSize( VIEW_AREA_SIZE );
-  foldEffect.SetTransitionDuration( TRANSITION_DURATION );
-  DALI_TEST_EQUALS( TRANSITION_DURATION, foldEffect.GetTransitionDuration(), TEST_LOCATION );
+  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New(NUM_ROWS, NUM_COLUMNS);
+  foldEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  foldEffect.SetTransitionDuration(TRANSITION_DURATION);
+  DALI_TEST_EQUALS(TRANSITION_DURATION, foldEffect.GetTransitionDuration(), TEST_LOCATION);
   END_TEST;
 }
 
@@ -236,15 +231,15 @@ int UtcDaliCubeTransitionEffectSetGetCubeDisplacement(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionEffectSetGetTransitionDuration ");
 
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS);
-  waveEffect.SetSize( VIEW_AREA_SIZE );
-  waveEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  DALI_TEST_EQUALS( CUBE_DISPLACEMENT, waveEffect.GetCubeDisplacement(), TEST_LOCATION );
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  waveEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  DALI_TEST_EQUALS(CUBE_DISPLACEMENT, waveEffect.GetCubeDisplacement(), TEST_LOCATION);
 
-  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-  crossEffect.SetSize( VIEW_AREA_SIZE );
-  crossEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  DALI_TEST_EQUALS( CUBE_DISPLACEMENT, crossEffect.GetCubeDisplacement(), TEST_LOCATION );
+  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+  crossEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  crossEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  DALI_TEST_EQUALS(CUBE_DISPLACEMENT, crossEffect.GetCubeDisplacement(), TEST_LOCATION);
 
   //Cube displacement is not used in CubeTransitionFoldEffect
   END_TEST;
@@ -256,31 +251,31 @@ int UtcDaliCubeTransitionEffectGetRoot(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionEffectGetRoot ");
 
-  unsigned int totalNum = NUM_ROWS*NUM_COLUMNS;
+  unsigned int totalNum = NUM_ROWS * NUM_COLUMNS;
 
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40 );
+  Texture texture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40);
 
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetSize( VIEW_AREA_SIZE );
-  Stage::GetCurrent().Add( waveEffect );
-  waveEffect.SetCurrentTexture( texture );
-  waveEffect.SetTargetTexture( texture );
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  application.GetScene().Add(waveEffect);
+  waveEffect.SetCurrentTexture(texture);
+  waveEffect.SetTargetTexture(texture);
 
   application.SendNotification();
   application.Render();
 
   waveEffect.StartTransition();
 
-  Wait( application, TRANSITION_DURATION * 0.5f );
+  Wait(application, TRANSITION_DURATION * 0.5f);
 
   // check that we have a total of NUM_ROWS*NUM_COLUMNS cubes;
   Actor boxesRoot = waveEffect.GetChildAt(0);
-  DALI_TEST_CHECK( totalNum == boxesRoot.GetChildCount() );
+  DALI_TEST_CHECK(totalNum == boxesRoot.GetChildCount());
 
   // check that every cube has two children
-  DALI_TEST_CHECK( 2 == boxesRoot.GetChildAt(0).GetChildCount() );
-  DALI_TEST_CHECK( 2 == boxesRoot.GetChildAt(totalNum/2).GetChildCount() );
-  DALI_TEST_CHECK( 2 == boxesRoot.GetChildAt(totalNum-1).GetChildCount() );
+  DALI_TEST_CHECK(2 == boxesRoot.GetChildAt(0).GetChildCount());
+  DALI_TEST_CHECK(2 == boxesRoot.GetChildAt(totalNum / 2).GetChildCount());
+  DALI_TEST_CHECK(2 == boxesRoot.GetChildAt(totalNum - 1).GetChildCount());
   END_TEST;
 }
 
@@ -289,58 +284,58 @@ int UtcDaliCubeTransitionEffectIsTransitioning(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionEffectIsTransiting ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40 );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  Texture texture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40);
 
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetSize( VIEW_AREA_SIZE );
-  Stage::GetCurrent().Add( waveEffect );
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  application.GetScene().Add(waveEffect);
 
-  waveEffect.SetTransitionDuration( TRANSITION_DURATION );
-  waveEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  DALI_TEST_CHECK( !waveEffect.IsTransitioning() );
+  waveEffect.SetTransitionDuration(TRANSITION_DURATION);
+  waveEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  DALI_TEST_CHECK(!waveEffect.IsTransitioning());
 
-  waveEffect.SetCurrentTexture( texture );
-  waveEffect.SetTargetTexture( texture );
+  waveEffect.SetCurrentTexture(texture);
+  waveEffect.SetTargetTexture(texture);
   //transition is started
   waveEffect.StartTransition();
-  DALI_TEST_CHECK( waveEffect.IsTransitioning() );
+  DALI_TEST_CHECK(waveEffect.IsTransitioning());
   //transition is finished
-  Wait( application, TRANSITION_DURATION );
-  DALI_TEST_CHECK( !waveEffect.IsTransitioning() );
+  Wait(application, TRANSITION_DURATION);
+  DALI_TEST_CHECK(!waveEffect.IsTransitioning());
 
-  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-  crossEffect.SetSize( VIEW_AREA_SIZE );
-  Stage::GetCurrent().Add( crossEffect );
+  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+  crossEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  application.GetScene().Add(crossEffect);
 
-  crossEffect.SetTransitionDuration( TRANSITION_DURATION );
-  crossEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  DALI_TEST_CHECK( !crossEffect.IsTransitioning() );
+  crossEffect.SetTransitionDuration(TRANSITION_DURATION);
+  crossEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  DALI_TEST_CHECK(!crossEffect.IsTransitioning());
 
-  crossEffect.SetCurrentTexture( texture );
-  crossEffect.SetTargetTexture( texture );
+  crossEffect.SetCurrentTexture(texture);
+  crossEffect.SetTargetTexture(texture);
   //transition is started
   crossEffect.StartTransition(false);
-  DALI_TEST_CHECK( crossEffect.IsTransitioning() );
+  DALI_TEST_CHECK(crossEffect.IsTransitioning());
   //transition is finished
-  Wait( application, TRANSITION_DURATION );
-  DALI_TEST_CHECK( !crossEffect.IsTransitioning() );
+  Wait(application, TRANSITION_DURATION);
+  DALI_TEST_CHECK(!crossEffect.IsTransitioning());
 
-  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New( NUM_ROWS, NUM_COLUMNS );
-  foldEffect.SetSize( VIEW_AREA_SIZE );
-  Stage::GetCurrent().Add( foldEffect );
+  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New(NUM_ROWS, NUM_COLUMNS);
+  foldEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  application.GetScene().Add(foldEffect);
 
-  foldEffect.SetTransitionDuration( TRANSITION_DURATION );
-  DALI_TEST_CHECK( !foldEffect.IsTransitioning() );
+  foldEffect.SetTransitionDuration(TRANSITION_DURATION);
+  DALI_TEST_CHECK(!foldEffect.IsTransitioning());
 
-  foldEffect.SetCurrentTexture( texture );
-  foldEffect.SetTargetTexture( texture );
+  foldEffect.SetCurrentTexture(texture);
+  foldEffect.SetTargetTexture(texture);
   //transition is started
   foldEffect.StartTransition(true);
-  DALI_TEST_CHECK(foldEffect.IsTransitioning() );
+  DALI_TEST_CHECK(foldEffect.IsTransitioning());
   //transition is finished
-  Wait( application, TRANSITION_DURATION );
-  DALI_TEST_CHECK( !foldEffect.IsTransitioning() );
+  Wait(application, TRANSITION_DURATION);
+  DALI_TEST_CHECK(!foldEffect.IsTransitioning());
 
   END_TEST;
 }
@@ -351,14 +346,14 @@ int UtcDaliCubeTransitionEffectSetCurrentTexture(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionEffectSetCurrentTexture ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40 );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  Texture texture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40);
 
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetSize( VIEW_AREA_SIZE );
-  waveEffect.SetCurrentTexture( texture );
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  waveEffect.SetCurrentTexture(texture);
 
-  Stage::GetCurrent().Add( waveEffect );
+  application.GetScene().Add(waveEffect);
 
   application.SendNotification();
   application.Render();
@@ -367,19 +362,19 @@ int UtcDaliCubeTransitionEffectSetCurrentTexture(void)
 
   // the current image content is set to the tiles facing the camera
   Actor currentTile = waveEffect.GetChildAt(0).GetChildAt(0).GetChildAt(0);
-  Actor targetTile = waveEffect.GetChildAt(0).GetChildAt(0).GetChildAt(1);
+  Actor targetTile  = waveEffect.GetChildAt(0).GetChildAt(0).GetChildAt(1);
 
   //check the pixel area set to the cube
-  Vector4 pixelAreaDef( 0.f, 0.f, 1.f / NUM_COLUMNS, 1.f / NUM_ROWS);
+  Vector4 pixelAreaDef(0.f, 0.f, 1.f / NUM_COLUMNS, 1.f / NUM_ROWS);
 
-  Property::Index textureRectIndex = currentTile.GetPropertyIndex( "uTextureRect" );
-  DALI_TEST_CHECK( textureRectIndex != Property::INVALID_INDEX );
-  Property::Value textureRectValue = currentTile.GetProperty( textureRectIndex );
-  DALI_TEST_CHECK( textureRectValue.GetType() == Property::VECTOR4 );
+  Property::Index textureRectIndex = currentTile.GetPropertyIndex("uTextureRect");
+  DALI_TEST_CHECK(textureRectIndex != Property::INVALID_INDEX);
+  Property::Value textureRectValue = currentTile.GetProperty(textureRectIndex);
+  DALI_TEST_CHECK(textureRectValue.GetType() == Property::VECTOR4);
   Vector4 pixelArea;
-  DALI_TEST_CHECK( textureRectValue.Get( pixelArea ) );
+  DALI_TEST_CHECK(textureRectValue.Get(pixelArea));
 
-  DALI_TEST_EQUALS( pixelAreaDef, pixelArea, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(pixelAreaDef, pixelArea, FLT_EPISILON, TEST_LOCATION);
 
   END_TEST;
 }
@@ -390,16 +385,16 @@ int UtcDaliCubeTransitionEffectSetTargetTexture(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionEffectSetTargetTexture ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40 );
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetSize( VIEW_AREA_SIZE );
-  Stage::GetCurrent().Add( waveEffect );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  Texture              texture    = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40);
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  application.GetScene().Add(waveEffect);
 
-  waveEffect.SetCurrentTexture( texture );
-  waveEffect.SetTargetTexture( texture );
+  waveEffect.SetCurrentTexture(texture);
+  waveEffect.SetTargetTexture(texture);
 
-  Stage::GetCurrent().Add( waveEffect );
+  application.GetScene().Add(waveEffect);
 
   application.SendNotification();
   application.Render();
@@ -410,16 +405,16 @@ int UtcDaliCubeTransitionEffectSetTargetTexture(void)
   Actor tile = waveEffect.GetChildAt(0).GetChildAt(0).GetChildAt(1);
 
   //check the pixel area set to the cube
-  Vector4 pixelAreaDef( 0.f, 0.f, 1.f / NUM_COLUMNS, 1.f / NUM_ROWS);
+  Vector4 pixelAreaDef(0.f, 0.f, 1.f / NUM_COLUMNS, 1.f / NUM_ROWS);
 
-  Property::Index textureRectIndex = tile.GetPropertyIndex( "uTextureRect" );
-  DALI_TEST_CHECK( textureRectIndex != -1 );
-  Property::Value textureRectValue = tile.GetProperty( textureRectIndex );
-  DALI_TEST_CHECK( textureRectValue.GetType() == Property::VECTOR4 );
+  Property::Index textureRectIndex = tile.GetPropertyIndex("uTextureRect");
+  DALI_TEST_CHECK(textureRectIndex != -1);
+  Property::Value textureRectValue = tile.GetProperty(textureRectIndex);
+  DALI_TEST_CHECK(textureRectValue.GetType() == Property::VECTOR4);
   Vector4 pixelArea;
-  DALI_TEST_CHECK( textureRectValue.Get( pixelArea ) );
+  DALI_TEST_CHECK(textureRectValue.Get(pixelArea));
 
-  DALI_TEST_EQUALS( pixelAreaDef, pixelArea, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(pixelAreaDef, pixelArea, FLT_EPISILON, TEST_LOCATION);
 
   END_TEST;
 }
@@ -429,55 +424,55 @@ int UtcDaliCubeTransitionWaveEffectStartTransition(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionWaveEffectStartTransition ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   Devel::PixelBuffer pixelBuffer = LoadImageFromFile(TEST_RESOURCE_DIR "/gallery-small-1.jpg");
-  PixelData pixelData = Devel::PixelBuffer::Convert( pixelBuffer );
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight() );
-  texture.Upload( pixelData );
+  PixelData          pixelData   = Devel::PixelBuffer::Convert(pixelBuffer);
+  Texture            texture     = Texture::New(TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight());
+  texture.Upload(pixelData);
 
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetSize( VIEW_AREA_SIZE );
-  waveEffect.SetTransitionDuration( TRANSITION_DURATION );
-  waveEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  waveEffect.SetCurrentTexture( texture );
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  waveEffect.SetTransitionDuration(TRANSITION_DURATION);
+  waveEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  waveEffect.SetCurrentTexture(texture);
 
-  Stage::GetCurrent().Add( waveEffect );
+  application.GetScene().Add(waveEffect);
 
   application.SendNotification();
   application.Render();
 
-  waveEffect.StartTransition( true );
+  waveEffect.StartTransition(true);
 
   Actor cube = waveEffect.GetChildAt(0).GetChildAt(0);
 
   //check the cube rotation value and color values just before the end of different transitions
-  waveEffect.SetTargetTexture( texture );
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  waveEffect.SetTargetTexture(texture);
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
 
-  waveEffect.SetTargetTexture( texture );
+  waveEffect.SetTargetTexture(texture);
   waveEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1);
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
 
-  waveEffect.SetTargetTexture( texture );
+  waveEffect.SetTargetTexture(texture);
   waveEffect.StartTransition(false);
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
 
-  waveEffect.SetTargetTexture( texture );
+  waveEffect.SetTargetTexture(texture);
   waveEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2);
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
   END_TEST;
 }
 
@@ -486,21 +481,21 @@ int UtcDaliCubeTransitionCrossEffectStartTransition(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionCrossEffectStartTransition ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   Devel::PixelBuffer pixelBuffer = LoadImageFromFile(TEST_RESOURCE_DIR "/gallery-small-1.jpg");
-  PixelData pixelData = Devel::PixelBuffer::Convert( pixelBuffer );
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight() );
-  texture.Upload( pixelData );
+  PixelData          pixelData   = Devel::PixelBuffer::Convert(pixelBuffer);
+  Texture            texture     = Texture::New(TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight());
+  texture.Upload(pixelData);
 
-  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-  crossEffect.SetSize( VIEW_AREA_SIZE );
-  crossEffect.SetTransitionDuration( TRANSITION_DURATION );
-  crossEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  crossEffect.SetCurrentTexture( texture );
-  crossEffect.SetTargetTexture( texture );
+  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+  crossEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  crossEffect.SetTransitionDuration(TRANSITION_DURATION);
+  crossEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  crossEffect.SetCurrentTexture(texture);
+  crossEffect.SetTargetTexture(texture);
 
-  Stage::GetCurrent().Add( crossEffect );
+  application.GetScene().Add(crossEffect);
 
   application.SendNotification();
   application.Render();
@@ -511,37 +506,35 @@ int UtcDaliCubeTransitionCrossEffectStartTransition(void)
   Actor cube1 = crossEffect.GetChildAt(0).GetChildAt(1);
 
   //check the cube rotation value and color values just before the end of different transitions
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90,  Vector3::XAXIS), EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::XAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
 
-
-  crossEffect.SetTargetTexture( texture );
+  crossEffect.SetTargetTexture(texture);
   crossEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1);
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90,  Vector3::XAXIS), EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
-
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::XAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
 
-  crossEffect.SetTargetTexture( texture );
+  crossEffect.SetTargetTexture(texture);
   crossEffect.StartTransition(false);
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90,  Vector3::XAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::XAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
 
-  crossEffect.SetTargetTexture( texture );
+  crossEffect.SetTargetTexture(texture);
   crossEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2);
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90,  Vector3::XAXIS), EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::XAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
   END_TEST;
 }
 
@@ -550,15 +543,15 @@ int UtcDaliCubeTransitionFoldEffectStartTransition(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionFoldEffectStartTransition ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40 );
-  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New( NUM_ROWS, NUM_COLUMNS );
-  foldEffect.SetSize( VIEW_AREA_SIZE );
-  foldEffect.SetTransitionDuration( TRANSITION_DURATION );
-  foldEffect.SetCurrentTexture( texture );
-  foldEffect.SetTargetTexture( texture );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  Texture              texture    = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40);
+  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New(NUM_ROWS, NUM_COLUMNS);
+  foldEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  foldEffect.SetTransitionDuration(TRANSITION_DURATION);
+  foldEffect.SetCurrentTexture(texture);
+  foldEffect.SetTargetTexture(texture);
 
-  Stage::GetCurrent().Add( foldEffect );
+  application.GetScene().Add(foldEffect);
 
   application.SendNotification();
   application.Render();
@@ -569,36 +562,35 @@ int UtcDaliCubeTransitionFoldEffectStartTransition(void)
   Actor cube1 = foldEffect.GetChildAt(0).GetChildAt(1);
 
   //check the cube rotation value and color values just before the end of different transitions
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
 
-  foldEffect.SetTargetTexture( texture );
+  foldEffect.SetTargetTexture(texture);
   foldEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1);
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
 
-
-  foldEffect.SetTargetTexture( texture );
+  foldEffect.SetTargetTexture(texture);
   foldEffect.StartTransition(false);
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(),FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
 
-  foldEffect.SetTargetTexture( texture );
+  foldEffect.SetTargetTexture(texture);
   foldEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2);
-  Wait( application, TRANSITION_BEFORE_END_DURATION );
-  DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( -Dali::ANGLE_90,  Vector3::YAXIS), EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION );
+  Wait(application, TRANSITION_BEFORE_END_DURATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(-Dali::ANGLE_90, Vector3::YAXIS), EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, EPISILON, TEST_LOCATION);
   END_TEST;
 }
 
@@ -607,88 +599,88 @@ int UtcDaliCubeTransitionEffectSignalTransitionCompleted(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionEffectSignalTransitionCompleted ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
-  Texture firstTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30 );
-  Texture secondTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20 );
-  Texture thirdTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40 );
-
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetSize( VIEW_AREA_SIZE );
-  waveEffect.SetTransitionDuration( TRANSITION_DURATION );
-  waveEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  Stage::GetCurrent().Add( waveEffect );
-
-  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-  crossEffect.SetSize( VIEW_AREA_SIZE );
-  crossEffect.SetTransitionDuration( TRANSITION_DURATION );
-  crossEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  Stage::GetCurrent().Add( crossEffect );
-
-  CubeTransitionEffect foldEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-  foldEffect.SetSize( VIEW_AREA_SIZE );
-  foldEffect.SetTransitionDuration( TRANSITION_DURATION );
-  Stage::GetCurrent().Add( foldEffect );
-
-  bool signalVerified = false;
-  CubeTransitionEffect currentEffect;
-  Texture actorTransitTo;
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  Texture firstTexture  = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30);
+  Texture secondTexture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20);
+  Texture thirdTexture  = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 40, 40);
+
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  waveEffect.SetTransitionDuration(TRANSITION_DURATION);
+  waveEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  application.GetScene().Add(waveEffect);
+
+  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+  crossEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  crossEffect.SetTransitionDuration(TRANSITION_DURATION);
+  crossEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  application.GetScene().Add(crossEffect);
+
+  CubeTransitionEffect foldEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+  foldEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  foldEffect.SetTransitionDuration(TRANSITION_DURATION);
+  application.GetScene().Add(foldEffect);
+
+  bool                        signalVerified = false;
+  CubeTransitionEffect        currentEffect;
+  Texture                     actorTransitTo;
   TransitionCompletedCallback callback(signalVerified, currentEffect, actorTransitTo);
-  waveEffect.TransitionCompletedSignal().Connect( &callback, &TransitionCompletedCallback::Callback );
-  crossEffect.TransitionCompletedSignal().Connect( &callback, &TransitionCompletedCallback::Callback );
-  foldEffect.TransitionCompletedSignal().Connect( &callback, &TransitionCompletedCallback::Callback );
+  waveEffect.TransitionCompletedSignal().Connect(&callback, &TransitionCompletedCallback::Callback);
+  crossEffect.TransitionCompletedSignal().Connect(&callback, &TransitionCompletedCallback::Callback);
+  foldEffect.TransitionCompletedSignal().Connect(&callback, &TransitionCompletedCallback::Callback);
 
   //check that the wave effect is used to transit to secondTexture
-  currentEffect = waveEffect;
+  currentEffect  = waveEffect;
   actorTransitTo = secondTexture;
-  waveEffect.SetCurrentTexture( firstTexture );
-  waveEffect.SetTargetTexture( secondTexture );
+  waveEffect.SetCurrentTexture(firstTexture);
+  waveEffect.SetTargetTexture(secondTexture);
   waveEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1);
-  Wait( application, TRANSITION_DURATION );
+  Wait(application, TRANSITION_DURATION);
   DALI_TEST_CHECK(callback.mSignalVerified);
   callback.Reset();
 
   //check that the wave effect is used to transit to thirdTexture
   actorTransitTo = thirdTexture;
-  waveEffect.SetTargetTexture( thirdTexture );
+  waveEffect.SetTargetTexture(thirdTexture);
   waveEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2);
-  Wait( application, TRANSITION_DURATION );
+  Wait(application, TRANSITION_DURATION);
   DALI_TEST_CHECK(callback.mSignalVerified);
   callback.Reset();
 
   //check that the cross effect is used to transit to secondTexture
-  currentEffect = crossEffect;
+  currentEffect  = crossEffect;
   actorTransitTo = secondTexture;
-  crossEffect.SetCurrentTexture( thirdTexture );
-  crossEffect.SetTargetTexture( secondTexture );
+  crossEffect.SetCurrentTexture(thirdTexture);
+  crossEffect.SetTargetTexture(secondTexture);
   crossEffect.StartTransition(true);
-  Wait( application, TRANSITION_DURATION );
+  Wait(application, TRANSITION_DURATION);
   DALI_TEST_CHECK(callback.mSignalVerified);
   callback.Reset();
 
   //check that the cross effect is used to transit to firstTexture
   actorTransitTo = firstTexture;
-  crossEffect.SetTargetTexture( firstTexture );
+  crossEffect.SetTargetTexture(firstTexture);
   crossEffect.StartTransition(false);
-  Wait( application, TRANSITION_DURATION );
+  Wait(application, TRANSITION_DURATION);
   DALI_TEST_CHECK(callback.mSignalVerified);
   callback.Reset();
 
   //check that the fold effect is used to transit to secondTexture
-  currentEffect = foldEffect;
+  currentEffect  = foldEffect;
   actorTransitTo = secondTexture;
-  foldEffect.SetCurrentTexture( firstTexture );
-  foldEffect.SetTargetTexture( secondTexture );
+  foldEffect.SetCurrentTexture(firstTexture);
+  foldEffect.SetTargetTexture(secondTexture);
   foldEffect.StartTransition();
-  Wait( application, TRANSITION_DURATION );
-  DALI_TEST_CHECK( callback.mSignalVerified );
+  Wait(application, TRANSITION_DURATION);
+  DALI_TEST_CHECK(callback.mSignalVerified);
   callback.Reset();
 
   //check that the fold effect is used to transit to thirdTexture
   actorTransitTo = thirdTexture;
-  foldEffect.SetTargetTexture( thirdTexture );
-  foldEffect.StartTransition( false );
-  Wait( application, TRANSITION_DURATION );
-  DALI_TEST_CHECK( callback.mSignalVerified );
+  foldEffect.SetTargetTexture(thirdTexture);
+  foldEffect.StartTransition(false);
+  Wait(application, TRANSITION_DURATION);
+  DALI_TEST_CHECK(callback.mSignalVerified);
   END_TEST;
 }
 
@@ -697,104 +689,104 @@ int UtcDaliCubeTransitionEffectPauseResumeTransition(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionEffectPauseResumeTransition ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
-  Texture firstTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30 );
-  Texture secondTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20 );
-
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetSize( VIEW_AREA_SIZE );
-  waveEffect.SetTransitionDuration( TRANSITION_DURATION );
-  waveEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  Stage::GetCurrent().Add( waveEffect );
-
-  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-  crossEffect.SetSize( VIEW_AREA_SIZE );
-  crossEffect.SetTransitionDuration( TRANSITION_DURATION );
-  crossEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  Stage::GetCurrent().Add( crossEffect );
-
-  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New( NUM_ROWS, NUM_COLUMNS );
-  foldEffect.SetSize( VIEW_AREA_SIZE );
-  foldEffect.SetTransitionDuration( TRANSITION_DURATION );
-  Stage::GetCurrent().Add( foldEffect );
-
-  bool signalVerified = false;
-  CubeTransitionEffect currentEffect;
-  Texture actorTransitTo;
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  Texture firstTexture  = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30);
+  Texture secondTexture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20);
+
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  waveEffect.SetTransitionDuration(TRANSITION_DURATION);
+  waveEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  application.GetScene().Add(waveEffect);
+
+  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+  crossEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  crossEffect.SetTransitionDuration(TRANSITION_DURATION);
+  crossEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  application.GetScene().Add(crossEffect);
+
+  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New(NUM_ROWS, NUM_COLUMNS);
+  foldEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  foldEffect.SetTransitionDuration(TRANSITION_DURATION);
+  application.GetScene().Add(foldEffect);
+
+  bool                        signalVerified = false;
+  CubeTransitionEffect        currentEffect;
+  Texture                     actorTransitTo;
   TransitionCompletedCallback callback(signalVerified, currentEffect, actorTransitTo);
-  waveEffect.TransitionCompletedSignal().Connect( &callback, &TransitionCompletedCallback::Callback );
-  crossEffect.TransitionCompletedSignal().Connect( &callback, &TransitionCompletedCallback::Callback );
-  foldEffect.TransitionCompletedSignal().Connect( &callback, &TransitionCompletedCallback::Callback );
+  waveEffect.TransitionCompletedSignal().Connect(&callback, &TransitionCompletedCallback::Callback);
+  crossEffect.TransitionCompletedSignal().Connect(&callback, &TransitionCompletedCallback::Callback);
+  foldEffect.TransitionCompletedSignal().Connect(&callback, &TransitionCompletedCallback::Callback);
 
-  currentEffect = waveEffect;
+  currentEffect  = waveEffect;
   actorTransitTo = secondTexture;
-  waveEffect.SetCurrentTexture( firstTexture );
-  waveEffect.SetTargetTexture( secondTexture );
+  waveEffect.SetCurrentTexture(firstTexture);
+  waveEffect.SetTargetTexture(secondTexture);
   // start transition; transit for 0.5*duration; pause for 0.5*duration;
   // resume for 0.25*duration; pause for 0.25*duration; resume for another 0.25*duration;
   // only until now the transition finished signal can be received
   waveEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1);
-  Wait( application, TRANSITION_DURATION*0.5f );
+  Wait(application, TRANSITION_DURATION * 0.5f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   waveEffect.PauseTransition();
-  Wait( application, TRANSITION_DURATION*0.5f );
+  Wait(application, TRANSITION_DURATION * 0.5f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   waveEffect.ResumeTransition();
-  Wait( application, TRANSITION_DURATION*0.25f );
+  Wait(application, TRANSITION_DURATION * 0.25f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   waveEffect.PauseTransition();
-  Wait( application, TRANSITION_DURATION*0.25f );
+  Wait(application, TRANSITION_DURATION * 0.25f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   waveEffect.ResumeTransition();
-  Wait( application, TRANSITION_DURATION*0.25f );
+  Wait(application, TRANSITION_DURATION * 0.25f);
   DALI_TEST_CHECK(callback.mSignalVerified);
   callback.Reset();
 
-  currentEffect = crossEffect;
+  currentEffect  = crossEffect;
   actorTransitTo = firstTexture;
-  crossEffect.SetCurrentTexture( secondTexture );
-  crossEffect.SetTargetTexture( firstTexture );
+  crossEffect.SetCurrentTexture(secondTexture);
+  crossEffect.SetTargetTexture(firstTexture);
   // start transition; transit for 0.25*duration; pause for 0.2*duration;
   // resume for 0.5*duration; pause for 0.2*duration; resume for another 0.25*duration;
   // only until now the transition finished signal can be received
   crossEffect.StartTransition(false);
-  Wait( application, TRANSITION_DURATION*0.25f );
+  Wait(application, TRANSITION_DURATION * 0.25f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   crossEffect.PauseTransition();
-  Wait( application, TRANSITION_DURATION*0.2f );
+  Wait(application, TRANSITION_DURATION * 0.2f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   crossEffect.ResumeTransition();
-  Wait( application, TRANSITION_DURATION*0.5f );
+  Wait(application, TRANSITION_DURATION * 0.5f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   crossEffect.PauseTransition();
-  Wait( application, TRANSITION_DURATION*0.2f );
+  Wait(application, TRANSITION_DURATION * 0.2f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   crossEffect.ResumeTransition();
-  Wait( application, TRANSITION_DURATION*0.25f );
+  Wait(application, TRANSITION_DURATION * 0.25f);
   DALI_TEST_CHECK(callback.mSignalVerified);
   callback.Reset();
 
-  currentEffect = foldEffect;
+  currentEffect  = foldEffect;
   actorTransitTo = secondTexture;
-  foldEffect.SetCurrentTexture( firstTexture );
-  foldEffect.SetTargetTexture( secondTexture );
+  foldEffect.SetCurrentTexture(firstTexture);
+  foldEffect.SetTargetTexture(secondTexture);
   // start transition; transit for 0.5*duration; pause for 0.5*duration;
   // resume for 0.25*duration; pause for 0.25*duration; resume for another 0.25*duration;
   // only until now the transition finished signal can be received
   foldEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1);
-  Wait( application, TRANSITION_DURATION*0.5f );
+  Wait(application, TRANSITION_DURATION * 0.5f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   foldEffect.PauseTransition();
-  Wait( application, TRANSITION_DURATION*0.5f );
+  Wait(application, TRANSITION_DURATION * 0.5f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   foldEffect.ResumeTransition();
-  Wait( application, TRANSITION_DURATION*0.25f );
+  Wait(application, TRANSITION_DURATION * 0.25f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   foldEffect.PauseTransition();
-  Wait( application, TRANSITION_DURATION*0.25f );
+  Wait(application, TRANSITION_DURATION * 0.25f);
   DALI_TEST_CHECK(!callback.mSignalVerified);
   foldEffect.ResumeTransition();
-  Wait( application, TRANSITION_DURATION*0.25f );
+  Wait(application, TRANSITION_DURATION * 0.25f);
   DALI_TEST_CHECK(callback.mSignalVerified);
   END_TEST;
 }
@@ -804,18 +796,18 @@ int UtcDaliCubeTransitionWaveEffectStopTransition(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionWaveEffectStopTransition ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
-  Texture firstTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30 );
-  Texture secondTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20 );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  Texture firstTexture  = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30);
+  Texture secondTexture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20);
 
-  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New( NUM_ROWS, NUM_COLUMNS );
-  waveEffect.SetSize( VIEW_AREA_SIZE );
-  waveEffect.SetTransitionDuration( TRANSITION_DURATION );
-  waveEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  waveEffect.SetCurrentTexture( firstTexture );
-  waveEffect.SetTargetTexture( secondTexture );
+  CubeTransitionEffect waveEffect = CubeTransitionWaveEffect::New(NUM_ROWS, NUM_COLUMNS);
+  waveEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  waveEffect.SetTransitionDuration(TRANSITION_DURATION);
+  waveEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  waveEffect.SetCurrentTexture(firstTexture);
+  waveEffect.SetTargetTexture(secondTexture);
 
-  Stage::GetCurrent().Add( waveEffect );
+  application.GetScene().Add(waveEffect);
 
   application.SendNotification();
   application.Render();
@@ -825,43 +817,43 @@ int UtcDaliCubeTransitionWaveEffectStopTransition(void)
   Actor cube = waveEffect.GetChildAt(0).GetChildAt(0);
 
   //check the cube rotation value and color values reset after stopping different transitions in the middle
-  Wait( application, TRANSITION_DURATION*0.2f );
+  Wait(application, TRANSITION_DURATION * 0.2f);
   waveEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
 
-  waveEffect.SetTargetTexture( firstTexture );
+  waveEffect.SetTargetTexture(firstTexture);
   waveEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1);
-  Wait( application, TRANSITION_DURATION*0.4f );
+  Wait(application, TRANSITION_DURATION * 0.4f);
   waveEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
 
-  waveEffect.SetTargetTexture( secondTexture );
+  waveEffect.SetTargetTexture(secondTexture);
   waveEffect.StartTransition(false);
-  Wait( application, TRANSITION_DURATION*0.6f );
+  Wait(application, TRANSITION_DURATION * 0.6f);
   waveEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
 
-  waveEffect.SetTargetTexture( firstTexture );
+  waveEffect.SetTargetTexture(firstTexture);
   waveEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2);
-  Wait( application, TRANSITION_DURATION*0.8f );
+  Wait(application, TRANSITION_DURATION * 0.8f);
   waveEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
   END_TEST;
 }
 
@@ -870,18 +862,18 @@ int UtcDaliCubeTransitionCrossEffectStopTransition(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionCrossEffectStopTransition ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
-  Texture firstTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30 );
-  Texture secondTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20 );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  Texture firstTexture  = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30);
+  Texture secondTexture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20);
 
-  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New( NUM_ROWS, NUM_COLUMNS );
-  crossEffect.SetSize( VIEW_AREA_SIZE );
-  crossEffect.SetTransitionDuration( TRANSITION_DURATION );
-  crossEffect.SetCubeDisplacement( CUBE_DISPLACEMENT );
-  crossEffect.SetCurrentTexture( firstTexture );
-  crossEffect.SetTargetTexture( secondTexture );
+  CubeTransitionEffect crossEffect = CubeTransitionCrossEffect::New(NUM_ROWS, NUM_COLUMNS);
+  crossEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  crossEffect.SetTransitionDuration(TRANSITION_DURATION);
+  crossEffect.SetCubeDisplacement(CUBE_DISPLACEMENT);
+  crossEffect.SetCurrentTexture(firstTexture);
+  crossEffect.SetTargetTexture(secondTexture);
 
-  Stage::GetCurrent().Add( crossEffect );
+  application.GetScene().Add(crossEffect);
 
   application.SendNotification();
   application.Render();
@@ -892,47 +884,47 @@ int UtcDaliCubeTransitionCrossEffectStopTransition(void)
   Actor cube1 = crossEffect.GetChildAt(0).GetChildAt(1);
 
   //check the cube rotation values and color values reset after stop the different transitions in the middle
-  Wait( application, TRANSITION_DURATION*0.2f );
+  Wait(application, TRANSITION_DURATION * 0.2f);
   crossEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
 
-  crossEffect.SetTargetTexture( firstTexture );
+  crossEffect.SetTargetTexture(firstTexture);
   crossEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1);
-  Wait( application, TRANSITION_DURATION*0.4f );
+  Wait(application, TRANSITION_DURATION * 0.4f);
   crossEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
 
-  crossEffect.SetTargetTexture( secondTexture );
+  crossEffect.SetTargetTexture(secondTexture);
   crossEffect.StartTransition(false);
-  Wait( application, TRANSITION_DURATION*0.6f );
+  Wait(application, TRANSITION_DURATION * 0.6f);
   crossEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::ZERO), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::ZERO), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
 
-  crossEffect.SetTargetTexture( firstTexture );
+  crossEffect.SetTargetTexture(firstTexture);
   crossEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2);
-  Wait( application, TRANSITION_DURATION*0.8f );
+  Wait(application, TRANSITION_DURATION * 0.8f);
   crossEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
   END_TEST;
 }
 
@@ -941,17 +933,17 @@ int UtcDaliCubeTransitionFoldEffectStopTransition(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliCubeTransitionFoldEffectStopTransition ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
-  Texture firstTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30 );
-  Texture secondTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20 );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
+  Texture firstTexture  = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 30, 30);
+  Texture secondTexture = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 20, 20);
 
-  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New( NUM_ROWS, NUM_COLUMNS );
-  foldEffect.SetSize( VIEW_AREA_SIZE );
-  foldEffect.SetTransitionDuration( TRANSITION_DURATION );
-  foldEffect.SetCurrentTexture( firstTexture );
-  foldEffect.SetTargetTexture( secondTexture );
+  CubeTransitionEffect foldEffect = CubeTransitionFoldEffect::New(NUM_ROWS, NUM_COLUMNS);
+  foldEffect.SetProperty(Actor::Property::SIZE, Vector2(VIEW_AREA_SIZE));
+  foldEffect.SetTransitionDuration(TRANSITION_DURATION);
+  foldEffect.SetCurrentTexture(firstTexture);
+  foldEffect.SetTargetTexture(secondTexture);
 
-  Stage::GetCurrent().Add( foldEffect );
+  application.GetScene().Add(foldEffect);
 
   application.SendNotification();
   application.Render();
@@ -962,47 +954,47 @@ int UtcDaliCubeTransitionFoldEffectStopTransition(void)
   Actor cube1 = foldEffect.GetChildAt(0).GetChildAt(1);
 
   //check the cube rotation values and color values after stop the different transitions in the middle
-  Wait( application, TRANSITION_DURATION*0.2f );
+  Wait(application, TRANSITION_DURATION * 0.2f);
   foldEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
 
-  DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
 
-  foldEffect.SetTargetTexture( firstTexture );
+  foldEffect.SetTargetTexture(firstTexture);
   foldEffect.StartTransition(PAN_POSITION1, PAN_DISPLACEMENT1);
-  Wait( application, TRANSITION_DURATION*0.4f );
+  Wait(application, TRANSITION_DURATION * 0.4f);
   foldEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
 
-  foldEffect.SetTargetTexture( secondTexture );
+  foldEffect.SetTargetTexture(secondTexture);
   foldEffect.StartTransition(false);
-  Wait( application, TRANSITION_DURATION*0.6f );
+  Wait(application, TRANSITION_DURATION * 0.6f);
   foldEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::XAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
 
-  foldEffect.SetTargetTexture( firstTexture );
+  foldEffect.SetTargetTexture(firstTexture);
   foldEffect.StartTransition(PAN_POSITION2, PAN_DISPLACEMENT2);
-  Wait( application, TRANSITION_DURATION*0.8f );
+  Wait(application, TRANSITION_DURATION * 0.8f);
   foldEffect.StopTransition();
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
-  DALI_TEST_EQUALS( cube1.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetCurrentOrientation(), Quaternion( Dali::ANGLE_0,  Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION  );
-  DALI_TEST_EQUALS( cube0.GetChildAt(0).GetCurrentColor(), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
-  DALI_TEST_EQUALS( cube0.GetChildAt(1).GetCurrentColor(), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION );
+  DALI_TEST_EQUALS(cube1.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetCurrentProperty<Quaternion>(Actor::Property::ORIENTATION), Quaternion(Dali::ANGLE_0, Vector3::YAXIS), FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(0).GetCurrentProperty<Vector4>(Actor::Property::COLOR), FULL_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
+  DALI_TEST_EQUALS(cube0.GetChildAt(1).GetCurrentProperty<Vector4>(Actor::Property::COLOR), HALF_BRIGHTNESS, FLT_EPISILON, TEST_LOCATION);
   END_TEST;
 }
Domain: Graphics System / DALi;