X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-actor-utils.h;h=0dbe07e878a7a20943a8374a4c6b5fa493d448d5;hb=6a219d0bbcfd016e24b5466d5fb1a666c92feae5;hp=c5c5d0a363eb49a066a143ff2bc4556cc731d552;hpb=c4a92ccf72121cbe2a015711e4253e8d16f28fef;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h
index c5c5d0a..0dbe07e 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TEST_ACTOR_UTILS_H__
-#define __DALI_TEST_ACTOR_UTILS_H__
+#ifndef DALI_TEST_ACTOR_UTILS_H
+#define DALI_TEST_ACTOR_UTILS_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -19,13 +19,15 @@
  */
 
 // EXTERNAL INCLUDES
+#include <dali/public-api/rendering/texture-set.h>
+#include <dali/public-api/rendering/texture.h>
 #include <string>
 
 namespace Dali
 {
-
 class Actor;
 class Image;
+class Texture;
 
 /**
  * @brief Creates a simple renderable-actor with solid colored quad.
@@ -38,7 +40,7 @@ Actor CreateRenderableActor();
  * @param[in] texture Texture to set.
  * @return An actor with a renderer.
  */
-Actor CreateRenderableActor( Image texture );
+Actor CreateRenderableActor(Texture texture);
 
 /**
  * @brief Creates a renderable-actor with a texture and custom shaders.
@@ -47,15 +49,19 @@ Actor CreateRenderableActor( Image texture );
  * @param[in] fragmentShader The fragment-shader.
  * @return An actor with a renderer.
  */
-Actor CreateRenderableActor( Image texture, const std::string& vertexShader, const std::string& fragmentShader );
+Actor CreateRenderableActor(Texture texture, const std::string& vertexShader, const std::string& fragmentShader);
 
 /**
- * @brief Retrieves the texture used in a renderable actor (if available).
- * @return The texture used by the actor.
- * @note Assumes the actor only has one renderer, and that renderer only has one texture.
+ * @brief Creates a renderable-actor with a texture and custom shaders.
+ * @param[in] textures TextureSet to set.
+ * @param[in] vertexShader The vertex-shader.
+ * @param[in] fragmentShader The fragment-shader.
+ * @return An actor with a renderer.
  */
-Image GetTexture( Actor actor );
+Actor CreateRenderableActor2(TextureSet textures, const std::string& vertexShader, const std::string& fragmentShader);
+
+Texture CreateTexture(TextureType::Type type, Pixel::Format format, int width, int height);
 
 } // namespace Dali
 
-#endif // __DALI_TEST_ACTOR_UTILS_H__
+#endif // DALI_TEST_ACTOR_UTILS_H