X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-Control.cpp;h=396bab4a7da7175ad8ee85a3bf4deae1a539cb76;hp=e7b096af0c4b6b58b67754a660fdbeffe4bfff5a;hb=894bdab40ca92a1c6ff5f553322b6c9f11d48741;hpb=667a103d2c6f9caba8c970bdafd26bdd10144715

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
old mode 100755
new mode 100644
index e7b096a..396bab4
--- a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -142,7 +142,7 @@ int UtcDaliControlRegister(void)
   ToolkitTestApplication application;
 
   // Ensure the object is registered after creation
-  ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
+  ObjectRegistry registry = application.GetCore().GetObjectRegistry();
   DALI_TEST_CHECK( registry );
 
   gObjectCreatedCallBackCalled = false;
@@ -181,6 +181,43 @@ int UtcDaliControlCopyAndAssignment(void)
   END_TEST;
 }
 
+int UtcDaliControlMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+
+  Control control = Control::New();
+  DALI_TEST_EQUALS( 1, control.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  control.SetProperty( Actor::Property::SENSITIVE, false );
+  DALI_TEST_CHECK( false == control.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+
+  Control moved = std::move( control );
+  DALI_TEST_CHECK( moved );
+  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  DALI_TEST_CHECK( false == moved.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+  DALI_TEST_CHECK( !control );
+
+  END_TEST;
+}
+
+int UtcDaliControlMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  Control control = Control::New();
+  DALI_TEST_EQUALS( 1, control.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  control.SetProperty( Actor::Property::SENSITIVE, false );
+  DALI_TEST_CHECK( false == control.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+
+  Control moved;
+  moved = std::move( control );
+  DALI_TEST_CHECK( moved );
+  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  DALI_TEST_CHECK( false == moved.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+  DALI_TEST_CHECK( !control );
+
+  END_TEST;
+}
+
 int UtcDaliControlDownCast(void)
 {
   ToolkitTestApplication application;
@@ -230,7 +267,7 @@ int UtcDaliControlNavigationProperties(void)
   ToolkitTestApplication application;
 
   Control control = Control::New();
-  Stage::GetCurrent().Add( control );
+  application.GetScene().Add( control );
 
   DALI_TEST_EQUALS( -1, control.GetProperty( DevelControl::Property::LEFT_FOCUSABLE_ACTOR_ID ).Get< int >(), TEST_LOCATION );
   DALI_TEST_EQUALS( -1, control.GetProperty( DevelControl::Property::RIGHT_FOCUSABLE_ACTOR_ID ).Get< int >(), TEST_LOCATION );
@@ -261,7 +298,7 @@ int UtcDaliControlNavigationProperties(void)
 int UtcDaliControlKeyInputFocus(void)
 {
   ToolkitTestApplication application;
-  Stage stage = Stage::GetCurrent();
+  Integration::Scene stage = application.GetScene();
 
   DummyControl control;
 
@@ -369,7 +406,7 @@ int UtcDaliControlSignalConnectDisconnect(void)
     DummyControl dummy = DummyControlImpl::New();
 
     Actor actor = Actor::New();
-    DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 0u, TEST_LOCATION );
+    DALI_TEST_EQUALS( actor.OnSceneSignal().GetConnectionCount(), 0u, TEST_LOCATION );
     Toolkit::Internal::Control& control = Toolkit::Internal::GetImplementation( dummy );
     DummyControlImpl* dummyImpl = dynamic_cast<DummyControlImpl*>(&control);
 
@@ -379,18 +416,18 @@ int UtcDaliControlSignalConnectDisconnect(void)
       END_TEST;
     }
 
-    actor.OnStageSignal().Connect( dummyImpl, &DummyControlImpl::CustomSlot1 );
-    DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 1u, TEST_LOCATION );
+    actor.OnSceneSignal().Connect( dummyImpl, &DummyControlImpl::CustomSlot1 );
+    DALI_TEST_EQUALS( actor.OnSceneSignal().GetConnectionCount(), 1u, TEST_LOCATION );
     DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, false, TEST_LOCATION );
 
-    Stage::GetCurrent().Add( actor );
+    application.GetScene().Add( actor );
     DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, true, TEST_LOCATION );
 
     dummyImpl->mCustomSlot1Called = false;
-    actor.OnStageSignal().Disconnect( dummyImpl, &DummyControlImpl::CustomSlot1 );
-    DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 0u, TEST_LOCATION );
-    Stage::GetCurrent().Remove( actor );
-    Stage::GetCurrent().Add( actor );
+    actor.OnSceneSignal().Disconnect( dummyImpl, &DummyControlImpl::CustomSlot1 );
+    DALI_TEST_EQUALS( actor.OnSceneSignal().GetConnectionCount(), 0u, TEST_LOCATION );
+    application.GetScene().Remove( actor );
+    application.GetScene().Add( actor );
     DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, false, TEST_LOCATION );
   }
   END_TEST;
@@ -413,17 +450,17 @@ int UtcDaliControlSignalAutomaticDisconnect(void)
       END_TEST;
     }
 
-    actor.OnStageSignal().Connect( dummyImpl, &DummyControlImpl::CustomSlot1 );
-    DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 1u, TEST_LOCATION );
+    actor.OnSceneSignal().Connect( dummyImpl, &DummyControlImpl::CustomSlot1 );
+    DALI_TEST_EQUALS( actor.OnSceneSignal().GetConnectionCount(), 1u, TEST_LOCATION );
     DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, false, TEST_LOCATION );
 
-    Stage::GetCurrent().Add( actor );
+    application.GetScene().Add( actor );
     DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, true, TEST_LOCATION );
-    Stage::GetCurrent().Remove( actor );
+    application.GetScene().Remove( actor );
   }
   // dummyControl automatically disconnects
 
-  DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 0u, TEST_LOCATION );
+  DALI_TEST_EQUALS( actor.OnSceneSignal().GetConnectionCount(), 0u, TEST_LOCATION );
 
   const Vector3 ignoredSize( 20, 20, 0 );
   actor.SetProperty( Actor::Property::SIZE, ignoredSize );
@@ -437,7 +474,7 @@ int UtcDaliControlTestParameters(void)
 
   test.SetProperty( Actor::Property::SIZE, Vector3( 0.7f, 0.7f, 0.7f ) );
 
-  Stage::GetCurrent().Add( test );
+  application.GetScene().Add( test );
 
   application.SendNotification();
   application.Render();
@@ -488,7 +525,7 @@ int UtcDaliControlBackgroundColorRendererCount(void)
 
   ToolkitTestApplication application;
   Control control = Control::New();
-  Stage::GetCurrent().Add( control );
+  application.GetScene().Add( control );
 
   tet_infoline( "Set transparent, no renderers should be created" );
   control.SetBackgroundColor( Color::TRANSPARENT );
@@ -512,6 +549,18 @@ int UtcDaliControlBackgroundColorRendererCount(void)
   DALI_TEST_EQUALS( control.GetRendererCount(), 1u, TEST_LOCATION );
   DALI_TEST_EQUALS( GetControlBackgroundColor( control ), semiTransparent, TEST_LOCATION );
 
+  Renderer renderer = control.GetRendererAt( 0 );
+  DALI_TEST_CHECK( renderer );
+
+  tet_infoline( "Set semi transparent alpha with positive RGB values, renderer should not be changed" );
+  const Vector4 newColor( 1.0f, 1.0f, 0.5f, 0.5f );
+  control.SetBackgroundColor( newColor );
+  application.SendNotification();
+  application.Render();
+  DALI_TEST_EQUALS( control.GetRendererCount(), 1u, TEST_LOCATION );
+  DALI_TEST_EQUALS( GetControlBackgroundColor( control ), newColor, TEST_LOCATION );
+  DALI_TEST_EQUALS( renderer, control.GetRendererAt( 0 ), TEST_LOCATION );
+
   tet_infoline( "Set transparent, ensure no renderers are created" );
   control.SetBackgroundColor( Color::TRANSPARENT );
   application.SendNotification();
@@ -673,7 +722,7 @@ int UtcDaliControlKeyProperties(void)
   ToolkitTestApplication application;
 
   Control control = Control::New();
-  Stage::GetCurrent().Add( control );
+  application.GetScene().Add( control );
 
   DALI_TEST_EQUALS( control.HasKeyInputFocus(), control.GetProperty( Control::Property::KEY_INPUT_FOCUS ).Get< bool >(), TEST_LOCATION );
 
@@ -720,7 +769,7 @@ int UtcDaliControlImplKeyInputFocusGainedSignal(void)
   ToolkitTestApplication application;
 
   Control control = Control::New();
-  Stage::GetCurrent().Add( control );
+  application.GetScene().Add( control );
 
   gKeyInputFocusCallBackCalled = false;
   control.KeyInputFocusGainedSignal().Connect(&TestKeyInputFocusCallback);
@@ -742,7 +791,7 @@ int UtcDaliControlImplKeyInputFocusLostSignal(void)
   ToolkitTestApplication application;
 
   Control control = Control::New();
-  Stage::GetCurrent().Add( control );
+  application.GetScene().Add( control );
 
   gKeyInputFocusCallBackCalled = false;
   control.KeyInputFocusLostSignal().Connect(&TestKeyInputFocusCallback);
@@ -784,7 +833,7 @@ int UtcDaliControlAutoClipping(void)
 
   control.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN );
 
-  Stage::GetCurrent().Add( control );
+  application.GetScene().Add( control );
 
   application.SendNotification();
   application.Render();
@@ -807,7 +856,7 @@ int UtcDaliControlAutoClippingN(void)
 
   control.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN );
 
-  Stage::GetCurrent().Add( control );
+  application.GetScene().Add( control );
 
   application.SendNotification();
   application.Render();
@@ -834,7 +883,7 @@ int UtcDaliControlAutoClippingWhenAlreadyOnStage(void)
 
   DALI_TEST_EQUALS( 0, control.GetRendererCount(), TEST_LOCATION );
 
-  Stage::GetCurrent().Add( control );
+  application.GetScene().Add( control );
 
   application.SendNotification();
   application.Render();
@@ -862,7 +911,7 @@ int UtcDaliControlAutoClippingWhenAlreadyOnStageN(void)
 
   DALI_TEST_EQUALS( 0, control.GetRendererCount(), TEST_LOCATION );
 
-  Stage::GetCurrent().Add( control );
+  application.GetScene().Add( control );
 
   application.SendNotification();
   application.Render();
@@ -903,7 +952,7 @@ int UtcDaliControlSetTransformSize(void)
 
   tet_infoline( "Test to ensure that the control background transform does not get overwritten when adding to the stage" );
 
-  Stage::GetCurrent().Add( control );
+  application.GetScene().Add( control );
 
   application.SendNotification();
   application.Render();
@@ -958,7 +1007,7 @@ int UtcDaliControlResourcesReady(void)
   DALI_TEST_EQUALS( actor.IsResourceReady(), false, TEST_LOCATION );
   DALI_TEST_EQUALS( static_cast<int>(resourceStatus), static_cast<int>(Toolkit::Visual::ResourceStatus::PREPARING), TEST_LOCATION );
 
-  Stage::GetCurrent().Add( actor );
+  application.GetScene().Add( actor );
   application.SendNotification();
   application.Render();
 
@@ -1017,7 +1066,7 @@ int UtcDaliControlResourcesReady02(void)
   propertyMap.Insert( ImageVisual::Property::URL, "invalid.jpg" );
   control.SetProperty( Control::Property::BACKGROUND, propertyMap );
 
-  Stage::GetCurrent().Add( control );
+  application.GetScene().Add( control );
 
   application.SendNotification();
   application.Render();
@@ -1043,7 +1092,7 @@ int UtcDaliControlMarginProperty(void)
 
   control.SetProperty( Control::Property::MARGIN, Extents( 20, 10, 0, 0 ) );
 
-  Stage::GetCurrent().Add( control );
+  application.GetScene().Add( control );
 
   application.SendNotification();
   application.Render();
@@ -1074,7 +1123,7 @@ int UtcDaliControlPaddingProperty(void)
 
   control.SetProperty( Control::Property::PADDING, Extents( 15, 10, 5, 10 ) );
 
-  Stage::GetCurrent().Add( control );
+  application.GetScene().Add( control );
 
   application.SendNotification();
   application.Render();
@@ -1122,7 +1171,7 @@ int UtcDaliControlDoAction(void)
 
   dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, imageVisual );
   dummyControl.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) );
-  Stage::GetCurrent().Add( dummyControl );
+  application.GetScene().Add( dummyControl );
 
   DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
 
@@ -1184,7 +1233,7 @@ int UtcDaliControlDoActionWhenNotStage(void)
 
   tet_infoline( "Adding control to stage will in turn add the visual to the stage" );
 
-  Stage::GetCurrent().Add( dummyControl );
+  application.GetScene().Add( dummyControl );
   application.SendNotification();
   application.Render();
   tet_infoline( "No change in textures could occurs as already loaded and cached texture will be used" );