From 77c742d3ea337a4051758b3530b22d4b54d8e3db Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Tue, 19 Apr 2016 11:39:16 +0100 Subject: [PATCH] Synchronize automated tests with other repos Change-Id: I5784c342607528c0e886971366ec0e480ef62fe3 --- .../dali-test-suite-utils/dali-test-suite-utils.cpp | 17 +++++++++++------ .../dali/dali-test-suite-utils/dali-test-suite-utils.h | 1 + .../dali-test-suite-utils/test-platform-abstraction.cpp | 1 + .../dali-test-suite-utils/test-platform-abstraction.h | 1 + 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.cpp b/automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.cpp index fc14c4b..0a90c8e 100644 --- a/automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.cpp +++ b/automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.cpp @@ -299,9 +299,9 @@ void ConstraintAppliedCheck::CheckSignalNotReceived() } } -BufferImage CreateBufferImage() +BufferImage CreateBufferImage(int width, int height, const Vector4& color) { - BufferImage image = BufferImage::New(4,4,Pixel::RGBA8888); + BufferImage image = BufferImage::New(width, height, Pixel::RGBA8888); PixelBuffer* pixbuf = image.GetBuffer(); @@ -309,11 +309,16 @@ BufferImage CreateBufferImage() // than a 3x3 image for(size_t i=0; i<16; i++) { - pixbuf[i*4+0] = 0xFF; - pixbuf[i*4+1] = 0xFF; - pixbuf[i*4+2] = 0xFF; - pixbuf[i*4+3] = 0xFF; + pixbuf[i*4+0] = color.r*255; + pixbuf[i*4+1] = color.g*255; + pixbuf[i*4+2] = color.b*255; + pixbuf[i*4+3] = color.a*255; } return image; } + +BufferImage CreateBufferImage() +{ + return CreateBufferImage(4, 4, Color::WHITE); +} diff --git a/automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.h b/automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.h index 7222640..baeaa6a 100644 --- a/automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.h +++ b/automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.h @@ -396,5 +396,6 @@ struct DefaultFunctionCoverage // Helper to Create buffer image BufferImage CreateBufferImage(); +BufferImage CreateBufferImage(int width, int height, const Vector4& color); #endif // __DALI_TEST_SUITE_UTILS_H__ diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp index 1e56f8d..2f62474 100644 --- a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp +++ b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp @@ -189,6 +189,7 @@ bool TestPlatformAbstraction::WasCalled(TestFuncEnum func) case SuspendFunc: return mTrace.FindMethod("Suspend"); case ResumeFunc: return mTrace.FindMethod("Resume"); case LoadResourceFunc: return mTrace.FindMethod("LoadResource"); + case LoadResourceSynchronouslyFunc: return mTrace.FindMethod("LoadResourceSynchronously"); case LoadFileFunc: return mTrace.FindMethod("LoadFile"); case LoadShaderBinaryFileFunc: return mTrace.FindMethod("LoadShaderBinaryFile"); case SaveShaderBinaryFileFunc: return mTrace.FindMethod("SaveShaderBinaryFile"); diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h index a728ac2..d7e0563 100644 --- a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h +++ b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h @@ -171,6 +171,7 @@ public: // TEST FUNCTIONS SuspendFunc, ResumeFunc, LoadResourceFunc, + LoadResourceSynchronouslyFunc, SaveFileFunc, LoadFileFunc, LoadShaderBinaryFileFunc, -- 2.7.4