X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-PageTurnView.cpp;h=db1b84531f072081ba098d3efd7e55719298ff99;hp=934299276715ac96814da83d3c514c62210b180d;hb=HEAD;hpb=5e937a6322849b76d49d5b3f41cb5d91c94acd3e

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp
index 9342992..7415f8a 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -15,26 +15,26 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
-#include <string.h>
-#include <sstream>
 #include <dali-toolkit-test-suite-utils.h>
-#include <dali/integration-api/events/touch-event-integ.h>
 #include <dali-toolkit/devel-api/controls/page-turn-view/page-factory.h>
 #include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h>
 #include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h>
 #include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h>
+#include <dali/integration-api/events/touch-event-integ.h>
+#include <stdlib.h>
+#include <string.h>
+#include <iostream>
+#include <sstream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
 
 namespace
 {
-const int RENDER_FRAME_INTERVAL = 16;                           ///< Duration of each frame in ms. (at approx 60FPS)
-const unsigned int TOTAL_PAGE_NUMBER = 20;
-const Vector2 VIEW_PAGE_SIZE( 300.f,400.f );
-const Vector2 SPINE_SHADOW_PARAMETER( 60.0f, 30.0f );
+const int          RENDER_FRAME_INTERVAL = 16; ///< Duration of each frame in ms. (at approx 60FPS)
+const unsigned int TOTAL_PAGE_NUMBER     = 20;
+const Vector2      VIEW_PAGE_SIZE(300.f, 400.f);
+const Vector2      SPINE_SHADOW_PARAMETER(60.0f, 30.0f);
 
 static bool gObjectCreatedCallBackCalled;
 static void TestCallback(BaseHandle handle)
@@ -54,7 +54,7 @@ int Wait(ToolkitTestApplication& application, int duration = 0)
 {
   int time = 0;
 
-  for(int i = 0; i <= ( duration / RENDER_FRAME_INTERVAL); i++)
+  for(int i = 0; i <= (duration / RENDER_FRAME_INTERVAL); i++)
   {
     application.SendNotification();
     application.Render(RENDER_FRAME_INTERVAL);
@@ -64,69 +64,66 @@ int Wait(ToolkitTestApplication& application, int duration = 0)
   return time;
 }
 
-
 static Vector2 PerformGestureDiagonalSwipe(ToolkitTestApplication& application, Vector2 start, Vector2 direction, int frames, uint32_t& time, bool toStart = true, bool toFinish = true)
 {
-  Vector2 pos( start );
+  Vector2 pos(start);
 
-  if( toStart )
+  if(toStart)
   {
     // Now do a pan starting from (start + 20) and heading (direction)
-    Vector2 pos_start_jump( start + Vector2(15.0f, 0.0f) );
-    TestStartPan( application, start, pos_start_jump, time );
+    Vector2 pos_start_jump(start + Vector2(15.0f, 0.0f));
+    TestStartPan(application, start, pos_start_jump, time);
     pos += direction;
   }
 
   time += Wait(application);
 
-  for(int i = 0;i<frames;i++)
+  for(int i = 0; i < frames; i++)
   {
     pos += direction;
-    TestMovePan(application, pos, time );
+    TestMovePan(application, pos, time);
     time += Wait(application);
   }
 
   if(toFinish)
   {
     pos += direction;
-    TestEndPan(application, pos, time );
+    TestEndPan(application, pos, time);
     time += Wait(application);
   }
 
   return pos;
 }
 
-
 //Functor to test whether PageTurnSignal / PagePanSignal is emitted
 class PageSignalCallback : public Dali::ConnectionTracker
 {
 public:
-
-  PageSignalCallback( bool& signalReceived, PageTurnView& view, unsigned int& pageIndex, bool& isForwards )
-  : mSignalVerified( signalReceived ),
-    mView( view ),
-    mPageIndex( pageIndex ),
-    mIsTurningForwards( isForwards )
+  PageSignalCallback(bool& signalReceived, PageTurnView& view, unsigned int& pageIndex, bool& isForwards)
+  : mSignalVerified(signalReceived),
+    mView(view),
+    mPageIndex(pageIndex),
+    mIsTurningForwards(isForwards)
   {
   }
 
   // callback to be connected to PageTurnSignal
-  void PageTurnSignalCallback( PageTurnView view, unsigned int pageIndex, bool isTurningForward )
+  void PageTurnSignalCallback(PageTurnView view, unsigned int pageIndex, bool isTurningForward)
   {
-    tet_infoline( "Verifying PageTurnedSignal" );
+    tet_infoline("Verifying PageTurnedSignal");
 
-    if( mView == view && mPageIndex == pageIndex && mIsTurningForwards == isTurningForward )
+    if(mView == view && mPageIndex == pageIndex && mIsTurningForwards == isTurningForward)
     {
       mSignalVerified = true;
     }
   }
 
   // callback to be connected to PagePanSignal
-  void PagePanSignalCallback( PageTurnView view )
+  void PagePanSignalCallback(PageTurnView view)
   {
-    tet_infoline( "Verifying PagePannedSignal" );
+    tet_infoline("Verifying PagePannedSignal");
 
-    if( mView == view )
+    if(mView == view)
     {
       mSignalVerified = true;
     }
@@ -141,17 +138,14 @@ public:
   PageTurnView& mView;
   unsigned int& mPageIndex;
   bool&         mIsTurningForwards;
-
 };
 
-
 //Implementation of PageFactory for providing page actors to PageTurnView
 class TestPageFactory : public PageFactory
 {
 public:
-
-  TestPageFactory( bool returnValidTexture = true )
-  : mValidTexture( returnValidTexture )
+  TestPageFactory(bool returnValidTexture = true)
+  : mValidTexture(returnValidTexture)
   {
     mTotalPageNumber = TOTAL_PAGE_NUMBER;
   }
@@ -170,21 +164,21 @@ public:
    * @param[in] pageId The ID of the page to create.
    * @return An image, or an empty handle if the ID is out of range.
    */
-  virtual Texture NewPage( unsigned int pageId )
+  virtual Texture NewPage(unsigned int pageId)
   {
-    if( mValidTexture )
+    if(mValidTexture)
     {
-      return Texture::New( Dali::TextureType::TEXTURE_2D, Pixel::RGB888, 100, 100 );
+      return Texture::New(Dali::TextureType::TEXTURE_2D, Pixel::RGB888, 100, 100);
     }
     return Texture(); // empty handle
   }
 
 private:
-  unsigned int            mTotalPageNumber;
-  bool                    mValidTexture;
+  unsigned int mTotalPageNumber;
+  bool         mValidTexture;
 };
 
-}// namespace
+} // namespace
 
 void dali_page_turn_view_startup(void)
 {
@@ -204,34 +198,34 @@ int UtcDaliPageTurnPortraitViewNew(void)
 
   // Test default constructor
   PageTurnView portraitView;
-  DALI_TEST_CHECK( !portraitView );
+  DALI_TEST_CHECK(!portraitView);
 
   // Test object creation
   TestPageFactory factory;
-  portraitView = PageTurnPortraitView::New( factory, VIEW_PAGE_SIZE );
-  DALI_TEST_CHECK( portraitView );
+  portraitView = PageTurnPortraitView::New(factory, VIEW_PAGE_SIZE);
+  DALI_TEST_CHECK(portraitView);
 
   //Additional check to ensure object is created by checking if it's registered
-  ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  ObjectRegistry registry = application.GetCore().GetObjectRegistry();
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
     TestPageFactory factory;
-    PageTurnView portraitView = PageTurnPortraitView::New( factory, VIEW_PAGE_SIZE );
+    PageTurnView    portraitView = PageTurnPortraitView::New(factory, VIEW_PAGE_SIZE);
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
 
   // Test copy constructor
-  PageTurnView viewCopy( portraitView );
-  DALI_TEST_CHECK( viewCopy );
+  PageTurnView viewCopy(portraitView);
+  DALI_TEST_CHECK(viewCopy);
 
   // Test down cast
   Handle handleView;
-  handleView = portraitView;
-  PageTurnView downCastView = PageTurnView::DownCast( handleView );
-  DALI_TEST_CHECK( downCastView );
+  handleView                = portraitView;
+  PageTurnView downCastView = PageTurnView::DownCast(handleView);
+  DALI_TEST_CHECK(downCastView);
 
   END_TEST;
 }
@@ -244,34 +238,34 @@ int UtcDaliPageTurnLandscapeViewNew(void)
 
   //Test default constructor
   PageTurnView landscapeView;
-  DALI_TEST_CHECK( !landscapeView );
+  DALI_TEST_CHECK(!landscapeView);
 
   // Test object creation
   TestPageFactory factory;
-  landscapeView = PageTurnLandscapeView::New( factory, VIEW_PAGE_SIZE );
-  DALI_TEST_CHECK( landscapeView );
+  landscapeView = PageTurnLandscapeView::New(factory, VIEW_PAGE_SIZE);
+  DALI_TEST_CHECK(landscapeView);
 
   //Additional check to ensure object is created by checking if it's registered
-  ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
-  DALI_TEST_CHECK( registry );
+  ObjectRegistry registry = application.GetCore().GetObjectRegistry();
+  DALI_TEST_CHECK(registry);
 
   gObjectCreatedCallBackCalled = false;
-  registry.ObjectCreatedSignal().Connect( &TestCallback );
+  registry.ObjectCreatedSignal().Connect(&TestCallback);
   {
     TestPageFactory factory;
-    PageTurnView landscapeView = PageTurnLandscapeView::New( factory, VIEW_PAGE_SIZE );
+    PageTurnView    landscapeView = PageTurnLandscapeView::New(factory, VIEW_PAGE_SIZE);
   }
-  DALI_TEST_CHECK( gObjectCreatedCallBackCalled );
+  DALI_TEST_CHECK(gObjectCreatedCallBackCalled);
 
   // Test copy constructor
-  PageTurnView viewCopy( landscapeView );
-  DALI_TEST_CHECK( viewCopy );
+  PageTurnView viewCopy(landscapeView);
+  DALI_TEST_CHECK(viewCopy);
 
   // Test down cast
   Handle handleView;
-  handleView = landscapeView;
-  PageTurnView downCastView = PageTurnView::DownCast( handleView );
-  DALI_TEST_CHECK( downCastView );
+  handleView                = landscapeView;
+  PageTurnView downCastView = PageTurnView::DownCast(handleView);
+  DALI_TEST_CHECK(downCastView);
 
   END_TEST;
 }
@@ -284,28 +278,28 @@ int UtcDaliPageTurnPortraitViewCopyConstructorAndAssignment(void)
 
   // Test default constructor
   PageTurnPortraitView portraitView;
-  DALI_TEST_CHECK( !portraitView );
+  DALI_TEST_CHECK(!portraitView);
 
   // Test object creation
   TestPageFactory factory;
-  portraitView = PageTurnPortraitView::New( factory, VIEW_PAGE_SIZE );
-  DALI_TEST_CHECK( portraitView );
+  portraitView = PageTurnPortraitView::New(factory, VIEW_PAGE_SIZE);
+  DALI_TEST_CHECK(portraitView);
 
   // Test copy constructor
-  PageTurnPortraitView viewCopy( portraitView );
-  DALI_TEST_CHECK( viewCopy );
+  PageTurnPortraitView viewCopy(portraitView);
+  DALI_TEST_CHECK(viewCopy);
 
   // Test assignment
   PageTurnPortraitView portraitView2;
   portraitView2 = portraitView;
-  DALI_TEST_CHECK( portraitView2 );
-  DALI_TEST_CHECK( portraitView == portraitView2);
+  DALI_TEST_CHECK(portraitView2);
+  DALI_TEST_CHECK(portraitView == portraitView2);
 
   // Test down cast
   Handle handleView;
-  handleView = portraitView;
-  PageTurnPortraitView downCastView = PageTurnPortraitView::DownCast( handleView );
-  DALI_TEST_CHECK( downCastView );
+  handleView                        = portraitView;
+  PageTurnPortraitView downCastView = PageTurnPortraitView::DownCast(handleView);
+  DALI_TEST_CHECK(downCastView);
 
   END_TEST;
 }
@@ -318,28 +312,28 @@ int UtcDaliPageTurnLandscapeViewCopyConstructorAndAssignment(void)
 
   // Test default constructor
   PageTurnLandscapeView landscapeView;
-  DALI_TEST_CHECK( !landscapeView );
+  DALI_TEST_CHECK(!landscapeView);
 
   // Test object creation
   TestPageFactory factory;
-  landscapeView = PageTurnLandscapeView::New( factory, VIEW_PAGE_SIZE );
-  DALI_TEST_CHECK( landscapeView );
+  landscapeView = PageTurnLandscapeView::New(factory, VIEW_PAGE_SIZE);
+  DALI_TEST_CHECK(landscapeView);
 
   // Test copy constructor
-  PageTurnLandscapeView viewCopy( landscapeView );
-  DALI_TEST_CHECK( viewCopy );
+  PageTurnLandscapeView viewCopy(landscapeView);
+  DALI_TEST_CHECK(viewCopy);
 
   // Test assignment
   PageTurnLandscapeView landscapeView2;
   landscapeView2 = landscapeView;
-  DALI_TEST_CHECK( landscapeView2 );
-  DALI_TEST_CHECK( landscapeView == landscapeView2);
+  DALI_TEST_CHECK(landscapeView2);
+  DALI_TEST_CHECK(landscapeView == landscapeView2);
 
   // Test down cast
   Handle handleView;
-  handleView = landscapeView;
-  PageTurnLandscapeView downCastView = PageTurnLandscapeView::DownCast( handleView );
-  DALI_TEST_CHECK( downCastView );
+  handleView                         = landscapeView;
+  PageTurnLandscapeView downCastView = PageTurnLandscapeView::DownCast(handleView);
+  DALI_TEST_CHECK(downCastView);
 
   END_TEST;
 }
@@ -351,44 +345,44 @@ int UtcDaliPageTurnViewSetGetProperty(void)
   tet_infoline(" UtcDaliPageTurnViewSetGetProperty ");
 
   TestPageFactory factory;
-  PageTurnView landscapeView = PageTurnLandscapeView::New( factory, VIEW_PAGE_SIZE );
-  DALI_TEST_CHECK( landscapeView );
+  PageTurnView    landscapeView = PageTurnLandscapeView::New(factory, VIEW_PAGE_SIZE);
+  DALI_TEST_CHECK(landscapeView);
 
-  Stage::GetCurrent().Add( landscapeView );
+  application.GetScene().Add(landscapeView);
 
   // Test "viewPageSize" property
-  DALI_TEST_CHECK( landscapeView.GetPropertyIndex("viewPageSize") == PageTurnView::Property::VIEW_PAGE_SIZE  );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::VIEW_PAGE_SIZE).Get<Vector2>(), VIEW_PAGE_SIZE, TEST_LOCATION );
+  DALI_TEST_CHECK(landscapeView.GetPropertyIndex("viewPageSize") == PageTurnView::Property::VIEW_PAGE_SIZE);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::VIEW_PAGE_SIZE).Get<Vector2>(), VIEW_PAGE_SIZE, TEST_LOCATION);
 
-  Vector2 newSize( VIEW_PAGE_SIZE.x*0.75, VIEW_PAGE_SIZE.y*0.5f );
-  landscapeView.SetProperty( PageTurnView::Property::VIEW_PAGE_SIZE, newSize );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::VIEW_PAGE_SIZE).Get<Vector2>(), newSize, TEST_LOCATION );
-  Wait( application);
-  DALI_TEST_EQUALS( Vector2(landscapeView.GetTargetSize()), Vector2(newSize.x*2.f, newSize.y), TEST_LOCATION);
+  Vector2 newSize(VIEW_PAGE_SIZE.x * 0.75, VIEW_PAGE_SIZE.y * 0.5f);
+  landscapeView.SetProperty(PageTurnView::Property::VIEW_PAGE_SIZE, newSize);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::VIEW_PAGE_SIZE).Get<Vector2>(), newSize, TEST_LOCATION);
+  Wait(application);
+  DALI_TEST_EQUALS(Vector2(landscapeView.GetTargetSize()), Vector2(newSize.x * 2.f, newSize.y), TEST_LOCATION);
 
-  landscapeView.SetProperty( PageTurnView::Property::VIEW_PAGE_SIZE,newSize*1.5f);
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::VIEW_PAGE_SIZE).Get<Vector2>(), newSize*1.5f, TEST_LOCATION );
-  Wait( application);
-  DALI_TEST_EQUALS( Vector2(landscapeView.GetTargetSize()), Vector2(newSize.x*3.f, newSize.y*1.5f), TEST_LOCATION);
+  landscapeView.SetProperty(PageTurnView::Property::VIEW_PAGE_SIZE, newSize * 1.5f);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::VIEW_PAGE_SIZE).Get<Vector2>(), newSize * 1.5f, TEST_LOCATION);
+  Wait(application);
+  DALI_TEST_EQUALS(Vector2(landscapeView.GetTargetSize()), Vector2(newSize.x * 3.f, newSize.y * 1.5f), TEST_LOCATION);
 
   // Test "currentPageId" property
-  DALI_TEST_CHECK( landscapeView.GetPropertyIndex("currentPageId") == PageTurnView::Property::CURRENT_PAGE_ID );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION );
+  DALI_TEST_CHECK(landscapeView.GetPropertyIndex("currentPageId") == PageTurnView::Property::CURRENT_PAGE_ID);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION);
 
-  int pageId = static_cast<int>(TOTAL_PAGE_NUMBER)/3;
-  landscapeView.SetProperty( PageTurnView::Property::CURRENT_PAGE_ID, pageId );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), pageId, TEST_LOCATION );
+  int pageId = static_cast<int>(TOTAL_PAGE_NUMBER) / 3;
+  landscapeView.SetProperty(PageTurnView::Property::CURRENT_PAGE_ID, pageId);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), pageId, TEST_LOCATION);
 
-  landscapeView.SetProperty( PageTurnView::Property::CURRENT_PAGE_ID, pageId*2 );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), pageId*2, TEST_LOCATION );
+  landscapeView.SetProperty(PageTurnView::Property::CURRENT_PAGE_ID, pageId * 2);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), pageId * 2, TEST_LOCATION);
 
   // Test "spinShadow" property
-  DALI_TEST_CHECK( landscapeView.GetPropertyIndex( "spineShadow" ) == PageTurnView::Property::SPINE_SHADOW );
-  landscapeView.SetProperty( PageTurnView::Property::SPINE_SHADOW, SPINE_SHADOW_PARAMETER );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::SPINE_SHADOW).Get<Vector2>(), SPINE_SHADOW_PARAMETER, TEST_LOCATION );
+  DALI_TEST_CHECK(landscapeView.GetPropertyIndex("spineShadow") == PageTurnView::Property::SPINE_SHADOW);
+  landscapeView.SetProperty(PageTurnView::Property::SPINE_SHADOW, SPINE_SHADOW_PARAMETER);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::SPINE_SHADOW).Get<Vector2>(), SPINE_SHADOW_PARAMETER, TEST_LOCATION);
 
-  landscapeView.SetProperty( PageTurnView::Property::SPINE_SHADOW,  SPINE_SHADOW_PARAMETER*0.75f );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::SPINE_SHADOW).Get<Vector2>(), SPINE_SHADOW_PARAMETER*0.75f, TEST_LOCATION );
+  landscapeView.SetProperty(PageTurnView::Property::SPINE_SHADOW, SPINE_SHADOW_PARAMETER * 0.75f);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::SPINE_SHADOW).Get<Vector2>(), SPINE_SHADOW_PARAMETER * 0.75f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -399,13 +393,13 @@ int UtcDaliPageTurnPortraitViewSignals(void)
 
   tet_infoline(" UtcDaliPageTurnPortraitViewSignals ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
   TestPageFactory factory;
-  Vector2 size = Stage::GetCurrent().GetSize();
-  PageTurnView portraitView = PageTurnPortraitView::New( factory, size );
-  portraitView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  Stage::GetCurrent().Add( portraitView );
+  Vector2         size         = application.GetScene().GetSize();
+  PageTurnView    portraitView = PageTurnPortraitView::New(factory, size);
+  portraitView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  application.GetScene().Add(portraitView);
 
   // Render and notify
   application.SendNotification();
@@ -413,108 +407,108 @@ int UtcDaliPageTurnPortraitViewSignals(void)
 
   // [0]: testing PageTurnStartedSignal;  [1]: testing PageTurnFinishedSignal
   // [2]: testing PagePanStartedSignal;   [3]: testing PagePanFinishedSignal
-  bool signalVerified[4] = {false, false, false, false};
+  bool         signalVerified[4] = {false, false, false, false};
   PageTurnView currentView;
   unsigned int pageIndex;
-  bool isTurningForwards;
+  bool         isTurningForwards;
 
-  PageSignalCallback callbackTurnStarted( signalVerified[0], currentView, pageIndex, isTurningForwards );
-  portraitView.PageTurnStartedSignal().Connect( &callbackTurnStarted, &PageSignalCallback::PageTurnSignalCallback );
+  PageSignalCallback callbackTurnStarted(signalVerified[0], currentView, pageIndex, isTurningForwards);
+  portraitView.PageTurnStartedSignal().Connect(&callbackTurnStarted, &PageSignalCallback::PageTurnSignalCallback);
 
-  PageSignalCallback callbackTurnFinished( signalVerified[1], currentView, pageIndex, isTurningForwards );
-  portraitView.PageTurnFinishedSignal().Connect( &callbackTurnFinished, &PageSignalCallback::PageTurnSignalCallback );
+  PageSignalCallback callbackTurnFinished(signalVerified[1], currentView, pageIndex, isTurningForwards);
+  portraitView.PageTurnFinishedSignal().Connect(&callbackTurnFinished, &PageSignalCallback::PageTurnSignalCallback);
 
-  PageSignalCallback callbackPanStarted( signalVerified[2], currentView, pageIndex, isTurningForwards );
-  portraitView.PagePanStartedSignal().Connect( &callbackPanStarted, &PageSignalCallback::PagePanSignalCallback );
+  PageSignalCallback callbackPanStarted(signalVerified[2], currentView, pageIndex, isTurningForwards);
+  portraitView.PagePanStartedSignal().Connect(&callbackPanStarted, &PageSignalCallback::PagePanSignalCallback);
 
-  PageSignalCallback callbackPanFinished( signalVerified[3], currentView, pageIndex, isTurningForwards );
-  portraitView.PagePanFinishedSignal().Connect( &callbackPanFinished, &PageSignalCallback::PagePanSignalCallback );
+  PageSignalCallback callbackPanFinished(signalVerified[3], currentView, pageIndex, isTurningForwards);
+  portraitView.PagePanFinishedSignal().Connect(&callbackPanFinished, &PageSignalCallback::PagePanSignalCallback);
 
-  DALI_TEST_CHECK( !callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanFinished.mSignalVerified );
+  DALI_TEST_CHECK(!callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanFinished.mSignalVerified);
 
   currentView = portraitView;
 
   //-----Test 1: pan 10 frames from position(size * 0.75f) to position(size * 0.25f), page 0 will be turned forward----
-  pageIndex = 0;
+  pageIndex         = 0;
   isTurningForwards = true;
   // Do a pan moving up diagonally
-  uint32_t time = 0;
-  Vector2 start = size * 0.75f;
-  Vector2 direction = -size*0.05f; //-size*0.5f/10.f;
+  uint32_t time      = 0;
+  Vector2  start     = size * 0.75f;
+  Vector2  direction = -size * 0.05f; //-size*0.5f/10.f;
 
-  DALI_TEST_EQUALS( portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION );
-  PerformGestureDiagonalSwipe( application, start, direction, 5, time, true, false);
-  DALI_TEST_CHECK( callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( callbackPanStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanFinished.mSignalVerified );
+  DALI_TEST_EQUALS(portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION);
+  PerformGestureDiagonalSwipe(application, start, direction, 5, time, true, false);
+  DALI_TEST_CHECK(callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(callbackPanStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanFinished.mSignalVerified);
 
-  PerformGestureDiagonalSwipe( application, start+direction*5.f, direction, 5, time, false, true);
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( callbackPanFinished.mSignalVerified );
+  PerformGestureDiagonalSwipe(application, start + direction * 5.f, direction, 5, time, false, true);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(callbackPanFinished.mSignalVerified);
 
   time += Wait(application, 1000);
-  DALI_TEST_CHECK( callbackTurnFinished.mSignalVerified );
+  DALI_TEST_CHECK(callbackTurnFinished.mSignalVerified);
   // the page is turned over
-  DALI_TEST_EQUALS( portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), (int)(pageIndex+1), TEST_LOCATION );
+  DALI_TEST_EQUALS(portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), (int)(pageIndex + 1), TEST_LOCATION);
 
   //---Test 2: pan from position( size*0.5f ) to position( size.width, size.height*0.5f ) to position( size * 0.75f ), page 1 will bent then slid back---
   callbackTurnStarted.Reset();
   callbackTurnFinished.Reset();
   callbackPanStarted.Reset();
   callbackPanFinished.Reset();
-  portraitView.SetProperty( PageTurnView::Property::CURRENT_PAGE_ID, 5 );
-  pageIndex = 5;
+  portraitView.SetProperty(PageTurnView::Property::CURRENT_PAGE_ID, 5);
+  pageIndex         = 5;
   isTurningForwards = true;
 
   //pan 10 frames from position( size.width, size.height*0.5f ) to position( size * 0.75f )
-  start = Vector2( size.width, size.height*0.5f );
-  direction = Vector2(-size.width*0.025f, size.height*0.025f);
-  PerformGestureDiagonalSwipe( application, start, direction, 5, time, true, false);
-  DALI_TEST_CHECK( callbackPanStarted.mSignalVerified );
-  DALI_TEST_CHECK( callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanFinished.mSignalVerified );
+  start     = Vector2(size.width, size.height * 0.5f);
+  direction = Vector2(-size.width * 0.025f, size.height * 0.025f);
+  PerformGestureDiagonalSwipe(application, start, direction, 5, time, true, false);
+  DALI_TEST_CHECK(callbackPanStarted.mSignalVerified);
+  DALI_TEST_CHECK(callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanFinished.mSignalVerified);
 
   signalVerified[0] = false;
   isTurningForwards = false;
-  PerformGestureDiagonalSwipe( application, start + direction*2 , direction, 5, time, false, true);
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( callbackPanFinished.mSignalVerified );
-  DALI_TEST_CHECK( callbackTurnStarted.mSignalVerified ); // start the sliding back
+  PerformGestureDiagonalSwipe(application, start + direction * 2, direction, 5, time, false, true);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(callbackPanFinished.mSignalVerified);
+  DALI_TEST_CHECK(callbackTurnStarted.mSignalVerified); // start the sliding back
 
   time += Wait(application, 1000);
-  DALI_TEST_CHECK( callbackTurnFinished.mSignalVerified );
-  DALI_TEST_EQUALS( portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), (int)pageIndex, TEST_LOCATION ); // the page is not turned over
+  DALI_TEST_CHECK(callbackTurnFinished.mSignalVerified);
+  DALI_TEST_EQUALS(portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), (int)pageIndex, TEST_LOCATION); // the page is not turned over
 
   // ----Test 3: pan 10 frames from position( size*0.25f ) to position( size.width*0.75f, size.height*0.25f ), the previous page will be turned backwards---
   callbackTurnStarted.Reset();
   callbackTurnFinished.Reset();
   callbackPanStarted.Reset();
   callbackPanFinished.Reset();
-  portraitView.SetProperty( PageTurnView::Property::CURRENT_PAGE_ID, 10);
-  pageIndex = 9; // will turn the previous page back
+  portraitView.SetProperty(PageTurnView::Property::CURRENT_PAGE_ID, 10);
+  pageIndex         = 9; // will turn the previous page back
   isTurningForwards = false;
-  start = size*0.25f;
-  direction = Vector2(size.x*0.05f, 0.f);
-  PerformGestureDiagonalSwipe( application, start, direction, 4, time, true, false);
-  DALI_TEST_CHECK( callbackPanStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanFinished.mSignalVerified );
-
-  PerformGestureDiagonalSwipe( application, start+direction*5.f, direction, 5, time, false, true);
-  DALI_TEST_CHECK( callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( callbackPanFinished.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-
-  Wait( application, 1000 );
-
-  DALI_TEST_CHECK( callbackTurnFinished.mSignalVerified );
-  DALI_TEST_EQUALS( portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 9, TEST_LOCATION );
+  start             = size * 0.25f;
+  direction         = Vector2(size.x * 0.05f, 0.f);
+  PerformGestureDiagonalSwipe(application, start, direction, 4, time, true, false);
+  DALI_TEST_CHECK(callbackPanStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanFinished.mSignalVerified);
+
+  PerformGestureDiagonalSwipe(application, start + direction * 5.f, direction, 5, time, false, true);
+  DALI_TEST_CHECK(callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(callbackPanFinished.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+
+  Wait(application, 1000);
+
+  DALI_TEST_CHECK(callbackTurnFinished.mSignalVerified);
+  DALI_TEST_EQUALS(portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 9, TEST_LOCATION);
   END_TEST;
 }
 
@@ -524,7 +518,7 @@ int UtcDaliPageTurnLanscapeViewSignals(void)
 
   tet_infoline(" UtcDaliPageTurnLanscapeViewSignals ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
   /***
    * -----------------
    * |               |
@@ -540,10 +534,10 @@ int UtcDaliPageTurnLanscapeViewSignals(void)
    */
 
   TestPageFactory factory;
-  Vector2 stageSize = Stage::GetCurrent().GetSize();
-  PageTurnView landscapeView = PageTurnLandscapeView::New( factory, Vector2(stageSize.x*0.5f, stageSize.x*0.8f) );
-  landscapeView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  Stage::GetCurrent().Add( landscapeView );
+  Vector2         stageSize     = application.GetScene().GetSize();
+  PageTurnView    landscapeView = PageTurnLandscapeView::New(factory, Vector2(stageSize.x * 0.5f, stageSize.x * 0.8f));
+  landscapeView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  application.GetScene().Add(landscapeView);
 
   // Render and notify
   application.SendNotification();
@@ -551,53 +545,53 @@ int UtcDaliPageTurnLanscapeViewSignals(void)
 
   // [0]: testing PageTurnStartedSignal;  [1]: testing PageTurnFinishedSignal
   // [2]: testing PagePanStartedSignal;   [3]: testing PagePanFinishedSignal
-  bool signalVerified[4] = {false, false, false, false};
+  bool         signalVerified[4] = {false, false, false, false};
   PageTurnView currentView;
   unsigned int pageIndex;
-  bool isTurningForwards;
+  bool         isTurningForwards;
 
-  PageSignalCallback callbackTurnStarted( signalVerified[0], currentView, pageIndex, isTurningForwards );
-  landscapeView.PageTurnStartedSignal().Connect( &callbackTurnStarted, &PageSignalCallback::PageTurnSignalCallback );
+  PageSignalCallback callbackTurnStarted(signalVerified[0], currentView, pageIndex, isTurningForwards);
+  landscapeView.PageTurnStartedSignal().Connect(&callbackTurnStarted, &PageSignalCallback::PageTurnSignalCallback);
 
-  PageSignalCallback callbackTurnFinished( signalVerified[1], currentView, pageIndex, isTurningForwards );
-  landscapeView.PageTurnFinishedSignal().Connect( &callbackTurnFinished, &PageSignalCallback::PageTurnSignalCallback );
+  PageSignalCallback callbackTurnFinished(signalVerified[1], currentView, pageIndex, isTurningForwards);
+  landscapeView.PageTurnFinishedSignal().Connect(&callbackTurnFinished, &PageSignalCallback::PageTurnSignalCallback);
 
-  PageSignalCallback callbackPanStarted( signalVerified[2], currentView, pageIndex, isTurningForwards );
-  landscapeView.PagePanStartedSignal().Connect( &callbackPanStarted, &PageSignalCallback::PagePanSignalCallback );
+  PageSignalCallback callbackPanStarted(signalVerified[2], currentView, pageIndex, isTurningForwards);
+  landscapeView.PagePanStartedSignal().Connect(&callbackPanStarted, &PageSignalCallback::PagePanSignalCallback);
 
-  PageSignalCallback callbackPanFinished( signalVerified[3], currentView, pageIndex, isTurningForwards );
-  landscapeView.PagePanFinishedSignal().Connect( &callbackPanFinished, &PageSignalCallback::PagePanSignalCallback );
+  PageSignalCallback callbackPanFinished(signalVerified[3], currentView, pageIndex, isTurningForwards);
+  landscapeView.PagePanFinishedSignal().Connect(&callbackPanFinished, &PageSignalCallback::PagePanSignalCallback);
 
-  DALI_TEST_CHECK( !callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanFinished.mSignalVerified );
+  DALI_TEST_CHECK(!callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanFinished.mSignalVerified);
 
   currentView = landscapeView;
 
   //-----Test 1: pan 10 frames from position(stageSize.x * 0.85f, stageSize.y*0.5) to position(stageSize.x * 0.45f, stageSize.y*0.5-stageSize.x * 0.3f), page 0 will be turned forward----
-  pageIndex = 0;
+  pageIndex         = 0;
   isTurningForwards = true;
   // Do a pan to the left.
-  uint32_t time = 0;
-  Vector2 start = Vector2(stageSize.x * 0.85f, stageSize.y*0.5);
-  Vector2 direction = Vector2(-stageSize.x*0.04f, -stageSize.x*0.03f);
+  uint32_t time      = 0;
+  Vector2  start     = Vector2(stageSize.x * 0.85f, stageSize.y * 0.5);
+  Vector2  direction = Vector2(-stageSize.x * 0.04f, -stageSize.x * 0.03f);
 
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION );
-  PerformGestureDiagonalSwipe( application, start, direction, 5, time, true, false);
-  DALI_TEST_CHECK( callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( callbackPanStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanFinished.mSignalVerified );
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION);
+  PerformGestureDiagonalSwipe(application, start, direction, 5, time, true, false);
+  DALI_TEST_CHECK(callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(callbackPanStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanFinished.mSignalVerified);
 
-  PerformGestureDiagonalSwipe( application, start+direction*5.f, direction, 5, time, false, true);
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( callbackPanFinished.mSignalVerified );
+  PerformGestureDiagonalSwipe(application, start + direction * 5.f, direction, 5, time, false, true);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(callbackPanFinished.mSignalVerified);
 
   time += Wait(application, 1000);
-  DALI_TEST_CHECK( callbackTurnFinished.mSignalVerified );
+  DALI_TEST_CHECK(callbackTurnFinished.mSignalVerified);
   // the page is turned over
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), (int)(pageIndex+1), TEST_LOCATION );
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), (int)(pageIndex + 1), TEST_LOCATION);
 
   //---Test 2: pan from position(stageSize.x * 0.15f, stageSize.y*0.5) to position(stageSize.x * 0.45f, stageSize.y*0.5) page 4 will be turned back---
   callbackTurnStarted.Reset();
@@ -607,21 +601,21 @@ int UtcDaliPageTurnLanscapeViewSignals(void)
   isTurningForwards = false;
 
   //pan 10 frames from position( size.width, size.height*0.5f ) to position( size * 0.75f )
-  start = Vector2( stageSize.x * 0.15f, stageSize.y*0.5f );
+  start     = Vector2(stageSize.x * 0.15f, stageSize.y * 0.5f);
   direction = Vector2(stageSize.x * 0.03f, 0.f);
-  PerformGestureDiagonalSwipe( application, start, direction, 5, time, true, false);
-  DALI_TEST_CHECK( callbackPanStarted.mSignalVerified );
-  DALI_TEST_CHECK( callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanFinished.mSignalVerified );
+  PerformGestureDiagonalSwipe(application, start, direction, 5, time, true, false);
+  DALI_TEST_CHECK(callbackPanStarted.mSignalVerified);
+  DALI_TEST_CHECK(callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanFinished.mSignalVerified);
 
-  PerformGestureDiagonalSwipe( application, start + direction*5.f , direction, 5, time, false, true);
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( callbackPanFinished.mSignalVerified );
+  PerformGestureDiagonalSwipe(application, start + direction * 5.f, direction, 5, time, false, true);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(callbackPanFinished.mSignalVerified);
 
   time += Wait(application, 1000);
-  DALI_TEST_CHECK( callbackTurnFinished.mSignalVerified );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION ); // the first page is turned back
+  DALI_TEST_CHECK(callbackTurnFinished.mSignalVerified);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION); // the first page is turned back
 
   // ----Test 3: pan 10 frames from position( size*0.55f ) to position( size.width*0.8f, size.height*0.5f ), no page turn will be started---
   callbackTurnStarted.Reset();
@@ -629,31 +623,31 @@ int UtcDaliPageTurnLanscapeViewSignals(void)
   callbackPanStarted.Reset();
   callbackPanFinished.Reset();
   isTurningForwards = false;
-  start = stageSize*0.55f;
-  direction = Vector2(stageSize.x*0.025f, 0.f);
-  PerformGestureDiagonalSwipe( application, start, direction, 5, time, true, false);
-  DALI_TEST_CHECK( callbackPanStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_CHECK( !callbackPanFinished.mSignalVerified );
-
-  PerformGestureDiagonalSwipe( application, start+direction*5.f, direction, 5, time, false, true);
-  DALI_TEST_CHECK( !callbackTurnStarted.mSignalVerified );
-  DALI_TEST_CHECK( callbackPanFinished.mSignalVerified );
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-
-  Wait( application, 1000 );
-
-  DALI_TEST_CHECK( !callbackTurnFinished.mSignalVerified );
-  DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION );
+  start             = stageSize * 0.55f;
+  direction         = Vector2(stageSize.x * 0.025f, 0.f);
+  PerformGestureDiagonalSwipe(application, start, direction, 5, time, true, false);
+  DALI_TEST_CHECK(callbackPanStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_CHECK(!callbackPanFinished.mSignalVerified);
+
+  PerformGestureDiagonalSwipe(application, start + direction * 5.f, direction, 5, time, false, true);
+  DALI_TEST_CHECK(!callbackTurnStarted.mSignalVerified);
+  DALI_TEST_CHECK(callbackPanFinished.mSignalVerified);
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+
+  Wait(application, 1000);
+
+  DALI_TEST_CHECK(!callbackTurnFinished.mSignalVerified);
+  DALI_TEST_EQUALS(landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPageImageFactoryGetExtention(void)
 {
   ToolkitTestApplication application;
-  TestPageFactory factory;
-  DALI_TEST_CHECK( factory.GetExtension() == NULL );
+  TestPageFactory        factory;
+  DALI_TEST_CHECK(factory.GetExtension() == NULL);
   END_TEST;
 }
 
@@ -663,27 +657,26 @@ int UtcDaliPageTurnEmptyTextureHandle(void)
 
   tet_infoline(" UtcDaliPageTurnEmptyTextureHandle ");
 
-  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
+  application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE);
 
-  TestPageFactory factory( false /* returns empty handles */ );
-  Vector2 size = Stage::GetCurrent().GetSize();
+  TestPageFactory factory(false /* returns empty handles */);
+  Vector2         size = application.GetScene().GetSize();
   try
   {
-    PageTurnView portraitView = PageTurnPortraitView::New( factory, size );
-    portraitView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    Stage::GetCurrent().Add( portraitView );
+    PageTurnView portraitView = PageTurnPortraitView::New(factory, size);
+    portraitView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+    application.GetScene().Add(portraitView);
 
     tet_result(TET_FAIL);
   }
-  catch (DaliException& e)
+  catch(DaliException& e)
   {
-    DALI_TEST_ASSERT(e, "must pass in valid texture", TEST_LOCATION );
+    DALI_TEST_ASSERT(e, "must pass in valid texture", TEST_LOCATION);
   }
-  catch (...)
+  catch(...)
   {
     tet_result(TET_FAIL);
   }
 
   END_TEST;
 }
-