Rename of Control Renderers to Visuals

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / utc-Dali-DebugVisual.cpp

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-DebugRenderer.cpp b/automated-tests/src/dali-toolkit/utc-Dali-DebugVisual.cpp
similarity index 69%
rename from automated-tests/src/dali-toolkit/utc-Dali-DebugRenderer.cpp
rename to automated-tests/src/dali-toolkit/utc-Dali-DebugVisual.cpp
index 57543d0..6e62e5e 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-DebugRenderer.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-DebugVisual.cpp
@@ -16,7 +16,7 @@
  */
 
 #include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.h>
+#include <dali-toolkit/devel-api/controls/visual-factory/visual-factory.h>
 #include <dali/public-api/rendering/renderer.h>
 #include <dali/public-api/rendering/geometry.h>
 
@@ -30,9 +30,9 @@ namespace
 const char* TEST_IMAGE_FILE_NAME =  "image_01.jpg";
 const char* TEST_NPATCH_FILE_NAME =  "image_01.9.jpg";
 
-bool IsDebugRenderer( ControlRenderer& renderer )
+bool IsDebugVisual( Visual& renderer )
 {
-  bool isDebugRendererType = false;
+  bool isDebugVisualType = false;
   bool isGeometryLineType = false;
 
   Property::Map propertyMap;
@@ -40,7 +40,7 @@ bool IsDebugRenderer( ControlRenderer& renderer )
   Property::Value* typeValue = propertyMap.Find( "rendererType",  Property::STRING );
   if ( typeValue )
   {
-    isDebugRendererType = ( typeValue->Get<std::string>() == "DEBUG" );
+    isDebugVisualType = ( typeValue->Get<std::string>() == "DEBUG" );
   }
 
   Actor actor = Actor::New();
@@ -48,7 +48,7 @@ bool IsDebugRenderer( ControlRenderer& renderer )
   Geometry geometry = actor.GetRendererAt( 0 ).GetGeometry();
   isGeometryLineType = ( geometry.GetGeometryType() == Geometry::LINES );
 
-  return isDebugRendererType && isGeometryLineType;
+  return isDebugVisualType && isGeometryLineType;
 }
 }
 
@@ -62,31 +62,31 @@ void dali_debug_renderer_cleanup(void)
   test_return_value = TET_PASS;
 }
 
-int UtcDaliDebugRendererGetRenderer1(void)
+int UtcDaliDebugVisualGetRenderer1(void)
 {
   EnvironmentVariable::SetTestingEnvironmentVariable(true);
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliDebugRendererGetRenderer1:  Request renderer with a Property::Map" );
+  tet_infoline( "UtcDaliDebugVisualGetRenderer1:  Request renderer with a Property::Map" );
 
-  RendererFactory factory = RendererFactory::Get();
+  VisualFactory factory = VisualFactory::Get();
   DALI_TEST_CHECK( factory );
 
   // Test that color renderer is replaced with debug renderer
   Property::Map propertyMap1;
   propertyMap1.Insert("rendererType",  "COLOR");
   propertyMap1.Insert("mixColor",  Color::BLUE);
-  ControlRenderer colorRenderer = factory.CreateControlRenderer(propertyMap1);
+  Visual colorRenderer = factory.CreateVisual(propertyMap1);
   DALI_TEST_CHECK( colorRenderer );
-  DALI_TEST_CHECK( IsDebugRenderer( colorRenderer ) );
+  DALI_TEST_CHECK( IsDebugVisual( colorRenderer ) );
 
   // Test that border renderer is replaced with debug renderer
   Property::Map propertyMap2;
   propertyMap2.Insert("rendererType",  "BORDER");
   propertyMap2.Insert("borderColor",  Color::BLUE);
   propertyMap2.Insert("borderSize",  2.f);
-  ControlRenderer borderRenderer = factory.CreateControlRenderer(propertyMap2);
+  Visual borderRenderer = factory.CreateVisual(propertyMap2);
   DALI_TEST_CHECK( borderRenderer );
-  DALI_TEST_CHECK( IsDebugRenderer( borderRenderer ) );
+  DALI_TEST_CHECK( IsDebugVisual( borderRenderer ) );
 
   // Test that gradient renderer is replaced with debug renderer
   Property::Map propertyMap3;
@@ -104,37 +104,37 @@ int UtcDaliDebugRendererGetRenderer1(void)
   stopColors.PushBack( Color::RED );
   stopColors.PushBack( Color::GREEN );
   propertyMap3.Insert("stopColor", stopColors);
-  ControlRenderer gradientRenderer = factory.CreateControlRenderer(propertyMap3);
+  Visual gradientRenderer = factory.CreateVisual(propertyMap3);
   DALI_TEST_CHECK( gradientRenderer );
-  DALI_TEST_CHECK( IsDebugRenderer( gradientRenderer ) );
+  DALI_TEST_CHECK( IsDebugVisual( gradientRenderer ) );
 
   // Test that image renderer is replaced with debug renderer
   Property::Map propertyMap4;
   propertyMap4.Insert( "rendererType",  "IMAGE" );
   propertyMap4.Insert( "url",  TEST_IMAGE_FILE_NAME );
-  ControlRenderer imageRenderer = factory.CreateControlRenderer( propertyMap4 );
+  Visual imageRenderer = factory.CreateVisual( propertyMap4 );
   DALI_TEST_CHECK( imageRenderer );
-  DALI_TEST_CHECK( IsDebugRenderer( imageRenderer ) );
+  DALI_TEST_CHECK( IsDebugVisual( imageRenderer ) );
 
   // Test that n patch renderer is replaced with debug renderer
   Property::Map propertyMap5;
   propertyMap5.Insert( "rendererType",  "IMAGE" );
   propertyMap5.Insert( "url",  TEST_NPATCH_FILE_NAME );
-  ControlRenderer nPatchRenderer = factory.CreateControlRenderer( propertyMap4 );
+  Visual nPatchRenderer = factory.CreateVisual( propertyMap4 );
   DALI_TEST_CHECK( nPatchRenderer );
-  DALI_TEST_CHECK( IsDebugRenderer( nPatchRenderer ) );
+  DALI_TEST_CHECK( IsDebugVisual( nPatchRenderer ) );
 
   EnvironmentVariable::SetTestingEnvironmentVariable(false);
   END_TEST;
 }
 
-int UtcDaliDebugRendererGetRenderer2(void)
+int UtcDaliDebugVisualGetRenderer2(void)
 {
   EnvironmentVariable::SetTestingEnvironmentVariable(true);
   ToolkitTestApplication application;
-  tet_infoline( "UtcDaliDebugRendererGetRenderer2: Request renderer with various parameters" );
+  tet_infoline( "UtcDaliDebugVisualGetRenderer2: Request renderer with various parameters" );
 
-  RendererFactory factory = RendererFactory::Get();
+  VisualFactory factory = VisualFactory::Get();
   DALI_TEST_CHECK( factory );
 
   // Test that color renderer is replaced with debug renderer
@@ -142,29 +142,29 @@ int UtcDaliDebugRendererGetRenderer2(void)
   map[ "rendererType" ] = "COLOR";
   map[ "mixColor" ] = Color::CYAN;
 
-  ControlRenderer colorRenderer = factory.CreateControlRenderer( map);
+  Visual colorRenderer = factory.CreateVisual( map);
   DALI_TEST_CHECK( colorRenderer );
-  DALI_TEST_CHECK( IsDebugRenderer( colorRenderer ) );
+  DALI_TEST_CHECK( IsDebugVisual( colorRenderer ) );
 
   // Test that border renderer is replaced with debug renderer
   map.Clear();
   map[ "rendererType" ] = "BORDER";
   map[ "borderColor"  ] = Color::GREEN;
   map[ "borderSize"   ] = 2.f;
-  ControlRenderer borderRenderer = factory.CreateControlRenderer( map );
+  Visual borderRenderer = factory.CreateVisual( map );
   DALI_TEST_CHECK( borderRenderer );
-  DALI_TEST_CHECK( IsDebugRenderer( borderRenderer ) );
+  DALI_TEST_CHECK( IsDebugVisual( borderRenderer ) );
 
   // Test that image renderer is replaced with debug renderer
   Image image = ResourceImage::New(TEST_IMAGE_FILE_NAME);
-  ControlRenderer imageRenderer = factory.CreateControlRenderer( image );
+  Visual imageRenderer = factory.CreateVisual( image );
   DALI_TEST_CHECK( imageRenderer );
-  DALI_TEST_CHECK( IsDebugRenderer( imageRenderer ) );
+  DALI_TEST_CHECK( IsDebugVisual( imageRenderer ) );
 
   // Test that n patch renderer is replaced with debug renderer
-  ControlRenderer nPatchRenderer = factory.CreateControlRenderer( TEST_NPATCH_FILE_NAME, ImageDimensions() );
+  Visual nPatchRenderer = factory.CreateVisual( TEST_NPATCH_FILE_NAME, ImageDimensions() );
   DALI_TEST_CHECK( nPatchRenderer );
-  DALI_TEST_CHECK( IsDebugRenderer( nPatchRenderer ) );
+  DALI_TEST_CHECK( IsDebugVisual( nPatchRenderer ) );
 
   EnvironmentVariable::SetTestingEnvironmentVariable(false);
   END_TEST;