(Automated Tests) Use Scene instead of Stage

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / utc-Dali-FlexContainer.cpp

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-FlexContainer.cpp b/automated-tests/src/dali-toolkit/utc-Dali-FlexContainer.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 26e9585..a698b3c
--- a/automated-tests/src/dali-toolkit/utc-Dali-FlexContainer.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-FlexContainer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 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.
@@ -149,7 +149,7 @@ int UtcDaliToolkitFlexContainerSetPropertyP(void)
   DALI_TEST_CHECK( flexContainer );
 
   // Add flex container to the stage
-  Stage::GetCurrent().Add( flexContainer );
+  application.GetScene().Add( flexContainer );
 
   // Create two actors and add them to the container
   Actor actor1 = Actor::New();
@@ -196,7 +196,7 @@ int UtcDaliToolkitFlexContainerSetPropertyEnumP(void)
   DALI_TEST_CHECK( flexContainer );
 
   // Add flex container to the stage
-  Stage::GetCurrent().Add( flexContainer );
+  application.GetScene().Add( flexContainer );
 
   // Create two actors and add them to the container
   Actor actor1 = Actor::New();
@@ -242,7 +242,7 @@ int UtcDaliToolkitFlexContainerSetChildPropertyP(void)
   DALI_TEST_CHECK( flexContainer );
 
   // Add flex container to the stage
-  Stage::GetCurrent().Add( flexContainer );
+  application.GetScene().Add( flexContainer );
 
   // Create an actor and add it to the container
   Actor actor = Actor::New();
@@ -310,7 +310,7 @@ int UtcDaliToolkitFlexContainerRemoveChildP(void)
   DALI_TEST_CHECK( flexContainer );
 
   // Add flex container to the stage
-  Stage::GetCurrent().Add( flexContainer );
+  application.GetScene().Add( flexContainer );
 
   RelayoutSignalHandler relayoutSignal(flexContainer);
   flexContainer.OnRelayoutSignal().Connect(&relayoutSignal, &RelayoutSignalHandler::RelayoutCallback );
@@ -436,18 +436,18 @@ int UtcDaliToolkitFlexContainerMoveFocus(void)
   flexContainer.SetProperty( FlexContainer::Property::FLEX_DIRECTION, FlexContainer::ROW );
 
   // Add flex container to the stage
-  Stage::GetCurrent().Add( flexContainer );
-  Size stageSize = Stage::GetCurrent().GetSize();
+  application.GetScene().Add( flexContainer );
+  Size stageSize = application.GetScene().GetSize();
 
   RelayoutSignalHandler relayoutSignal(flexContainer);
   flexContainer.OnRelayoutSignal().Connect(&relayoutSignal, &RelayoutSignalHandler::RelayoutCallback );
-  flexContainer.SetSize( stageSize );
+  flexContainer.SetProperty( Actor::Property::SIZE, stageSize );
 
   // Create two actors and add them to the container
   Actor actor1 = Actor::New();
   Actor actor2 = Actor::New();
-  actor1.SetKeyboardFocusable(true);
-  actor2.SetKeyboardFocusable(true);
+  actor1.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
+  actor2.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE, true );
   DALI_TEST_CHECK( actor1 );
   DALI_TEST_CHECK( actor2 );
 
@@ -505,7 +505,7 @@ int UtcDaliToolkitFlexContainerRTLSupportP(void)
 
   Actor actor0 = Actor::New();
 
-  Stage::GetCurrent().Add( actor0 );
+  application.GetScene().Add( actor0 );
   actor0.Add( flexContainer );
 
   // Create two actors and add them to the container
@@ -524,10 +524,10 @@ int UtcDaliToolkitFlexContainerRTLSupportP(void)
   // Check content direction property.
   DALI_TEST_EQUALS( (FlexContainer::ContentDirection)flexContainer.GetProperty<int>( FlexContainer::Property::CONTENT_DIRECTION ), FlexContainer::INHERIT, TEST_LOCATION );
 
-  actor0.SetProperty( Dali::DevelActor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::RIGHT_TO_LEFT );
+  actor0.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::RIGHT_TO_LEFT );
   DALI_TEST_EQUALS( (FlexContainer::ContentDirection)flexContainer.GetProperty<int>( FlexContainer::Property::CONTENT_DIRECTION ), FlexContainer::RTL, TEST_LOCATION );
 
-  actor0.SetProperty( Dali::DevelActor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::LEFT_TO_RIGHT );
+  actor0.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::LEFT_TO_RIGHT );
   DALI_TEST_EQUALS( (FlexContainer::ContentDirection)flexContainer.GetProperty<int>( FlexContainer::Property::CONTENT_DIRECTION ), FlexContainer::LTR, TEST_LOCATION );
 
   flexContainer.SetProperty( FlexContainer::Property::CONTENT_DIRECTION, "RTL" );
@@ -536,7 +536,7 @@ int UtcDaliToolkitFlexContainerRTLSupportP(void)
   flexContainer.SetProperty( FlexContainer::Property::CONTENT_DIRECTION, "LTR" );
   DALI_TEST_EQUALS( (FlexContainer::ContentDirection)flexContainer.GetProperty<int>( FlexContainer::Property::CONTENT_DIRECTION ), FlexContainer::LTR, TEST_LOCATION );
 
-  actor0.SetProperty( Dali::DevelActor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::RIGHT_TO_LEFT );
+  actor0.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::RIGHT_TO_LEFT );
   DALI_TEST_EQUALS( (FlexContainer::ContentDirection)flexContainer.GetProperty<int>( FlexContainer::Property::CONTENT_DIRECTION ), FlexContainer::LTR, TEST_LOCATION );
 
   flexContainer.SetProperty( FlexContainer::Property::CONTENT_DIRECTION, "inherit" );