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=01b90969a972b38525546c7076781116245c7b3d;hb=268f651469300b3950b3f314fa33803b6c24273e;hpb=8dd298d8917641dcc284fceef820410451fb81cb diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp index 01b9096..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. @@ -128,7 +128,7 @@ int UtcDaliBuilderQuitSignal(void) "\"orientation\": [10,10,10,10]," "\"clippingBox\": [10,10,10,10]," "\"signals\": [{" - "\"name\": \"touch\"," + "\"name\": \"touched\"," "\"action\": \"quit\"" "}]" "}]" @@ -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 ); @@ -277,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\": [{" @@ -288,7 +303,7 @@ int UtcDaliBuilderAnimationP(void) " \"size\": [200, 200, 1]," " \"orientation\": [0, 0, 30]," " \"signals\": [{" - " \"name\": \"touch\"," + " \"name\": \"touched\"," " \"action\": \"play\"," " \"animation\": \"animate\"" " }]" @@ -297,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"); @@ -313,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; @@ -412,7 +431,7 @@ int UtcDaliBuilderAnimationN(void) " \"size\": [200, 200, 1]," " \"orientation\": [0, 0, 30]," " \"signals\": [{" - " \"name\": \"touch\"," + " \"name\": \"touched\"," " \"action\": \"play\"," " \"animation\": \"animate\"" " }]" @@ -427,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"); @@ -448,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); @@ -485,7 +504,7 @@ int UtcDaliBuilderConstantsP(void) " \"image\": { \"url\": \"dir/{IMAGE_PATH}\" }," " \"sizeWidth\": \"{WIDTH}\"," " \"signals\": [{" - " \"name\": \"touch\"," + " \"name\": \"touched\"," " \"action\": \"quit\"" " }]" "}]" @@ -511,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; @@ -555,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" @@ -603,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" @@ -665,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" @@ -682,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; } @@ -712,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" @@ -723,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(); @@ -741,7 +760,7 @@ 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.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) ); @@ -768,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" @@ -780,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(); @@ -798,7 +817,7 @@ 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.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) ); @@ -825,7 +844,7 @@ int UtcDaliBuilderGenericActionP(void) " \"name\": \"subActor\"\n" " }],\n" " \"signals\": [{\n" - " \"name\": \"touch\",\n" + " \"name\": \"touched\",\n" " \"action\": \"hide\"\n" " }]\n" " }]\n" @@ -834,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(); @@ -852,7 +871,7 @@ 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.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) ); @@ -879,7 +898,7 @@ int UtcDaliBuilderPropertyNotificationP(void) " \"name\": \"subActor\"\n" " }],\n" " \"signals\": [{\n" - " \"name\": \"touch\",\n" + " \"name\": \"touched\",\n" " \"action\": \"hide\"\n" " }],\n" " \"notifications\": [{\n" @@ -919,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(); @@ -941,7 +960,7 @@ 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.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) ); @@ -972,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(...) @@ -999,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" @@ -1072,7 +1091,7 @@ int UtcDaliBuilderCustomShaderP(void) " },\n" " \"signals\": [\n" " {\n" - " \"name\": \"onStage\",\n" + " \"name\": \"onScene\",\n" " \"action\": \"play\",\n" " \"animation\": \"Animation_1\"\n" " }\n" @@ -1103,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 ); @@ -1132,7 +1151,7 @@ int UtcDaliBuilderLoadFromStringN(void) "\"parentOrigin\": \"TOP_LEFT\"," "\"anchorPoint\": \"TOP_LEFT\"," "\"signals\": [{" - "\"name\": \"touch\"," + "\"name\": \"touched\"," "\"action\": \"quit\"" "}]" "}]" @@ -1179,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" @@ -1190,13 +1209,13 @@ 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.GetCurrentProperty< bool >( Actor::Property::VISIBLE ) ); @@ -1230,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" @@ -1250,7 +1269,7 @@ int UtcDaliBuilderPathConstraintsP(void) " ]\n" " },\n" " {\n" - " \"name\": \"onStage\",\n" + " \"name\": \"onScene\",\n" " \"action\": \"applyConstraint\",\n" " \"constrainer\": \"constrainer1\",\n" " \"properties\":\n" @@ -1265,7 +1284,7 @@ int UtcDaliBuilderPathConstraintsP(void) " ]\n" " },\n" " {\n" - " \"name\": \"offStage\",\n" + " \"name\": \"offScene\",\n" " \"action\": \"removeConstraints\",\n" " \"constrainer\": \"constrainer0\",\n" " \"properties\":\n" @@ -1280,7 +1299,7 @@ int UtcDaliBuilderPathConstraintsP(void) " ]\n" " },\n" " {\n" - " \"name\": \"offStage\",\n" + " \"name\": \"offScene\",\n" " \"action\": \"removeConstraints\",\n" " \"constrainer\": \"constrainer1\",\n" " \"properties\":\n" @@ -1396,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 @@ -1502,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(); @@ -1574,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(); @@ -1621,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 ); @@ -1658,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 ); @@ -1687,7 +1706,7 @@ int UtcDaliBuilderCustomControl(void) ); Actor rootActor = Actor::New(); - Stage::GetCurrent().Add( rootActor ); + application.GetScene().Add( rootActor ); Builder builder = Builder::New(); builder.LoadFromString( json ); @@ -1723,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" @@ -1739,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