X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-actor-utils.cpp;h=f8d7bf87f72c91f1bd93c490f265db1b9450c889;hb=d7708e4df9cd7392fd0d2c880f47d8b703b2b8e6;hp=fb50bf54abc7746d5bf2bd2cef172cdfa2c5f866;hpb=31f5a9b81937d528ffe10c521ea6188e2a828b09;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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 fb50bf5..f8d7bf8 100644
--- 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,21 +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
   uniform mediump mat4 uMvpMatrix;\n
@@ -67,7 +67,7 @@ Actor CreateRenderableActor( Image texture )
 Actor CreateRenderableActor( Image texture, const std::string& vertexShader, const std::string& fragmentShader )
 {
   // Create the geometry
-  Geometry geometry = Geometry::QUAD();
+  Geometry geometry = CreateQuadGeometry();
 
   // Create Shader
   Shader shader = Shader::New( vertexShader, fragmentShader );
@@ -83,7 +83,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
@@ -104,7 +104,7 @@ Image GetTexture( Actor actor )
       TextureSet textureSet = renderer.GetTextures();
       if( textureSet && textureSet.GetTextureCount() )
       {
-        image = textureSet.GetImage( 0u );
+        image = TextureGetImage( textureSet, 0u );
       }
     }
   }