X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-Builder.cpp;h=2fb0f0cfa550ed659f7f2aed4458e75aea157f16;hb=refs%2Fchanges%2F61%2F66561%2F1;hp=deb3727ed89ee67dfa0a7cc224a215eb89487d8f;hpb=40e6eada47390ac9be4db5fbe210cc5d23c8ebcd;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 deb3727..2fb0f0c 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) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2014-2016 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. @@ -20,6 +20,10 @@ #include #include #include +#include +#include +#include +#include #define STRINGIFY(A)#A @@ -422,13 +426,13 @@ int UtcDaliBuilderConstantsP(void) "}," "\"stage\":" "[{" - " \"type\": \"ImageActor\"," + " \"type\": \"ImageView\"," " \"name\": \"{NAME}\"," " \"size\": [100,100,1]," " \"parentOrigin\": \"TOP_LEFT\"," " \"anchorPoint\": \"{ANCHOR}\"," " \"padding\": \"{PADDING}\"," - " \"image\": { \"filename\": \"dir/{IMAGE_PATH}\" }," + " \"image\": { \"imageUrl\": \"dir/{IMAGE_PATH}\" }," " \"sizeWidth\": \"{WIDTH}\"," " \"signals\": [{" " \"name\": \"touched\"," @@ -492,7 +496,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void) "\"templates\":\n" "{\n" " \"imageTree\": { \n" - " \"type\": \"ImageActor\",\n" + " \"type\": \"ImageView\",\n" " \"styles\": [\"imageStyle\"],\n" " \"name\": \"image\",\n" " \"size\": \"{SIZE}\",\n" @@ -502,7 +506,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void) " }],\n" " \"actors\": [\n" " {\n" - " \"type\":\"ImageActor\",\n" + " \"type\":\"ImageView\",\n" " \"name\":\"childImage\" \n" " }\n" " ]\n" @@ -529,7 +533,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void) std::string templatejson( "{ \n" - " \"type\": \"ImageActor\",\n" + " \"type\": \"ImageView\",\n" " \"styles\": [\"imageStyle\"],\n" " \"name\": \"image\",\n" " \"size\": \"{SIZE}\",\n" @@ -539,7 +543,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void) " }],\n" " \"actors\": [\n" " {\n" - " \"type\":\"ImageActor\",\n" + " \"type\":\"ImageView\",\n" " \"name\":\"childImage\" \n" " }\n" " ]\n" @@ -549,16 +553,16 @@ int UtcDaliBuilderTemplatesAndStylesP(void) Builder builder = Builder::New(); builder.LoadFromString( json ); - ImageActor actor = ImageActor::DownCast( builder.Create( "imageTree" ) ); + ImageView actor = ImageView::DownCast( builder.Create( "imageTree" ) ); DALI_TEST_CHECK( actor ); Dali::Property::Map map; map["SIZE"] = Vector3(100,100,1); - actor = ImageActor::DownCast( builder.Create( "imageTree", map ) ); + actor = ImageView::DownCast( builder.Create( "imageTree", map ) ); DALI_TEST_CHECK( actor ); // create from json snippet - actor = ImageActor::DownCast( builder.CreateFromJson( templatejson ) ); + actor = ImageView::DownCast( builder.CreateFromJson( templatejson ) ); DALI_TEST_CHECK( actor ); @@ -592,7 +596,7 @@ int UtcDaliBuilderRenderTasksP(void) " \"name\": \"image\"\n" " }, \n" " { \n" - " \"type\": \"ImageActor\",\n" + " \"type\": \"ImageView\",\n" " \"name\": \"image\",\n" " \"size\": [100,100,1],\n" " \"signals\": [{\n" @@ -601,7 +605,7 @@ int UtcDaliBuilderRenderTasksP(void) " }],\n" " \"actors\": [\n" " {\n" - " \"type\":\"ImageActor\",\n" + " \"type\":\"ImageView\",\n" " \"name\":\"childImage\" \n" " }\n" " ]\n" @@ -852,7 +856,7 @@ int UtcDaliBuilderCustomPropertyP(void) "\"templates\":\n" "{\n" " \"imageTree\": { \n" - " \"type\": \"ImageActor\",\n" + " \"type\": \"ImageView\",\n" " \"name\": \"image\",\n" " \"size\": [100,100,1],\n" " \"signals\": [{\n" @@ -864,7 +868,7 @@ int UtcDaliBuilderCustomPropertyP(void) " },\n" " \"actors\": [\n" " {\n" - " \"type\":\"ImageActor\",\n" + " \"type\":\"ImageView\",\n" " \"name\":\"childImage\" \n" " }\n" " ]\n" @@ -876,7 +880,7 @@ int UtcDaliBuilderCustomPropertyP(void) Builder builder = Builder::New(); builder.LoadFromString( json ); - ImageActor actor = ImageActor::DownCast( builder.Create( "imageTree" ) ); + ImageView actor = ImageView::DownCast( builder.Create( "imageTree" ) ); DALI_TEST_CHECK( actor ); // NB: already applied in create @@ -897,7 +901,7 @@ int UtcDaliBuilderShaderEffectP(void) "{\n" " \"stage\": [\n" " {\n" - " \"type\": \"ImageActor\",\n" + " \"type\": \"ImageView\",\n" " \"name\": \"Image1\",\n" " \"position\": [\n" " 0.40461349487305,\n" @@ -948,7 +952,7 @@ int UtcDaliBuilderShaderEffectP(void) " \"vertexPrefix\": \"\",\n" " \"vertex\": \"void main(void)\\n{\\n gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n vTexCoord = aTexCoord;\\n}\\n\\n\",\n" " \"fragmentPrefix\": \"\",\n" - " \"fragment\": \"precision mediump float;\\nuniform float uAmplitude; // 0.02; (< 1)\\nuniform float uTime;\\nvoid main()\\n{\\n highp vec2 textureSize = uTextureRect.zw - uTextureRect.xy;\\n highp vec2 pos = -1.0 + 2.0 * vTexCoord.st/textureSize;\\n highp float len = length(pos);\\n highp vec2 texCoord = vTexCoord.st/textureSize + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude; \\n gl_FragColor = texture2D(sTexture, texCoord) * uColor;\\n}\\n\\n\\n\",\n" + " \"fragment\": \"precision mediump float;\\nuniform float uAmplitude; // 0.02; (< 1)\\nuniform float uTime;\\nvoid main()\\n{\\n highp vec2 textureSize = sTextureRect.zw - sTextureRect.xy;\\n highp vec2 pos = -1.0 + 2.0 * vTexCoord.st/textureSize;\\n highp float len = length(pos);\\n highp vec2 texCoord = vTexCoord.st/textureSize + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude; \\n gl_FragColor = texture2D(sTexture, texCoord) * uColor;\\n}\\n\\n\\n\",\n" " \"geometryType\": \"GEOMETRY_TYPE_IMAGE\"\n" " },\n" " \"geometryHints\": \"HINT_NONE\",\n" @@ -1024,7 +1028,7 @@ int UtcDaliBuilderShaderEffect2P(void) "\"templates\":\n" "{\n" " \"imageTree\": { \n" - " \"type\": \"ImageActor\",\n" + " \"type\": \"ImageView\",\n" " \"size\": [100,100,1],\n" " \"parentOrigin\": [0.5, 0.5, 0.5],\n" " \"position\": [\n" @@ -1038,7 +1042,7 @@ int UtcDaliBuilderShaderEffect2P(void) " }],\n" " \"actors\": [\n" " {\n" - " \"type\":\"ImageActor\",\n" + " \"type\":\"ImageView\",\n" " \"name\":\"childImage\" \n" " }\n" " ]\n" @@ -1058,7 +1062,7 @@ int UtcDaliBuilderShaderEffect2P(void) " \"vertexPrefix\": \"\",\n" " \"vertex\": \"void main(void)\\n{\\n gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n vTexCoord = aTexCoord;\\n}\\n\\n\",\n" " \"fragmentPrefix\": \"\",\n" - " \"fragment\": \"precision mediump float;\\nuniform float uAmplitude; // 0.02; (< 1)\\nuniform float uTime;\\nvoid main()\\n{\\n highp vec2 textureSize = uTextureRect.zw - uTextureRect.xy;\\n highp vec2 pos = -1.0 + 2.0 * vTexCoord.st/textureSize;\\n highp float len = length(pos);\\n highp vec2 texCoord = vTexCoord.st/textureSize + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude; \\n gl_FragColor = texture2D(sTexture, texCoord) * uColor;\\n}\\n\\n\\n\",\n" + " \"fragment\": \"precision mediump float;\\nuniform float uAmplitude; // 0.02; (< 1)\\nuniform float uTime;\\nvoid main()\\n{\\n highp vec2 textureSize = sTextureRect.zw - sTextureRect.xy;\\n highp vec2 pos = -1.0 + 2.0 * vTexCoord.st/textureSize;\\n highp float len = length(pos);\\n highp vec2 texCoord = vTexCoord.st/textureSize + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude; \\n gl_FragColor = texture2D(sTexture, texCoord) * uColor;\\n}\\n\\n\\n\",\n" " \"geometryType\": \"GEOMETRY_TYPE_IMAGE\"\n" " },\n" " \"geometryHints\": \"HINT_NONE\",\n" @@ -1150,7 +1154,7 @@ int UtcDaliBuilderFrameBufferP(void) " },\n" " \"stage\": [\n" " {\n" - " \"type\": \"ImageActor\",\n" + " \"type\": \"ImageView\",\n" " \"name\": \"fbOnStage\",\n" " \"position\": [\n" " 0.40461349487305,\n" @@ -1163,17 +1167,13 @@ int UtcDaliBuilderFrameBufferP(void) " \"clearColor\": [1,0,0,1]\n" " },\n" " {\n" - " \"type\": \"ImageActor\",\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" - " \"filename\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\",\n" - " \"width\": 200,\n" - " \"height\": 80,\n" - " \"loadPolicy\": \"IMMEDIATE\",\n" - " \"releasePolicy\": \"NEVER\"\n" + " \"imageUrl\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\"\n" " },\n" " \"signals\": [\n" " {\n" @@ -1241,7 +1241,7 @@ int UtcDaliBuilderFrameBufferP(void) " \"vertexPrefix\": \"\",\n" " \"vertex\": \"void main(void)\\n{\\n gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n vTexCoord = aTexCoord;\\n}\\n\\n\",\n" " \"fragmentPrefix\": \"\",\n" - " \"fragment\": \"precision mediump float;\\nuniform float uAmplitude; // 0.02; (< 1)\\nuniform float uTime;\\nvoid main()\\n{\\n highp vec2 textureSize = uTextureRect.zw - uTextureRect.xy;\\n highp vec2 pos = -1.0 + 2.0 * vTexCoord.st/textureSize;\\n highp float len = length(pos);\\n highp vec2 texCoord = vTexCoord.st/textureSize + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude; \\n gl_FragColor = texture2D(sTexture, texCoord) * uColor;\\n}\\n\\n\\n\",\n" + " \"fragment\": \"precision mediump float;\\nuniform float uAmplitude; // 0.02; (< 1)\\nuniform float uTime;\\nvoid main()\\n{\\n highp vec2 textureSize = sTextureRect.zw - sTextureRect.xy;\\n highp vec2 pos = -1.0 + 2.0 * vTexCoord.st/textureSize;\\n highp float len = length(pos);\\n highp vec2 texCoord = vTexCoord.st/textureSize + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude; \\n gl_FragColor = texture2D(sTexture, texCoord) * uColor;\\n}\\n\\n\\n\",\n" " \"geometryType\": \"GEOMETRY_TYPE_IMAGE\"\n" " },\n" " \"geometryHints\": \"HINT_NONE\",\n" @@ -1290,17 +1290,13 @@ int UtcDaliBuilderPathConstraintsP(void) " },\n" " \"stage\": [\n" " {\n" - " \"type\": \"ImageActor\",\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" - " \"filename\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\",\n" - " \"width\": 200,\n" - " \"height\": 80,\n" - " \"loadPolicy\": \"IMMEDIATE\",\n" - " \"releasePolicy\": \"NEVER\"\n" + " \"imageUrl\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\"\n" " },\n" " \"signals\": [\n" " {\n" @@ -1412,7 +1408,7 @@ int UtcDaliBuilderPathConstraintsP(void) " \"vertexPrefix\": \"\",\n" " \"vertex\": \"void main(void)\\n{\\n gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n vTexCoord = aTexCoord;\\n}\\n\\n\",\n" " \"fragmentPrefix\": \"\",\n" - " \"fragment\": \"precision mediump float;\\nuniform float uAmplitude; // 0.02; (< 1)\\nuniform float uTime;\\nvoid main()\\n{\\n highp vec2 textureSize = uTextureRect.zw - uTextureRect.xy;\\n highp vec2 pos = -1.0 + 2.0 * vTexCoord.st/textureSize;\\n highp float len = length(pos);\\n highp vec2 texCoord = vTexCoord.st/textureSize + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude; \\n gl_FragColor = texture2D(sTexture, texCoord) * uColor;\\n}\\n\\n\\n\",\n" + " \"fragment\": \"precision mediump float;\\nuniform float uAmplitude; // 0.02; (< 1)\\nuniform float uTime;\\nvoid main()\\n{\\n highp vec2 textureSize = sTextureRect.zw - sTextureRect.xy;\\n highp vec2 pos = -1.0 + 2.0 * vTexCoord.st/textureSize;\\n highp float len = length(pos);\\n highp vec2 texCoord = vTexCoord.st/textureSize + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude; \\n gl_FragColor = texture2D(sTexture, texCoord) * uColor;\\n}\\n\\n\\n\",\n" " \"geometryType\": \"GEOMETRY_TYPE_IMAGE\"\n" " },\n" " \"geometryHints\": \"HINT_NONE\",\n" @@ -1455,3 +1451,194 @@ int UtcDaliBuilderPathConstraintsP(void) END_TEST; } + +#define CHECK_MAP_ELEMENT( xMap, xKey, xType, xPropType, xExpected, xLocation ) \ + { \ + Property::Value* value = xMap->Find( xKey ); \ + DALI_TEST_EQUALS( value==NULL, false, xLocation); \ + if( value != NULL ) \ + { \ + DALI_TEST_EQUALS( value->GetType(), xPropType, xLocation ); \ + xType result; \ + value->Get(result); \ + DALI_TEST_EQUALS( result, xExpected, TEST_LOCATION ); \ + std::ostringstream oss; \ + oss << "Animation element " << xKey << "= " << result << std::endl; \ + tet_printf( oss.str().c_str() ); \ + } \ + else \ + { \ + tet_printf("Can't find map element " xKey "\n"); \ + } \ + } + + +int UtcDaliBuilderMapping01(void) +{ + ToolkitTestApplication application; + + const char* json = + "{\n" + " \"mappings\":\n" + " {\n" + " \"buttonPressFadeOut\":{\n" + " \"alphaFunction\":\"EASE_OUT\",\n" + " \"timePeriod\":{\n" + " \"delay\":0.0,\n" + " \"duration\":0.4\n" + " }\n" + " },\n" + " \"buttonPressFadeIn\":{\n" + " \"alphaFunction\":\"EASE_IN\",\n" + " \"timePeriod\":{\n" + " \"delay\":0.4,\n" + " \"duration\":0.5\n" + " }\n" + " },\n" + " \"transition:buttonPressed\":\n" + " [\n" + " {\n" + " \"target\": \"unselectedBackgroundRenderer\",\n" + " \"property\": \"opacity\",\n" + " \"value\": 0,\n" + " \"animator\":\"\"\n" + " }\n" + " ],\n" + " \"transition:buttonReleased\":\n" + " [\n" + " {\n" + " \"target\": \"unselectedBackgroundRenderer\",\n" + " \"property\": \"opacity\",\n" + " \"value\": 1,\n" + " \"animator\":\"\"\n" + " },\n" + " {\n" + " \"target\": \"unselectedForegroundRenderer\",\n" + " \"property\": \"scale\",\n" + " \"value\": [ 1, 1, 1 ],\n" + " \"animator\":\"\"\n" + " },\n" + " {\n" + " \"target\": \"selectedBackgroundRenderer\",\n" + " \"property\": \"opacity\",\n" + " \"value\": 0,\n" + " \"animator\": \"\"\n" + " },\n" + " {\n" + " \"target\": \"selectedForegroundRenderer\",\n" + " \"property\": \"scale\",\n" + " \"value\": [ 0, 0, 0 ],\n" + " \"animator\":\"\"\n" + " }\n" + " ]\n" + " },\n" + " \"styles\":\n" + " {\n" + " \"testbutton\":\n" + " {\n" + " \"pressTransition\":\"\",\n" + " \"releaseTransition\":\"\"\n" + " }\n" + " }\n" + "}\n"; + + Builder builder = Builder::New(); + builder.LoadFromString( json ); + + Test::TestButton testButton = Test::TestButton::New(); + Stage::GetCurrent().Add( testButton ); + + // Render and notify + application.SendNotification(); + application.Render(); + + DALI_TEST_CHECK( builder.ApplyStyle( "testbutton", testButton ) ); + + // Now check that it has loaded the transition correctly: + Property::Value transition = testButton.GetProperty(Test::TestButton::Property::PRESS_TRANSITION); + DALI_TEST_EQUALS( transition.GetType(), Property::ARRAY, TEST_LOCATION ); + Property::Array* array = transition.GetArray(); + + DALI_TEST_EQUALS( array->Size(), 1, TEST_LOCATION ); + Property::Value element = array->GetElementAt(0); + DALI_TEST_CHECK( element.GetType() == Property::MAP ); + Property::Map* map = element.GetMap(); + + CHECK_MAP_ELEMENT(map, "target", std::string, Property::STRING, "unselectedBackgroundRenderer", TEST_LOCATION); + CHECK_MAP_ELEMENT(map, "property", std::string, Property::STRING, "opacity", TEST_LOCATION); + CHECK_MAP_ELEMENT(map, "alphaFunction", int, Property::INTEGER, (int)Dali::AlphaFunction::EASE_OUT, TEST_LOCATION); + CHECK_MAP_ELEMENT(map, "timePeriodDelay", float, Property::FLOAT, 0.0f, TEST_LOCATION); + CHECK_MAP_ELEMENT(map, "timePeriodDuration", float, Property::FLOAT, 0.4f, TEST_LOCATION); + + END_TEST; +} + + +int UtcDaliBuilderMappingCycleCheck(void) +{ + ToolkitTestApplication application; + + std::string json( + "{\n" + " \"mappings\":\n" + " {\n" + " \"cyclicKey1\":\"\",\n" + " \"cyclicKey2\":\"\",\n" + " \"cyclicKey3\":\"\",\n" + " \"FadeOut\":{\n" + " \"alphaFunction\":\"EASE_IN\",\n" + " \"timePeriod\":{\n" + " \"delay\":\"\",\n" + " \"duration\":0.6\n" + " }\n" + " },\n" + " \"transition:buttonPressed\":\n" + " [\n" + " {\n" + " \"target\": \"\",\n" + " \"property\": \"\",\n" + " \"value\": 0,\n" + " \"animator\":\"\"\n" + " }\n" + " ]\n" + " },\n" + " \"styles\":\n" + " {\n" + " \"testbutton\":\n" + " {\n" + " \"pressTransition\":\"\",\n" + " \"releaseTransition\":\"\",\n" + " \"disabledTransition\":\"\",\n" + " \"enabledTransition\":\"\"\n" + " }\n" + " }\n" + "}\n"); + + Builder builder = Builder::New(); + builder.LoadFromString( json ); + + Test::TestButton testButton = Test::TestButton::New(); + Stage::GetCurrent().Add( testButton ); + + // Render and notify + application.SendNotification(); + application.Render(); + + DALI_TEST_CHECK( builder.ApplyStyle( "testbutton", testButton ) ); + + // Now check that it has loaded the transition correctly: + Property::Value transition = testButton.GetProperty(Test::TestButton::Property::PRESS_TRANSITION); + DALI_TEST_EQUALS( transition.GetType(), Property::ARRAY, TEST_LOCATION ); + Property::Array* array = transition.GetArray(); + + DALI_TEST_EQUALS( array->Size(), 1, TEST_LOCATION ); + Property::Value element = array->GetElementAt(0); + DALI_TEST_CHECK( element.GetType() == Property::MAP ); + Property::Map* map = element.GetMap(); + + CHECK_MAP_ELEMENT(map, "target", std::string, Property::STRING, "", TEST_LOCATION); + CHECK_MAP_ELEMENT(map, "property", std::string, Property::STRING, "", TEST_LOCATION); + CHECK_MAP_ELEMENT(map, "timePeriodDuration", float, Property::FLOAT, 0.6f, TEST_LOCATION); + + END_TEST; +}