X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ControlRenderer.cpp;h=43caadd2b1b0418174dd782d70fa40f92e03b9aa;hb=e8b6a55bb502bb265b14521313a41b7851aa42ab;hp=d524b81eac95c98a0a329846db2d84e867b6ed08;hpb=1b0a5f5931b61343586de7cd62fd44793c79ae73;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 d524b81..43caadd 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ControlRenderer.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ControlRenderer.cpp @@ -30,6 +30,9 @@ 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) @@ -51,7 +54,7 @@ int UtcDaliControlRendererCopyAndAssignment(void) Property::Map propertyMap; propertyMap.Insert("rendererType", "color"); propertyMap.Insert("mixColor", Color::BLUE); - ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap ); + ControlRenderer controlRenderer = factory.CreateControlRenderer( propertyMap ); ControlRenderer controlRendererCopy( controlRenderer ); DALI_TEST_CHECK(controlRenderer == controlRendererCopy); @@ -84,7 +87,7 @@ int UtcDaliControlRendererSetGetDepthIndex(void) Property::Map propertyMap; propertyMap.Insert("rendererType", "color"); propertyMap.Insert("mixColor", Color::BLUE); - ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap ); + ControlRenderer controlRenderer = factory.CreateControlRenderer( propertyMap ); controlRenderer.SetDepthIndex( 1.f ); @@ -115,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); @@ -123,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); @@ -134,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); @@ -142,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); @@ -160,14 +170,14 @@ int UtcDaliControlRendererSize(void) stopColors.PushBack( Color::RED ); stopColors.PushBack( Color::GREEN ); propertyMap.Insert("stopColor", stopColors); - ControlRenderer gradientRenderer = factory.GetControlRenderer(propertyMap); + 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.GetControlRenderer( TEST_SVG_FILE_NAME ); + ControlRenderer svgRenderer = factory.CreateControlRenderer( TEST_SVG_FILE_NAME, ImageDimensions() ); svgRenderer.SetSize( rendererSize ); DALI_TEST_EQUALS( svgRenderer.GetSize(), rendererSize, TEST_LOCATION ); svgRenderer.GetNaturalSize(naturalSize); @@ -188,7 +198,7 @@ int UtcDaliControlRendererSetOnOffStage(void) Property::Map propertyMap; propertyMap.Insert("rendererType", "color"); propertyMap.Insert("mixColor", Color::BLUE); - ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap ); + ControlRenderer controlRenderer = factory.CreateControlRenderer( propertyMap ); Actor actor = Actor::New(); actor.SetSize(200.f, 200.f); @@ -235,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 ); @@ -261,7 +271,7 @@ int UtcDaliControlRendererGetPropertyMap1(void) Property::Map propertyMap; propertyMap.Insert("rendererType", "color"); propertyMap.Insert("mixColor", Color::BLUE); - ControlRenderer colorRenderer = factory.GetControlRenderer( propertyMap ); + ControlRenderer colorRenderer = factory.CreateControlRenderer( propertyMap ); Property::Map resultMap; colorRenderer.CreatePropertyMap( resultMap ); @@ -276,7 +286,9 @@ int UtcDaliControlRendererGetPropertyMap1(void) // 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( "mixColor", Property::VECTOR4 ); @@ -296,7 +308,7 @@ int UtcDaliControlRendererGetPropertyMap2(void) 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 ); @@ -314,7 +326,11 @@ 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 ); @@ -356,7 +372,7 @@ int UtcDaliControlRendererGetPropertyMap3(void) stopColors.PushBack( Color::GREEN ); propertyMap.Insert("stopColor", stopColors); - ControlRenderer gradientRenderer = factory.GetControlRenderer(propertyMap); + ControlRenderer gradientRenderer = factory.CreateControlRenderer(propertyMap); Property::Map resultMap; gradientRenderer.CreatePropertyMap( resultMap ); @@ -423,7 +439,7 @@ int UtcDaliControlRendererGetPropertyMap4(void) stopColors.PushBack( Color::GREEN ); propertyMap.Insert("stopColor", stopColors); - ControlRenderer gradientRenderer = factory.GetControlRenderer(propertyMap); + ControlRenderer gradientRenderer = factory.CreateControlRenderer(propertyMap); DALI_TEST_CHECK( gradientRenderer ); Property::Map resultMap; @@ -485,7 +501,7 @@ int UtcDaliControlRendererGetPropertyMap5(void) propertyMap.Insert( "samplingMode", "BOX_THEN_NEAREST" ); propertyMap.Insert( "synchronousLoading", true ); - ControlRenderer imageRenderer = factory.GetControlRenderer(propertyMap); + ControlRenderer imageRenderer = factory.CreateControlRenderer(propertyMap); DALI_TEST_CHECK( imageRenderer ); Property::Map resultMap; @@ -522,7 +538,7 @@ int UtcDaliControlRendererGetPropertyMap5(void) // 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 ); @@ -566,7 +582,7 @@ int UtcDaliControlRendererGetPropertyMap6(void) 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 ); @@ -597,7 +613,7 @@ int UtcDaliControlRendererGetPropertyMap7(void) Property::Map propertyMap; propertyMap.Insert( "rendererType", "image" ); propertyMap.Insert( "url", TEST_SVG_FILE_NAME ); - ControlRenderer svgRenderer = factory.GetControlRenderer( propertyMap ); + ControlRenderer svgRenderer = factory.CreateControlRenderer( propertyMap ); Property::Map resultMap; svgRenderer.CreatePropertyMap( resultMap ); @@ -611,7 +627,7 @@ int UtcDaliControlRendererGetPropertyMap7(void) DALI_TEST_CHECK( value->Get() == TEST_SVG_FILE_NAME ); // request SvgRenderer with an URL - ControlRenderer svgRenderer2 = factory.GetControlRenderer( TEST_SVG_FILE_NAME ); + 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 @@ -625,3 +641,46 @@ int UtcDaliControlRendererGetPropertyMap7(void) 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; +}