X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-Builder.cpp;h=41c715310c53008b77c595a76efa529346c0cc35;hb=2c6a6697e24d39ef061f134b39f30acc5c47b0cb;hp=77439d4c809dd2d14be08be48310b3638e95dd39;hpb=61eb93cd9df8f71406040d485fdc518755f49f84;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 77439d4..41c7153 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
@@ -28,6 +28,7 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <test-button.h>
 #include <test-animation-data.h>
+#include <dummy-control.h>
 
 
 #define STRINGIFY(A)#A
@@ -1203,126 +1204,6 @@ int UtcDaliBuilderAddActorsP(void)
   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 );
-
-  END_TEST;
-}
-
 int UtcDaliBuilderPathConstraintsP(void)
 {
   ToolkitTestApplication application;
@@ -1791,6 +1672,43 @@ int UtcDaliBuilderBuilderControl(void)
   END_TEST;
 }
 
+int UtcDaliBuilderCustomControl(void)
+{
+  ToolkitTestApplication application;
+
+  std::string json(
+    "{"
+       "\"stage\":"
+       "[{"
+         "\"type\": \"DummyControl\","
+         "\"name\": \"I can haz custom Control\""
+      "}]"
+    "}"
+  );
+
+  Actor rootActor = Actor::New();
+  Stage::GetCurrent().Add( rootActor );
+
+  Builder builder = Builder::New();
+  builder.LoadFromString( json );
+  builder.AddActors( rootActor );
+
+  application.SendNotification();
+  application.Render();
+
+  Actor customControl = rootActor.FindChildByName( "I can haz custom Control" );
+
+  // Test that we have the correct type of custom control
+  DummyControl dummyControl = DummyControl::DownCast( customControl );
+  DALI_TEST_CHECK( dummyControl );
+  if( dummyControl )
+  {
+    DALI_TEST_CHECK( typeid(dummyControl.GetImplementation()) == typeid(DummyControlImpl) );
+  }
+
+  END_TEST;
+}
+
 int UtcDaliBuilderActionsWithParams(void)
 {
   ToolkitTestApplication application;