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=44f2da9d9b08cc27e79479808b433fb557db0a03;hp=1657a4bfae1a6b3405c073e92e1575cd605d05b8;hb=ae0234f649dae770bff1a404de99ab2b5b3bdb54;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e 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 1657a4b..44f2da9 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,25 +1,25 @@ #ifndef __DALI_TEST_SUITE_UTILS_H__ #define __DALI_TEST_SUITE_UTILS_H__ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * Copyright (c) 2014 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ // INTERNAL INCLUDES #include -#include #include void tet_infoline(const char*str); @@ -139,13 +139,13 @@ inline bool CompareType(Quaternion q1, Quaternion q2, float epsilon) template <> inline bool CompareType(Radian q1, Radian q2, float epsilon) { - return CompareType(float(q1), float(q2), epsilon); + return CompareType(q1.radian, q2.radian, epsilon); } template <> inline bool CompareType(Degree q1, Degree q2, float epsilon) { - return CompareType(float(q1), float(q2), epsilon); + return CompareType(q1.degree, q2.degree, epsilon); } bool operator==(TimePeriod a, TimePeriod b); @@ -295,42 +295,6 @@ void DALI_TEST_EQUALS( const std::string &str1, const char* str2, const char* lo */ void DALI_TEST_EQUALS( const char* str1, const std::string &str2, const char* location); - -/** - * Test whether two UTF32 strings are equal. - * @param[in] str1 The first string - * @param[in] str2 The second string - * @param[in] location The TEST_LOCATION macro should be used here - */ -template<> -inline void DALI_TEST_EQUALS( const TextArray& str1, const TextArray& str2, const char* location) -{ - if (!std::equal(str1.begin(), str1.end(), str2.begin())) - { - fprintf(stderr, "%s, checking '", location); - - for( unsigned int i = 0; i < str1.size(); ++i) - { - fprintf(stderr, "%c", str1[i]); - } - - fprintf(stderr, "' == '"); - - for( unsigned int i = 0; i < str2.size(); ++i) - { - fprintf(stderr, "%c", str2[i]); - } - - fprintf(stderr, "'\n"); - - tet_result(TET_FAIL); - } - else - { - tet_result(TET_PASS); - } -} - /** * Test whether one unsigned integer value is greater than another. * Test succeeds if value1 > value2 @@ -351,31 +315,28 @@ void DALI_TEST_GREATER( float value1, float value2, const char* location); /** * Test whether the assertion condition that failed and thus triggered the - * exception \b e contained a given substring at the start of its literal text. - * @param[in] e The exception that we expect was fired by a runtime assertion - * failure. + * exception \b e contained a given substring. + * @param[in] e The exception that we expect was fired by a runtime assertion failure. * @param[in] conditionSubString The text that we expect to be present in an * assertion which triggered the exception. * @param[in] location The TEST_LOCATION macro should be used here. - * - * @remark **Side-effects:** The result of the tet test is set to TET_PASS if - * the substring is at the start of the exception's condition and - * TET_FAIL if it isn't. Note, if the result of a test is set multiple - * times, a TET_FAIL will override any number of TET_PASSes. */ void DALI_TEST_ASSERT( DaliException& e, std::string conditionSubString, const char* location ); -/** Self-documenting wrapper for DALI_TEST_ASSERT. - * @copydoc DALI_TEST_ASSERT() +/** + * Print the assert + * @param[in] e The exception that we expect was fired by a runtime assertion failure. */ -void DALI_TEST_ASSERT_CONDITION_STARTS_WITH_SUBSTRING( DaliException& exceptionFromAssertion, std::string conditionSubString, const char* location ); - +inline void DALI_TEST_PRINT_ASSERT( DaliException& e ) +{ + tet_printf("Assertion %s failed at %s\n", e.condition, e.location ); +} // Functor to test whether an Applied signal is emitted struct ConstraintAppliedCheck { ConstraintAppliedCheck( bool& signalReceived ); - void operator()( ActiveConstraint& constraint ); + void operator()( Constraint& constraint ); void Reset(); void CheckSignalReceived(); void CheckSignalNotReceived(); @@ -400,8 +361,8 @@ struct DefaultFunctionCoverage // Helper to Create bitmap image -BitmapImage CreateBitmapImage(); -BitmapImage CreateBitmapImage(int width, int height, const Vector4& color); +BufferImage CreateBufferImage(); +BufferImage CreateBufferImage(int width, int height, const Vector4& color); #endif // __DALI_TEST_SUITE_UTILS_H__