X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ProgressBar.cpp;h=9e27978d8c635bb2739a77591a9a5157ee11b9f4;hb=946461ac1b49e996d9155c95130ec5aa1b08f77d;hp=d6f125d7600da8df2d8fe1735fbc985d23d7428c;hpb=160d5d7d3f87c50540f4083ac82458309a3a4610;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ProgressBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ProgressBar.cpp index d6f125d..9e27978 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ProgressBar.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ProgressBar.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -76,7 +76,7 @@ int UtcDaliProgressBarNew(void) DALI_TEST_CHECK( progressBar3 == progressBar2 ); //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; @@ -141,10 +141,10 @@ int UtcDaliProgressBarSignals(void) // Create the ProgressBar actor ProgressBar progressBar = ProgressBar::New(); - Stage::GetCurrent().Add( progressBar ); + application.GetScene().Add( progressBar ); progressBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); progressBar.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); - progressBar.SetProperty( Actor::Property::SIZE, Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) ); + progressBar.SetProperty( Actor::Property::SIZE, Vector2( application.GetScene().GetSize().x, 20.0f ) ); progressBar.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f )); progressBar.ValueChangedSignal().Connect( &OnProgressBarValueChanged ); @@ -174,10 +174,10 @@ int UtcDaliProgressBarSetPropertyP(void) ProgressBar progressBar = ProgressBar::New(); progressBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); progressBar.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); - progressBar.SetProperty( Actor::Property::SIZE, Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) ); + progressBar.SetProperty( Actor::Property::SIZE, Vector2( application.GetScene().GetSize().x, 20.0f ) ); progressBar.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f )); progressBar.ValueChangedSignal().Connect( &OnProgressBarValueChanged ); - Stage::GetCurrent().Add(progressBar); + application.GetScene().Add(progressBar); application.SendNotification(); application.Render(); @@ -321,11 +321,11 @@ int UtcDaliProgressBarSetPropertyP1(void) ProgressBar progressBar = ProgressBar::New(); progressBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); progressBar.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT); - progressBar.SetProperty( Actor::Property::SIZE, Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) ); + progressBar.SetProperty( Actor::Property::SIZE, Vector2( application.GetScene().GetSize().x, 20.0f ) ); progressBar.SetProperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f )); progressBar.ValueChangedSignal().Connect( &OnProgressBarValueChanged ); - Stage::GetCurrent().Add(progressBar); + application.GetScene().Add(progressBar); application.SendNotification(); application.Render(); @@ -414,8 +414,8 @@ int UtcDaliProgressBarSetPropertyP2(void) progressBar.SetProperty(ProgressBar::Property::SECONDARY_PROGRESS_VALUE, 0.3f); progressBar.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); - progressBar.SetProperty( Actor::Property::SIZE, Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) ); - Stage::GetCurrent().Add(progressBar); + progressBar.SetProperty( Actor::Property::SIZE, Vector2( application.GetScene().GetSize().x, 20.0f ) ); + application.GetScene().Add(progressBar); application.SendNotification(); application.Render(); @@ -438,8 +438,8 @@ int UtcDaliProgressBarSetPropertyP3(void) ProgressBar progressBar = ProgressBar::New(); progressBar.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT); progressBar.SetProperty( Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT); - progressBar.SetProperty( Actor::Property::SIZE, Vector2( Stage::GetCurrent().GetSize().x, Stage::GetCurrent().GetSize().y ) ); - Stage::GetCurrent().Add( progressBar ); + progressBar.SetProperty( Actor::Property::SIZE, Vector2( application.GetScene().GetSize().x, application.GetScene().GetSize().y ) ); + application.GetScene().Add( progressBar ); application.SendNotification(); application.Render();