X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-application.cpp;h=0b98b271f3155635202c7c7fbe284e6024cbf0d6;hb=8ae521ab64a3922f3419fbbfb83dde57e6135cf5;hp=8bb7176a0f5aca266910af7a9160ce203dbb4c7a;hpb=3b5c91aa5c8ec803487ded2008d6b460530e96ad;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 8bb7176..0b98b27 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -20,43 +20,24 @@ namespace Dali { +bool TestApplication::mLoggingEnabled = true; -TestApplication::TestApplication( size_t surfaceWidth, - size_t surfaceHeight, - float horizontalDpi, - float verticalDpi, +TestApplication::TestApplication( uint32_t surfaceWidth, + uint32_t surfaceHeight, + uint32_t horizontalDpi, + uint32_t verticalDpi, ResourcePolicy::DataRetention policy) : mCore( NULL ), mSurfaceWidth( surfaceWidth ), mSurfaceHeight( surfaceHeight ), mFrame( 0u ), - mDpi( horizontalDpi, verticalDpi ), + mDpi{ horizontalDpi, verticalDpi }, mLastVSyncTime(0u), mDataRetentionPolicy( policy ) { Initialize(); } -TestApplication::TestApplication( bool initialize, - size_t surfaceWidth, - size_t surfaceHeight, - float horizontalDpi, - float verticalDpi, - ResourcePolicy::DataRetention policy) -: mCore( NULL ), - mSurfaceWidth( surfaceWidth ), - mSurfaceHeight( surfaceHeight ), - mFrame( 0u ), - mDpi( horizontalDpi, verticalDpi ), - mLastVSyncTime(0u), - mDataRetentionPolicy( policy ) -{ - if ( initialize ) - { - Initialize(); - } -} - void TestApplication::Initialize() { // We always need the first update! @@ -66,15 +47,12 @@ void TestApplication::Initialize() mPlatformAbstraction, mGlAbstraction, mGlSyncAbstraction, - mGestureManager, mDataRetentionPolicy, Integration::RenderToFrameBuffer::FALSE, Integration::DepthBufferAvailable::TRUE, Integration::StencilBufferAvailable::TRUE ); mCore->ContextCreated(); - mCore->SurfaceResized( mSurfaceWidth, mSurfaceHeight ); - mCore->SetDpi( mDpi.x, mDpi.y ); Dali::Integration::Log::LogFunction logFunction(&TestApplication::LogMessage); Dali::Integration::Log::InstallLogFunction(logFunction); @@ -84,12 +62,22 @@ void TestApplication::Initialize() Dali::Integration::Trace::LogContext( true, "Test" ); + mRenderSurface = new TestRenderSurface( Dali::PositionSize( 0, 0, mSurfaceWidth, mSurfaceHeight ) ); + mScene = Dali::Integration::Scene::New( Vector2( static_cast( mSurfaceWidth ), static_cast( mSurfaceHeight ) ) ); + mScene.SetSurface( *mRenderSurface ); + + mScene.SetDpi( Vector2( static_cast( mDpi.x ), static_cast( mDpi.y ) ) ); + + mCore->SurfaceResized( mRenderSurface ); + mCore->SceneCreated(); + mCore->Initialize(); } TestApplication::~TestApplication() { Dali::Integration::Log::UninstallLogFunction(); + delete mRenderSurface; delete mCore; } @@ -97,30 +85,33 @@ void TestApplication::LogContext( bool start, const char* tag ) { if( start ) { - fprintf(stderr, "INFO: Trace Start: %s", tag); + fprintf(stderr, "INFO: Trace Start: %s\n", tag); } else { - fprintf(stderr, "INFO: Trace End: %s", tag); + fprintf(stderr, "INFO: Trace End: %s\n", tag); } } void TestApplication::LogMessage(Dali::Integration::Log::DebugPriority level, std::string& message) { - switch(level) + if( mLoggingEnabled ) { - case Dali::Integration::Log::DebugInfo: - fprintf(stderr, "INFO: %s", message.c_str()); - break; - case Dali::Integration::Log::DebugWarning: - fprintf(stderr, "WARN: %s", message.c_str()); - break; - case Dali::Integration::Log::DebugError: - fprintf(stderr, "ERROR: %s", message.c_str()); - break; - default: - fprintf(stderr, "DEFAULT: %s", message.c_str()); - break; + switch(level) + { + case Dali::Integration::Log::DebugInfo: + fprintf(stderr, "INFO: %s", message.c_str()); + break; + case Dali::Integration::Log::DebugWarning: + fprintf(stderr, "WARN: %s", message.c_str()); + break; + case Dali::Integration::Log::DebugError: + fprintf(stderr, "ERROR: %s", message.c_str()); + break; + default: + fprintf(stderr, "DEFAULT: %s", message.c_str()); + break; + } } } @@ -149,11 +140,6 @@ TestGlSyncAbstraction& TestApplication::GetGlSyncAbstraction() return mGlSyncAbstraction; } -TestGestureManager& TestApplication::GetGestureManager() -{ - return mGestureManager; -} - void TestApplication::ProcessEvent(const Integration::Event& event) { mCore->QueueEvent(event); @@ -165,20 +151,7 @@ void TestApplication::SendNotification() mCore->ProcessEvents(); } -void TestApplication::SetSurfaceWidth( unsigned int width, unsigned height ) -{ - mSurfaceWidth = width; - mSurfaceHeight = height; - - mCore->SurfaceResized( mSurfaceWidth, mSurfaceHeight ); -} - -void TestApplication::SetTopMargin( unsigned int margin ) -{ - mCore->SetTopMargin( margin ); -} - -void TestApplication::DoUpdate( unsigned int intervalMilliseconds, const char* location ) +void TestApplication::DoUpdate( uint32_t intervalMilliseconds, const char* location ) { if( GetUpdateStatus() == 0 && mRenderStatus.NeedsUpdate() == false && @@ -187,8 +160,8 @@ void TestApplication::DoUpdate( unsigned int intervalMilliseconds, const char* l fprintf(stderr, "WARNING - Update not required :%s\n", location==NULL?"NULL":location); } - unsigned int nextVSyncTime = mLastVSyncTime + intervalMilliseconds; - float elapsedSeconds = intervalMilliseconds / 1e3f; + uint32_t nextVSyncTime = mLastVSyncTime + intervalMilliseconds; + float elapsedSeconds = static_cast( intervalMilliseconds ) * 0.001f; mCore->Update( elapsedSeconds, mLastVSyncTime, nextVSyncTime, mStatus, false, false ); @@ -197,7 +170,7 @@ void TestApplication::DoUpdate( unsigned int intervalMilliseconds, const char* l mLastVSyncTime = nextVSyncTime; } -bool TestApplication::Render( unsigned int intervalMilliseconds, const char* location ) +bool TestApplication::Render( uint32_t intervalMilliseconds, const char* location ) { DoUpdate( intervalMilliseconds, location ); mCore->Render( mRenderStatus, false ); @@ -207,12 +180,12 @@ bool TestApplication::Render( unsigned int intervalMilliseconds, const char* loc return mStatus.KeepUpdating() || mRenderStatus.NeedsUpdate(); } -unsigned int TestApplication::GetUpdateStatus() +uint32_t TestApplication::GetUpdateStatus() { return mStatus.KeepUpdating(); } -bool TestApplication::UpdateOnly( unsigned int intervalMilliseconds ) +bool TestApplication::UpdateOnly( uint32_t intervalMilliseconds ) { DoUpdate( intervalMilliseconds ); return mStatus.KeepUpdating(); @@ -240,11 +213,11 @@ void TestApplication::ResetContext() mCore->ContextCreated(); } -unsigned int TestApplication::Wait( unsigned int durationToWait ) +uint32_t TestApplication::Wait( uint32_t durationToWait ) { int time = 0; - for(unsigned int i = 0; i <= ( durationToWait / RENDER_FRAME_INTERVAL); i++) + for(uint32_t i = 0; i <= ( durationToWait / RENDER_FRAME_INTERVAL); i++) { SendNotification(); Render(RENDER_FRAME_INTERVAL);