X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Fdali-test-suite-utils.h;h=ed1a65f40597d7b602d6938155ea3f14c3b2c338;hp=4f719201183a4700afef0d6eabfa7d5ca4807c8a;hb=46378e74ac2f46a4ca7c6a038de9c42639d60faa;hpb=f147069c14a727226b2fdb76e2fdd9e42ca55dc6 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 4f71920..ed1a65f 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 @@ -64,9 +64,9 @@ constexpr int32_t basenameIndex( const char * const path, const int32_t index = #define TET_FAIL 1 #define TET_PASS 0 -extern int test_return_value; +extern int32_t test_return_value; -void tet_result(int value); +void tet_result(int32_t value); #define END_TEST \ return ((test_return_value>0)?1:0) @@ -199,20 +199,20 @@ inline void DALI_TEST_EQUALS( TimePeriod value1, TimePeriod value2, void DALI_TEST_EQUALS( const BaseHandle& baseHandle1, const BaseHandle& baseHandle2, const char* location ); /** - * Test whether a size_t value and an unsigned int are equal. + * Test whether a size_t value and an uint32_t are equal. * @param[in] value1 The first value * @param[in] value2 The second value * @param[in] location The TEST_LOCATION macro should be used here */ -void DALI_TEST_EQUALS( const size_t value1, const unsigned int value2, const char* location ); +void DALI_TEST_EQUALS( const size_t value1, const uint32_t value2, const char* location ); /** - * Test whether an unsigned int and a size_t value and are equal. + * Test whether an uint32_t and a size_t value and are equal. * @param[in] value1 The first value * @param[in] value2 The second value * @param[in] location The TEST_LOCATION macro should be used here */ -void DALI_TEST_EQUALS( const unsigned int value1, const size_t value2, const char* location ); +void DALI_TEST_EQUALS( const uint32_t value1, const size_t value2, const char* location ); /** * Test whether two Matrix3 objects are equal. @@ -374,11 +374,11 @@ struct DefaultFunctionCoverage // Helper to Create buffer image BufferImage CreateBufferImage(); -BufferImage CreateBufferImage(int width, int height, const Vector4& color); +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, unsigned int imageWidth, unsigned int imageHeight, Pixel::Format pixelFormat ); +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