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-FlexContainer.cpp;h=61c4a58f533adfd63f22129597cc5071c9f793cd;hp=3ae109cf417bcb9a03e201522b3fc91fd2aa26e7;hb=5a80f5b0c8814d86156be28bdcdafcfcd8486b49;hpb=9b1300733bb67e51e234ce719cef36c484e4091a

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
new mode 100644
index 3ae109c..61c4a58
--- 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.
@@ -109,6 +109,24 @@ int UtcDaliToolkitFlexContainerCopyConstructorP(void)
   END_TEST;
 }
 
+int UtcDaliFlexContainerMoveConstructor(void)
+{
+  ToolkitTestApplication application;
+
+  FlexContainer flexContainer = FlexContainer::New();
+  DALI_TEST_EQUALS( 1, flexContainer.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  flexContainer.SetProperty( FlexContainer::Property::FLEX_DIRECTION, FlexContainer::ROW_REVERSE );
+  DALI_TEST_CHECK( flexContainer.GetProperty<int>( FlexContainer::Property::FLEX_DIRECTION ) == FlexContainer::ROW_REVERSE );
+
+  FlexContainer moved = std::move( flexContainer );
+  DALI_TEST_CHECK( moved );
+  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  DALI_TEST_CHECK( moved.GetProperty<int>( FlexContainer::Property::FLEX_DIRECTION ) == FlexContainer::ROW_REVERSE );
+  DALI_TEST_CHECK( !flexContainer );
+
+  END_TEST;
+}
+
 int UtcDaliToolkitFlexContainerAssignmentOperatorP(void)
 {
   ToolkitTestApplication application;
@@ -122,6 +140,25 @@ int UtcDaliToolkitFlexContainerAssignmentOperatorP(void)
   END_TEST;
 }
 
+int UtcDaliFlexContainerMoveAssignment(void)
+{
+  ToolkitTestApplication application;
+
+  FlexContainer flexContainer = FlexContainer::New();
+  DALI_TEST_EQUALS( 1, flexContainer.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  flexContainer.SetProperty( FlexContainer::Property::FLEX_DIRECTION, FlexContainer::ROW_REVERSE );
+  DALI_TEST_CHECK( flexContainer.GetProperty<int>( FlexContainer::Property::FLEX_DIRECTION ) == FlexContainer::ROW_REVERSE );
+
+  FlexContainer moved;
+  moved = std::move( flexContainer );
+  DALI_TEST_CHECK( moved );
+  DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  DALI_TEST_CHECK( moved.GetProperty<int>( FlexContainer::Property::FLEX_DIRECTION ) == FlexContainer::ROW_REVERSE );
+  DALI_TEST_CHECK( !flexContainer );
+
+  END_TEST;
+}
+
 // Positive test case for a method
 int UtcDaliToolkitFlexContainerGetPropertyP(void)
 {
@@ -149,7 +186,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 +233,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 +279,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 +347,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,8 +473,8 @@ 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 );
@@ -505,7 +542,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