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=8a647e87a01c5c78451653c1264a9eea81ac9b20;hpb=c01f2590ed7bb00d9b3600511d08dc420261ed46

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp
index 9342992..db1b845 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) 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.
@@ -212,7 +212,7 @@ int UtcDaliPageTurnPortraitViewNew(void)
   DALI_TEST_CHECK( portraitView );
 
   //Additional check to ensure object is created by checking if it's registered
-  ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
+  ObjectRegistry registry = application.GetCore().GetObjectRegistry();
   DALI_TEST_CHECK( registry );
 
   gObjectCreatedCallBackCalled = false;
@@ -252,7 +252,7 @@ int UtcDaliPageTurnLandscapeViewNew(void)
   DALI_TEST_CHECK( landscapeView );
 
   //Additional check to ensure object is created by checking if it's registered
-  ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
+  ObjectRegistry registry = application.GetCore().GetObjectRegistry();
   DALI_TEST_CHECK( registry );
 
   gObjectCreatedCallBackCalled = false;
@@ -354,7 +354,7 @@ int UtcDaliPageTurnViewSetGetProperty(void)
   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  );
@@ -402,10 +402,10 @@ int UtcDaliPageTurnPortraitViewSignals(void)
   application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
 
   TestPageFactory factory;
-  Vector2 size = Stage::GetCurrent().GetSize();
+  Vector2 size = application.GetScene().GetSize();
   PageTurnView portraitView = PageTurnPortraitView::New( factory, size );
   portraitView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  Stage::GetCurrent().Add( portraitView );
+  application.GetScene().Add( portraitView );
 
   // Render and notify
   application.SendNotification();
@@ -540,10 +540,10 @@ int UtcDaliPageTurnLanscapeViewSignals(void)
    */
 
   TestPageFactory factory;
-  Vector2 stageSize = Stage::GetCurrent().GetSize();
+  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 );
-  Stage::GetCurrent().Add( landscapeView );
+  application.GetScene().Add( landscapeView );
 
   // Render and notify
   application.SendNotification();
@@ -666,12 +666,12 @@ int UtcDaliPageTurnEmptyTextureHandle(void)
   application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE );
 
   TestPageFactory factory( false /* returns empty handles */ );
-  Vector2 size = Stage::GetCurrent().GetSize();
+  Vector2 size = application.GetScene().GetSize();
   try
   {
     PageTurnView portraitView = PageTurnPortraitView::New( factory, size );
     portraitView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    Stage::GetCurrent().Add( portraitView );
+    application.GetScene().Add( portraitView );
 
     tet_result(TET_FAIL);
   }