X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-Builder.cpp;h=645863ea9d97d4252a5261ff420cd55f5679a601;hb=e8b6a55bb502bb265b14521313a41b7851aa42ab;hp=f2d3e9c18499c5816261c9e827a8d2f961cf59e6;hpb=41278d3fb755de3cb89edf6d80603b18562b4e01;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 f2d3e9c..645863e 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp @@ -78,12 +78,15 @@ int UtcDaliBuilderQuitSignal(void) "{" "\"stage\":" "[{" - "\"type\": \"Actor\"," + "\"type\": \"Layer\"," "\"size\": [100,100,1]," "\"parentOrigin\": \"TOP_LEFT\"," "\"anchorPoint\": \"TOP_LEFT\"," + "\"maximumSize\": [100,100]," + "\"orientation\": [10,10,10,10]," + "\"clippingBox\": [10,10,10,10]," "\"signals\": [{" - "\"name\": \"touched\"," + "\"name\": \"touch\"," "\"action\": \"quit\"" "}]" "}]" @@ -103,7 +106,10 @@ int UtcDaliBuilderQuitSignal(void) // Emit touch event and check that our quit method is called Integration::TouchEvent touchEvent; - touchEvent.points.push_back( TouchPoint ( 0, TouchPoint::Down, 10.0f, 10.0f ) ); + Integration::Point point; + point.SetState( PointState::DOWN ); + point.SetScreenPosition( Vector2( 10.0f, 10.0f ) ); + touchEvent.points.push_back( point ); application.ProcessEvent( touchEvent ); DALI_TEST_CHECK( functorCalled ); @@ -240,7 +246,7 @@ int UtcDaliBuilderAnimationP(void) " \"size\": [200, 200, 1]," " \"orientation\": [0, 0, 30]," " \"signals\": [{" - " \"name\": \"touched\"," + " \"name\": \"touch\"," " \"action\": \"play\"," " \"animation\": \"animate\"" " }]" @@ -268,7 +274,10 @@ int UtcDaliBuilderAnimationP(void) // trigger play // Emit touch event and check that our quit method is called Integration::TouchEvent touchEvent; - touchEvent.points.push_back( TouchPoint ( 0, TouchPoint::Down, 10.0f, 10.0f ) ); + Integration::Point point; + point.SetState( PointState::DOWN ); + point.SetScreenPosition( Vector2( 10.0f, 10.0f ) ); + touchEvent.points.push_back( point ); application.ProcessEvent( touchEvent ); // Render and notify @@ -361,7 +370,7 @@ int UtcDaliBuilderAnimationN(void) " \"size\": [200, 200, 1]," " \"orientation\": [0, 0, 30]," " \"signals\": [{" - " \"name\": \"touched\"," + " \"name\": \"touch\"," " \"action\": \"play\"," " \"animation\": \"animate\"" " }]" @@ -434,7 +443,7 @@ int UtcDaliBuilderConstantsP(void) " \"image\": { \"url\": \"dir/{IMAGE_PATH}\" }," " \"sizeWidth\": \"{WIDTH}\"," " \"signals\": [{" - " \"name\": \"touched\"," + " \"name\": \"touch\"," " \"action\": \"quit\"" " }]" "}]" @@ -487,26 +496,41 @@ int UtcDaliBuilderTemplatesAndStylesP(void) " \"color\": [1,0,0,1],\n" " \"actors\": {\n" " \"childImage\": {\n" - " \"color\": [0,1,0,1]\n" + " \"color\": \"34\"\n" " }\n" " }\n" " }\n" "},\n" "\"templates\":\n" "{\n" + " \"imageViewTemplate\": { \n" + " \"type\": \"ImageView\",\n" + " \"styles\": [\"imageStyle\"]\n" + " },\n" " \"imageTree\": { \n" " \"type\": \"ImageView\",\n" " \"styles\": [\"imageStyle\"],\n" " \"name\": \"image\",\n" " \"size\": \"{SIZE}\",\n" " \"signals\": [{\n" - " \"name\": \"touched\",\n" + " \"name\": \"touch\",\n" " \"action\": \"quit\"\n" " }],\n" " \"actors\": [\n" " {\n" " \"type\":\"ImageView\",\n" - " \"name\":\"childImage\" \n" + " \"name\":\"childImage\", \n" + " \"color\": \n" + " {\n" + " \"r\": 10,\n" + " \"g\": 10,\n" + " \"b\": 10,\n" + " \"a\": 100\n" + " }\n" + " },\n" + " {\n" + " \"type\":\"imageViewTemplate\",\n" + " \"name\":\"childImage2\"\n" " }\n" " ]\n" " }\n" @@ -524,7 +548,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void) " \"color\": [1,0,0,1],\n" " \"actors\": {\n" " \"childImage\": {\n" - " \"color\": [0,1,0,1]\n" + " \"color\": \"#344353\"\n" " }\n" " }\n" "}\n" @@ -537,7 +561,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void) " \"name\": \"image\",\n" " \"size\": \"{SIZE}\",\n" " \"signals\": [{\n" - " \"name\": \"touched\",\n" + " \"name\": \"touch\",\n" " \"action\": \"quit\"\n" " }],\n" " \"actors\": [\n" @@ -592,14 +616,14 @@ int UtcDaliBuilderRenderTasksP(void) "[\n" " { \n" " \"type\": \"CameraActor\",\n" - " \"name\": \"image\"\n" + " \"name\": \"camera\"\n" " }, \n" " { \n" " \"type\": \"ImageView\",\n" " \"name\": \"image\",\n" " \"size\": [100,100,1],\n" " \"signals\": [{\n" - " \"name\": \"touched\",\n" + " \"name\": \"touch\",\n" " \"action\": \"quit\"\n" " }],\n" " \"actors\": [\n" @@ -646,7 +670,7 @@ int UtcDaliBuilderChildActionP(void) " \"name\": \"subActor\"\n" " }],\n" " \"signals\": [{\n" - " \"name\": \"touched\",\n" + " \"name\": \"touch\",\n" " \"action\": \"hide\",\n" " \"actor\": \"actor\",\n" " \"childActor\": \"subActor\"\n" @@ -665,7 +689,10 @@ int UtcDaliBuilderChildActionP(void) // Emit touch event and check that our quit method is called Integration::TouchEvent touchEvent; - touchEvent.points.push_back( TouchPoint ( 0, TouchPoint::Down, 10.0f, 10.0f ) ); + Integration::Point point; + point.SetState( PointState::DOWN ); + point.SetScreenPosition( Vector2( 10.0f, 10.0f ) ); + touchEvent.points.push_back( point ); application.ProcessEvent( touchEvent ); // Render and notify @@ -699,7 +726,7 @@ int UtcDaliBuilderSetPropertyActionP(void) " \"name\": \"subActor\"\n" " }],\n" " \"signals\": [{\n" - " \"name\": \"touched\",\n" + " \"name\": \"touch\",\n" " \"action\": \"set\",\n" " \"actor\": \"subActor\",\n" " \"property\": \"visible\",\n" @@ -719,7 +746,10 @@ int UtcDaliBuilderSetPropertyActionP(void) // Emit touch event and check that our quit method is called Integration::TouchEvent touchEvent; - touchEvent.points.push_back( TouchPoint ( 0, TouchPoint::Down, 10.0f, 10.0f ) ); + Integration::Point point; + point.SetState( PointState::DOWN ); + point.SetScreenPosition( Vector2( 10.0f, 10.0f ) ); + touchEvent.points.push_back( point ); application.ProcessEvent( touchEvent ); // Render and notify @@ -753,7 +783,7 @@ int UtcDaliBuilderGenericActionP(void) " \"name\": \"subActor\"\n" " }],\n" " \"signals\": [{\n" - " \"name\": \"touched\",\n" + " \"name\": \"touch\",\n" " \"action\": \"hide\"\n" " }]\n" " }]\n" @@ -770,7 +800,10 @@ int UtcDaliBuilderGenericActionP(void) // Emit touch event and check that our quit method is called Integration::TouchEvent touchEvent; - touchEvent.points.push_back( TouchPoint ( 0, TouchPoint::Down, 10.0f, 10.0f ) ); + Integration::Point point; + point.SetState( PointState::DOWN ); + point.SetScreenPosition( Vector2( 10.0f, 10.0f ) ); + touchEvent.points.push_back( point ); application.ProcessEvent( touchEvent ); // Render and notify @@ -804,7 +837,7 @@ int UtcDaliBuilderPropertyNotificationP(void) " \"name\": \"subActor\"\n" " }],\n" " \"signals\": [{\n" - " \"name\": \"touched\",\n" + " \"name\": \"touch\",\n" " \"action\": \"hide\"\n" " }],\n" " \"notifications\": [{\n" @@ -826,7 +859,10 @@ int UtcDaliBuilderPropertyNotificationP(void) // Emit touch event and check that our quit method is called Integration::TouchEvent touchEvent; - touchEvent.points.push_back( TouchPoint ( 0, TouchPoint::Down, 10.0f, 10.0f ) ); + Integration::Point point; + point.SetState( PointState::DOWN ); + point.SetScreenPosition( Vector2( 10.0f, 10.0f ) ); + touchEvent.points.push_back( point ); application.ProcessEvent( touchEvent ); // Render and notify @@ -859,7 +895,7 @@ int UtcDaliBuilderCustomPropertyP(void) " \"name\": \"image\",\n" " \"size\": [100,100,1],\n" " \"signals\": [{\n" - " \"name\": \"touched\",\n" + " \"name\": \"touch\",\n" " \"action\": \"quit\"\n" " }],\n" " \"properties\": {\n" @@ -992,7 +1028,7 @@ int UtcDaliBuilderLoadFromStringN(void) "\"parentOrigin\": \"TOP_LEFT\"," "\"anchorPoint\": \"TOP_LEFT\"," "\"signals\": [{" - "\"name\": \"touched\"," + "\"name\": \"touch\"," "\"action\": \"quit\"" "}]" "}]" @@ -1039,7 +1075,7 @@ int UtcDaliBuilderAddActorsP(void) " \"visible\": false\n" " }],\n" " \"signals\": [{\n" - " \"name\": \"touched\",\n" + " \"name\": \"touch\",\n" " \"action\": \"hide\",\n" " \"actor\": \"actor\",\n" " \"childActor\": \"subActor\"\n" @@ -1568,3 +1604,43 @@ int UtcDaliBuilderMappingCycleCheck(void) END_TEST; } + +int UtcDaliBuilderTypeCasts(void) +{ + ToolkitTestApplication application; + + std::string json( + "{" + "\"stage\":" + "[{" + "\"type\": \"Layer\"," + "\"maximumSize\": { \"typeCast\":\"vector2\", \"value\":[100,15] }," + "\"position\": { \"typeCast\":\"vector3\", \"value\":[100,10,1] }," + "\"color\": { \"typeCast\":\"vector4\", \"value\":[0.5,0.5,0.5,1] }," + "\"sensitive\": { \"typeCast\":\"boolean\", \"value\":false }," + "\"orientation\": { \"typeCast\":\"rotation\", \"value\":[10,10,10,10] }," + "\"colorMode\": { \"typeCast\":\"string\", \"value\":\"USE_OWN_MULTIPLY_PARENT_COLOR\" }," + "\"clippingBox\": { \"typeCast\":\"rect\", \"value\":[10,10,10,10] }" + "}]" + "}" + ); + + Actor rootActor = Actor::New(); + Stage::GetCurrent().Add( rootActor ); + + Builder builder = Builder::New(); + builder.LoadFromString( json ); + builder.AddActors( rootActor ); + + application.SendNotification(); + 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 ); + + END_TEST; +}