X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ControlRenderer.cpp;h=43caadd2b1b0418174dd782d70fa40f92e03b9aa;hb=refs%2Fchanges%2F16%2F75316%2F15;hp=da69b02724567395492d037ff993fa1992312aac;hpb=2a8f032f9d3e1a78a31986a95ea72964a5b515b0;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ControlRenderer.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ControlRenderer.cpp index da69b02..43caadd 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ControlRenderer.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ControlRenderer.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include @@ -29,6 +29,10 @@ namespace { const char* TEST_IMAGE_FILE_NAME = "gallery_image_01.jpg"; const char* TEST_NPATCH_FILE_NAME = "gallery_image_01.9.jpg"; +const char* TEST_SVG_FILE_NAME = TEST_RESOURCE_DIR "/svg1.svg"; +const char* TEST_OBJ_FILE_NAME = TEST_RESOURCE_DIR "/Cube.obj"; +const char* TEST_MTL_FILE_NAME = TEST_RESOURCE_DIR "/ToyRobot-Metal.mtl"; +const char* TEST_RESOURCE_LOCATION = TEST_RESOURCE_DIR "/"; } void dali_control_renderer_startup(void) @@ -48,9 +52,9 @@ int UtcDaliControlRendererCopyAndAssignment(void) RendererFactory factory = RendererFactory::Get(); Property::Map propertyMap; - propertyMap.Insert("rendererType", "colorRenderer"); - propertyMap.Insert("blendColor", Color::BLUE); - ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap ); + propertyMap.Insert("rendererType", "color"); + propertyMap.Insert("mixColor", Color::BLUE); + ControlRenderer controlRenderer = factory.CreateControlRenderer( propertyMap ); ControlRenderer controlRendererCopy( controlRenderer ); DALI_TEST_CHECK(controlRenderer == controlRendererCopy); @@ -81,9 +85,9 @@ int UtcDaliControlRendererSetGetDepthIndex(void) RendererFactory factory = RendererFactory::Get(); Property::Map propertyMap; - propertyMap.Insert("rendererType", "colorRenderer"); - propertyMap.Insert("blendColor", Color::BLUE); - ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap ); + propertyMap.Insert("rendererType", "color"); + propertyMap.Insert("mixColor", Color::BLUE); + ControlRenderer controlRenderer = factory.CreateControlRenderer( propertyMap ); controlRenderer.SetDepthIndex( 1.f ); @@ -114,7 +118,10 @@ int UtcDaliControlRendererSize(void) Vector2 naturalSize; // color renderer - ControlRenderer colorRenderer = factory.GetControlRenderer( Color::MAGENTA ); + Dali::Property::Map map; + map[ "rendererType" ] = "color"; + map[ "mixColor" ] = Color::MAGENTA; + ControlRenderer colorRenderer = factory.CreateControlRenderer( map ); colorRenderer.SetSize( rendererSize ); DALI_TEST_EQUALS( colorRenderer.GetSize(), rendererSize, TEST_LOCATION ); colorRenderer.GetNaturalSize(naturalSize); @@ -122,7 +129,7 @@ int UtcDaliControlRendererSize(void) // image renderer Image image = ResourceImage::New(TEST_IMAGE_FILE_NAME, ImageDimensions(100, 200)); - ControlRenderer imageRenderer = factory.GetControlRenderer( image ); + ControlRenderer imageRenderer = factory.CreateControlRenderer( image ); imageRenderer.SetSize( rendererSize ); DALI_TEST_EQUALS( imageRenderer.GetSize(), rendererSize, TEST_LOCATION ); imageRenderer.GetNaturalSize(naturalSize); @@ -133,7 +140,7 @@ int UtcDaliControlRendererSize(void) Vector2 testSize(80.f, 160.f); platform.SetClosestImageSize(testSize); image = ResourceImage::New(TEST_NPATCH_FILE_NAME); - ControlRenderer nPatchRenderer = factory.GetControlRenderer( image ); + ControlRenderer nPatchRenderer = factory.CreateControlRenderer( image ); nPatchRenderer.SetSize( rendererSize ); DALI_TEST_EQUALS( nPatchRenderer.GetSize(), rendererSize, TEST_LOCATION ); nPatchRenderer.GetNaturalSize(naturalSize); @@ -141,7 +148,11 @@ int UtcDaliControlRendererSize(void) // border renderer float borderSize = 5.f; - ControlRenderer borderRenderer = factory.GetControlRenderer( borderSize, Color::RED ); + map.Clear(); + map[ "rendererType" ] = "border"; + map[ "borderColor" ] = Color::RED; + map[ "borderSize" ] = borderSize; + ControlRenderer borderRenderer = factory.CreateControlRenderer( map ); borderRenderer.SetSize( rendererSize ); DALI_TEST_EQUALS( borderRenderer.GetSize(), rendererSize, TEST_LOCATION ); borderRenderer.GetNaturalSize(naturalSize); @@ -149,22 +160,32 @@ int UtcDaliControlRendererSize(void) // gradient renderer Property::Map propertyMap; - propertyMap.Insert("rendererType", "gradientRenderer"); + propertyMap.Insert("rendererType", "gradient"); Vector2 start(-1.f, -1.f); Vector2 end(1.f, 1.f); - propertyMap.Insert("gradientStartPosition", start); - propertyMap.Insert("gradientEndPosition", end); - propertyMap.Insert("gradientStopOffset", Vector2(0.f, 1.f)); + propertyMap.Insert("startPosition", start); + propertyMap.Insert("endPosition", end); + propertyMap.Insert("stopOffset", Vector2(0.f, 1.f)); Property::Array stopColors; stopColors.PushBack( Color::RED ); stopColors.PushBack( Color::GREEN ); - propertyMap.Insert("gradientStopColor", stopColors); - ControlRenderer gradientRenderer = factory.GetControlRenderer(propertyMap); + propertyMap.Insert("stopColor", stopColors); + ControlRenderer gradientRenderer = factory.CreateControlRenderer(propertyMap); gradientRenderer.SetSize( rendererSize ); DALI_TEST_EQUALS( gradientRenderer.GetSize(), rendererSize, TEST_LOCATION ); gradientRenderer.GetNaturalSize(naturalSize); DALI_TEST_EQUALS( naturalSize, Vector2::ZERO,TEST_LOCATION ); + //svg renderer + ControlRenderer svgRenderer = factory.CreateControlRenderer( TEST_SVG_FILE_NAME, ImageDimensions() ); + svgRenderer.SetSize( rendererSize ); + DALI_TEST_EQUALS( svgRenderer.GetSize(), rendererSize, TEST_LOCATION ); + svgRenderer.GetNaturalSize(naturalSize); + // TEST_SVG_FILE: + // + // + // + DALI_TEST_EQUALS( naturalSize, Vector2(100.f, 100.f), TEST_LOCATION ); END_TEST; } @@ -175,9 +196,9 @@ int UtcDaliControlRendererSetOnOffStage(void) RendererFactory factory = RendererFactory::Get(); Property::Map propertyMap; - propertyMap.Insert("rendererType", "colorRenderer"); - propertyMap.Insert("blendColor", Color::BLUE); - ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap ); + propertyMap.Insert("rendererType", "color"); + propertyMap.Insert("mixColor", Color::BLUE); + ControlRenderer controlRenderer = factory.CreateControlRenderer( propertyMap ); Actor actor = Actor::New(); actor.SetSize(200.f, 200.f); @@ -224,7 +245,7 @@ int UtcDaliControlRendererRemoveAndReset(void) } Image image = ResourceImage::New(TEST_IMAGE_FILE_NAME, ImageDimensions(100, 200)); - imageRenderer = factory.GetControlRenderer(image); + imageRenderer = factory.CreateControlRenderer(image); DALI_TEST_CHECK( imageRenderer ); imageRenderer.SetOnStage( actor ); @@ -248,27 +269,29 @@ int UtcDaliControlRendererGetPropertyMap1(void) RendererFactory factory = RendererFactory::Get(); Property::Map propertyMap; - propertyMap.Insert("rendererType", "colorRenderer"); - propertyMap.Insert("blendColor", Color::BLUE); - ControlRenderer colorRenderer = factory.GetControlRenderer( propertyMap ); + propertyMap.Insert("rendererType", "color"); + propertyMap.Insert("mixColor", Color::BLUE); + ControlRenderer colorRenderer = factory.CreateControlRenderer( propertyMap ); Property::Map resultMap; colorRenderer.CreatePropertyMap( resultMap ); Property::Value* typeValue = resultMap.Find( "rendererType", Property::STRING ); DALI_TEST_CHECK( typeValue ); - DALI_TEST_CHECK( typeValue->Get() == "colorRenderer" ); + DALI_TEST_CHECK( typeValue->Get() == "color" ); - Property::Value* colorValue = resultMap.Find( "blendColor", Property::VECTOR4 ); + Property::Value* colorValue = resultMap.Find( "mixColor", Property::VECTOR4 ); DALI_TEST_CHECK( colorValue ); DALI_TEST_CHECK( colorValue->Get() == Color::BLUE ); // change the blend color Actor actor; - factory.ResetRenderer( colorRenderer, actor, Color::CYAN ); + colorRenderer.RemoveAndReset( actor ); + propertyMap["mixColor"] = Color::CYAN; + colorRenderer = factory.CreateControlRenderer( propertyMap ); colorRenderer.CreatePropertyMap( resultMap ); - colorValue = resultMap.Find( "blendColor", Property::VECTOR4 ); + colorValue = resultMap.Find( "mixColor", Property::VECTOR4 ); DALI_TEST_CHECK( colorValue ); DALI_TEST_CHECK( colorValue->Get() == Color::CYAN ); @@ -282,10 +305,10 @@ int UtcDaliControlRendererGetPropertyMap2(void) RendererFactory factory = RendererFactory::Get(); Property::Map propertyMap; - propertyMap.Insert("rendererType", "borderRenderer"); + propertyMap.Insert("rendererType", "border"); propertyMap.Insert("borderColor", Color::BLUE); propertyMap.Insert("borderSize", 5.f); - ControlRenderer borderRenderer = factory.GetControlRenderer( propertyMap ); + ControlRenderer borderRenderer = factory.CreateControlRenderer( propertyMap ); Property::Map resultMap; borderRenderer.CreatePropertyMap( resultMap ); @@ -293,7 +316,7 @@ int UtcDaliControlRendererGetPropertyMap2(void) // check the property values from the returned map from control renderer Property::Value* typeValue = resultMap.Find( "rendererType", Property::STRING ); DALI_TEST_CHECK( typeValue ); - DALI_TEST_CHECK( typeValue->Get() == "borderRenderer" ); + DALI_TEST_CHECK( typeValue->Get() == "border" ); Property::Value* colorValue = resultMap.Find( "borderColor", Property::VECTOR4 ); DALI_TEST_CHECK( colorValue ); @@ -303,14 +326,18 @@ int UtcDaliControlRendererGetPropertyMap2(void) DALI_TEST_CHECK( sizeValue ); DALI_TEST_CHECK( sizeValue->Get() == 5.f ); - borderRenderer = factory.GetControlRenderer( 10.f, Color::CYAN ); + Property::Map propertyMap1; + propertyMap1[ "rendererType" ] = "border"; + propertyMap1[ "borderColor" ] = Color::CYAN; + propertyMap1[ "borderSize" ] = 10.0f; + borderRenderer = factory.CreateControlRenderer( propertyMap1 ); borderRenderer.CreatePropertyMap( resultMap ); typeValue = resultMap.Find( "rendererType", Property::STRING ); DALI_TEST_CHECK( typeValue ); - DALI_TEST_CHECK( typeValue->Get() == "borderRenderer" ); + DALI_TEST_CHECK( typeValue->Get() == "border" ); - colorValue = resultMap.Find( "borderColor", Property::VECTOR4 ); + colorValue = resultMap.Find( "borderColor", Property::VECTOR4 ); DALI_TEST_CHECK( colorValue ); DALI_TEST_CHECK( colorValue->Get() == Color::CYAN ); @@ -330,22 +357,22 @@ int UtcDaliControlRendererGetPropertyMap3(void) DALI_TEST_CHECK( factory ); Property::Map propertyMap; - propertyMap.Insert("rendererType", "gradientRenderer"); + propertyMap.Insert("rendererType", "gradient"); Vector2 start(-1.f, -1.f); Vector2 end(1.f, 1.f); - propertyMap.Insert("gradientStartPosition", start); - propertyMap.Insert("gradientEndPosition", end); - propertyMap.Insert("gradientSpreadMethod", "repeat"); + propertyMap.Insert("startPosition", start); + propertyMap.Insert("endPosition", end); + propertyMap.Insert("spreadMethod", "repeat"); - propertyMap.Insert("gradientStopOffset", Vector2(0.2f, 0.8f)); + propertyMap.Insert("stopOffset", Vector2(0.2f, 0.8f)); Property::Array stopColors; stopColors.PushBack( Color::RED ); stopColors.PushBack( Color::GREEN ); - propertyMap.Insert("gradientStopColor", stopColors); + propertyMap.Insert("stopColor", stopColors); - ControlRenderer gradientRenderer = factory.GetControlRenderer(propertyMap); + ControlRenderer gradientRenderer = factory.CreateControlRenderer(propertyMap); Property::Map resultMap; gradientRenderer.CreatePropertyMap( resultMap ); @@ -353,32 +380,32 @@ int UtcDaliControlRendererGetPropertyMap3(void) // check the property values from the returned map from control renderer Property::Value* value = resultMap.Find( "rendererType", Property::STRING ); DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == "gradientRenderer" ); + DALI_TEST_CHECK( value->Get() == "gradient" ); - value = resultMap.Find( "gradientUnits", Property::STRING ); + value = resultMap.Find( "units", Property::STRING ); DALI_TEST_CHECK( value ); DALI_TEST_CHECK( value->Get() == "objectBoundingBox" ); - value = resultMap.Find( "gradientSpreadMethod", Property::STRING ); + value = resultMap.Find( "spreadMethod", Property::STRING ); DALI_TEST_CHECK( value ); DALI_TEST_CHECK( value->Get() == "repeat" ); - value = resultMap.Find( "gradientStartPosition", Property::VECTOR2 ); + value = resultMap.Find( "startPosition", Property::VECTOR2 ); DALI_TEST_CHECK( value ); DALI_TEST_EQUALS( value->Get(), start , Math::MACHINE_EPSILON_100, TEST_LOCATION ); - value = resultMap.Find( "gradientEndPosition", Property::VECTOR2 ); + value = resultMap.Find( "endPosition", Property::VECTOR2 ); DALI_TEST_CHECK( value ); DALI_TEST_EQUALS( value->Get(), end , Math::MACHINE_EPSILON_100, TEST_LOCATION ); - value = resultMap.Find( "gradientStopOffset", Property::ARRAY ); + value = resultMap.Find( "stopOffset", Property::ARRAY ); DALI_TEST_CHECK( value ); Property::Array* offsetArray = value->GetArray(); DALI_TEST_CHECK( offsetArray->Count() == 2 ); DALI_TEST_EQUALS( offsetArray->GetElementAt(0).Get(), 0.2f , Math::MACHINE_EPSILON_100, TEST_LOCATION ); DALI_TEST_EQUALS( offsetArray->GetElementAt(1).Get(), 0.8f , Math::MACHINE_EPSILON_100, TEST_LOCATION ); - value = resultMap.Find( "gradientStopColor", Property::ARRAY ); + value = resultMap.Find( "stopColor", Property::ARRAY ); DALI_TEST_CHECK( value ); Property::Array* colorArray = value->GetArray(); DALI_TEST_CHECK( colorArray->Count() == 2 ); @@ -397,22 +424,22 @@ int UtcDaliControlRendererGetPropertyMap4(void) DALI_TEST_CHECK( factory ); Property::Map propertyMap; - propertyMap.Insert("rendererType", "gradientRenderer"); + propertyMap.Insert("rendererType", "gradient"); Vector2 center(100.f, 100.f); float radius = 100.f; - propertyMap.Insert("gradientUnits", "userSpace"); - propertyMap.Insert("gradientCenter", center); - propertyMap.Insert("gradientRadius", radius); - propertyMap.Insert("gradientStopOffset", Vector3(0.1f, 0.3f, 1.1f)); + propertyMap.Insert("units", "userSpace"); + propertyMap.Insert("center", center); + propertyMap.Insert("radius", radius); + propertyMap.Insert("stopOffset", Vector3(0.1f, 0.3f, 1.1f)); Property::Array stopColors; stopColors.PushBack( Color::RED ); stopColors.PushBack( Color::BLACK ); stopColors.PushBack( Color::GREEN ); - propertyMap.Insert("gradientStopColor", stopColors); + propertyMap.Insert("stopColor", stopColors); - ControlRenderer gradientRenderer = factory.GetControlRenderer(propertyMap); + ControlRenderer gradientRenderer = factory.CreateControlRenderer(propertyMap); DALI_TEST_CHECK( gradientRenderer ); Property::Map resultMap; @@ -421,25 +448,25 @@ int UtcDaliControlRendererGetPropertyMap4(void) // check the property values from the returned map from control renderer Property::Value* value = resultMap.Find( "rendererType", Property::STRING ); DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == "gradientRenderer" ); + DALI_TEST_CHECK( value->Get() == "gradient" ); - value = resultMap.Find( "gradientUnits", Property::STRING ); + value = resultMap.Find( "units", Property::STRING ); DALI_TEST_CHECK( value ); DALI_TEST_CHECK( value->Get() == "userSpace" ); - value = resultMap.Find( "gradientSpreadMethod", Property::STRING ); + value = resultMap.Find( "spreadMethod", Property::STRING ); DALI_TEST_CHECK( value ); DALI_TEST_CHECK( value->Get() == "pad" ); - value = resultMap.Find( "gradientCenter", Property::VECTOR2 ); + value = resultMap.Find( "center", Property::VECTOR2 ); DALI_TEST_CHECK( value ); DALI_TEST_EQUALS( value->Get(), center , Math::MACHINE_EPSILON_100, TEST_LOCATION ); - value = resultMap.Find( "gradientRadius", Property::FLOAT ); + value = resultMap.Find( "radius", Property::FLOAT ); DALI_TEST_CHECK( value ); DALI_TEST_EQUALS( value->Get(), radius , Math::MACHINE_EPSILON_100, TEST_LOCATION ); - value = resultMap.Find( "gradientStopOffset", Property::ARRAY ); + value = resultMap.Find( "stopOffset", Property::ARRAY ); DALI_TEST_CHECK( value ); Property::Array* offsetArray = value->GetArray(); DALI_TEST_CHECK( offsetArray->Count() == 3 ); @@ -448,7 +475,7 @@ int UtcDaliControlRendererGetPropertyMap4(void) // any stop value will be clamped to [0.0, 1.0]; DALI_TEST_EQUALS( offsetArray->GetElementAt(2).Get(), 1.0f , Math::MACHINE_EPSILON_100, TEST_LOCATION ); - value = resultMap.Find( "gradientStopColor", Property::ARRAY ); + value = resultMap.Find( "stopColor", Property::ARRAY ); DALI_TEST_CHECK( value ); Property::Array* colorArray = value->GetArray(); DALI_TEST_CHECK( colorArray->Count() == 3 ); @@ -466,14 +493,15 @@ int UtcDaliControlRendererGetPropertyMap5(void) RendererFactory factory = RendererFactory::Get(); Property::Map propertyMap; - propertyMap.Insert( "rendererType", "imageRenderer" ); - propertyMap.Insert( "imageUrl", TEST_IMAGE_FILE_NAME ); - propertyMap.Insert( "imageDesiredWidth", 20 ); - propertyMap.Insert( "imageDesiredHeight", 30 ); - propertyMap.Insert( "imageFittingMode", "fitHeight" ); - propertyMap.Insert( "imageSamplingMode", "boxThenNearest" ); - - ControlRenderer imageRenderer = factory.GetControlRenderer(propertyMap); + propertyMap.Insert( "rendererType", "image" ); + propertyMap.Insert( "url", TEST_IMAGE_FILE_NAME ); + propertyMap.Insert( "desiredWidth", 20 ); + propertyMap.Insert( "desiredHeight", 30 ); + propertyMap.Insert( "fittingMode", "FIT_HEIGHT" ); + propertyMap.Insert( "samplingMode", "BOX_THEN_NEAREST" ); + propertyMap.Insert( "synchronousLoading", true ); + + ControlRenderer imageRenderer = factory.CreateControlRenderer(propertyMap); DALI_TEST_CHECK( imageRenderer ); Property::Map resultMap; @@ -482,57 +510,65 @@ int UtcDaliControlRendererGetPropertyMap5(void) // check the property values from the returned map from control renderer Property::Value* value = resultMap.Find( "rendererType", Property::STRING ); DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == "imageRenderer" ); + DALI_TEST_CHECK( value->Get() == "image" ); - value = resultMap.Find( "imageUrl", Property::STRING ); + value = resultMap.Find( "url", Property::STRING ); DALI_TEST_CHECK( value ); DALI_TEST_CHECK( value->Get() == TEST_IMAGE_FILE_NAME ); - value = resultMap.Find( "imageFittingMode", Property::STRING ); + value = resultMap.Find( "fittingMode", Property::STRING ); DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == "fitHeight" ); + DALI_TEST_CHECK( value->Get() == "FIT_HEIGHT" ); - value = resultMap.Find( "imageSamplingMode", Property::STRING ); + value = resultMap.Find( "samplingMode", Property::STRING ); DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == "boxThenNearest" ); + DALI_TEST_CHECK( value->Get() == "BOX_THEN_NEAREST" ); - value = resultMap.Find( "imageDesiredWidth", Property::INTEGER ); + value = resultMap.Find( "desiredWidth", Property::INTEGER ); DALI_TEST_CHECK( value ); DALI_TEST_CHECK( value->Get() == 20 ); - value = resultMap.Find( "imageDesiredHeight", Property::INTEGER ); + value = resultMap.Find( "desiredHeight", Property::INTEGER ); DALI_TEST_CHECK( value ); DALI_TEST_CHECK( value->Get() == 30 ); + value = resultMap.Find( "synchronousLoading", Property::BOOLEAN ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get() == true ); + // Get an image renderer with an image handle, and test the default property values Image image = ResourceImage::New(TEST_IMAGE_FILE_NAME, ImageDimensions(100, 200)); - imageRenderer = factory.GetControlRenderer(image); + imageRenderer = factory.CreateControlRenderer(image); imageRenderer.CreatePropertyMap( resultMap ); value = resultMap.Find( "rendererType", Property::STRING ); DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == "imageRenderer" ); + DALI_TEST_CHECK( value->Get() == "image" ); - value = resultMap.Find( "imageUrl", Property::STRING ); + value = resultMap.Find( "url", Property::STRING ); DALI_TEST_CHECK( value ); DALI_TEST_CHECK( value->Get() == TEST_IMAGE_FILE_NAME ); - value = resultMap.Find( "imageFittingMode", Property::STRING ); + value = resultMap.Find( "fittingMode", Property::STRING ); DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == "shrinkToFit" ); + DALI_TEST_CHECK( value->Get() == "SHRINK_TO_FIT" ); - value = resultMap.Find( "imageSamplingMode", Property::STRING ); + value = resultMap.Find( "samplingMode", Property::STRING ); DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == "box" ); + DALI_TEST_CHECK( value->Get() == "BOX" ); - value = resultMap.Find( "imageDesiredWidth", Property::INTEGER ); + value = resultMap.Find( "desiredWidth", Property::INTEGER ); DALI_TEST_CHECK( value ); DALI_TEST_CHECK( value->Get() == 100 ); - value = resultMap.Find( "imageDesiredHeight", Property::INTEGER ); + value = resultMap.Find( "desiredHeight", Property::INTEGER ); DALI_TEST_CHECK( value ); DALI_TEST_CHECK( value->Get() == 200 ); + value = resultMap.Find( "synchronousLoading", Property::BOOLEAN ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get() == false ); + END_TEST; } @@ -543,10 +579,10 @@ int UtcDaliControlRendererGetPropertyMap6(void) RendererFactory factory = RendererFactory::Get(); Property::Map propertyMap; - propertyMap.Insert( "rendererType", "nPatchRenderer" ); - propertyMap.Insert( "imageUrl", TEST_NPATCH_FILE_NAME ); + propertyMap.Insert( "rendererType", "image" ); + propertyMap.Insert( "url", TEST_NPATCH_FILE_NAME ); propertyMap.Insert( "borderOnly", true ); - ControlRenderer nPatchRenderer = factory.GetControlRenderer( propertyMap ); + ControlRenderer nPatchRenderer = factory.CreateControlRenderer( propertyMap ); Property::Map resultMap; nPatchRenderer.CreatePropertyMap( resultMap ); @@ -554,9 +590,9 @@ int UtcDaliControlRendererGetPropertyMap6(void) // check the property values from the returned map from control renderer Property::Value* value = resultMap.Find( "rendererType", Property::STRING ); DALI_TEST_CHECK( value ); - DALI_TEST_CHECK( value->Get() == "nPatchRenderer" ); + DALI_TEST_CHECK( value->Get() == "image" ); - value = resultMap.Find( "imageUrl", Property::STRING ); + value = resultMap.Find( "url", Property::STRING ); DALI_TEST_CHECK( value ); DALI_TEST_CHECK( value->Get() == TEST_NPATCH_FILE_NAME ); @@ -566,3 +602,85 @@ int UtcDaliControlRendererGetPropertyMap6(void) END_TEST; } + +int UtcDaliControlRendererGetPropertyMap7(void) +{ + ToolkitTestApplication application; + tet_infoline( "UtcDaliControlRendererGetPropertyMap7: SvgRenderer" ); + + // request SvgRenderer with a property map + RendererFactory factory = RendererFactory::Get(); + Property::Map propertyMap; + propertyMap.Insert( "rendererType", "image" ); + propertyMap.Insert( "url", TEST_SVG_FILE_NAME ); + ControlRenderer svgRenderer = factory.CreateControlRenderer( propertyMap ); + + Property::Map resultMap; + svgRenderer.CreatePropertyMap( resultMap ); + // check the property values from the returned map from control renderer + Property::Value* value = resultMap.Find( "rendererType", Property::STRING ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get() == "image" ); + + value = resultMap.Find( "url", Property::STRING ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get() == TEST_SVG_FILE_NAME ); + + // request SvgRenderer with an URL + ControlRenderer svgRenderer2 = factory.CreateControlRenderer( TEST_SVG_FILE_NAME, ImageDimensions() ); + resultMap.Clear(); + svgRenderer2.CreatePropertyMap( resultMap ); + // check the property values from the returned map from control renderer + value = resultMap.Find( "rendererType", Property::STRING ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get() == "image" ); + + value = resultMap.Find( "url", Property::STRING ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get() == TEST_SVG_FILE_NAME ); + + END_TEST; +} + +//Mesh renderer +int UtcDaliControlRendererGetPropertyMap8(void) +{ + ToolkitTestApplication application; + tet_infoline( "UtcDaliControlRendererGetPropertyMap8: MeshRenderer" ); + + //Request MeshRenderer using a property map. + RendererFactory factory = RendererFactory::Get(); + Property::Map propertyMap; + propertyMap.Insert( "rendererType", "mesh" ); + propertyMap.Insert( "objectUrl", TEST_OBJ_FILE_NAME ); + propertyMap.Insert( "materialUrl", TEST_MTL_FILE_NAME ); + propertyMap.Insert( "texturesPath", TEST_RESOURCE_LOCATION ); + propertyMap.Insert( "shaderType", "textureless" ); + ControlRenderer meshRenderer = factory.CreateControlRenderer( propertyMap ); + + Property::Map resultMap; + meshRenderer.CreatePropertyMap( resultMap ); + + //Check values in the result map are identical to the initial map's values. + Property::Value* value = resultMap.Find( "rendererType", Property::STRING ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get() == "mesh" ); + + value = resultMap.Find( "objectUrl", Property::STRING ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get() == TEST_OBJ_FILE_NAME ); + + value = resultMap.Find( "materialUrl", Property::STRING ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get() == TEST_MTL_FILE_NAME ); + + value = resultMap.Find( "texturesPath", Property::STRING ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get() == TEST_RESOURCE_LOCATION ); + + value = resultMap.Find( "shaderType", Property::STRING ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get() == "textureless" ); + + END_TEST; +}