Add KEYBOARD_FOCUSABLE_CHILDREN property.
[platform/core/uifw/dali-core.git] / automated-tests / src / dali / utc-Dali-Actor.cpp
index e772118..8da28bc 100644 (file)
@@ -26,6 +26,7 @@
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/public-api/dali-core.h>
 #include <mesh-builder.h>
+#include <test-actor-utils.h>
 
 #include <cfloat> // For FLT_MAX
 #include <string>
@@ -636,6 +637,32 @@ int UtcDaliActorRemoveP(void)
   END_TEST;
 }
 
+int UtcDaliActorSwitchParentN(void)
+{
+  tet_infoline("Testing Actor::UtcDaliActorSwitchParentN");
+  TestApplication application;
+
+  Actor parent1 = Actor::New();
+  Actor child   = Actor::New();
+
+  DALI_TEST_EQUALS(parent1.GetChildCount(), 0u, TEST_LOCATION);
+
+  parent1.Add(child);
+
+  DALI_TEST_EQUALS(parent1.GetChildCount(), 1u, TEST_LOCATION);
+
+  Actor parent2 = Actor::New();
+
+  DALI_TEST_EQUALS(parent2.GetChildCount(), 0u, TEST_LOCATION);
+
+  // Try switch parent with that both of parent1 and parent2 are off scene.
+  DevelActor::SwitchParent(child, parent2);
+
+  DALI_TEST_EQUALS(parent1.GetChildCount(), 1u, TEST_LOCATION);
+  DALI_TEST_EQUALS(parent2.GetChildCount(), 0u, TEST_LOCATION);
+  END_TEST;
+}
+
 int UtcDaliActorGetChildCount(void)
 {
   TestApplication application;
@@ -2523,6 +2550,54 @@ int UtcDaliActorIsKeyboardFocusable(void)
   END_TEST;
 }
 
+int UtcDaliActorSetKeyboardFocusableChildren(void)
+{
+  TestApplication application;
+
+  Actor actor = Actor::New();
+
+  actor.SetProperty(DevelActor::Property::KEYBOARD_FOCUSABLE_CHILDREN, true);
+  DALI_TEST_CHECK(actor.GetProperty<bool>(DevelActor::Property::KEYBOARD_FOCUSABLE_CHILDREN) == true);
+
+  actor.SetProperty(DevelActor::Property::KEYBOARD_FOCUSABLE_CHILDREN, false);
+  DALI_TEST_CHECK(actor.GetProperty<bool>(DevelActor::Property::KEYBOARD_FOCUSABLE_CHILDREN) == false);
+  END_TEST;
+}
+
+int UtcDaliActorAreChildrenKeyBoardFocusable(void)
+{
+  TestApplication application;
+
+  Actor actor = Actor::New();
+
+  DALI_TEST_CHECK(actor.GetProperty<bool>(DevelActor::Property::KEYBOARD_FOCUSABLE_CHILDREN) == true);
+  END_TEST;
+}
+
+int UtcDaliActorSetTouchFocusable(void)
+{
+  TestApplication application;
+
+  Actor actor = Actor::New();
+
+  actor.SetProperty(DevelActor::Property::TOUCH_FOCUSABLE, true);
+  DALI_TEST_CHECK(actor.GetProperty<bool>(DevelActor::Property::TOUCH_FOCUSABLE) == true);
+
+  actor.SetProperty(DevelActor::Property::TOUCH_FOCUSABLE, false);
+  DALI_TEST_CHECK(actor.GetProperty<bool>(DevelActor::Property::TOUCH_FOCUSABLE) == false);
+  END_TEST;
+}
+
+int UtcDaliActorIsTouchFocusable(void)
+{
+  TestApplication application;
+
+  Actor actor = Actor::New();
+
+  DALI_TEST_CHECK(actor.GetProperty<bool>(DevelActor::Property::TOUCH_FOCUSABLE) == false);
+  END_TEST;
+}
+
 int UtcDaliActorRemoveConstraints(void)
 {
   tet_infoline(" UtcDaliActorRemoveConstraints");
@@ -2963,9 +3038,9 @@ int UtcDaliActorSetDrawModeOverlayRender(void)
   ids.push_back(10); // third rendered actor
   application.GetGlAbstraction().SetNextTextureIds(ids);
 
-  Texture imageA = Texture::New(TextureType::TEXTURE_2D, Pixel::Format::RGBA8888, 16, 16);
-  Texture imageB = Texture::New(TextureType::TEXTURE_2D, Pixel::Format::RGBA8888, 16, 16);
-  Texture imageC = Texture::New(TextureType::TEXTURE_2D, Pixel::Format::RGBA8888, 16, 16);
+  Texture imageA = CreateTexture(TextureType::TEXTURE_2D, Pixel::Format::RGBA8888, 16, 16);
+  Texture imageB = CreateTexture(TextureType::TEXTURE_2D, Pixel::Format::RGBA8888, 16, 16);
+  Texture imageC = CreateTexture(TextureType::TEXTURE_2D, Pixel::Format::RGBA8888, 16, 16);
   Actor   a      = CreateRenderableActor(imageA);
   Actor   b      = CreateRenderableActor(imageB);
   Actor   c      = CreateRenderableActor(imageC);
@@ -4104,7 +4179,7 @@ int UtcDaliActorRemoveRendererN(void)
 // Clipping test helper functions:
 Actor CreateActorWithContent(uint32_t width, uint32_t height)
 {
-  Texture image = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, width, height);
+  Texture image = CreateTexture(TextureType::TEXTURE_2D, Pixel::RGBA8888, width, height);
   Actor   actor = CreateRenderableActor(image);
 
   // Setup dimensions and position so actor is not skipped by culling.
@@ -4142,7 +4217,9 @@ void CheckColorMask(TestGlAbstraction& glAbstraction, bool maskValue)
   DALI_TEST_EQUALS<bool>(colorMaskParams.red, maskValue, TEST_LOCATION);
   DALI_TEST_EQUALS<bool>(colorMaskParams.green, maskValue, TEST_LOCATION);
   DALI_TEST_EQUALS<bool>(colorMaskParams.blue, maskValue, TEST_LOCATION);
-  DALI_TEST_EQUALS<bool>(colorMaskParams.alpha, maskValue, TEST_LOCATION);
+
+  // @todo only test alpha if the framebuffer has an alpha channel
+  //DALI_TEST_EQUALS<bool>(colorMaskParams.alpha, maskValue, TEST_LOCATION);
 }
 
 int UtcDaliActorPropertyClippingP(void)
@@ -4251,7 +4328,9 @@ int UtcDaliActorPropertyClippingActor(void)
   CheckColorMask(glAbstraction, true);
 
   // Check the stencil buffer was enabled.
-  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Enable", "2960")); // 2960 is GL_STENCIL_TEST
+  std::ostringstream oss;
+  oss << std::hex << GL_STENCIL_TEST;
+  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Enable", oss.str()));
 
   // Check the stencil buffer was cleared.
   DALI_TEST_CHECK(stencilTrace.FindMethodAndParamsFromStartIndex("ClearStencil", "0", startIndex));
@@ -4287,7 +4366,9 @@ int UtcDaliActorPropertyClippingActorEnableThenDisable(void)
   CheckColorMask(glAbstraction, true);
 
   // Check the stencil buffer was enabled.
-  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Enable", "2960")); // 2960 is GL_STENCIL_TEST
+  std::ostringstream oss;
+  oss << std::hex << GL_STENCIL_TEST;
+  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Enable", oss.str()));
 
   // Check the stencil buffer was cleared.
   DALI_TEST_CHECK(stencilTrace.FindMethodAndParamsFromStartIndex("ClearStencil", "0", startIndex));
@@ -4304,7 +4385,9 @@ int UtcDaliActorPropertyClippingActorEnableThenDisable(void)
   GenerateTrace(application, enabledDisableTrace, stencilTrace);
 
   // Check the stencil buffer was disabled.
-  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Disable", "2960")); // 2960 is GL_STENCIL_TEST
+  std::ostringstream stencil;
+  stencil << std::hex << GL_STENCIL_TEST;
+  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Disable", stencil.str()));
 
   // Ensure all values in stencil-mask are set to 1.
   startIndex = 0u;
@@ -4351,7 +4434,9 @@ int UtcDaliActorPropertyClippingNestedChildren(void)
   CheckColorMask(glAbstraction, true);
 
   // Check the stencil buffer was enabled.
-  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Enable", "2960")); // 2960 is GL_STENCIL_TEST
+  std::ostringstream oss;
+  oss << std::hex << GL_STENCIL_TEST;
+  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Enable", oss.str()));
 
   // Perform the test twice, once for 2D layer, and once for 3D.
   for(unsigned int i = 0u; i < 2u; ++i)
@@ -4412,7 +4497,7 @@ int UtcDaliActorPropertyClippingActorDrawOrder(void)
   Actor actors[5];
   for(int i = 0; i < 5; ++i)
   {
-    Texture image = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 16u, 16u);
+    Texture image = CreateTexture(TextureType::TEXTURE_2D, Pixel::RGBA8888, 16u, 16u);
     Actor   actor = CreateRenderableActor(image);
 
     // Setup dimensions and position so actor is not skipped by culling.
@@ -4458,10 +4543,15 @@ int UtcDaliActorPropertyClippingActorDrawOrder(void)
      Note: Correct enable call trace:    StackTrace: Index:0, Function:Enable, ParamList:3042 StackTrace: Index:1, Function:Enable, ParamList:2960 StackTrace: Index:2, Function:Disable, ParamList:2960
            Incorrect enable call trace:  StackTrace: Index:0, Function:Enable, ParamList:3042 StackTrace: Index:1, Function:Enable, ParamList:2960
   */
-  size_t startIndex = 0u;
-  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParamsFromStartIndex("Enable", "3042", startIndex));
-  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParamsFromStartIndex("Enable", "2960", startIndex)); // 2960 is GL_STENCIL_TEST
-  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParamsFromStartIndex("Disable", "2960", startIndex));
+  size_t             startIndex = 0u;
+  std::ostringstream blend;
+  blend << std::hex << GL_BLEND;
+  std::ostringstream stencil;
+  stencil << std::hex << GL_STENCIL_TEST;
+
+  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParamsFromStartIndex("Enable", blend.str(), startIndex));
+  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParamsFromStartIndex("Enable", stencil.str(), startIndex));
+  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParamsFromStartIndex("Disable", stencil.str(), startIndex));
 
   // Swap the clipping actor from top of left branch to top of right branch.
   actors[1].SetProperty(Actor::Property::CLIPPING_MODE, ClippingMode::DISABLED);
@@ -4477,13 +4567,13 @@ int UtcDaliActorPropertyClippingActorDrawOrder(void)
   // Check stencil is enabled but NOT disabled again (as right-hand branch of tree is drawn).
   // This proves the draw order has remained the same.
   startIndex = 0u;
-  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParamsFromStartIndex("Enable", "2960", startIndex));
-  DALI_TEST_CHECK(!enabledDisableTrace.FindMethodAndParamsFromStartIndex("Disable", "2960", startIndex));
+  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParamsFromStartIndex("Enable", stencil.str(), startIndex));
+  DALI_TEST_CHECK(!enabledDisableTrace.FindMethodAndParamsFromStartIndex("Disable", stencil.str(), startIndex));
 
   END_TEST;
 }
 
-int UtcDaliActorPropertyScissorClippingActor(void)
+int UtcDaliActorPropertyScissorClippingActor01(void)
 {
   // This test checks that an actor is correctly setup for clipping.
   tet_infoline("Testing Actor::Property::ClippingMode: CLIP_TO_BOUNDING_BOX actor");
@@ -4512,7 +4602,10 @@ int UtcDaliActorPropertyScissorClippingActor(void)
   CheckColorMask(glAbstraction, true);
 
   // Check scissor test was enabled.
-  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Enable", "3089")); // 3089 = 0xC11 (GL_SCISSOR_TEST)
+
+  std::ostringstream scissor;
+  scissor << std::hex << GL_SCISSOR_TEST;
+  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Enable", scissor.str()));
 
   // Check the scissor was set, and the coordinates are correct.
   std::stringstream compareParametersString;
@@ -4534,6 +4627,68 @@ int UtcDaliActorPropertyScissorClippingActor(void)
   END_TEST;
 }
 
+int UtcDaliActorPropertyScissorClippingActor02(void)
+{
+  // This test checks that an actor is correctly setup for clipping.
+  tet_infoline("Testing Actor::Property::ClippingMode: CLIP_TO_BOUNDING_BOX actor with a transparent renderer");
+  TestApplication application;
+
+  TestGlAbstraction& glAbstraction       = application.GetGlAbstraction();
+  TraceCallStack&    scissorTrace        = glAbstraction.GetScissorTrace();
+  TraceCallStack&    enabledDisableTrace = glAbstraction.GetEnableDisableTrace();
+
+  const Vector2 stageSize(TestApplication::DEFAULT_SURFACE_WIDTH, TestApplication::DEFAULT_SURFACE_HEIGHT);
+  const Vector2 actorSize(16.0f, 16.0f);
+
+  // Create a clipping actor.
+  Actor clippingActorA                  = CreateRenderableActor();
+  clippingActorA[Actor::Property::SIZE] = actorSize;
+
+  Renderer renderer = clippingActorA.GetRendererAt(0);
+  DALI_TEST_CHECK(renderer);
+
+  // Make Renderer opacity 0.
+  renderer[DevelRenderer::Property::OPACITY] = 0.0f;
+
+  // Note: Scissor coords are have flipped Y values compared with DALi's coordinate system.
+  // We choose BOTTOM_LEFT to give us x=0, y=0 starting coordinates for the first test.
+  clippingActorA.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_LEFT);
+  clippingActorA.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_LEFT);
+  clippingActorA.SetProperty(Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_TO_BOUNDING_BOX);
+  application.GetScene().Add(clippingActorA);
+
+  // Gather the call trace.
+  GenerateTrace(application, enabledDisableTrace, scissorTrace);
+
+  // Check we are writing to the color buffer.
+  CheckColorMask(glAbstraction, true);
+
+  // Check scissor test was enabled.
+
+  std::ostringstream scissor;
+  scissor << std::hex << GL_SCISSOR_TEST;
+  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Enable", scissor.str()));
+
+  // Check the scissor was set, and the coordinates are correct.
+  std::stringstream compareParametersString;
+  compareParametersString << "0, 0, " << actorSize.x << ", " << actorSize.y;
+  DALI_TEST_CHECK(scissorTrace.FindMethodAndParams("Scissor", compareParametersString.str())); // Compare with 0, 0, 16, 16
+
+  clippingActorA.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_RIGHT);
+  clippingActorA.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_RIGHT);
+
+  // Gather the call trace.
+  GenerateTrace(application, enabledDisableTrace, scissorTrace);
+
+  // Check the scissor was set, and the coordinates are correct.
+  compareParametersString.str(std::string());
+  compareParametersString.clear();
+  compareParametersString << (stageSize.x - actorSize.x) << ", " << (stageSize.y - actorSize.y) << ", " << actorSize.x << ", " << actorSize.y;
+  DALI_TEST_CHECK(scissorTrace.FindMethodAndParams("Scissor", compareParametersString.str())); // Compare with 464, 784, 16, 16
+
+  END_TEST;
+}
+
 int UtcDaliActorPropertyScissorClippingActorSiblings(void)
 {
   // This test checks that an actor is correctly setup for clipping.
@@ -4573,7 +4728,9 @@ int UtcDaliActorPropertyScissorClippingActorSiblings(void)
   CheckColorMask(glAbstraction, true);
 
   // Check scissor test was enabled.
-  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Enable", "3089")); // 3089 = 0xC11 (GL_SCISSOR_TEST)
+  std::ostringstream scissor;
+  scissor << std::hex << GL_SCISSOR_TEST;
+  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Enable", scissor.str()));
 
   // Check the scissor was set, and the coordinates are correct.
   std::stringstream compareParametersString;
@@ -4652,7 +4809,9 @@ int UtcDaliActorPropertyScissorClippingActorNested01(void)
     CheckColorMask(glAbstraction, true);
 
     // Check scissor test was enabled.
-    DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Enable", "3089")); // 3089 = 0xC11 (GL_SCISSOR_TEST)
+    std::ostringstream scissor;
+    scissor << std::hex << GL_SCISSOR_TEST;
+    DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Enable", scissor.str()));
 
     // Check the scissor was set, and the coordinates are correct.
     const Vector4&    expectResults(expect[test]);
@@ -4736,7 +4895,9 @@ int UtcDaliActorPropertyScissorClippingActorNested02(void)
   CheckColorMask(glAbstraction, true);
 
   // Check scissor test was enabled.
-  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Enable", "3089")); // 3089 = 0xC11 (GL_SCISSOR_TEST)
+  std::ostringstream scissor;
+  scissor << std::hex << GL_SCISSOR_TEST;
+  DALI_TEST_CHECK(enabledDisableTrace.FindMethodAndParams("Enable", scissor.str()));
 
   // Check the scissor was set, and the coordinates are correct.
   std::string clipA("0, 500, 480, 200");
@@ -4748,7 +4909,7 @@ int UtcDaliActorPropertyScissorClippingActorNested02(void)
   DALI_TEST_CHECK(scissorTrace.FindMethodAndParams("Scissor", clipB));
   DALI_TEST_CHECK(scissorTrace.FindMethodAndParams("Scissor", clipC));
   DALI_TEST_CHECK(scissorTrace.FindMethodAndParams("Scissor", clipD));
-  DALI_TEST_CHECK(scissorTrace.CountMethod("Scissor") == 4); // Scissor rect should not be changed in clippingActorE case. So count should be 4.
+  DALI_TEST_EQUALS(scissorTrace.CountMethod("Scissor"), 4, TEST_LOCATION); // Scissor rect should not be changed in clippingActorE case. So count should be 4.
 
   END_TEST;
 }
@@ -4778,11 +4939,14 @@ int UtcDaliActorPropertyClippingActorWithRendererOverride(void)
   CheckColorMask(glAbstraction, true);
 
   // Check the stencil buffer was not enabled.
-  DALI_TEST_CHECK(!enabledDisableTrace.FindMethodAndParams("Enable", "2960")); // 2960 is GL_STENCIL_TEST
+  std::ostringstream stencil;
+  stencil << std::hex << GL_STENCIL_TEST;
+  DALI_TEST_CHECK(!enabledDisableTrace.FindMethodAndParams("Enable", stencil.str()));
 
   // Check stencil functions are not called.
   DALI_TEST_CHECK(!stencilTrace.FindMethod("StencilFunc"));
-  DALI_TEST_CHECK(!stencilTrace.FindMethod("StencilMask"));
+  // TODO: Temporarily commented out the line below when caching is disabled. Will need to add it back.
+  //  DALI_TEST_CHECK(!stencilTrace.FindMethod("StencilMask"));
   DALI_TEST_CHECK(!stencilTrace.FindMethod("StencilOp"));
 
   // Check that scissor clipping is overriden by the renderer properties.
@@ -4794,7 +4958,9 @@ int UtcDaliActorPropertyClippingActorWithRendererOverride(void)
   GenerateTrace(application, enabledDisableTrace, scissorTrace);
 
   // Check the stencil buffer was not enabled.
-  DALI_TEST_CHECK(!enabledDisableTrace.FindMethodAndParams("Enable", "3089")); // 3089 = 0xC11 (GL_SCISSOR_TEST)
+  std::ostringstream scissor;
+  scissor << std::hex << GL_SCISSOR_TEST;
+  DALI_TEST_CHECK(!enabledDisableTrace.FindMethodAndParams("Enable", scissor.str()));
 
   DALI_TEST_CHECK(!scissorTrace.FindMethod("StencilFunc"));
 
@@ -5024,9 +5190,9 @@ int UtcDaliActorRaiseToTopLowerToBottom(void)
   tet_printf("Trace Output:%s \n", glSetUniformStack.GetTraceString().c_str());
 
   // Test order of uniforms in stack
-  int indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3");
-  int indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2");
-  int indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1");
+  int indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3.000000");
+  int indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2.000000");
+  int indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1.000000");
 
   bool CBA = (indexC > indexB) && (indexB > indexA);
 
@@ -5068,8 +5234,7 @@ int UtcDaliActorRaiseToTopLowerToBottom(void)
 
   application.ProcessEvent(touchEvent);
 
-  glAbstraction.ResetSetUniformCallStack();
-  glSetUniformStack = glAbstraction.GetSetUniformTrace();
+  glSetUniformStack.Reset();
 
   application.SendNotification();
   application.Render();
@@ -5077,9 +5242,9 @@ int UtcDaliActorRaiseToTopLowerToBottom(void)
   tet_printf("Trace:%s \n", glSetUniformStack.GetTraceString().c_str());
 
   // Test order of uniforms in stack
-  indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3");
-  indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2");
-  indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1");
+  indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3.000000");
+  indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2.000000");
+  indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1.000000");
 
   tet_infoline("Testing A above C and B at bottom\n");
   bool ACB = (indexA > indexC) && (indexC > indexB);
@@ -5105,8 +5270,7 @@ int UtcDaliActorRaiseToTopLowerToBottom(void)
 
   application.ProcessEvent(touchEvent);
 
-  glAbstraction.ResetSetUniformCallStack();
-  glSetUniformStack = glAbstraction.GetSetUniformTrace();
+  glSetUniformStack.Reset();
 
   application.SendNotification();
   application.Render();
@@ -5114,9 +5278,9 @@ int UtcDaliActorRaiseToTopLowerToBottom(void)
   tet_printf("Trace:%s \n", glSetUniformStack.GetTraceString().c_str());
 
   // Test order of uniforms in stack
-  indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3");
-  indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2");
-  indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1");
+  indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3.000000");
+  indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2.000000");
+  indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1.000000");
 
   tet_infoline("Testing B above A and C at bottom\n");
   bool BAC = (indexB > indexA) && (indexA > indexC);
@@ -5153,8 +5317,7 @@ int UtcDaliActorRaiseToTopLowerToBottom(void)
 
   application.ProcessEvent(touchEvent);
 
-  glAbstraction.ResetSetUniformCallStack();
-  glSetUniformStack = glAbstraction.GetSetUniformTrace();
+  glSetUniformStack.Reset();
 
   application.SendNotification();
   application.Render();
@@ -5162,9 +5325,9 @@ int UtcDaliActorRaiseToTopLowerToBottom(void)
   tet_printf("Trace:%s \n", glSetUniformStack.GetTraceString().c_str());
 
   // Test order of uniforms in stack
-  indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3");
-  indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2");
-  indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1");
+  indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3.000000");
+  indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2.000000");
+  indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1.000000");
 
   tet_infoline("Testing C above A and B at bottom\n");
   bool CAB = (indexC > indexA) && (indexA > indexB);
@@ -5481,14 +5644,12 @@ int UtcDaliActorLowerBelow(void)
   application.SendNotification();
   application.Render();
 
-  glSetUniformStack = glAbstraction.GetSetUniformTrace();
-
   tet_printf("Trace:%s \n", glSetUniformStack.GetTraceString().c_str());
 
   // Test order of uniforms in stack
-  int indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3");
-  int indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2");
-  int indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1");
+  int indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3.000000");
+  int indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2.000000");
+  int indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1.000000");
 
   tet_infoline("Testing C above B and A at bottom\n");
   bool CBA = (indexC > indexB) && (indexB > indexA);
@@ -5535,8 +5696,7 @@ int UtcDaliActorLowerBelow(void)
 
   application.ProcessEvent(touchEvent); // touch event
 
-  glAbstraction.ResetSetUniformCallStack();
-  glSetUniformStack = glAbstraction.GetSetUniformTrace();
+  glSetUniformStack.Reset();
 
   application.SendNotification();
   application.Render();
@@ -5544,9 +5704,9 @@ int UtcDaliActorLowerBelow(void)
   tet_printf("Trace:%s \n", glSetUniformStack.GetTraceString().c_str());
 
   // Test order of uniforms in stack
-  indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3");
-  indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2");
-  indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1");
+  indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3.000000");
+  indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2.000000");
+  indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1.000000");
 
   tet_infoline("Testing render order is A, C, B");
   DALI_TEST_EQUALS(indexC > indexA, true, TEST_LOCATION);
@@ -5573,16 +5733,15 @@ int UtcDaliActorLowerBelow(void)
 
   application.ProcessEvent(touchEvent);
 
-  glAbstraction.ResetSetUniformCallStack();
-  glSetUniformStack = glAbstraction.GetSetUniformTrace();
+  glSetUniformStack.Reset();
 
   application.Render();
   tet_printf("Trace:%s \n", glSetUniformStack.GetTraceString().c_str());
 
   // Test order of uniforms in stack
-  indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3");
-  indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2");
-  indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1");
+  indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3.000000");
+  indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2.000000");
+  indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1.000000");
 
   DALI_TEST_EQUALS(indexA > indexC, true, TEST_LOCATION);
   DALI_TEST_EQUALS(indexB > indexA, true, TEST_LOCATION);
@@ -5608,16 +5767,15 @@ int UtcDaliActorLowerBelow(void)
 
   application.ProcessEvent(touchEvent);
 
-  glAbstraction.ResetSetUniformCallStack();
-  glSetUniformStack = glAbstraction.GetSetUniformTrace();
+  glSetUniformStack.Reset();
 
   application.Render();
   tet_printf("Trace:%s \n", glSetUniformStack.GetTraceString().c_str());
 
   // Test order of uniforms in stack
-  indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3");
-  indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2");
-  indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1");
+  indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3.000000");
+  indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2.000000");
+  indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1.000000");
 
   DALI_TEST_EQUALS(indexC > indexB, true, TEST_LOCATION);
   DALI_TEST_EQUALS(indexA > indexC, true, TEST_LOCATION);
@@ -5706,14 +5864,12 @@ int UtcDaliActorLowerBelow2(void)
   application.SendNotification();
   application.Render();
 
-  glSetUniformStack = glAbstraction.GetSetUniformTrace();
-
   tet_printf("Trace:%s \n", glSetUniformStack.GetTraceString().c_str());
 
   // Test order of uniforms in stack
-  int indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3");
-  int indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2");
-  int indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1");
+  int indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3.000000");
+  int indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2.000000");
+  int indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1.000000");
 
   tet_infoline("Testing C above B and A at bottom\n");
   bool CBA = (indexC > indexB) && (indexB > indexA);
@@ -5760,8 +5916,7 @@ int UtcDaliActorLowerBelow2(void)
 
   application.ProcessEvent(touchEvent); // touch event
 
-  glAbstraction.ResetSetUniformCallStack();
-  glSetUniformStack = glAbstraction.GetSetUniformTrace();
+  glSetUniformStack.Reset();
 
   application.SendNotification();
   application.Render();
@@ -5769,9 +5924,9 @@ int UtcDaliActorLowerBelow2(void)
   tet_printf("Trace:%s \n", glSetUniformStack.GetTraceString().c_str());
 
   // Test order of uniforms in stack
-  indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3");
-  indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2");
-  indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1");
+  indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3.000000");
+  indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2.000000");
+  indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1.000000");
 
   tet_infoline("Testing render order is A, C, B");
   DALI_TEST_EQUALS(indexC > indexA, true, TEST_LOCATION);
@@ -5798,16 +5953,15 @@ int UtcDaliActorLowerBelow2(void)
 
   application.ProcessEvent(touchEvent);
 
-  glAbstraction.ResetSetUniformCallStack();
-  glSetUniformStack = glAbstraction.GetSetUniformTrace();
+  glSetUniformStack.Reset();
 
   application.Render();
   tet_printf("Trace:%s \n", glSetUniformStack.GetTraceString().c_str());
 
   // Test order of uniforms in stack
-  indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3");
-  indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2");
-  indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1");
+  indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3.000000");
+  indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2.000000");
+  indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1.000000");
 
   DALI_TEST_EQUALS(indexA > indexC, true, TEST_LOCATION);
   DALI_TEST_EQUALS(indexB > indexA, true, TEST_LOCATION);
@@ -5833,16 +5987,15 @@ int UtcDaliActorLowerBelow2(void)
 
   application.ProcessEvent(touchEvent);
 
-  glAbstraction.ResetSetUniformCallStack();
-  glSetUniformStack = glAbstraction.GetSetUniformTrace();
+  glSetUniformStack.Reset();
 
   application.Render();
   tet_printf("Trace:%s \n", glSetUniformStack.GetTraceString().c_str());
 
   // Test order of uniforms in stack
-  indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3");
-  indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2");
-  indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1");
+  indexC = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "3.000000");
+  indexB = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "2.000000");
+  indexA = glSetUniformStack.FindIndexFromMethodAndParams("uRendererColor", "1.000000");
 
   DALI_TEST_EQUALS(indexC > indexB, true, TEST_LOCATION);
   DALI_TEST_EQUALS(indexA > indexC, true, TEST_LOCATION);
@@ -7558,6 +7711,61 @@ int UtcDaliChildMovedSignalP(void)
   END_TEST;
 }
 
+int UtcDaliActorSwitchParentP(void)
+{
+  tet_infoline("Testing Actor::UtcDaliActorSwitchParentP");
+  TestApplication application;
+
+  Actor parent1 = Actor::New();
+  Actor child   = Actor::New();
+
+  application.GetScene().Add(parent1);
+
+  DALI_TEST_EQUALS(parent1.GetChildCount(), 0u, TEST_LOCATION);
+
+  child.OnSceneSignal().Connect(OnSceneCallback);
+  child.OffSceneSignal().Connect(OffSceneCallback);
+
+  // sanity check
+  DALI_TEST_CHECK(gOnSceneCallBackCalled == 0);
+  DALI_TEST_CHECK(gOffSceneCallBackCalled == 0);
+
+  parent1.Add(child);
+
+  DALI_TEST_EQUALS(parent1.GetChildCount(), 1u, TEST_LOCATION);
+
+  DALI_TEST_CHECK(gOnSceneCallBackCalled == 1);
+  DALI_TEST_CHECK(gOffSceneCallBackCalled == 0);
+
+  Actor parent2 = Actor::New();
+  application.GetScene().Add(parent2);
+
+  bool                  addSignalReceived = false;
+  ChildAddedSignalCheck addedSignal(addSignalReceived, child);
+  DevelActor::ChildAddedSignal(application.GetScene().GetRootLayer()).Connect(&application, addedSignal);
+  DALI_TEST_EQUALS(addSignalReceived, false, TEST_LOCATION);
+
+  bool                    removedSignalReceived = false;
+  ChildRemovedSignalCheck removedSignal(removedSignalReceived, child);
+  DevelActor::ChildRemovedSignal(application.GetScene().GetRootLayer()).Connect(&application, removedSignal);
+  DALI_TEST_EQUALS(removedSignalReceived, false, TEST_LOCATION);
+
+  DevelActor::SwitchParent(child, parent2);
+
+  DALI_TEST_EQUALS(addSignalReceived, false, TEST_LOCATION);
+  DALI_TEST_EQUALS(removedSignalReceived, false, TEST_LOCATION);
+
+  DALI_TEST_EQUALS(parent1.GetChildCount(), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(parent2.GetChildCount(), 1u, TEST_LOCATION);
+
+  DALI_TEST_CHECK(gOnSceneCallBackCalled == 1);
+  DALI_TEST_CHECK(gOffSceneCallBackCalled == 0);
+  DALI_TEST_CHECK(child.GetProperty<bool>(Dali::Actor::Property::CONNECTED_TO_SCENE));
+  DALI_TEST_CHECK(child.GetParent() == parent2);
+
+  END_TEST;
+}
+
 int utcDaliActorCulled(void)
 {
   TestApplication application;
@@ -8080,7 +8288,7 @@ int utcDaliActorPartialUpdateSetProperty(void)
   DALI_TEST_EQUALS(damagedRects.size(), 0, TEST_LOCATION);
   application.RenderWithPartialUpdate(damagedRects, clippingRect);
 
-  Texture image = Texture::New(TextureType::TEXTURE_2D, Pixel::RGBA8888, 4u, 4u);
+  Texture image = CreateTexture(TextureType::TEXTURE_2D, Pixel::RGBA8888, 4u, 4u);
   Actor   actor = CreateRenderableActor(image, RENDER_SHADOW_VERTEX_SOURCE, RENDER_SHADOW_FRAGMENT_SOURCE);
   actor.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
   actor.SetProperty(Actor::Property::POSITION, Vector3(16.0f, 16.0f, 0.0f));
@@ -8552,20 +8760,20 @@ int UtcDaliActorCaptureAllTouchAfterStartPropertyN(void)
   END_TEST;
 }
 
-int UtcDaliActorTouchAreaPropertyP(void)
+int UtcDaliActorTouchAreaOffsetPropertyP(void)
 {
   TestApplication application;
 
-  Actor   actor     = Actor::New();
-  Vector2 touchArea = actor.GetProperty(DevelActor::Property::TOUCH_AREA).Get<Vector2>();
-  DALI_TEST_EQUALS(touchArea, Vector2::ZERO, TEST_LOCATION);
-  actor.SetProperty(DevelActor::Property::TOUCH_AREA, Vector2(10.f, 10.f));
-  touchArea = actor.GetProperty(DevelActor::Property::TOUCH_AREA).Get<Vector2>();
-  DALI_TEST_EQUALS(touchArea, Vector2(10.f, 10.f), TEST_LOCATION);
+  Actor     actor           = Actor::New();
+  Rect<int> touchAreaOffset = actor.GetProperty(DevelActor::Property::TOUCH_AREA_OFFSET).Get<Rect<int>>();
+  DALI_TEST_EQUALS(Rect<int>(0, 0, 0, 0), touchAreaOffset, TEST_LOCATION);
+  actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, Rect<int>(10, 20, 30, 40));
+  touchAreaOffset = actor.GetProperty(DevelActor::Property::TOUCH_AREA_OFFSET).Get<Rect<int>>();
+  DALI_TEST_EQUALS(Rect<int>(10, 20, 30, 40), touchAreaOffset, TEST_LOCATION);
   END_TEST;
 }
 
-int UtcDaliActorTouchAreaPropertyN(void)
+int UtcDaliActorTouchAreaOffsetPropertyN(void)
 {
   TestApplication application;
 
@@ -8574,12 +8782,12 @@ int UtcDaliActorTouchAreaPropertyN(void)
   // Make sure setting invalid types does not cause a crash
   try
   {
-    actor.SetProperty(DevelActor::Property::TOUCH_AREA, 1.0f);
-    actor.SetProperty(DevelActor::Property::TOUCH_AREA, Vector2::ONE);
-    actor.SetProperty(DevelActor::Property::TOUCH_AREA, Vector3::ONE);
-    actor.SetProperty(DevelActor::Property::TOUCH_AREA, Vector4::ONE);
-    actor.SetProperty(DevelActor::Property::TOUCH_AREA, Property::Map());
-    actor.SetProperty(DevelActor::Property::TOUCH_AREA, Property::Array());
+    actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, 1.0f);
+    actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, Vector2::ONE);
+    actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, Vector3::ONE);
+    actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, Vector4::ONE);
+    actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, Property::Map());
+    actor.SetProperty(DevelActor::Property::TOUCH_AREA_OFFSET, Property::Array());
     tet_result(TET_PASS);
   }
   catch(...)