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-Builder.cpp;h=ca325225e07613b4bb380ed31ff63263d1113f25;hp=77439d4c809dd2d14be08be48310b3638e95dd39;hb=268f651469300b3950b3f314fa33803b6c24273e;hpb=327e9280031da8874029123bf52ce2f31fb4ffd7 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp index 77439d4..ca32522 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. @@ -28,6 +28,7 @@ #include #include #include +#include #define STRINGIFY(A)#A @@ -127,7 +128,7 @@ int UtcDaliBuilderQuitSignal(void) "\"orientation\": [10,10,10,10]," "\"clippingBox\": [10,10,10,10]," "\"signals\": [{" - "\"name\": \"touch\"," + "\"name\": \"touched\"," "\"action\": \"quit\"" "}]" "}]" @@ -135,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 ); @@ -276,6 +277,21 @@ int UtcDaliBuilderAnimationP(void) " \"duration\": 3" " }" " }]" + " }," + " \"pathAnimation2\": {" + " \"duration\": 3.0," + " \"endAction\": \"BAKE_FINAL\"," + " \"disconnectAction\": \"DISCARD\"," + " \"properties\": [{" + " \"actor\": \"greeting\"," + " \"path\":\"path0\"," + " \"forward\":[1,0,0]," + " \"alphaFunction\": \"EASE_IN_OUT\"," + " \"timePeriod\": {" + " \"delay\": 0," + " \"duration\": 3" + " }" + " }]" " }" " }," " \"stage\": [{" @@ -287,7 +303,7 @@ int UtcDaliBuilderAnimationP(void) " \"size\": [200, 200, 1]," " \"orientation\": [0, 0, 30]," " \"signals\": [{" - " \"name\": \"touch\"," + " \"name\": \"touched\"," " \"action\": \"play\"," " \"animation\": \"animate\"" " }]" @@ -296,7 +312,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"); @@ -312,6 +328,10 @@ int UtcDaliBuilderAnimationP(void) DALI_TEST_CHECK( anim ); + anim = builder.CreateAnimation("pathAnimation2"); + + DALI_TEST_CHECK( anim ); + // trigger play // Emit touch event and check that our quit method is called Integration::TouchEvent touchEvent; @@ -411,7 +431,7 @@ int UtcDaliBuilderAnimationN(void) " \"size\": [200, 200, 1]," " \"orientation\": [0, 0, 30]," " \"signals\": [{" - " \"name\": \"touch\"," + " \"name\": \"touched\"," " \"action\": \"play\"," " \"animation\": \"animate\"" " }]" @@ -426,7 +446,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"); @@ -447,11 +467,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); @@ -484,7 +504,7 @@ int UtcDaliBuilderConstantsP(void) " \"image\": { \"url\": \"dir/{IMAGE_PATH}\" }," " \"sizeWidth\": \"{WIDTH}\"," " \"signals\": [{" - " \"name\": \"touch\"," + " \"name\": \"touched\"," " \"action\": \"quit\"" " }]" "}]" @@ -510,10 +530,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; @@ -554,7 +574,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void) " \"name\": \"image\",\n" " \"size\": \"{SIZE}\",\n" " \"signals\": [{\n" - " \"name\": \"touch\",\n" + " \"name\": \"touched\",\n" " \"action\": \"quit\"\n" " }],\n" " \"actors\": [\n" @@ -602,7 +622,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void) " \"name\": \"image\",\n" " \"size\": \"{SIZE}\",\n" " \"signals\": [{\n" - " \"name\": \"touch\",\n" + " \"name\": \"touched\",\n" " \"action\": \"quit\"\n" " }],\n" " \"actors\": [\n" @@ -664,7 +684,7 @@ int UtcDaliBuilderRenderTasksP(void) " \"name\": \"image\",\n" " \"size\": [100,100,1],\n" " \"signals\": [{\n" - " \"name\": \"touch\",\n" + " \"name\": \"touched\",\n" " \"action\": \"quit\"\n" " }],\n" " \"actors\": [\n" @@ -681,13 +701,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; } @@ -711,7 +731,7 @@ int UtcDaliBuilderChildActionP(void) " \"name\": \"subActor\"\n" " }],\n" " \"signals\": [{\n" - " \"name\": \"touch\",\n" + " \"name\": \"touched\",\n" " \"action\": \"hide\",\n" " \"actor\": \"actor\",\n" " \"childActor\": \"subActor\"\n" @@ -722,7 +742,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(); @@ -740,10 +760,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; } @@ -767,7 +787,7 @@ int UtcDaliBuilderSetPropertyActionP(void) " \"name\": \"subActor\"\n" " }],\n" " \"signals\": [{\n" - " \"name\": \"touch\",\n" + " \"name\": \"touched\",\n" " \"action\": \"set\",\n" " \"actor\": \"subActor\",\n" " \"property\": \"visible\",\n" @@ -779,7 +799,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(); @@ -797,10 +817,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; } @@ -824,7 +844,7 @@ int UtcDaliBuilderGenericActionP(void) " \"name\": \"subActor\"\n" " }],\n" " \"signals\": [{\n" - " \"name\": \"touch\",\n" + " \"name\": \"touched\",\n" " \"action\": \"hide\"\n" " }]\n" " }]\n" @@ -833,7 +853,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(); @@ -851,10 +871,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; } @@ -878,7 +898,7 @@ int UtcDaliBuilderPropertyNotificationP(void) " \"name\": \"subActor\"\n" " }],\n" " \"signals\": [{\n" - " \"name\": \"touch\",\n" + " \"name\": \"touched\",\n" " \"action\": \"hide\"\n" " }],\n" " \"notifications\": [{\n" @@ -918,7 +938,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(); @@ -940,10 +960,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; } @@ -971,7 +991,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(...) @@ -998,7 +1018,7 @@ int UtcDaliBuilderCustomPropertyP(void) " \"name\": \"image\",\n" " \"size\": [100,100,1],\n" " \"signals\": [{\n" - " \"name\": \"touch\",\n" + " \"name\": \"touched\",\n" " \"action\": \"quit\"\n" " }],\n" " \"properties\": {\n" @@ -1071,7 +1091,7 @@ int UtcDaliBuilderCustomShaderP(void) " },\n" " \"signals\": [\n" " {\n" - " \"name\": \"onStage\",\n" + " \"name\": \"onScene\",\n" " \"action\": \"play\",\n" " \"animation\": \"Animation_1\"\n" " }\n" @@ -1102,13 +1122,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 ); @@ -1131,7 +1151,7 @@ int UtcDaliBuilderLoadFromStringN(void) "\"parentOrigin\": \"TOP_LEFT\"," "\"anchorPoint\": \"TOP_LEFT\"," "\"signals\": [{" - "\"name\": \"touch\"," + "\"name\": \"touched\"," "\"action\": \"quit\"" "}]" "}]" @@ -1178,7 +1198,7 @@ int UtcDaliBuilderAddActorsP(void) " \"visible\": false\n" " }],\n" " \"signals\": [{\n" - " \"name\": \"touch\",\n" + " \"name\": \"touched\",\n" " \"action\": \"hide\",\n" " \"actor\": \"actor\",\n" " \"childActor\": \"subActor\"\n" @@ -1189,136 +1209,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() ); - - 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; } @@ -1349,12 +1249,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" @@ -1369,7 +1269,7 @@ int UtcDaliBuilderPathConstraintsP(void) " ]\n" " },\n" " {\n" - " \"name\": \"onStage\",\n" + " \"name\": \"onScene\",\n" " \"action\": \"applyConstraint\",\n" " \"constrainer\": \"constrainer1\",\n" " \"properties\":\n" @@ -1384,7 +1284,7 @@ int UtcDaliBuilderPathConstraintsP(void) " ]\n" " },\n" " {\n" - " \"name\": \"offStage\",\n" + " \"name\": \"offScene\",\n" " \"action\": \"removeConstraints\",\n" " \"constrainer\": \"constrainer0\",\n" " \"properties\":\n" @@ -1399,7 +1299,7 @@ int UtcDaliBuilderPathConstraintsP(void) " ]\n" " },\n" " {\n" - " \"name\": \"offStage\",\n" + " \"name\": \"offScene\",\n" " \"action\": \"removeConstraints\",\n" " \"constrainer\": \"constrainer1\",\n" " \"properties\":\n" @@ -1515,7 +1415,7 @@ int UtcDaliBuilderPathConstraintsP(void) // For coverage Actor actor = Actor::New(); - Stage::GetCurrent().Add( actor ); + application.GetScene().Add( actor ); builder.AddActors( actor ); // Render and notify @@ -1621,7 +1521,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(); @@ -1693,7 +1593,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(); @@ -1740,7 +1640,7 @@ int UtcDaliBuilderTypeCasts(void) ); Actor rootActor = Actor::New(); - Stage::GetCurrent().Add( rootActor ); + application.GetScene().Add( rootActor ); Builder builder = Builder::New(); builder.LoadFromString( json ); @@ -1750,11 +1650,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; } @@ -1777,7 +1677,7 @@ int UtcDaliBuilderBuilderControl(void) ); Actor rootActor = Actor::New(); - Stage::GetCurrent().Add( rootActor ); + application.GetScene().Add( rootActor ); Builder builder = Builder::New(); builder.LoadFromString( json ); @@ -1791,6 +1691,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(); + application.GetScene().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; @@ -1805,7 +1742,7 @@ int UtcDaliBuilderActionsWithParams(void) " \"name\": \"image\",\n" " \"size\": [100,100,1],\n" " \"signals\": [{\n" - " \"name\": \"touch\",\n" + " \"name\": \"touched\",\n" " \"action\": \"show\",\n" " \"parameters\": {\n" " \"property1\" : 10,\n" @@ -1821,7 +1758,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