X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-EffectsView.cpp;h=0c8a10b07e1c99803b5fa9b75a4d3e23826baf90;hb=8c98262c52c72d5767c4552bb3c294a1565aefaa;hp=15758d50af432fc797f53aa0bc439b73c8926267;hpb=24ea337df1049251ab2e47c556edc6e8458f9c93;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp index 15758d5..0c8a10b 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -110,7 +109,7 @@ int UtcDaliEffectsViewAddRemoveDropShadow(void) DALI_TEST_CHECK( !actor.OnStage() ); - view.SetParentOrigin(ParentOrigin::CENTER); + view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); view.SetSize(Stage::GetCurrent().GetSize()); view.Add(actor); Stage::GetCurrent().Add(view); @@ -156,7 +155,7 @@ int UtcDaliEffectsViewAddRemoveEmboss(void) actor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); DALI_TEST_CHECK( !actor.OnStage() ); - view.SetParentOrigin(ParentOrigin::CENTER); + view.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); view.Add(actor); view.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); @@ -360,7 +359,7 @@ int UtcDaliEffectsViewOffsetProperty(void) application.SendNotification(); application.Render(static_cast(durationSeconds*1000.0f) + 1u/*just beyond the animation duration*/); - value = DevelHandle::GetCurrentProperty( view, EffectsView::Property::EFFECT_OFFSET ); + value = view.GetCurrentProperty( EffectsView::Property::EFFECT_OFFSET ); value.Get(offsetValue); DALI_TEST_EQUALS( offsetValue, offsetAnimate, TEST_LOCATION ); @@ -395,7 +394,7 @@ int UtcDaliEffectsViewColorProperty(void) application.SendNotification(); application.Render(static_cast(durationSeconds*1000.0f) + 1u/*just beyond the animation duration*/); - value = DevelHandle::GetCurrentProperty( view, EffectsView::Property::EFFECT_COLOR ); + value = view.GetCurrentProperty( EffectsView::Property::EFFECT_COLOR ); value.Get(colorValue); DALI_TEST_EQUALS( colorValue, colorAnimate, TEST_LOCATION ); @@ -506,7 +505,7 @@ int UtcDaliEffectsViewSizeSet(void) stage.Add( view ); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( view.GetCurrentSize(), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION ); + DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION ); } { @@ -516,7 +515,7 @@ int UtcDaliEffectsViewSizeSet(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( view.GetCurrentSize(), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION ); + DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION ); } { @@ -530,7 +529,7 @@ int UtcDaliEffectsViewSizeSet(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( view.GetCurrentSize(), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION ); + DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION ); } END_TEST;