From 08abb9a9ca153829e665ca7497fc504440bf5a89 Mon Sep 17 00:00:00 2001 From: David Steele Date: Fri, 26 Sep 2014 18:17:21 +0100 Subject: [PATCH] Fixed internal material test cases [problem] Test cases rely on shader loading being immediate [cause] Shader loading has changed to lazy load, context relies on GlContextCreated() being called. [solution] Fixup test setup. Change-Id: I28c5f86873949b821386b941e26228775bb4d5ab Signed-off-by: David Steele --- automated-tests/src/dali-internal/utc-Dali-Internal-Material.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-Material.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-Material.cpp index b4d8b85..01190b5 100644 --- a/automated-tests/src/dali-internal/utc-Dali-Internal-Material.cpp +++ b/automated-tests/src/dali-internal/utc-Dali-Internal-Material.cpp @@ -76,13 +76,15 @@ public: : app(application) { Internal::Context* testContext = new Internal::Context( application.GetGlAbstraction() ); + testContext->GlContextCreated(); + Integration::ShaderDataPtr shaderData = new Integration::ShaderData("123", "132"); shaderData->AllocateBuffer(10); Integration::ResourceId resourceId = 100; program = Internal::Program::New(resourceId, shaderData.Get(), *testContext, true); + program->Use(); // Ensure program lazy loading is forced to load program. programId = app.GetGlAbstraction().GetLastProgramCreated(); - program->Use(); } virtual ~TestProgram() -- 2.7.4