X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-adaptor%2Fdali-test-suite-utils%2Ftest-application.cpp;h=14258c935cdc5d0a2b324c4a10790fe3f1cbf633;hb=33f258bb821af0d4052d0a814dd7951622603073;hp=1562d27d1ea031353cf6217418c2fd239abd11d8;hpb=eca7aed71a48957ba7b3bc9d64136b654feef362;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.cpp b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.cpp
old mode 100644
new mode 100755
index 1562d27..14258c9
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.cpp
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -26,20 +26,30 @@ TestApplication::TestApplication( uint32_t surfaceWidth,
                                   uint32_t surfaceHeight,
                                   uint32_t  horizontalDpi,
                                   uint32_t  verticalDpi,
-                                  ResourcePolicy::DataRetention policy)
-: mCore( NULL ),
+                                  bool initialize )
+: mRenderSurface( NULL ),
+  mCore( NULL ),
   mSurfaceWidth( surfaceWidth ),
   mSurfaceHeight( surfaceHeight ),
   mFrame( 0u ),
   mDpi{ horizontalDpi, verticalDpi },
-  mLastVSyncTime(0u),
-  mDataRetentionPolicy( policy )
+  mLastVSyncTime(0u)
 {
-  Initialize();
+  if( initialize )
+  {
+    Initialize();
+  }
 }
 
 void TestApplication::Initialize()
 {
+  CreateCore();
+  CreateScene();
+  InitializeCore();
+}
+
+void TestApplication::CreateCore()
+{
   // We always need the first update!
   mStatus.keepUpdating = Integration::KeepUpdating::STAGE_KEEP_RENDERING;
 
@@ -47,11 +57,11 @@ void TestApplication::Initialize()
                                         mPlatformAbstraction,
                                         mGlAbstraction,
                                         mGlSyncAbstraction,
-                                        mGestureManager,
-                                        mDataRetentionPolicy,
+                                        mGlContextHelperAbstraction,
                                         Integration::RenderToFrameBuffer::FALSE,
                                         Integration::DepthBufferAvailable::TRUE,
-                                        Integration::StencilBufferAvailable::TRUE );
+                                        Integration::StencilBufferAvailable::TRUE,
+                                        Integration::PartialUpdateAvailable::FALSE );
 
   mCore->ContextCreated();
 
@@ -62,15 +72,17 @@ void TestApplication::Initialize()
   Dali::Integration::Trace::InstallLogContextFunction( logContextFunction );
 
   Dali::Integration::Trace::LogContext( true, "Test" );
+}
 
+void TestApplication::CreateScene()
+{
   mRenderSurface = new TestRenderSurface( Dali::PositionSize( 0, 0, mSurfaceWidth, mSurfaceHeight ) );
-  mScene = Dali::Integration::Scene::New( Vector2( static_cast<float>( mSurfaceWidth ), static_cast<float>( mSurfaceHeight ) ) );
-  mScene.SetSurface( *mRenderSurface );
-
+  mScene = Dali::Integration::Scene::New( *mRenderSurface );
   mScene.SetDpi( Vector2( static_cast<float>( mDpi.x ), static_cast<float>( mDpi.y ) ) );
+}
 
-  mCore->SurfaceResized( mRenderSurface );
-
+void TestApplication::InitializeCore()
+{
   mCore->SceneCreated();
   mCore->Initialize();
 }
@@ -141,9 +153,9 @@ TestGlSyncAbstraction& TestApplication::GetGlSyncAbstraction()
   return mGlSyncAbstraction;
 }
 
-TestGestureManager& TestApplication::GetGestureManager()
+TestGlContextHelperAbstraction& TestApplication::GetGlContextHelperAbstraction()
 {
-  return mGestureManager;
+  return mGlContextHelperAbstraction;
 }
 
 void TestApplication::ProcessEvent(const Integration::Event& event)
@@ -179,7 +191,7 @@ void TestApplication::DoUpdate( uint32_t intervalMilliseconds, const char* locat
 bool TestApplication::Render( uint32_t intervalMilliseconds, const char* location )
 {
   DoUpdate( intervalMilliseconds, location );
-  mCore->Render( mRenderStatus, false );
+  mCore->Render( mRenderStatus, false /*do not force clear*/, false /*do not skip rendering*/ );
 
   mFrame++;
 
@@ -205,7 +217,7 @@ bool TestApplication::GetRenderNeedsUpdate()
 bool TestApplication::RenderOnly( )
 {
   // Update Time values
-  mCore->Render( mRenderStatus, false );
+  mCore->Render( mRenderStatus, false /*do not force clear*/, false /*do not skip rendering*/ );
 
   mFrame++;