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.cpp;h=0a90c8e2f2e05b01e15c9659a1dc166f617356d1;hp=8ceaed3fd4a2c6cc8b7e58ecd9fe4fa207e36ddf;hb=75fdb5f9730fa6f6723c517691c9778fb646d082;hpb=24b3e26d147f772b0396937442484ff75b327aa7 diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp index 8ceaed3..0a90c8e 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 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. @@ -15,11 +15,14 @@ * */ +// CLASS HEADER +#include "dali-test-suite-utils.h" + +// EXTERNAL INCLUDES +#include + // INTERNAL INCLUDES #include -#include - -#include "dali-test-suite-utils.h" using namespace Dali; @@ -51,30 +54,41 @@ void tet_printf(const char *format, ...) va_end(arg); } -/** - * DALI_TEST_CHECK is a wrapper for tet_result. - * If the condition evaluates to false, then the function & line number is printed. - * @param[in] The boolean expression to check - */ -#define DALI_TEST_CHECK(condition) \ -if ( (condition) ) \ -{ \ - tet_result(TET_PASS); \ -} \ -else \ -{ \ - fprintf(stderr, "%s Failed in %s at line %d\n", __PRETTY_FUNCTION__, __FILE__, __LINE__); \ - tet_result(TET_FAIL); \ -} - bool operator==(TimePeriod a, TimePeriod b) { return Equals(a.durationSeconds, b.durationSeconds) && Equals(a.delaySeconds, b.delaySeconds) ; } -std::ostream& operator<< (std::ostream& o, const TimePeriod value) +std::ostream& operator<<( std::ostream& ostream, TimePeriod value ) { - return o << "( Duration:" << value.durationSeconds << " Delay:" << value.delaySeconds << ")"; + return ostream << "( Duration:" << value.durationSeconds << " Delay:" << value.delaySeconds << ")"; +} + +std::ostream& operator<<( std::ostream& ostream, Radian angle ) +{ + ostream << angle.radian; + return ostream; +} + +std::ostream& operator<<( std::ostream& ostream, Degree angle ) +{ + ostream << angle.degree; + return ostream; +} + +void DALI_TEST_EQUALS( const BaseHandle& baseHandle1, const BaseHandle& baseHandle2, const char* location ) +{ + DALI_TEST_EQUALS< const BaseHandle& >( baseHandle1, baseHandle2, location ); +} + +void DALI_TEST_EQUALS( const size_t value1, const unsigned int value2, const char* location ) +{ + DALI_TEST_EQUALS< unsigned int>( ( unsigned int )( value1 ), value2, location ); +} + +void DALI_TEST_EQUALS( const unsigned int value1, const size_t value2, const char* location ) +{ + DALI_TEST_EQUALS< unsigned int >( value1, ( unsigned int )( value2 ), location ); } void DALI_TEST_EQUALS( const Matrix3& matrix1, const Matrix3& matrix2, const char* location) @@ -85,10 +99,13 @@ void DALI_TEST_EQUALS( const Matrix3& matrix1, const Matrix3& matrix2, const cha for (int i=0;i<9;++i) { - equivalent &= (m1[i] != m2[i]); + if( ! (fabsf(m1[i] - m2[i])< GetRangedEpsilon(m1[i], m2[i])) ) + { + equivalent = false; + } } - if (!equivalent) + if( !equivalent ) { fprintf(stderr, "%s, checking\n" "(%f, %f, %f) (%f, %f, %f)\n" @@ -227,47 +244,6 @@ void DALI_TEST_EQUALS( const char* str1, const std::string &str2, const char* lo DALI_TEST_EQUALS(str1, str2.c_str(), location); } - -/** - * Test whether one unsigned integer value is greater than another. - * Test succeeds if value1 > value2 - * @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_GREATER(unsigned int value1, unsigned int value2, const char* location) -{ - if (!(value1 > value2)) - { - fprintf(stderr, "%s, checking %d > %d\n", location, value1, value2); - tet_result(TET_FAIL); - } - else - { - tet_result(TET_PASS); - } -} - -/** - * Test whether one float value is greater than another. - * Test succeeds if value1 > value2 - * @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_GREATER( float value1, float value2, const char* location) -{ - if (!(value1 > value2)) - { - fprintf(stderr, "%s, checking %f > %f\n", location, value1, value2); - tet_result(TET_FAIL); - } - else - { - tet_result(TET_PASS); - } -} - void DALI_TEST_ASSERT( DaliException& e, std::string conditionSubString, const char* location ) { if( NULL == strstr( e.condition, conditionSubString.c_str() ) ) @@ -287,7 +263,7 @@ ConstraintAppliedCheck::ConstraintAppliedCheck( bool& signalReceived ) { } -void ConstraintAppliedCheck::operator()( ActiveConstraint& constraint ) +void ConstraintAppliedCheck::operator()( Constraint& constraint ) { mSignalReceived = true; } @@ -323,9 +299,9 @@ void ConstraintAppliedCheck::CheckSignalNotReceived() } } -BitmapImage CreateBitmapImage(int width, int height, const Vector4& color) +BufferImage CreateBufferImage(int width, int height, const Vector4& color) { - BitmapImage image = BitmapImage::New(width, height, Pixel::RGBA8888); + BufferImage image = BufferImage::New(width, height, Pixel::RGBA8888); PixelBuffer* pixbuf = image.GetBuffer(); @@ -342,7 +318,7 @@ BitmapImage CreateBitmapImage(int width, int height, const Vector4& color) return image; } -BitmapImage CreateBitmapImage() +BufferImage CreateBufferImage() { - return CreateBitmapImage(4, 4, Color::WHITE); + return CreateBufferImage(4, 4, Color::WHITE); }