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.cpp;h=cc16ab016eeee53f32de3a9010ac7d5aae5c34f4;hb=3e17d9f63dedb5d669409301f8d9a3d8c393f979;hp=ef5f20f50c82fe8bb52b245b2be4ff12719406d0;hpb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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 ef5f20f..cc16ab0 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
@@ -16,7 +16,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <stdarg.h>
 
 #include "dali-test-suite-utils.h"
@@ -268,25 +268,11 @@ 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.
- * @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 )
 {
-  if( 0u != e.mCondition.find( conditionSubString ))
+  if( NULL == strstr( e.condition, conditionSubString.c_str() ) )
   {
-    fprintf(stderr, "Assertion %s failed at %s\n", conditionSubString.c_str(), location);
+    fprintf(stderr, "Expected substring '%s' : actual exception string '%s' : location %s\n", conditionSubString.c_str(), e.condition, location );
     tet_result(TET_FAIL);
   }
   else
@@ -295,14 +281,6 @@ void DALI_TEST_ASSERT( DaliException& e, std::string conditionSubString, const c
   }
 }
 
-/** Self-documenting wrapper for DALI_TEST_ASSERT.
- * @copydoc DALI_TEST_ASSERT()
- */
-void DALI_TEST_ASSERT_CONDITION_STARTS_WITH_SUBSTRING( DaliException& exceptionFromAssertion, std::string conditionSubString, const char* location )
-{
-  DALI_TEST_ASSERT(exceptionFromAssertion, conditionSubString, location);
-}
-
 // Functor to test whether an Applied signal is emitted
 ConstraintAppliedCheck::ConstraintAppliedCheck( bool& signalReceived )
 : mSignalReceived( signalReceived )
@@ -345,10 +323,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();
 
@@ -365,7 +342,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);
 }