Remove more public Setter/Getter APIs from Dali::Actor

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

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
index 4d8bfe0..01b9096 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
@@ -744,7 +744,7 @@ int UtcDaliBuilderChildActionP(void)
   Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("subActor");
   DALI_TEST_CHECK( actor );
 
-  DALI_TEST_CHECK( !actor.IsVisible() );
+  DALI_TEST_CHECK( !actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) );
 
   END_TEST;
 }
@@ -801,7 +801,7 @@ int UtcDaliBuilderSetPropertyActionP(void)
   Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("subActor");
   DALI_TEST_CHECK( actor );
 
-  DALI_TEST_CHECK( !actor.IsVisible() );
+  DALI_TEST_CHECK( !actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) );
 
   END_TEST;
 }
@@ -855,7 +855,7 @@ int UtcDaliBuilderGenericActionP(void)
   Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("actor");
   DALI_TEST_CHECK( actor );
 
-  DALI_TEST_CHECK( !actor.IsVisible() );
+  DALI_TEST_CHECK( !actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) );
 
   END_TEST;
 }
@@ -944,7 +944,7 @@ int UtcDaliBuilderPropertyNotificationP(void)
   Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("actor");
   DALI_TEST_CHECK( actor );
 
-  DALI_TEST_CHECK( actor.IsVisible() );
+  DALI_TEST_CHECK( actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) );
 
   END_TEST;
 }
@@ -1199,127 +1199,7 @@ int UtcDaliBuilderAddActorsP(void)
   Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("subActor");
   DALI_TEST_CHECK( actor );
 
-  DALI_TEST_CHECK( !actor.IsVisible() );
-
-  END_TEST;
-}
-
-int UtcDaliBuilderFrameBufferP(void)
-{
-  ToolkitTestApplication application;
-
-  // JSON with a quit event when the actor is touched
-  std::string json(
-    "{\n"
-    "  \"constants\":\n"
-    "  {\n"
-    "    \"FB_WIDTH\": 200.0,\n"
-    "    \"FB_HEIGHT\": 200.0,\n"
-    "    \"FB_SIZE\": [200,200],\n"
-    "    \"FB_ASPECT_RATIO\": 1\n"
-    "  },\n"
-    "  \"stage\": [\n"
-    "    {\n"
-    "      \"type\": \"ImageView\",\n"
-    "      \"name\": \"fbOnStage\",\n"
-    "      \"position\": [\n"
-    "        0.40461349487305,\n"
-    "        0.9150390625,\n"
-    "        0.0\n"
-    "      ],\n"
-    "      \"parentOrigin\": [0.5, 0.5, 0.5],\n"
-    "      \"size\": [300, 300, 0],\n"
-    "      \"image\": \"fb0\",\n"
-    "      \"clearColor\": [1,0,0,1]\n"
-    "    },\n"
-    "    {\n"
-    "      \"type\": \"ImageView\",\n"
-    "      \"name\": \"Image1\",\n"
-    "      \"size\": [200, 200, 0],\n"
-    "      \"parentOrigin\": [0.5, 0.5, 0.5],\n"
-    "      \"effect\": \"Ripple2D\",\n"
-    "      \"image\": {\n"
-    "        \"url\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\"\n"
-    "      },\n"
-    "      \"signals\": [\n"
-    "        {\n"
-    "          \"name\": \"onStage\",\n"
-    "          \"action\": \"play\",\n"
-    "          \"animation\": \"Animation_1\"\n"
-    "        }\n"
-    "      ]\n"
-    "    },\n"
-    "    {\n"
-    "      \"type\":\"CameraActor\",\n"
-    "      \"name\":\"fbCam\",\n"
-    "      \"aspectRatio\": \"{FB_ASPECT_RATIO}\",\n"
-    "      \"projectionMode\": \"PERSPECTIVE_PROJECTION\",\n"
-    "      \"fieldOfView\": 0.785,\n"
-    "      \"invertYAxis\": true\n"
-    "    }\n"
-    "  ],\n"
-    "  \"frameBufferImages\":\n"
-    "  {\n"
-    "    \"fb0\":\n"
-    "    {\n"
-    "      \"type\": \"FrameBufferImage\",\n"
-    "      \"width\": { \"typeCast\":\"float\", \"value\":\"{FB_WIDTH}\" },\n"
-    "      \"height\": { \"typeCast\":\"float\", \"value\":\"{FB_HEIGHT}\" }\n"
-    "    }\n"
-    "  },\n"
-    "  \"renderTasks\":\n"
-    "  {\n"
-    "    \"stage\":\n"
-    "    [\n"
-    "      {\n"
-    "        \"sourceActor\": \"fbOnStage\"\n"
-    "      },\n"
-    "      {\n"
-    "        \"sourceActor\": \"Image1\",\n"
-    "        \"targetFrameBuffer\": \"fb0\",\n"
-    "        \"viewportSize\":\"{FB_SIZE}\",\n"
-    "        \"cameraActor\":\"fbCam\"\n"
-    "      }\n"
-    "    ]\n"
-    "  },\n"
-    "  \"paths\": {},\n"
-    "  \"animations\": {\n"
-    "    \"Animation_1\": {\n"
-    "      \"loop\":true,\n"
-    "      \"properties\": [\n"
-    "        {\n"
-    "          \"actor\": \"Image1\",\n"
-    "          \"property\": \"uTime\",\n"
-    "          \"value\": 10.0,\n"
-    "          \"alphaFunction\": \"LINEAR\",\n"
-    "          \"timePeriod\": {\n"
-    "            \"delay\": 0,\n"
-    "            \"duration\": 10.0\n"
-    "          },\n"
-    "          \"gui-builder-timeline-color\": \"#8dc0da\"\n"
-    "        }\n"
-    "      ]\n"
-    "    }\n"
-    "  }\n"
-    "}\n");
-
-  Builder builder = Builder::New();
-
-  // frame buffer coverage
-  builder.LoadFromString( json );
-
-  // Render and notify
-  application.SendNotification();
-  application.Render();
-
-  Dali::FrameBufferImage frameBuffer = builder.GetFrameBufferImage( "fb0" );
-  DALI_TEST_CHECK( frameBuffer );
-
-  Dali::FrameBufferImage frameBuffer2 = builder.GetFrameBufferImage( "fb0" );
-  DALI_TEST_CHECK( frameBuffer2 );
-  DALI_TEST_CHECK( frameBuffer == frameBuffer2 );
-
-  DALI_TEST_CHECK( true );
+  DALI_TEST_CHECK( !actor.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) );
 
   END_TEST;
 }
@@ -1751,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;
 }