(Automated Tests) Sync with core tests

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

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp
index 5b127c7..48bc26b 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,8 +14,13 @@
  * limitations under the License.
  *
  */
+
+// CLASS HEADER
 #include "mesh-builder.h"
 
+// EXTERNAL INCLUDES
+#include <dali/devel-api/images/texture-set-image.h>
+
 namespace Dali
 {
 
@@ -28,10 +33,11 @@ TextureSet CreateTextureSet()
 {
   return TextureSet::New();
 }
+
 TextureSet CreateTextureSet( Image image )
 {
   TextureSet textureSet = TextureSet::New();
-  textureSet.SetImage( 0u, image );
+  TextureSetImage( textureSet, 0u, image );
   return textureSet;
 }
 
@@ -48,11 +54,6 @@ PropertyBuffer CreatePropertyBuffer()
 Geometry CreateQuadGeometry(void)
 {
   PropertyBuffer vertexData = CreatePropertyBuffer();
-  return CreateQuadGeometryFromBuffer( vertexData );
-}
-
-Geometry CreateQuadGeometryFromBuffer( PropertyBuffer vertexData )
-{
   const float halfQuadSize = .5f;
   struct TexturedQuadVertex { Vector2 position; Vector2 textureCoordinates; };
   TexturedQuadVertex texturedQuadVertexData[4] = {