From: Kimmo Hoikka Date: Fri, 10 Jul 2015 14:47:29 +0000 (-0700) Subject: Merge "Automated test fix for framebuffer creation" into devel/master X-Git-Tag: dali_1.0.49~21 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=1b07daeda0f5581e4d6b80e49fd5cefaa74deb2b;hp=07686be29a834f345803e0c74245a37eb37037b2 Merge "Automated test fix for framebuffer creation" into devel/master --- 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 ddf0356..ad8de5c 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 @@ -232,12 +232,6 @@ void TestPlatformAbstraction::JoinLoaderThreads() mTrace.PushCall("JoinLoaderThreads", ""); } -Integration::DynamicsFactory* TestPlatformAbstraction::GetDynamicsFactory() -{ - mTrace.PushCall("GetDynamicsFactory", ""); - return NULL; -} - /** Call this every test */ void TestPlatformAbstraction::Initialize() { @@ -273,7 +267,6 @@ bool TestPlatformAbstraction::WasCalled(TestFuncEnum func) case IsLoadingFunc: return mTrace.FindMethod("IsLoading"); case SetDpiFunc: return mTrace.FindMethod("SetDpi"); case JoinLoaderThreadsFunc: return mTrace.FindMethod("JoinLoaderThreads"); - case GetDynamicsFactoryFunc: return mTrace.FindMethod("GetDynamicsFactory"); } return false; } 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 c083fef..3a69ae7 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 @@ -177,8 +177,6 @@ public: virtual void JoinLoaderThreads(); - virtual Integration::DynamicsFactory* GetDynamicsFactory(); - public: // TEST FUNCTIONS // Enumeration of Platform Abstraction methods @@ -196,8 +194,7 @@ public: // TEST FUNCTIONS GetResourcesFunc, IsLoadingFunc, SetDpiFunc, - JoinLoaderThreadsFunc, - GetDynamicsFactoryFunc, + JoinLoaderThreadsFunc } TestFuncEnum; /** Call this every test */