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-AnimatedVectorImageVisual.cpp;h=2f918e19b0c3c41639fa8fb2ec5214232ceb55e6;hp=9f4ac8405fc9c569fd5f375521884966d7722d6c;hb=fdd8db51383b017e69fed8469cda07caf5f235ed;hpb=10caf1dca0d3b222b74ba3916a84474fbcf8834e diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp index 9f4ac84..2f918e1 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -74,7 +75,7 @@ int UtcDaliVisualFactoryGetAnimatedVectorImageVisual01(void) DummyControl actor = DummyControl::New( true ); DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() ); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - actor.SetSize( 200.0f, 200.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) ); Stage::GetCurrent().Add( actor ); application.SendNotification(); @@ -107,7 +108,7 @@ int UtcDaliVisualFactoryGetAnimatedVectorImageVisual02(void) DummyControl actor = DummyControl::New( true ); DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() ); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - actor.SetSize( 200.0f, 200.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) ); Stage::GetCurrent().Add( actor ); application.SendNotification(); @@ -146,7 +147,7 @@ int UtcDaliVisualFactoryGetAnimatedVectorImageVisual03(void) DummyControl actor = DummyControl::New( true ); DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() ); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - actor.SetSize( 200.0f, 200.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) ); Stage::GetCurrent().Add( actor ); application.SendNotification(); @@ -187,7 +188,7 @@ int UtcDaliVisualFactoryGetAnimatedVectorImageVisual04(void) DummyControl actor = DummyControl::New( true ); DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() ); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - actor.SetSize( 200.0f, 200.0f ); + actor.SetProperty( Actor::Property::SIZE, Vector2( 200.0f, 200.0f ) ); Stage::GetCurrent().Add( actor ); application.SendNotification(); @@ -258,7 +259,7 @@ int UtcDaliAnimatedVectorImageVisualGetPropertyMap01(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); Vector2 controlSize( 20.f, 30.f ); - actor.SetSize( controlSize ); + actor.SetProperty( Actor::Property::SIZE, controlSize ); Stage::GetCurrent().Add( actor ); @@ -346,8 +347,6 @@ int UtcDaliAnimatedVectorImageVisualPlayback(void) application.SendNotification(); application.Render( 16 ); - std::this_thread::sleep_for( std::chrono::milliseconds( 100 ) ); // wait for one animation loop (16fps, 5frames, need 80ms) - Property::Map map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL ); Property::Value* value = map.Find( DevelImageVisual::Property::PLAY_STATE ); DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::PLAYING ); @@ -358,8 +357,6 @@ int UtcDaliAnimatedVectorImageVisualPlayback(void) application.SendNotification(); application.Render(16); - std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) ); // wait for next rasterize thread run - map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL ); value = map.Find( DevelImageVisual::Property::PLAY_STATE ); DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::PAUSED ); @@ -412,7 +409,7 @@ int UtcDaliAnimatedVectorImageVisualPlayback(void) map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL ); value = map.Find( DevelImageVisual::Property::PLAY_STATE ); - DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::PAUSED ); + DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::STOPPED ); tet_infoline( "On stage again" ); Stage::GetCurrent().Add( dummyControl ); @@ -422,7 +419,7 @@ int UtcDaliAnimatedVectorImageVisualPlayback(void) map = dummyControl.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL ); value = map.Find( DevelImageVisual::Property::PLAY_STATE ); - DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::PAUSED ); + DALI_TEST_CHECK( value->Get< int >() == DevelImageVisual::PlayState::STOPPED ); tet_infoline( "Test Play action" ); DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes ); @@ -436,7 +433,7 @@ int UtcDaliAnimatedVectorImageVisualPlayback(void) // Change Size Vector3 newSize( 100.0f, 100.0f, 0.0f ); - dummyControl.SetSize( newSize ); + dummyControl.SetProperty( Actor::Property::SIZE, newSize ); application.SendNotification(); application.Render(16); @@ -475,8 +472,8 @@ int UtcDaliAnimatedVectorImageVisualCustomShader(void) Impl::DummyControl& dummyImpl = static_cast< Impl::DummyControl& >( dummy.GetImplementation() ); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); - dummy.SetSize( 200.f, 200.f ); - dummy.SetParentOrigin( ParentOrigin::CENTER ); + dummy.SetProperty( Actor::Property::SIZE, Vector2( 200.f, 200.f ) ); + dummy.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); Stage::GetCurrent().Add( dummy ); application.SendNotification(); @@ -525,7 +522,7 @@ int UtcDaliAnimatedVectorImageVisualNaturalSize(void) DALI_TEST_EQUALS( naturalSize, Vector2( 100.0f, 100.0f ), TEST_LOCATION ); // 100x100 is the content default size. - actor.SetSize( controlSize ); + actor.SetProperty( Actor::Property::SIZE, controlSize ); application.SendNotification(); application.Render(); @@ -555,7 +552,7 @@ int UtcDaliAnimatedVectorImageVisualLoopCount(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); Vector2 controlSize( 20.f, 30.f ); - actor.SetSize( controlSize ); + actor.SetProperty( Actor::Property::SIZE, controlSize ); Stage::GetCurrent().Add( actor ); @@ -565,7 +562,7 @@ int UtcDaliAnimatedVectorImageVisualLoopCount(void) application.SendNotification(); application.Render(); - // Trigger count is 1 - animation finished + // Trigger count is 1 - render a frame DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); // renderer is added to actor @@ -599,7 +596,7 @@ int UtcDaliAnimatedVectorImageVisualPlayRange(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); Vector2 controlSize( 20.f, 30.f ); - actor.SetSize( controlSize ); + actor.SetProperty( Actor::Property::SIZE, controlSize ); Stage::GetCurrent().Add( actor ); @@ -609,6 +606,8 @@ int UtcDaliAnimatedVectorImageVisualPlayRange(void) application.SendNotification(); application.Render(); + std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) ); // wait for next rasterize thread run + // renderer is added to actor DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); Renderer renderer = actor.GetRendererAt( 0u ); @@ -637,6 +636,8 @@ int UtcDaliAnimatedVectorImageVisualPlayRange(void) application.SendNotification(); application.Render(); + std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) ); // wait for next rasterize thread run + map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL ); value = map.Find( DevelImageVisual::Property::PLAY_RANGE ); @@ -657,6 +658,8 @@ int UtcDaliAnimatedVectorImageVisualPlayRange(void) application.SendNotification(); application.Render(); + std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) ); // wait for next rasterize thread run + map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL ); value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER ); DALI_TEST_EQUALS( value->Get< int >(), 3, TEST_LOCATION ); @@ -688,6 +691,106 @@ int UtcDaliAnimatedVectorImageVisualPlayRange(void) END_TEST; } +int UtcDaliAnimatedVectorImageVisualPlayRangeMarker(void) +{ + ToolkitTestApplication application; + tet_infoline( "UtcDaliAnimatedVectorImageVisualPlayRangeMarker" ); + + Property::Array array; + array.PushBack( VECTOR_ANIMATION_MARKER_NAME_1 ); + + Property::Map propertyMap; + propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE ) + .Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME ) + .Add( DevelImageVisual::Property::PLAY_RANGE, array ); + + Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap ); + DALI_TEST_CHECK( visual ); + + DummyControl actor = DummyControl::New( true ); + DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() ); + dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + + Vector2 controlSize( 20.f, 30.f ); + actor.SetProperty( Actor::Property::SIZE, controlSize ); + + Stage::GetCurrent().Add( actor ); + + Property::Map attributes; + DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes ); + + application.SendNotification(); + application.Render(); + + std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) ); // wait for next rasterize thread run + + // renderer is added to actor + DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); + Renderer renderer = actor.GetRendererAt( 0u ); + DALI_TEST_CHECK( renderer ); + + Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL ); + Property::Value* value = map.Find( DevelImageVisual::Property::PLAY_RANGE ); + + int resultStartFrame, resultEndFrame; + Property::Array* result = value->GetArray(); + result->GetElementAt( 0 ).Get( resultStartFrame ); + result->GetElementAt( 1 ).Get( resultEndFrame ); + + DALI_TEST_EQUALS( VECTOR_ANIMATION_MARKER_START_FRAME_1, resultStartFrame, TEST_LOCATION ); + DALI_TEST_EQUALS( VECTOR_ANIMATION_MARKER_END_FRAME_1, resultEndFrame, TEST_LOCATION ); + + // Set 2 markers + array.Clear(); + array.PushBack( VECTOR_ANIMATION_MARKER_NAME_1 ); + array.PushBack( VECTOR_ANIMATION_MARKER_NAME_2 ); + + attributes.Clear(); + attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array ); + DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes ); + + application.SendNotification(); + application.Render(); + + std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) ); // wait for next rasterize thread run + + map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL ); + value = map.Find( DevelImageVisual::Property::PLAY_RANGE ); + + result = value->GetArray(); + result->GetElementAt( 0 ).Get( resultStartFrame ); + result->GetElementAt( 1 ).Get( resultEndFrame ); + + DALI_TEST_EQUALS( VECTOR_ANIMATION_MARKER_START_FRAME_1, resultStartFrame, TEST_LOCATION ); + DALI_TEST_EQUALS( VECTOR_ANIMATION_MARKER_END_FRAME_2, resultEndFrame, TEST_LOCATION ); + + // Set invalid play range + array.Clear(); + array.PushBack( 1 ); + array.PushBack( VECTOR_ANIMATION_MARKER_NAME_1 ); + + attributes.Clear(); + attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array ); + DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes ); + + application.SendNotification(); + application.Render(); + + std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) ); // wait for next rasterize thread run + + map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL ); + value = map.Find( DevelImageVisual::Property::PLAY_RANGE ); + + result = value->GetArray(); + result->GetElementAt( 0 ).Get( resultStartFrame ); + result->GetElementAt( 1 ).Get( resultEndFrame ); + + DALI_TEST_EQUALS( VECTOR_ANIMATION_MARKER_START_FRAME_1, resultStartFrame, TEST_LOCATION ); // Should not be changed + DALI_TEST_EQUALS( VECTOR_ANIMATION_MARKER_END_FRAME_2, resultEndFrame, TEST_LOCATION ); + + END_TEST; +} + int UtcDaliAnimatedVectorImageVisualAnimationFinishedSignal(void) { ToolkitTestApplication application; @@ -708,7 +811,7 @@ int UtcDaliAnimatedVectorImageVisualAnimationFinishedSignal(void) DevelControl::VisualEventSignal( actor ).Connect( &VisualEventSignal ); Vector2 controlSize( 20.f, 30.f ); - actor.SetSize( controlSize ); + actor.SetProperty( Actor::Property::SIZE, controlSize ); Stage::GetCurrent().Add( actor ); @@ -719,7 +822,7 @@ int UtcDaliAnimatedVectorImageVisualAnimationFinishedSignal(void) application.Render(); // Wait for animation finish - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL ); Property::Value* value = map.Find( DevelImageVisual::Property::PLAY_STATE ); @@ -742,12 +845,14 @@ int UtcDaliAnimatedVectorImageVisualJumpTo(void) Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap ); DALI_TEST_CHECK( visual ); + tet_printf( "1. Visual is created.\n" ); + DummyControl actor = DummyControl::New( true ); DummyControlImpl& dummyImpl = static_cast< DummyControlImpl& >( actor.GetImplementation() ); dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); Vector2 controlSize( 20.f, 30.f ); - actor.SetSize( controlSize ); + actor.SetProperty( Actor::Property::SIZE, controlSize ); Stage::GetCurrent().Add( actor ); @@ -763,6 +868,8 @@ int UtcDaliAnimatedVectorImageVisualJumpTo(void) Property::Value* value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER ); DALI_TEST_EQUALS( value->Get< int >(), 2, TEST_LOCATION ); + tet_printf( "2. The current frame number is [%d].\n", value->Get< int >() ); + Property::Array array; array.PushBack( 0 ); array.PushBack( 2 ); @@ -780,6 +887,8 @@ int UtcDaliAnimatedVectorImageVisualJumpTo(void) value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER ); DALI_TEST_EQUALS( value->Get< int >(), 2, TEST_LOCATION ); + tet_printf( "3. The current frame number is [%d].\n", value->Get< int >() ); + // Change play range attributes.Clear(); array.Clear(); @@ -804,10 +913,14 @@ int UtcDaliAnimatedVectorImageVisualJumpTo(void) application.SendNotification(); application.Render(); + std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) ); // wait for next rasterize thread run + map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL ); value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER ); DALI_TEST_EQUALS( value->Get< int >(), 3, TEST_LOCATION ); + tet_printf( "4. The current frame number is [%d].\n", value->Get< int >() ); + // Jump to the same position DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3 ); @@ -818,13 +931,15 @@ int UtcDaliAnimatedVectorImageVisualJumpTo(void) value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER ); DALI_TEST_EQUALS( value->Get< int >(), 3, TEST_LOCATION ); + tet_printf( "5. The current frame number is [%d].\n", value->Get< int >() ); + END_TEST; } int UtcDaliAnimatedVectorImageVisualUpdateProperty(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliAnimatedVectorImageVisualJumpToCurrentProgress" ); + tet_infoline( "UtcDaliAnimatedVectorImageVisualUpdateProperty" ); int startFrame = 1, endFrame = 3; Property::Array playRange; @@ -845,13 +960,15 @@ int UtcDaliAnimatedVectorImageVisualUpdateProperty(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); Vector2 controlSize( 20.f, 30.f ); - actor.SetSize( controlSize ); + actor.SetProperty( Actor::Property::SIZE, controlSize ); Stage::GetCurrent().Add( actor ); application.SendNotification(); application.Render(); + std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) ); // wait for next rasterize thread run + Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL ); Property::Value* value = map.Find( DevelImageVisual::Property::LOOP_COUNT ); DALI_TEST_EQUALS( value->Get< int >(), 3, TEST_LOCATION ); @@ -878,6 +995,8 @@ int UtcDaliAnimatedVectorImageVisualUpdateProperty(void) application.SendNotification(); application.Render(); + std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) ); // wait for next rasterize thread run + map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL ); value = map.Find( DevelImageVisual::Property::LOOP_COUNT ); DALI_TEST_EQUALS( value->Get< int >(), 5, TEST_LOCATION ); @@ -902,6 +1021,8 @@ int UtcDaliAnimatedVectorImageVisualUpdateProperty(void) application.SendNotification(); application.Render(); + std::this_thread::sleep_for( std::chrono::milliseconds( 20 ) ); // wait for next rasterize thread run + map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL ); value = map.Find( DevelImageVisual::Property::PLAY_RANGE ); @@ -951,7 +1072,7 @@ int UtcDaliAnimatedVectorImageVisualStopBehavior(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); Vector2 controlSize( 20.f, 30.f ); - actor.SetSize( controlSize ); + actor.SetProperty( Actor::Property::SIZE, controlSize ); Stage::GetCurrent().Add( actor ); @@ -962,7 +1083,7 @@ int UtcDaliAnimatedVectorImageVisualStopBehavior(void) application.Render(); // Trigger count is 1 - animation finished - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL ); Property::Value* value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER ); @@ -1046,7 +1167,7 @@ int UtcDaliAnimatedVectorImageVisualLoopingMode(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); Vector2 controlSize( 20.f, 30.f ); - actor.SetSize( controlSize ); + actor.SetProperty( Actor::Property::SIZE, controlSize ); Stage::GetCurrent().Add( actor ); @@ -1057,7 +1178,7 @@ int UtcDaliAnimatedVectorImageVisualLoopingMode(void) application.Render(); // Trigger count is 1 - animation finished - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL ); Property::Value* value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER ); @@ -1123,8 +1244,8 @@ int UtcDaliAnimatedVectorImageVisualPropertyNotification(void) Vector2 controlSize( 20.f, 30.f ); Vector3 controlScale( 2.0f, 2.0f, 1.0f ); - actor.SetSize( controlSize ); - actor.SetScale( controlScale ); + actor.SetProperty( Actor::Property::SIZE, controlSize ); + actor.SetProperty( Actor::Property::SCALE, controlScale ); Stage::GetCurrent().Add( actor ); @@ -1146,8 +1267,8 @@ int UtcDaliAnimatedVectorImageVisualPropertyNotification(void) // Change scale and size controlSize = Vector2( 50.f, 40.f ); controlScale= Vector3( 0.5f, 0.5f, 1.0f ); - actor.SetSize( controlSize ); - actor.SetScale( controlScale ); + actor.SetProperty( Actor::Property::SIZE, controlSize ); + actor.SetProperty( Actor::Property::SCALE, controlScale ); application.SendNotification(); application.Render(); @@ -1184,7 +1305,7 @@ int UtcDaliAnimatedVectorImageVisualMultipleInstances(void) dummyImpl1.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual1 ); Vector2 controlSize( 20.f, 30.f ); - actor1.SetSize( controlSize ); + actor1.SetProperty( Actor::Property::SIZE, controlSize ); Stage::GetCurrent().Add( actor1 ); @@ -1199,7 +1320,7 @@ int UtcDaliAnimatedVectorImageVisualMultipleInstances(void) DummyControlImpl& dummyImpl2 = static_cast< DummyControlImpl& >( actor2.GetImplementation() ); dummyImpl2.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual2 ); - actor2.SetSize( controlSize ); + actor2.SetProperty( Actor::Property::SIZE, controlSize ); Stage::GetCurrent().Add( actor2 ); @@ -1248,7 +1369,7 @@ int UtcDaliAnimatedVectorImageVisualControlVisibilityChanged(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); Vector2 controlSize( 20.f, 30.f ); - actor.SetSize( controlSize ); + actor.SetProperty( Actor::Property::SIZE, controlSize ); Stage::GetCurrent().Add( actor ); @@ -1258,13 +1379,16 @@ int UtcDaliAnimatedVectorImageVisualControlVisibilityChanged(void) Property::Map attributes; DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes ); + application.SendNotification(); + application.Render(); + // Check rendering behavior DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); Renderer renderer = actor.GetRendererAt( 0u ); DALI_TEST_CHECK( renderer ); DALI_TEST_CHECK( renderer.GetProperty< int >( DevelRenderer::Property::RENDERING_BEHAVIOR ) == DevelRenderer::Rendering::CONTINUOUSLY ); - actor.SetVisible( false ); + actor.SetProperty( Actor::Property::VISIBLE, false ); application.SendNotification(); application.Render(); @@ -1292,7 +1416,7 @@ int UtcDaliAnimatedVectorImageVisualWindowVisibilityChanged(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); Vector2 controlSize( 20.f, 30.f ); - actor.SetSize( controlSize ); + actor.SetProperty( Actor::Property::SIZE, controlSize ); Stage::GetCurrent().Add( actor ); @@ -1302,6 +1426,9 @@ int UtcDaliAnimatedVectorImageVisualWindowVisibilityChanged(void) Property::Map attributes; DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::PLAY, attributes ); + application.SendNotification(); + application.Render(); + // Check rendering behavior DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); Renderer renderer = actor.GetRendererAt( 0u );