X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-BubbleEmitter.cpp;h=1b15e74f7fc4d3fe9de0e8e23e9bacc452fc1ddc;hb=5aaba5adcf1a717e1ece3ef9c55c8912420993b5;hp=c4efcc34048659eefc7b2075450adba2165027b0;hpb=24ea337df1049251ab2e47c556edc6e8458f9c93;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp index c4efcc3..1b15e74 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp @@ -24,7 +24,6 @@ #include #include -#include #include #include @@ -199,9 +198,9 @@ int UtcDaliBubbleEmitterSetBubbleScale(void) DALI_TEST_CHECK(emitter); Actor root = emitter.GetRootActor(); Stage::GetCurrent().Add( root ); - root.SetPosition( Vector3::ZERO ); - root.SetParentOrigin( ParentOrigin::CENTER ); - root.SetAnchorPoint( AnchorPoint::CENTER ); + root.SetProperty( Actor::Property::POSITION, Vector3::ZERO ); + root.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + root.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); TestGlAbstraction& gl = application.GetGlAbstraction(); @@ -289,8 +288,8 @@ int UtcDaliBubbleEmitterEmitBubble(void) (bubbleRenderer.GetProperty(propertyIndex1)).Get( value1 ); DALI_TEST_EQUALS(value0, 0.f, TEST_LOCATION ); DALI_TEST_EQUALS(value1, 0.f, TEST_LOCATION ); - ( DevelHandle::GetCurrentProperty( bubbleRenderer, propertyIndex0 ) ).Get( value0 ); - ( DevelHandle::GetCurrentProperty( bubbleRenderer, propertyIndex0 ) ).Get( value1 ); + ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value0 ); + ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value1 ); DALI_TEST_EQUALS(value0, 0.f, TEST_LOCATION ); DALI_TEST_EQUALS(value1, 0.f, TEST_LOCATION ); @@ -299,14 +298,14 @@ int UtcDaliBubbleEmitterEmitBubble(void) Wait(application, 300); propertyIndex0 = bubbleRenderer.GetPropertyIndex( "uPercentage[0]" ); propertyIndex1 = bubbleRenderer.GetPropertyIndex( "uPercentage[1]" ); - ( DevelHandle::GetCurrentProperty( bubbleRenderer, propertyIndex0 ) ).Get( value0 ); - ( DevelHandle::GetCurrentProperty( bubbleRenderer, propertyIndex0 ) ).Get( value1 ); + ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value0 ); + ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value1 ); DALI_TEST_CHECK( value0 >= 0.6f ); DALI_TEST_CHECK( value1 >= 0.6f ); Wait(application,500); - ( DevelHandle::GetCurrentProperty( bubbleRenderer, propertyIndex0 ) ).Get( value0 ); - ( DevelHandle::GetCurrentProperty( bubbleRenderer, propertyIndex0 ) ).Get( value1 ); + ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value0 ); + ( bubbleRenderer.GetCurrentProperty( propertyIndex0 ) ).Get( value1 ); DALI_TEST_EQUALS(value0, 1.f, TEST_LOCATION ); DALI_TEST_EQUALS(value1, 1.f, TEST_LOCATION ); END_TEST; @@ -322,9 +321,9 @@ int UtcDaliBubbleEmitterRestore(void) BubbleEmitter emitter = BubbleEmitter::New( movementArea,shapeImage, 90, Vector2( 5.f, 10.f )); Actor root = emitter.GetRootActor(); Stage::GetCurrent().Add( root ); - root.SetPosition( Vector3::ZERO ); - root.SetParentOrigin( ParentOrigin::CENTER ); - root.SetAnchorPoint( AnchorPoint::CENTER ); + root.SetProperty( Actor::Property::POSITION, Vector3::ZERO ); + root.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + root.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); Renderer renderer = root.GetRendererAt( 0 ); DALI_TEST_CHECK( renderer );