Removed GetRenderHasRendered() test from the toolkit autotest

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / dali-toolkit-test-utils / test-application.cpp

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 df3ae2e..f2e3cd7 100644 (file)
--- 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
@@ -48,6 +48,7 @@ TestApplication::TestApplication( bool   initialize,
   mSurfaceHeight( surfaceHeight ),
   mFrame( 0u ),
   mDpi( horizontalDpi, verticalDpi ),
   mSurfaceHeight( surfaceHeight ),
   mFrame( 0u ),
   mDpi( horizontalDpi, verticalDpi ),

+  mLastVSyncTime(0u),

   mDataRetentionPolicy( policy )
 {
   if ( initialize )
   mDataRetentionPolicy( policy )
 {
   if ( initialize )


@@ -58,6 +59,9 @@ TestApplication::TestApplication( bool   initialize,
 
 void TestApplication::Initialize()
 {
 
 void TestApplication::Initialize()
 {

+  // We always need the first update!
+  mStatus.keepUpdating = Integration::KeepUpdating::STAGE_KEEP_RENDERING;
+

   mCore = Dali::Integration::Core::New(
     mRenderController,
     mPlatformAbstraction,
   mCore = Dali::Integration::Core::New(
     mRenderController,
     mPlatformAbstraction,


@@ -150,23 +154,28 @@ void TestApplication::SetSurfaceWidth( unsigned int width, unsigned height )
   mCore->SurfaceResized( mSurfaceWidth, mSurfaceHeight );
 }
 
   mCore->SurfaceResized( mSurfaceWidth, mSurfaceHeight );
 }
 

-void TestApplication::DoUpdate( unsigned int intervalMilliseconds )
+void TestApplication::DoUpdate( unsigned int intervalMilliseconds, const char* location )

 {
 {

-  unsigned int seconds(0u), microseconds(0u);
-  mPlatformAbstraction.GetTimeMicroseconds( seconds, microseconds );
-  mLastVSyncTime = ( seconds * 1e3 ) + ( microseconds / 1e3 );
-  unsigned int nextVSyncTime = mLastVSyncTime + 16;
-
-  // Update Time values
-  mPlatformAbstraction.IncrementGetTimeResult( intervalMilliseconds );
+  if( GetUpdateStatus() == 0 &&
+      mRenderStatus.NeedsUpdate() == false &&
+      ! GetRenderController().WasCalled(TestRenderController::RequestUpdateFunc) )
+  {
+    fprintf(stderr, "WARNING - Update not required :%s\n", location==NULL?"NULL":location);
+  }

 
 

+  unsigned int nextVSyncTime = mLastVSyncTime + intervalMilliseconds;

   float elapsedSeconds = intervalMilliseconds / 1e3f;
   float elapsedSeconds = intervalMilliseconds / 1e3f;

+

   mCore->Update( elapsedSeconds, mLastVSyncTime, nextVSyncTime, mStatus );
   mCore->Update( elapsedSeconds, mLastVSyncTime, nextVSyncTime, mStatus );

+
+  GetRenderController().Initialize();
+
+  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++;
   mCore->Render( mRenderStatus );
 
   mFrame++;


@@ -185,6 +194,11 @@ bool TestApplication::UpdateOnly( unsigned int intervalMilliseconds  )
   return mStatus.KeepUpdating();
 }
 
   return mStatus.KeepUpdating();
 }
 

+bool TestApplication::GetRenderNeedsUpdate()
+{
+  return mRenderStatus.NeedsUpdate();
+}
+

 bool TestApplication::RenderOnly( )
 {
   // Update Time values
 bool TestApplication::RenderOnly( )
 {
   // Update Time values


@@ -198,6 +212,7 @@ bool TestApplication::RenderOnly( )
 void TestApplication::ResetContext()
 {
   mCore->ContextDestroyed();
 void TestApplication::ResetContext()
 {
   mCore->ContextDestroyed();

+  mGlAbstraction.Initialize();

   mCore->ContextCreated();
 }
 
   mCore->ContextCreated();
 }