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-TransitionData.cpp;h=3476f89bd8ba47bc247bdaef00f9a78b5d35cc72;hp=81bf496737efd4db70fae5e0edd07065370f22f0;hb=c01b6a044893962dbc4ec47aeca60bf3b5d09766;hpb=c01f2590ed7bb00d9b3600511d08dc420261ed46 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TransitionData.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TransitionData.cpp index 81bf496..3476f89 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TransitionData.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TransitionData.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. @@ -237,7 +237,7 @@ int UtcDaliTransitionDataMap1P(void) actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); actor.SetProperty( Actor::Property::COLOR,Color::CYAN); - Stage::GetCurrent().Add(actor); + application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); @@ -305,7 +305,7 @@ int UtcDaliTransitionDataMap2P(void) actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); actor.SetProperty( Actor::Property::COLOR,Color::CYAN); - Stage::GetCurrent().Add(actor); + application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); @@ -373,7 +373,7 @@ int UtcDaliTransitionDataMap2Pb(void) actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); actor.SetProperty( Actor::Property::COLOR,Color::CYAN); - Stage::GetCurrent().Add(actor); + application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); @@ -444,7 +444,7 @@ int UtcDaliTransitionDataMap3P(void) DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); - Stage::GetCurrent().Add(actor); + application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); Animation anim = dummyImpl.CreateTransition( transition ); @@ -511,7 +511,7 @@ int UtcDaliTransitionDataMap4P(void) DummyControl actor = DummyControl::New(); actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); - Stage::GetCurrent().Add(actor); + application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); @@ -573,7 +573,7 @@ int UtcDaliTransitionDataMap5P(void) actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); actor.SetProperty( Actor::Property::COLOR,Color::CYAN); - Stage::GetCurrent().Add(actor); + application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); @@ -645,7 +645,7 @@ int UtcDaliTransitionDataMap6P(void) actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); actor.SetProperty( Actor::Property::COLOR,Color::CYAN); - Stage::GetCurrent().Add(actor); + application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); @@ -718,7 +718,7 @@ int UtcDaliTransitionDataMap1N(void) actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); actor.SetProperty( Actor::Property::COLOR,Color::CYAN); - Stage::GetCurrent().Add(actor); + application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); Animation anim = dummyImpl.CreateTransition( transition ); @@ -794,7 +794,7 @@ int UtcDaliTransitionDataMapN4(void) actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); actor.SetProperty( Actor::Property::COLOR,Color::CYAN); - Stage::GetCurrent().Add(actor); + application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); Property::Map visualMap; @@ -846,7 +846,7 @@ int UtcDaliTransitionDataMapN5(void) actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); actor.SetProperty( Actor::Property::COLOR,Color::CYAN); - Stage::GetCurrent().Add(actor); + application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); Property::Map visualMap; @@ -897,7 +897,7 @@ int UtcDaliTransitionDataMapN6(void) actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); actor.SetProperty( Actor::Property::COLOR,Color::CYAN); - Stage::GetCurrent().Add(actor); + application.GetScene().Add(actor); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation()); Property::Map visualMap; @@ -969,7 +969,7 @@ int UtcDaliTransitionDataArrayP(void) actor.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); actor.SetProperty( Dali::Actor::Property::NAME,"Actor1"); actor.SetProperty( Actor::Property::COLOR,Color::CYAN); - Stage::GetCurrent().Add(actor); + application.GetScene().Add(actor); DALI_TEST_EQUALS( actor.GetCurrentProperty< Quaternion >( Actor::Property::ORIENTATION ), Quaternion(Radian(0), Vector3::ZAXIS), TEST_LOCATION); DummyControlImpl& dummyImpl = static_cast(actor.GetImplementation());