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-DebugRenderer.cpp;h=702f726486e42d2c29781917fc6bd6b8a8d095df;hp=45e166ca642b69fba1ddb67dd90ebd4a84e149b8;hb=9b1791de7d9e29435943464acc7cd896c44015a1;hpb=638cc5c949cd2a31ddfd189c30b9a4b37e3e0a29

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-DebugRenderer.cpp b/automated-tests/src/dali-toolkit/utc-Dali-DebugRenderer.cpp
index 45e166c..702f726 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-DebugRenderer.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-DebugRenderer.cpp
@@ -39,7 +39,7 @@ bool IsDebugRenderer( ControlRenderer& renderer )
   Property::Value* typeValue = propertyMap.Find( "rendererType",  Property::STRING );
   if ( typeValue )
   {
-    isDebugRendererType = ( typeValue->Get<std::string>() == "debugRenderer" );
+    isDebugRendererType = ( typeValue->Get<std::string>() == "debug" );
   }
 
   Actor actor = Actor::New();
@@ -72,15 +72,15 @@ int UtcDaliDebugRendererGetRenderer1(void)
 
   // Test that color renderer is replaced with debug renderer
   Property::Map propertyMap1;
-  propertyMap1.Insert("rendererType",  "colorRenderer");
-  propertyMap1.Insert("blendColor",  Color::BLUE);
+  propertyMap1.Insert("rendererType",  "color");
+  propertyMap1.Insert("mixColor",  Color::BLUE);
   ControlRenderer colorRenderer = factory.GetControlRenderer(propertyMap1);
   DALI_TEST_CHECK( colorRenderer );
   DALI_TEST_CHECK( IsDebugRenderer( colorRenderer ) );
 
   // Test that border renderer is replaced with debug renderer
   Property::Map propertyMap2;
-  propertyMap2.Insert("rendererType",  "borderRenderer");
+  propertyMap2.Insert("rendererType",  "border");
   propertyMap2.Insert("borderColor",  Color::BLUE);
   propertyMap2.Insert("borderSize",  2.f);
   ControlRenderer borderRenderer = factory.GetControlRenderer(propertyMap2);
@@ -89,7 +89,7 @@ int UtcDaliDebugRendererGetRenderer1(void)
 
   // Test that gradient renderer is replaced with debug renderer
   Property::Map propertyMap3;
-  propertyMap3.Insert("rendererType",  "gradientRenderer");
+  propertyMap3.Insert("rendererType",  "gradient");
   Vector2 start(-1.f, -1.f);
   Vector2 end(1.f, 1.f);
   propertyMap3.Insert("gradientStartPosition",   start);
@@ -109,16 +109,16 @@ int UtcDaliDebugRendererGetRenderer1(void)
 
   // Test that image renderer is replaced with debug renderer
   Property::Map propertyMap4;
-  propertyMap4.Insert( "rendererType",  "imageRenderer" );
-  propertyMap4.Insert( "imageUrl",  TEST_IMAGE_FILE_NAME );
+  propertyMap4.Insert( "rendererType",  "image" );
+  propertyMap4.Insert( "url",  TEST_IMAGE_FILE_NAME );
   ControlRenderer imageRenderer = factory.GetControlRenderer( propertyMap4 );
   DALI_TEST_CHECK( imageRenderer );
   DALI_TEST_CHECK( IsDebugRenderer( imageRenderer ) );
 
   // Test that n patch renderer is replaced with debug renderer
   Property::Map propertyMap5;
-  propertyMap5.Insert( "rendererType",  "nPatchRenderer" );
-  propertyMap5.Insert( "imageUrl",  TEST_NPATCH_FILE_NAME );
+  propertyMap5.Insert( "rendererType",  "image" );
+  propertyMap5.Insert( "url",  TEST_NPATCH_FILE_NAME );
   ControlRenderer nPatchRenderer = factory.GetControlRenderer( propertyMap4 );
   DALI_TEST_CHECK( nPatchRenderer );
   DALI_TEST_CHECK( IsDebugRenderer( nPatchRenderer ) );
@@ -190,7 +190,7 @@ int UtcDaliDebugRendererResetRenderer(void)
   // Reset with a property map of border renderer
   // Test that border renderer is replaced with debug renderer
   Property::Map propertyMap;
-  propertyMap.Insert("rendererType",  "borderRenderer");
+  propertyMap.Insert("rendererType",  "border");
   propertyMap.Insert("borderColor",  Color::BLUE);
   propertyMap.Insert("borderSize",  2.f);
   factory.ResetRenderer( controlRenderer, actor, propertyMap );