X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-BloomView.cpp;h=2105c4adeadcd6dc7f863c51eb741d288be7979a;hb=a57d543cd372560a9065a31b32184a6a02d49e77;hp=b5a59420402a59cc19c342680803b7ede6403420;hpb=5b3cf0e6742934674bdf62bbe15af00e39eae566;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp index b5a5942..2105c4a 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp @@ -121,19 +121,19 @@ int UtcDaliBloomViewAddRemove(void) DALI_TEST_CHECK( view ); Actor actor = Actor::New(); - DALI_TEST_CHECK( !actor.OnStage() ); + DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) ); - view.SetParentOrigin(ParentOrigin::CENTER); - view.SetSize(Stage::GetCurrent().GetSize()); + view.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + view.SetProperty( Actor::Property::SIZE, application.GetScene().GetSize()); view.Add(actor); - Stage::GetCurrent().Add(view); + application.GetScene().Add(view); - DALI_TEST_CHECK( actor.OnStage() ); + DALI_TEST_CHECK( actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) ); view.Remove(actor); - DALI_TEST_CHECK( !actor.OnStage() ); + DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) ); END_TEST; } @@ -146,21 +146,21 @@ int UtcDaliBloomActivateDeactivate(void) Toolkit::BloomView view = Toolkit::BloomView::New(); DALI_TEST_CHECK( view ); - RenderTaskList taskList = Stage::GetCurrent().GetRenderTaskList(); + RenderTaskList taskList = application.GetScene().GetRenderTaskList(); DALI_TEST_CHECK( 1u == taskList.GetTaskCount() ); - view.SetParentOrigin(ParentOrigin::CENTER); - view.SetSize(Stage::GetCurrent().GetSize()); + view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); + view.SetProperty( Actor::Property::SIZE, application.GetScene().GetSize()); view.Add(Actor::New()); - Stage::GetCurrent().Add(view); + application.GetScene().Add(view); view.Activate(); - RenderTaskList taskList2 = Stage::GetCurrent().GetRenderTaskList(); + RenderTaskList taskList2 = application.GetScene().GetRenderTaskList(); DALI_TEST_CHECK( 1u != taskList2.GetTaskCount() ); view.Deactivate(); - RenderTaskList taskList3 = Stage::GetCurrent().GetRenderTaskList(); + RenderTaskList taskList3 = application.GetScene().GetRenderTaskList(); DALI_TEST_CHECK( 1u == taskList3.GetTaskCount() ); END_TEST; } @@ -209,18 +209,18 @@ int UtcDaliBloomOnSizeSet(void) BloomView view = Toolkit::BloomView::New(); - Stage::GetCurrent().Add( view ); + application.GetScene().Add( view ); application.SendNotification(); application.Render(); Vector3 size( 200.0f, 300.0f, 0.0f ); - view.SetSize( size ); + view.SetProperty( Actor::Property::SIZE, size ); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( view.GetCurrentSize(), size, TEST_LOCATION ); + DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), size, TEST_LOCATION ); END_TEST; }