X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Fdali-test-suite-utils.h;h=0c5efa35615eb5a91a2735ad2c7a243b29847884;hb=3928808cc2029cbfd59230f2edb8889a63a59cec;hp=70f42547d07a8912655f5681dc53db8f372f1dea;hpb=141d88c741ff0aef9aa74259f116fc17023e043a;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h index 70f4254..0c5efa3 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TEST_SUITE_UTILS_H__ -#define __DALI_TEST_SUITE_UTILS_H__ +#ifndef DALI_TEST_SUITE_UTILS_H +#define DALI_TEST_SUITE_UTILS_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -34,6 +34,7 @@ void tet_printf(const char *format, ...); #include "test-application.h" #include "test-actor-utils.h" +#include "test-gesture-generator.h" using namespace Dali; @@ -392,15 +393,6 @@ struct DefaultFunctionCoverage } }; - -// Helper to Create buffer image -BufferImage CreateBufferImage(); -BufferImage CreateBufferImage(int32_t width, int32_t height, const Vector4& color); - - -// Prepare a resource image to be loaded. Should be called before creating the ResourceImage -void PrepareResourceImage( TestApplication& application, uint32_t imageWidth, uint32_t imageHeight, Pixel::Format pixelFormat ); - // Test namespace to prevent pollution of Dali namespace, add Test helper functions here namespace Test { @@ -419,8 +411,9 @@ public: /** * @brief Call in main part of code + * @param[in] objectRegistry The object Registry being used */ - ObjectDestructionTracker(); + ObjectDestructionTracker( ObjectRegistry objectRegistry ); /** * @brief Call in sub bock of code where the Actor being checked is still alive. @@ -437,9 +430,10 @@ public: bool IsDestroyed(); private: + ObjectRegistry mObjectRegistry; bool mRefObjectDestroyed; }; } // namespace Test -#endif // __DALI_TEST_SUITE_UTILS_H__ +#endif // DALI_TEST_SUITE_UTILS_H