X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-Builder.cpp;h=61bbc5c7173fdc1f36e4391e3e678352296450f5;hb=refs%2Fchanges%2F16%2F240216%2F2;hp=41c715310c53008b77c595a76efa529346c0cc35;hpb=f3e8b0bf4eba4e2f76294c2ed3d83a4cc9ca4613;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
index 41c7153..61bbc5c 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 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.
@@ -136,7 +136,7 @@ int UtcDaliBuilderQuitSignal(void)
   );
   Builder builder = Builder::New();
   builder.LoadFromString( json );
-  builder.AddActors ( Stage::GetCurrent().GetRootLayer() );
+  builder.AddActors ( application.GetScene().GetRootLayer() );
 
   // Connect to builder's quit signal
   bool functorCalled( false );
@@ -297,7 +297,7 @@ int UtcDaliBuilderAnimationP(void)
 
   Builder builder = Builder::New();
   builder.LoadFromString( json );
-  builder.AddActors( Stage::GetCurrent().GetRootLayer() );
+  builder.AddActors( application.GetScene().GetRootLayer() );
 
   Animation anim = builder.CreateAnimation("animate");
 
@@ -427,7 +427,7 @@ int UtcDaliBuilderAnimationN(void)
 
   Builder builder = Builder::New();
   builder.LoadFromString( json );
-  builder.AddActors( Stage::GetCurrent().GetRootLayer() );
+  builder.AddActors( application.GetScene().GetRootLayer() );
 
   Animation anim = builder.CreateAnimation("animate");
 
@@ -448,11 +448,11 @@ int UtcDaliBuilderAnimationN(void)
   DALI_TEST_CHECK(anim);
 
   // alternative actor to use for FindChildByName
-  anim = builder.CreateAnimation("animate2", Dali::Stage::GetCurrent().GetRootLayer());
+  anim = builder.CreateAnimation("animate2", application.GetScene().GetRootLayer());
   DALI_TEST_CHECK(anim);
 
   // alternative actor to use for FindChildByName
-  anim = builder.CreateAnimation("animate2", map, Dali::Stage::GetCurrent().GetRootLayer());
+  anim = builder.CreateAnimation("animate2", map, application.GetScene().GetRootLayer());
   DALI_TEST_CHECK(anim);
 
 
@@ -511,10 +511,10 @@ int UtcDaliBuilderConstantsP(void)
 
   DALI_TEST_CHECK( value.GetType() != Property::NONE );
 
-  builder.AddActors ( Stage::GetCurrent().GetRootLayer() );
+  builder.AddActors ( application.GetScene().GetRootLayer() );
   DALI_TEST_CHECK( builder );
 
-  Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("image");
+  Actor actor = application.GetScene().GetRootLayer().FindChildByName("image");
   DALI_TEST_CHECK( actor );
 
   END_TEST;
@@ -682,13 +682,13 @@ int UtcDaliBuilderRenderTasksP(void)
   Builder builder = Builder::New();
   builder.LoadFromString( json );
 
-  unsigned int count = Stage::GetCurrent().GetRenderTaskList().GetTaskCount();
+  unsigned int count = application.GetScene().GetRenderTaskList().GetTaskCount();
 
   // coverage
   builder.CreateRenderTask( "task0" );
 
   DALI_TEST_CHECK( count <
-                   Stage::GetCurrent().GetRenderTaskList().GetTaskCount() );
+                   application.GetScene().GetRenderTaskList().GetTaskCount() );
 
   END_TEST;
 }
@@ -723,7 +723,7 @@ int UtcDaliBuilderChildActionP(void)
 
   Builder builder = Builder::New();
   builder.LoadFromString( json );
-  builder.AddActors ( Stage::GetCurrent().GetRootLayer() );
+  builder.AddActors ( application.GetScene().GetRootLayer() );
 
   // Render and notify
   application.SendNotification();
@@ -741,10 +741,10 @@ int UtcDaliBuilderChildActionP(void)
   application.SendNotification();
   application.Render();
 
-  Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("subActor");
+  Actor actor = application.GetScene().GetRootLayer().FindChildByName("subActor");
   DALI_TEST_CHECK( actor );
 
-  DALI_TEST_CHECK( !actor.IsVisible() );
+  DALI_TEST_CHECK( !actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) );
 
   END_TEST;
 }
@@ -780,7 +780,7 @@ int UtcDaliBuilderSetPropertyActionP(void)
 
   Builder builder = Builder::New();
   builder.LoadFromString( json );
-  builder.AddActors ( Stage::GetCurrent().GetRootLayer() );
+  builder.AddActors ( application.GetScene().GetRootLayer() );
 
   // Render and notify
   application.SendNotification();
@@ -798,10 +798,10 @@ int UtcDaliBuilderSetPropertyActionP(void)
   application.SendNotification();
   application.Render();
 
-  Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("subActor");
+  Actor actor = application.GetScene().GetRootLayer().FindChildByName("subActor");
   DALI_TEST_CHECK( actor );
 
-  DALI_TEST_CHECK( !actor.IsVisible() );
+  DALI_TEST_CHECK( !actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) );
 
   END_TEST;
 }
@@ -834,7 +834,7 @@ int UtcDaliBuilderGenericActionP(void)
 
   Builder builder = Builder::New();
   builder.LoadFromString( json );
-  builder.AddActors ( Stage::GetCurrent().GetRootLayer() );
+  builder.AddActors ( application.GetScene().GetRootLayer() );
 
   // Render and notify
   application.SendNotification();
@@ -852,10 +852,10 @@ int UtcDaliBuilderGenericActionP(void)
   application.SendNotification();
   application.Render();
 
-  Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("actor");
+  Actor actor = application.GetScene().GetRootLayer().FindChildByName("actor");
   DALI_TEST_CHECK( actor );
 
-  DALI_TEST_CHECK( !actor.IsVisible() );
+  DALI_TEST_CHECK( !actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) );
 
   END_TEST;
 }
@@ -919,7 +919,7 @@ int UtcDaliBuilderPropertyNotificationP(void)
 
   Builder builder = Builder::New();
   builder.LoadFromString( json );
-  builder.AddActors ( Stage::GetCurrent().GetRootLayer() );
+  builder.AddActors ( application.GetScene().GetRootLayer() );
 
   // Render and notify
   application.SendNotification();
@@ -941,10 +941,10 @@ int UtcDaliBuilderPropertyNotificationP(void)
   application.SendNotification();
   application.Render();
 
-  Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("actor");
+  Actor actor = application.GetScene().GetRootLayer().FindChildByName("actor");
   DALI_TEST_CHECK( actor );
 
-  DALI_TEST_CHECK( actor.IsVisible() );
+  DALI_TEST_CHECK( actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) );
 
   END_TEST;
 }
@@ -972,7 +972,7 @@ int UtcDaliBuilderPropertyNotificationN(void)
   {
     Builder builder = Builder::New();
     builder.LoadFromString( json );
-    builder.AddActors ( Stage::GetCurrent().GetRootLayer() );
+    builder.AddActors ( application.GetScene().GetRootLayer() );
     DALI_TEST_CHECK( false );
   }
   catch(...)
@@ -1072,7 +1072,7 @@ int UtcDaliBuilderCustomShaderP(void)
     "      },\n"
     "      \"signals\": [\n"
     "        {\n"
-    "          \"name\": \"onStage\",\n"
+    "          \"name\": \"onScene\",\n"
     "          \"action\": \"play\",\n"
     "          \"animation\": \"Animation_1\"\n"
     "        }\n"
@@ -1103,13 +1103,13 @@ int UtcDaliBuilderCustomShaderP(void)
   Builder builder = Builder::New();
   builder.LoadFromString( json );
 
-  builder.AddActors ( "stage", Stage::GetCurrent().GetRootLayer() );
+  builder.AddActors ( "stage", application.GetScene().GetRootLayer() );
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("Image1");
+  Actor actor = application.GetScene().GetRootLayer().FindChildByName("Image1");
 
   // coverage
   DALI_TEST_CHECK( actor );
@@ -1190,16 +1190,16 @@ int UtcDaliBuilderAddActorsP(void)
 
   Builder builder = Builder::New();
   builder.LoadFromString( json );
-  builder.AddActors ( "arbitarysection", Stage::GetCurrent().GetRootLayer() );
+  builder.AddActors ( "arbitarysection", application.GetScene().GetRootLayer() );
 
   // Render and notify
   application.SendNotification();
   application.Render();
 
-  Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("subActor");
+  Actor actor = application.GetScene().GetRootLayer().FindChildByName("subActor");
   DALI_TEST_CHECK( actor );
 
-  DALI_TEST_CHECK( !actor.IsVisible() );
+  DALI_TEST_CHECK( !actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) );
 
   END_TEST;
 }
@@ -1230,12 +1230,12 @@ int UtcDaliBuilderPathConstraintsP(void)
     "      },\n"
     "      \"signals\": [\n"
     "        {\n"
-    "          \"name\": \"onStage\",\n"
+    "          \"name\": \"onScene\",\n"
     "          \"action\": \"play\",\n"
     "          \"animation\": \"pathAnimation\"\n"
     "        },\n"
     "        {\n"
-    "          \"name\": \"onStage\",\n"
+    "          \"name\": \"onScene\",\n"
     "          \"action\": \"applyConstraint\",\n"
     "          \"constrainer\": \"constrainer0\",\n"
     "          \"properties\":\n"
@@ -1250,7 +1250,7 @@ int UtcDaliBuilderPathConstraintsP(void)
     "          ]\n"
     "        },\n"
     "        {\n"
-    "          \"name\": \"onStage\",\n"
+    "          \"name\": \"onScene\",\n"
     "          \"action\": \"applyConstraint\",\n"
     "          \"constrainer\": \"constrainer1\",\n"
     "          \"properties\":\n"
@@ -1265,7 +1265,7 @@ int UtcDaliBuilderPathConstraintsP(void)
     "          ]\n"
     "        },\n"
     "        {\n"
-    "          \"name\": \"offStage\",\n"
+    "          \"name\": \"offScene\",\n"
     "          \"action\": \"removeConstraints\",\n"
     "          \"constrainer\": \"constrainer0\",\n"
     "          \"properties\":\n"
@@ -1280,7 +1280,7 @@ int UtcDaliBuilderPathConstraintsP(void)
     "          ]\n"
     "        },\n"
     "        {\n"
-    "          \"name\": \"offStage\",\n"
+    "          \"name\": \"offScene\",\n"
     "          \"action\": \"removeConstraints\",\n"
     "          \"constrainer\": \"constrainer1\",\n"
     "          \"properties\":\n"
@@ -1396,7 +1396,7 @@ int UtcDaliBuilderPathConstraintsP(void)
   // For coverage
 
   Actor actor = Actor::New();
-  Stage::GetCurrent().Add( actor );
+  application.GetScene().Add( actor );
   builder.AddActors( actor );
 
   // Render and notify
@@ -1502,7 +1502,7 @@ int UtcDaliBuilderMapping01(void)
   builder.LoadFromString( json );
 
   Test::TestButton testButton = Test::TestButton::New();
-  Stage::GetCurrent().Add( testButton );
+  application.GetScene().Add( testButton );
 
   // Render and notify
   application.SendNotification();
@@ -1574,7 +1574,7 @@ int UtcDaliBuilderMappingCycleCheck(void)
   builder.LoadFromString( json );
 
   Test::TestButton testButton = Test::TestButton::New();
-  Stage::GetCurrent().Add( testButton );
+  application.GetScene().Add( testButton );
 
   // Render and notify
   application.SendNotification();
@@ -1621,7 +1621,7 @@ int UtcDaliBuilderTypeCasts(void)
   );
 
   Actor rootActor = Actor::New();
-  Stage::GetCurrent().Add( rootActor );
+  application.GetScene().Add( rootActor );
 
   Builder builder = Builder::New();
   builder.LoadFromString( json );
@@ -1631,11 +1631,11 @@ int UtcDaliBuilderTypeCasts(void)
   application.Render();
 
   Actor createdActor = rootActor.GetChildAt( 0 );
-  DALI_TEST_EQUALS( createdActor.GetMaximumSize(), Vector2(100.0f,15.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( createdActor.GetCurrentPosition(), Vector3(100.0f,10.0f,1.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( createdActor.GetCurrentColor(), Vector4(0.5f,0.5f,0.5f,1.0f), TEST_LOCATION );
-  DALI_TEST_EQUALS( createdActor.IsSensitive(), false, TEST_LOCATION );
-  DALI_TEST_EQUALS( createdActor.GetColorMode(), USE_OWN_MULTIPLY_PARENT_COLOR, TEST_LOCATION );
+  DALI_TEST_EQUALS( createdActor.GetProperty< Vector2 >( Actor::Property::MAXIMUM_SIZE ), Vector2(100.0f,15.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS( createdActor.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ), Vector3(100.0f,10.0f,1.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS( createdActor.GetCurrentProperty< Vector4 >( Actor::Property::COLOR ), Vector4(0.5f,0.5f,0.5f,1.0f), TEST_LOCATION );
+  DALI_TEST_EQUALS( createdActor.GetProperty< bool >( Actor::Property::SENSITIVE ), false, TEST_LOCATION );
+  DALI_TEST_EQUALS( createdActor.GetProperty< ColorMode >( Actor::Property::COLOR_MODE ), USE_OWN_MULTIPLY_PARENT_COLOR, TEST_LOCATION );
 
   END_TEST;
 }
@@ -1658,7 +1658,7 @@ int UtcDaliBuilderBuilderControl(void)
   );
 
   Actor rootActor = Actor::New();
-  Stage::GetCurrent().Add( rootActor );
+  application.GetScene().Add( rootActor );
 
   Builder builder = Builder::New();
   builder.LoadFromString( json );
@@ -1687,7 +1687,7 @@ int UtcDaliBuilderCustomControl(void)
   );
 
   Actor rootActor = Actor::New();
-  Stage::GetCurrent().Add( rootActor );
+  application.GetScene().Add( rootActor );
 
   Builder builder = Builder::New();
   builder.LoadFromString( json );
@@ -1739,7 +1739,7 @@ int UtcDaliBuilderActionsWithParams(void)
 
   Builder builder = Builder::New();
   builder.LoadFromString( json );
-  builder.AddActors( Stage::GetCurrent().GetRootLayer() );
+  builder.AddActors( application.GetScene().GetRootLayer() );
 
   DALI_TEST_CHECK( true ); // For Coverage