X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-FlexContainer.cpp;h=3ae109cf417bcb9a03e201522b3fc91fd2aa26e7;hb=763c96a171fb79c5ae983792434537c70ac231fb;hp=26e95851bfb47462df4ea6e7b91bf3b2f1bd12e8;hpb=c37cdbabc290f906ef463f6fc8f212afcbac08f3;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-FlexContainer.cpp b/automated-tests/src/dali-toolkit/utc-Dali-FlexContainer.cpp
index 26e9585..3ae109c 100755
--- a/automated-tests/src/dali-toolkit/utc-Dali-FlexContainer.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-FlexContainer.cpp
@@ -441,13 +441,13 @@ int UtcDaliToolkitFlexContainerMoveFocus(void)
 
   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 );
 
@@ -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" );