-//
-// 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 <dali/dali.h>
+#include <dali/public-api/dali-core.h>
#include <stdarg.h>
#include "dali-test-suite-utils.h"
}
}
-/**
- * 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
}
}
-/** 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 )
}
}
-
-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();
return image;
}
-BitmapImage CreateBitmapImage()
+BufferImage CreateBufferImage()
{
- return CreateBitmapImage(4, 4, Color::WHITE);
+ return CreateBufferImage(4, 4, Color::WHITE);
}