From: Adeel Kazmi Date: Tue, 19 Apr 2016 10:37:44 +0000 (+0100) Subject: Synchronized Automated Tests with dali-core X-Git-Tag: dali_1.1.31~7 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=e50ad843a871ba17493a375d47e7197aa91de584 Synchronized Automated Tests with dali-core Change-Id: I7d743f9dd1fdb118b2308a2195f83d25407e62ae --- diff --git a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt index 7696421..f1ca98f 100644 --- a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt +++ b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt @@ -20,27 +20,35 @@ SET(TC_SOURCES # Append list of test harness files (Won't get parsed for test cases) LIST(APPEND TC_SOURCES - ../dali-toolkit/dali-toolkit-test-utils/test-harness.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-adaptor.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.cpp + ../dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp + ../dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.cpp + ../dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp - ../dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp - ../dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp ../dali-toolkit/dali-toolkit-test-utils/toolkit-text-model.cpp - ../dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp + ../dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp + ../dali-toolkit/dali-toolkit-test-utils/toolkit-tts-player.cpp ../dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp + ../dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp + ../dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp + ../dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp + ../dali-toolkit/dali-toolkit-test-utils/test-animation-data.cpp ../dali-toolkit/dali-toolkit-test-utils/test-application.cpp - ../dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp + ../dali-toolkit/dali-toolkit-test-utils/test-button.cpp + ../dali-toolkit/dali-toolkit-test-utils/test-harness.cpp ../dali-toolkit/dali-toolkit-test-utils/test-gesture-manager.cpp ../dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp ../dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.cpp + ../dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp ../dali-toolkit/dali-toolkit-test-utils/test-render-controller.cpp ../dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.cpp + ../dali-toolkit/dali-toolkit-test-utils/test-native-image.cpp ) @@ -65,6 +73,7 @@ INCLUDE_DIRECTORIES( ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES}) TARGET_LINK_LIBRARIES(${EXEC_NAME} ${${CAPI_LIB}_LIBRARIES} + -lpthread ) INSTALL(PROGRAMS ${EXEC_NAME} diff --git a/automated-tests/src/dali-toolkit/CMakeLists.txt b/automated-tests/src/dali-toolkit/CMakeLists.txt index bf5f24b..8bf9857 100644 --- a/automated-tests/src/dali-toolkit/CMakeLists.txt +++ b/automated-tests/src/dali-toolkit/CMakeLists.txt @@ -57,28 +57,32 @@ SET(TC_SOURCES # Append list of test harness files (Won't get parsed for test cases) LIST(APPEND TC_SOURCES - dali-toolkit-test-utils/test-harness.cpp dali-toolkit-test-utils/toolkit-accessibility-adaptor.cpp dali-toolkit-test-utils/toolkit-application.cpp dali-toolkit-test-utils/toolkit-clipboard.cpp + dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp dali-toolkit-test-utils/toolkit-event-thread-callback.cpp dali-toolkit-test-utils/toolkit-environment-variable.cpp dali-toolkit-test-utils/toolkit-imf-manager.cpp + dali-toolkit-test-utils/toolkit-orientation.cpp dali-toolkit-test-utils/toolkit-physical-keyboard.cpp dali-toolkit-test-utils/toolkit-style-monitor.cpp dali-toolkit-test-utils/toolkit-singleton-service.cpp + dali-toolkit-test-utils/toolkit-text-model.cpp dali-toolkit-test-utils/toolkit-timer.cpp - dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp dali-toolkit-test-utils/toolkit-tts-player.cpp - dali-toolkit-test-utils/dummy-control.cpp dali-toolkit-test-utils/dali-test-suite-utils.cpp + dali-toolkit-test-utils/dummy-control.cpp + dali-toolkit-test-utils/mesh-builder.cpp + dali-toolkit-test-utils/test-actor-utils.cpp dali-toolkit-test-utils/test-animation-data.cpp - dali-toolkit-test-utils/test-button.cpp dali-toolkit-test-utils/test-application.cpp - dali-toolkit-test-utils/test-platform-abstraction.cpp + dali-toolkit-test-utils/test-button.cpp + dali-toolkit-test-utils/test-harness.cpp dali-toolkit-test-utils/test-gesture-manager.cpp dali-toolkit-test-utils/test-gl-abstraction.cpp dali-toolkit-test-utils/test-gl-sync-abstraction.cpp + dali-toolkit-test-utils/test-platform-abstraction.cpp dali-toolkit-test-utils/test-render-controller.cpp dali-toolkit-test-utils/test-trace-call-stack.cpp dali-toolkit-test-utils/test-native-image.cpp 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 c521fbf..baeaa6a 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 @@ -29,6 +29,7 @@ void tet_infoline(const char*str); void tet_printf(const char *format, ...); #include "test-application.h" +#include "test-actor-utils.h" using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp new file mode 100644 index 0000000..304e567 --- /dev/null +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2015 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. + * + */ +#include "mesh-builder.h" + +namespace Dali +{ + +Shader CreateShader() +{ + return Shader::New( "vertexSrc", "fragmentSrc" ); +} + +TextureSet CreateTextureSet() +{ + return TextureSet::New(); +} +TextureSet CreateTextureSet( Image image ) +{ + TextureSet textureSet = TextureSet::New(); + textureSet.SetImage( 0u, image ); + return textureSet; +} + +PropertyBuffer CreatePropertyBuffer() +{ + Property::Map texturedQuadVertexFormat; + texturedQuadVertexFormat["aPosition"] = Property::VECTOR2; + texturedQuadVertexFormat["aVertexCoord"] = Property::VECTOR2; + + PropertyBuffer vertexData = PropertyBuffer::New( texturedQuadVertexFormat ); + return vertexData; +} + +Geometry CreateQuadGeometry(void) +{ + PropertyBuffer vertexData = CreatePropertyBuffer(); + return CreateQuadGeometryFromBuffer( vertexData ); +} + +Geometry CreateQuadGeometryFromBuffer( PropertyBuffer vertexData ) +{ + const float halfQuadSize = .5f; + struct TexturedQuadVertex { Vector2 position; Vector2 textureCoordinates; }; + TexturedQuadVertex texturedQuadVertexData[4] = { + { Vector2(-halfQuadSize, -halfQuadSize), Vector2(0.f, 0.f) }, + { Vector2( halfQuadSize, -halfQuadSize), Vector2(1.f, 0.f) }, + { Vector2(-halfQuadSize, halfQuadSize), Vector2(0.f, 1.f) }, + { Vector2( halfQuadSize, halfQuadSize), Vector2(1.f, 1.f) } }; + vertexData.SetData(texturedQuadVertexData, 4); + + unsigned int indexData[6] = { 0, 3, 1, 0, 2, 3 }; + Property::Map indexFormat; + indexFormat["indices"] = Property::INTEGER; + PropertyBuffer indices = PropertyBuffer::New( indexFormat ); + indices.SetData( indexData, sizeof(indexData)/sizeof(indexData[0]) ); + + Geometry geometry = Geometry::New(); + geometry.AddVertexBuffer( vertexData ); + geometry.SetIndexBuffer( indices ); + + return geometry; +} + + + +} // namespace Dali diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.h new file mode 100644 index 0000000..bf5f6a6 --- /dev/null +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.h @@ -0,0 +1,39 @@ +#ifndef MESH_BUILDER_H +#define MESH_BUILDER_H +/* + * Copyright (c) 2015 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. + * + */ + +#include +#include +#include +#include +#include +#include + +namespace Dali +{ + +Shader CreateShader(); +TextureSet CreateTextureSet(); +TextureSet CreateTextureSet( Image image ); +Geometry CreateQuadGeometry(); +Geometry CreateQuadGeometryFromBuffer( PropertyBuffer vertexData ); +PropertyBuffer CreatePropertyBuffer(); + +} + +#endif // MESH_BUILDER_H diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp new file mode 100644 index 0000000..2f833c6 --- /dev/null +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp @@ -0,0 +1,115 @@ +/* + * Copyright (c) 2016 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. + * + */ + +// HEADER +#include "test-actor-utils.h" +#include "mesh-builder.h" + +// EXTERNAL INCLUDES +#include +#include + +namespace Dali +{ + +namespace +{ +const char * const TEXTURE_UNIFORM_NAME( "sTexture" ); + +const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( + attribute mediump vec2 aPosition;\n + uniform mediump mat4 uMvpMatrix;\n + uniform mediump vec3 uSize;\n + \n + void main()\n + {\n + mediump vec4 vertexPosition = vec4(aPosition, 0.0, 1.0);\n + vertexPosition.xyz *= uSize;\n + gl_Position = uMvpMatrix * vertexPosition;\n + }\n +); + +const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( + uniform lowp vec4 uColor;\n + \n + void main()\n + {\n + gl_FragColor = uColor;\n + }\n +); + +} // unnamed namespace + +Actor CreateRenderableActor() +{ + return CreateRenderableActor( Image(), VERTEX_SHADER, FRAGMENT_SHADER ); +} + +Actor CreateRenderableActor( Image texture ) +{ + return CreateRenderableActor( texture, VERTEX_SHADER, FRAGMENT_SHADER ); +} + +Actor CreateRenderableActor( Image texture, const std::string& vertexShader, const std::string& fragmentShader ) +{ + // Create the geometry + Geometry geometry = CreateQuadGeometry(); + + // Create Shader + Shader shader = Shader::New( vertexShader, fragmentShader ); + + // Create renderer from geometry and material + Renderer renderer = Renderer::New( geometry, shader ); + + // Create actor and set renderer + Actor actor = Actor::New(); + actor.AddRenderer( renderer ); + + // If we a texture, then create a texture-set and add to renderer + if( texture ) + { + TextureSet textureSet = TextureSet::New(); + textureSet.SetImage( 0u, texture ); + renderer.SetTextures( textureSet ); + + // Set actor to the size of the texture if set + actor.SetSize( texture.GetWidth(), texture.GetHeight() ); + } + + return actor; +} + +Image GetTexture( Actor actor ) +{ + Image image; + if( actor && actor.GetRendererCount() ) + { + Renderer renderer = actor.GetRendererAt( 0u ); + if( renderer ) + { + TextureSet textureSet = renderer.GetTextures(); + if( textureSet && textureSet.GetTextureCount() ) + { + image = textureSet.GetImage( 0u ); + } + } + } + + return image; +} + +} // namespace Dali diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h new file mode 100644 index 0000000..c5c5d0a --- /dev/null +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h @@ -0,0 +1,61 @@ +#ifndef __DALI_TEST_ACTOR_UTILS_H__ +#define __DALI_TEST_ACTOR_UTILS_H__ + +/* + * Copyright (c) 2016 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. + * + */ + +// EXTERNAL INCLUDES +#include + +namespace Dali +{ + +class Actor; +class Image; + +/** + * @brief Creates a simple renderable-actor with solid colored quad. + * @return An actor with a renderer. + */ +Actor CreateRenderableActor(); + +/** + * @brief Creates a renderable-actor with a texture. + * @param[in] texture Texture to set. + * @return An actor with a renderer. + */ +Actor CreateRenderableActor( Image texture ); + +/** + * @brief Creates a renderable-actor with a texture and custom shaders. + * @param[in] texture Texture to set. + * @param[in] vertexShader The vertex-shader. + * @param[in] fragmentShader The fragment-shader. + * @return An actor with a renderer. + */ +Actor CreateRenderableActor( Image texture, const std::string& vertexShader, const std::string& fragmentShader ); + +/** + * @brief Retrieves the texture used in a renderable actor (if available). + * @return The texture used by the actor. + * @note Assumes the actor only has one renderer, and that renderer only has one texture. + */ +Image GetTexture( Actor actor ); + +} // namespace Dali + +#endif // __DALI_TEST_ACTOR_UTILS_H__ diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp index 5fb6e11..3f7318a 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp @@ -154,13 +154,13 @@ void TestApplication::SetSurfaceWidth( unsigned int width, unsigned height ) mCore->SurfaceResized( mSurfaceWidth, mSurfaceHeight ); } -void TestApplication::DoUpdate( unsigned int intervalMilliseconds ) +void TestApplication::DoUpdate( unsigned int intervalMilliseconds, const char* location ) { if( GetUpdateStatus() == 0 && mRenderStatus.NeedsUpdate() == false && ! GetRenderController().WasCalled(TestRenderController::RequestUpdateFunc) ) { - fprintf(stderr, "WARNING - Update not required\n"); + fprintf(stderr, "WARNING - Update not required :%s\n", location==NULL?"NULL":location); } unsigned int nextVSyncTime = mLastVSyncTime + intervalMilliseconds; @@ -173,9 +173,9 @@ void TestApplication::DoUpdate( unsigned int intervalMilliseconds ) mLastVSyncTime = nextVSyncTime; } -bool TestApplication::Render( unsigned int intervalMilliseconds ) +bool TestApplication::Render( unsigned int intervalMilliseconds, const char* location ) { - DoUpdate( intervalMilliseconds ); + DoUpdate( intervalMilliseconds, location ); mCore->Render( mRenderStatus ); mFrame++; @@ -216,6 +216,7 @@ bool TestApplication::RenderOnly( ) void TestApplication::ResetContext() { mCore->ContextDestroyed(); + mGlAbstraction.Initialize(); mCore->ContextCreated(); } diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h index cb5a92c..1f1161a 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h @@ -73,7 +73,7 @@ public: void ProcessEvent(const Integration::Event& event); void SendNotification(); void SetSurfaceWidth( unsigned int width, unsigned height ); - bool Render( unsigned int intervalMilliseconds = DEFAULT_RENDER_INTERVAL ); + bool Render( unsigned int intervalMilliseconds = DEFAULT_RENDER_INTERVAL, const char* location=NULL ); unsigned int GetUpdateStatus(); bool UpdateOnly( unsigned int intervalMilliseconds = DEFAULT_RENDER_INTERVAL ); bool RenderOnly( ); @@ -82,7 +82,7 @@ public: bool GetRenderHasRendered(); private: - void DoUpdate( unsigned int intervalMilliseconds ); + void DoUpdate( unsigned int intervalMilliseconds, const char* location=NULL ); protected: TestPlatformAbstraction mPlatformAbstraction; diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp index 4a12bdb..d42a548 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp @@ -32,7 +32,7 @@ void TestGlAbstraction::Initialize() mCurrentProgram = 0; mCompileStatus = GL_TRUE; mLinkStatus = GL_TRUE; - + mNumberOfActiveUniforms = 0; mGetAttribLocationResult = 0; mGetErrorResult = 0; mGetStringResult = NULL; @@ -78,6 +78,13 @@ void TestGlAbstraction::Initialize() mProgramUniforms3f.clear(); mProgramUniforms4f.clear(); + mCullFaceTrace.Reset(); + mEnableDisableTrace.Reset(); + mShaderTrace.Reset(); + mTextureTrace.Reset(); + mTexParamaterTrace.Reset(); + mDrawTrace.Reset(); + for( unsigned int i=0; i +#include +#include +#include + +namespace Dali +{ + +template +struct UtcCoverageIntrusivePtr +{ + typedef IntrusivePtr (*Creator)(); + + void Check( Creator creator) + { + IntrusivePtr a = creator(); + IntrusivePtr b = creator(); + + DALI_TEST_CHECK( a.Get() ); + + a.Reset(); + + T* pB = b.Detach(); + + a.Reset(pB); + + DALI_TEST_CHECK(a); + + a.Reset(); + + }; + +}; + +} // Dali + +#endif + + diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.cpp index d8ad2ba..135476e 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.cpp @@ -29,7 +29,7 @@ TestNativeImagePointer TestNativeImage::New(int width, int height) } TestNativeImage::TestNativeImage(int width, int height) -: mWidth(width), mHeight(height), mExtensionCreateCalls(0), mExtensionDestroyCalls(0), mTargetTextureCalls(0) +: mWidth(width), mHeight(height), mExtensionCreateCalls(0), mExtensionDestroyCalls(0), mTargetTextureCalls(0),createResult(true) { mExtension = new TestNativeImageExtension(); } diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h index 8dc6431..f361280 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h @@ -40,7 +40,8 @@ class DALI_IMPORT_API TestNativeImage : public Dali::NativeImageInterface public: static TestNativeImagePointer New(int width, int height); - inline virtual bool GlExtensionCreate() { ++mExtensionCreateCalls; return true;}; + inline void SetGlExtensionCreateResult(bool result){ createResult = result;} + inline virtual bool GlExtensionCreate() { ++mExtensionCreateCalls; return createResult;}; inline virtual void GlExtensionDestroy() { ++mExtensionDestroyCalls; }; inline virtual GLenum TargetTexture() { ++mTargetTextureCalls; return 1;}; inline virtual void PrepareTexture() {}; @@ -59,6 +60,8 @@ public: int mExtensionCreateCalls; int mExtensionDestroyCalls; int mTargetTextureCalls; + + bool createResult; TestNativeImageExtension* mExtension; }; diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp index 973f24a..2f62474 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp @@ -188,7 +188,8 @@ bool TestPlatformAbstraction::WasCalled(TestFuncEnum func) { case SuspendFunc: return mTrace.FindMethod("Suspend"); case ResumeFunc: return mTrace.FindMethod("Resume"); - case LoadResourceFunc: return mTrace.FindMethod("LoadResource") || mTrace.FindMethod("LoadResourceSynchronously"); + 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-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h index a728ac2..d7e0563 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h @@ -171,6 +171,7 @@ public: // TEST FUNCTIONS SuspendFunc, ResumeFunc, LoadResourceFunc, + LoadResourceSynchronouslyFunc, SaveFileFunc, LoadFileFunc, LoadShaderBinaryFileFunc, diff --git a/automated-tests/src/dali-toolkit/utc-Dali-RendererFactory.cpp b/automated-tests/src/dali-toolkit/utc-Dali-RendererFactory.cpp index 45550c2..6e22042 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-RendererFactory.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-RendererFactory.cpp @@ -205,7 +205,8 @@ void TestControlRendererRender( ToolkitTestApplication& application, if( resourcePtr ) { - DALI_TEST_CHECK(application.GetPlatform().WasCalled(TestPlatformAbstraction::LoadResourceFunc)); + DALI_TEST_CHECK( application.GetPlatform().WasCalled(TestPlatformAbstraction::LoadResourceFunc) || + application.GetPlatform().WasCalled(TestPlatformAbstraction::LoadResourceSynchronouslyFunc )); } DALI_TEST_CHECK( actor.GetRendererCount() == 1u );