From 6c2ffc254dc624d5b246c032d47a94814873a8f6 Mon Sep 17 00:00:00 2001 From: Yoonsang Lee Date: Wed, 22 Apr 2015 19:28:11 +0900 Subject: [PATCH] Fix UTCs for EncodedBufferImage & HitTestAlgorithm - UtcDaliEncodedBufferImageNew02, UtcDaliEncodedBufferImageNew03 : Assertion message can be different depending on --enable-debug flag, so remove code to check assertion message. - UtcDaliHitTestAlgorithmOrtho02 : Maybe due to different machine precision, the desktop & m0 report different results. So change to epsilon based comparision to pass for both environments. Change-Id: I1c5a528a59fd64d7dfb62f05c9222dd428162886 --- automated-tests/src/dali/utc-Dali-EncodedBufferImage.cpp | 2 -- automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/automated-tests/src/dali/utc-Dali-EncodedBufferImage.cpp b/automated-tests/src/dali/utc-Dali-EncodedBufferImage.cpp index e2aa312..5922eb8 100644 --- a/automated-tests/src/dali/utc-Dali-EncodedBufferImage.cpp +++ b/automated-tests/src/dali/utc-Dali-EncodedBufferImage.cpp @@ -811,7 +811,6 @@ int UtcDaliEncodedBufferImageNew02(void) { // Tests that a negative test of an assertion succeeds DALI_TEST_PRINT_ASSERT( e ); - DALI_TEST_ASSERT(e, "encodedImage && \"Null image pointer passed-in for decoding from memory.\"", TEST_LOCATION); } END_TEST; } @@ -839,7 +838,6 @@ int UtcDaliEncodedBufferImageNew03(void) { // Tests that a negative test of an assertion succeeds DALI_TEST_PRINT_ASSERT( e ); - DALI_TEST_ASSERT(e, "encodedImageByteCount > 0U && \"Zero size passed for image resource in memory buffer.\"", TEST_LOCATION); } END_TEST; } diff --git a/automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp b/automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp index db7b770..891d6c7 100644 --- a/automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp +++ b/automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp @@ -339,9 +339,9 @@ int UtcDaliHitTestAlgorithmOrtho02(void) { HitTestAlgorithm::Results results; - HitTest(stage, Vector2::ZERO, results, &DefaultIsActorTouchableFunction); + HitTest(stage, Vector2( 0.001f, 0.001f ), results, &DefaultIsActorTouchableFunction); DALI_TEST_CHECK( results.actor == blue ); - DALI_TEST_EQUALS( results.actorCoordinates, Vector2::ZERO, TEST_LOCATION ); + DALI_TEST_EQUALS( results.actorCoordinates, Vector2( 0.001f, 0.001f ), 0.001f, TEST_LOCATION ); } { -- 2.7.4