Update common test util

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / dali-toolkit-test-utils / test-actor-utils.cpp

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp
index 2f833c6..38eb0b2 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp
@@ -15,20 +15,21 @@
  *
  */
 
-// HEADER
+// CLASS HEADER
 #include "test-actor-utils.h"
-#include "mesh-builder.h"
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/dali-core.h>
-#include <dali/devel-api/rendering/renderer.h>
+#include <dali/devel-api/images/texture-set-image.h>
+
+// INTERNAL INCLUDES
+#include "mesh-builder.h"
 
 namespace Dali
 {
 
 namespace
 {
-const char * const TEXTURE_UNIFORM_NAME( "sTexture" );
 
 const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
   attribute mediump vec2 aPosition;\n
@@ -83,7 +84,7 @@ Actor CreateRenderableActor( Image texture, const std::string& vertexShader, con
   if( texture )
   {
     TextureSet textureSet = TextureSet::New();
-    textureSet.SetImage( 0u, texture );
+    TextureSetImage( textureSet, 0u, texture );
     renderer.SetTextures( textureSet );
 
     // Set actor to the size of the texture if set
@@ -93,23 +94,4 @@ Actor CreateRenderableActor( Image texture, const std::string& vertexShader, con
   return actor;
 }
 
-Image GetTexture( Actor actor )
-{
-  Image image;
-  if( actor && actor.GetRendererCount() )
-  {
-    Renderer renderer = actor.GetRendererAt( 0u );
-    if( renderer )
-    {
-      TextureSet textureSet = renderer.GetTextures();
-      if( textureSet && textureSet.GetTextureCount() )
-      {
-        image = textureSet.GetImage( 0u );
-      }
-    }
-  }
-
-  return image;
-}
-
 } // namespace Dali