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-AnimatedImageVisual.cpp;h=3d538cd25158c30e24ae1033168d259905bfab5a;hp=bb591ddc28e26dfbcaf04326a68e6af229d7acd1;hb=8c45458b64211285df3df591dfcb628126a1bc0e;hpb=f1577bfbe8f0f6e1df4267f0808b9e6c93810dff diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedImageVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedImageVisual.cpp index bb591dd..3d538cd 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedImageVisual.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedImageVisual.cpp @@ -107,7 +107,66 @@ int UtcDaliAnimatedImageVisualGetPropertyMap01(void) int UtcDaliAnimatedImageVisualGetPropertyMap02(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliAnimatedImageVisualGetPropertyMap for multi image" ); + tet_infoline( "UtcDaliAnimatedImageVisualGetPropertyMap for multi image with fixed cache" ); + + // request AnimatedImageVisual with a property map + VisualFactory factory = VisualFactory::Get(); + Property::Array urls; + CopyUrlsIntoArray( urls ); + + Visual::Base animatedImageVisual = factory.CreateVisual( + Property::Map() + .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE ) + .Add( "url", urls ) + .Add( "batchSize", 4 ) + .Add( "cacheSize", 20 ) + .Add( "loopCount", 10 ) + .Add( "frameDelay", 200 ) + .Add( "pixelArea", Vector4() ) + .Add( "wrapModeU", WrapMode::REPEAT ) + .Add( "wrapModeV", WrapMode::DEFAULT )); + + Property::Map resultMap; + animatedImageVisual.CreatePropertyMap( resultMap ); + // check the property values from the returned map from a visual + Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get() == Visual::ANIMATED_IMAGE ); + + value = resultMap.Find( ImageVisual::Property::URL, "url" ); + DALI_TEST_CHECK( value ); + Property::Array* resultUrls = value->GetArray(); + DALI_TEST_CHECK( resultUrls ); + DALI_TEST_EQUALS( resultUrls->Count(), urls.Count(), TEST_LOCATION ); + + value = resultMap.Find( ImageVisual::Property::BATCH_SIZE, "batchSize" ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get(), 4, TEST_LOCATION ); + + value = resultMap.Find( ImageVisual::Property::CACHE_SIZE, "cacheSize" ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get(), 20, TEST_LOCATION ); + + value = resultMap.Find( Toolkit::DevelImageVisual::Property::LOOP_COUNT, "loopCount" ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get(), 10, TEST_LOCATION ); + + value = resultMap.Find( ImageVisual::Property::FRAME_DELAY, "frameDelay" ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get(), 200, TEST_LOCATION ); + + value = resultMap.Find( Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, "totalFrameNumber" ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get(), 11, TEST_LOCATION ); + + END_TEST; +} + + +int UtcDaliAnimatedImageVisualGetPropertyMap03(void) +{ + ToolkitTestApplication application; + tet_infoline( "UtcDaliAnimatedImageVisualGetPropertyMap for multi image rolling cache" ); // request AnimatedImageVisual with a property map VisualFactory factory = VisualFactory::Get(); @@ -155,6 +214,113 @@ int UtcDaliAnimatedImageVisualGetPropertyMap02(void) DALI_TEST_CHECK( value ); DALI_TEST_EQUALS( value->Get(), 200, TEST_LOCATION ); + value = resultMap.Find( Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, "totalFrameNumber" ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get(), 11, TEST_LOCATION ); + + END_TEST; +} + +int UtcDaliAnimatedImageVisualGetPropertyMap04(void) +{ + ToolkitTestApplication application; + tet_infoline( "UtcDaliAnimatedImageVisualGetPropertyMap" ); + + // request AnimatedImageVisual with a property map + VisualFactory factory = VisualFactory::Get(); + Visual::Base animatedImageVisual = factory.CreateVisual( + Property::Map() + .Add( Toolkit::Visual::Property::TYPE, Visual::ANIMATED_IMAGE ) + .Add( ImageVisual::Property::URL, TEST_GIF_FILE_NAME ) + .Add( ImageVisual::Property::BATCH_SIZE, 1 ) + .Add( ImageVisual::Property::CACHE_SIZE, 1 ) + .Add( ImageVisual::Property::SYNCHRONOUS_LOADING, false )); + + Property::Map resultMap; + animatedImageVisual.CreatePropertyMap( resultMap ); + + // check the property values from the returned map from a visual + Property::Value* value = resultMap.Find( Toolkit::Visual::Property::TYPE, Property::INTEGER ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get() == Visual::ANIMATED_IMAGE ); + + value = resultMap.Find( ImageVisual::Property::URL, Property::STRING ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get() == TEST_GIF_FILE_NAME ); + + value = resultMap.Find( ImageVisual::Property::BATCH_SIZE, Property::INTEGER ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get() == 2 ); + + value = resultMap.Find( ImageVisual::Property::CACHE_SIZE, Property::INTEGER ); + DALI_TEST_CHECK( value ); + DALI_TEST_CHECK( value->Get() == 2 ); + + value = resultMap.Find( Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, "totalFrameNumber" ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get(), 4, TEST_LOCATION ); + + END_TEST; +} + + +int UtcDaliAnimatedImageVisualSynchronousLoading(void) +{ + ToolkitTestApplication application; + TestGlAbstraction& gl = application.GetGlAbstraction(); + + { + Property::Map propertyMap; + propertyMap.Insert(Visual::Property::TYPE, Visual::ANIMATED_IMAGE ); + propertyMap.Insert(ImageVisual::Property::URL, TEST_GIF_FILE_NAME ); + propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 2); + propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 2); + propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 20); + propertyMap.Insert( ImageVisual::Property::SYNCHRONOUS_LOADING, true); + + VisualFactory factory = VisualFactory::Get(); + Visual::Base visual = factory.CreateVisual( propertyMap ); + + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + + dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); + application.GetScene().Add( dummyControl ); + + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + application.SendNotification(); + application.Render(20); + + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); + + application.SendNotification(); + application.Render(); + + DALI_TEST_EQUALS( Test::GetTimerCount(), 1, TEST_LOCATION ); + DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 2, TEST_LOCATION ); + + DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::JUMP_TO, 3 ); + + application.SendNotification(); + application.Render(20); + + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); + + application.SendNotification(); + application.Render(); + + DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 3, TEST_LOCATION ); + + dummyControl.Unparent(); + } + tet_infoline("Test that removing the visual from stage deletes all textures"); + application.SendNotification(); + application.Render(16); + DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION ); + END_TEST; } @@ -183,7 +349,7 @@ int UtcDaliAnimatedImageVisualJumpToAction(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - Stage::GetCurrent().Add( dummyControl ); + application.GetScene().Add( dummyControl ); application.SendNotification(); application.Render(20); @@ -253,7 +419,7 @@ int UtcDaliAnimatedImageVisualStopBehavior(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - Stage::GetCurrent().Add( dummyControl ); + application.GetScene().Add( dummyControl ); application.SendNotification(); application.Render(20); @@ -293,7 +459,78 @@ int UtcDaliAnimatedImageVisualStopBehavior(void) } -int UtcDaliAnimatedImageVisualGif01(void) +int UtcDaliAnimatedImageVisualStopBehavior02(void) +{ + ToolkitTestApplication application; + TestGlAbstraction& gl = application.GetGlAbstraction(); + + Property::Array urls; + CopyUrlsIntoArray( urls ); + + { + Property::Map propertyMap; + propertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE ); + propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) ); + propertyMap.Insert( DevelImageVisual::Property::STOP_BEHAVIOR, DevelImageVisual::StopBehavior::LAST_FRAME); + propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 2); + propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 2); + propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 20); + + VisualFactory factory = VisualFactory::Get(); + Visual::Base visual = factory.CreateVisual( propertyMap ); + + // Expect that a batch of 4 textures has been requested. These will be serially loaded + // below. + + DummyControl dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); + dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + + dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); + application.GetScene().Add( dummyControl ); + + tet_infoline( "Ready the visual after the visual is on stage" ); + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); + + TraceCallStack& textureTrace = gl.GetTextureTrace(); + textureTrace.Enable(true); + + application.SendNotification(); + application.Render(20); + + DALI_TEST_EQUALS( gl.GetLastGenTextureId(), 2, TEST_LOCATION ); + + Test::EmitGlobalTimerSignal(); + + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + + application.SendNotification(); + application.Render(20); + + DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 2, TEST_LOCATION ); + + DevelControl::DoAction( dummyControl, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedImageVisual::Action::STOP, Property::Map() ); + + tet_infoline( "Ready the visual after the visual is on stage" ); + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); + + application.SendNotification(); + application.Render(20); + + DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 2, TEST_LOCATION ); + + dummyControl.Unparent(); + } + tet_infoline("Test that removing the visual from stage deletes all textures"); + application.SendNotification(); + application.Render(16); + DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION ); + + END_TEST; +} + + +int UtcDaliAnimatedImageVisualAnimatedImage01(void) { ToolkitTestApplication application; TestGlAbstraction& gl = application.GetGlAbstraction(); @@ -317,7 +554,13 @@ int UtcDaliAnimatedImageVisualGif01(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - Stage::GetCurrent().Add( dummyControl ); + application.GetScene().Add( dummyControl ); + + application.SendNotification(); + application.Render(); + + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); + application.SendNotification(); application.Render(20); @@ -331,6 +574,11 @@ int UtcDaliAnimatedImageVisualGif01(void) Test::EmitGlobalTimerSignal(); application.SendNotification(); + application.Render(); + + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); + + application.SendNotification(); application.Render(20); DALI_TEST_EQUALS( gl.GetLastGenTextureId(), 4, TEST_LOCATION ); @@ -373,7 +621,7 @@ int UtcDaliAnimatedImageVisualMultiImage01(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - Stage::GetCurrent().Add( dummyControl ); + application.GetScene().Add( dummyControl ); application.SendNotification(); application.Render(16); @@ -443,7 +691,7 @@ int UtcDaliAnimatedImageVisualMultiImage02(void) ToolkitTestApplication application; TestGlAbstraction& gl = application.GetGlAbstraction(); - tet_infoline( "Test that the animated visual still works with zero sized cache" ); + tet_infoline( "Test that the animated visual has different batch and cache size." ); { Property::Array urls; @@ -459,52 +707,123 @@ int UtcDaliAnimatedImageVisualMultiImage02(void) VisualFactory factory = VisualFactory::Get(); Visual::Base visual = factory.CreateVisual( propertyMap ); // TexMgr::Request load tId:0 - // Expect that each image is loaded each tick + // Check the batch size and cache size need to have minimum 2. + Property::Map resultMap; + visual.CreatePropertyMap( resultMap ); + Property::Value* value = resultMap.Find( ImageVisual::Property::BATCH_SIZE, "batchSize" ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get(), 2, TEST_LOCATION ); + value = resultMap.Find( ImageVisual::Property::CACHE_SIZE, "cacheSize" ); + DALI_TEST_CHECK( value ); + DALI_TEST_EQUALS( value->Get(), 2, TEST_LOCATION ); + visual.Reset(); + + // Batch size is 2 and cache size is 3 + propertyMap.Clear(); + propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE ); + propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) ); + propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 2); + propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 3); + propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 100); + + visual = factory.CreateVisual( propertyMap ); // TexMgr::Request load tId:0 + // Expect that each image is loaded each tick DummyControl dummyControl = DummyControl::New(true); - Impl::DummyControl& dummyImpl = static_cast(dummyControl.GetImplementation()); - dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + Impl::DummyControl& dummyImpl1 = static_cast(dummyControl.GetImplementation()); + dummyImpl1.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + visual.Reset(); dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - Stage::GetCurrent().Add( dummyControl ); + application.GetScene().Add( dummyControl ); application.SendNotification(); application.Render(16); - tet_infoline( "Ready the visual after the visual is on stage" ); + tet_infoline( "Ready the visual after the visual is on window" ); + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); + application.SendNotification(); + application.Render(16);//glGenTextures 1 and 2 + DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 2, TEST_LOCATION ); + + tet_infoline( "Test that each tick, a new image is requested" ); + Test::EmitGlobalTimerSignal(); // TexMgr::Remove tId:0 + application.SendNotification(); + application.Render(16); + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); + application.SendNotification(); + application.Render(16);//glGenTextures 3 + DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 3, TEST_LOCATION ); + + tet_infoline( "Test that each tick, a new image is requested" ); + Test::EmitGlobalTimerSignal(); // TexMgr::Remove tId:1 + application.SendNotification(); + application.Render(16); DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); application.SendNotification(); - application.Render(16);//glGenTextures 1 - DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 1, TEST_LOCATION ); + application.Render(16);//glGenTextures 4 + DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 3, TEST_LOCATION ); + + dummyImpl1.UnregisterVisual( DummyControl::Property::TEST_VISUAL ); + dummyControl.Unparent(); + + + // Batch size is 9 and cache size is 4 + propertyMap.Clear(); + propertyMap.Insert(Visual::Property::TYPE, Visual::IMAGE ); + propertyMap.Insert( ImageVisual::Property::URL, Property::Value(urls) ); + propertyMap.Insert( ImageVisual::Property::BATCH_SIZE, 3); + propertyMap.Insert( ImageVisual::Property::CACHE_SIZE, 7); + propertyMap.Insert( ImageVisual::Property::FRAME_DELAY, 100); + + visual = factory.CreateVisual( propertyMap ); // TexMgr::Request load tId:0 + + // Expect that each image is loaded each tick + dummyControl = DummyControl::New(true); + Impl::DummyControl& dummyImpl2 = static_cast(dummyControl.GetImplementation()); + dummyImpl2.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); + visual.Reset(); + + dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); + application.GetScene().Add( dummyControl ); + application.SendNotification(); + application.Render(16); + + tet_infoline( "Ready the visual after the visual is on window" ); + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION ); + application.SendNotification(); + application.Render(16);//glGenTextures 1, 2, and 3 + DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 3, TEST_LOCATION ); tet_infoline( "Test that each tick, a new image is requested" ); Test::EmitGlobalTimerSignal(); // TexMgr::Remove tId:0 application.SendNotification(); application.Render(16); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1, 10 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION ); application.SendNotification(); - application.Render(16);//glGenTextures 2 - DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 1, TEST_LOCATION ); + application.Render(16);//glGenTextures 4, 5, and 6 + DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 5, TEST_LOCATION ); tet_infoline( "Test that each tick, a new image is requested" ); - Test::EmitGlobalTimerSignal(); // Internal::~TextureSet() + Test::EmitGlobalTimerSignal(); // TexMgr::Remove tId:1 application.SendNotification(); - application.Render(16);//glDeleteTextures 2 - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1, 10 ), true, TEST_LOCATION ); + application.Render(16); + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION ); application.SendNotification(); - application.Render(16);//glGenTextures 3 - DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 1, TEST_LOCATION ); + application.Render(16);//glGenTextures 7, 1, and 2 + DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 7, TEST_LOCATION ); tet_infoline( "Test that each tick, a new image is requested" ); - Test::EmitGlobalTimerSignal(); + Test::EmitGlobalTimerSignal(); // TexMgr::Remove tId:2 application.SendNotification(); - application.Render(16);//glDeleteTextures 3 - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1, 10 ), true, TEST_LOCATION ); + application.Render(16); + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); application.SendNotification(); - application.Render(16);//Gen4 - DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 1, TEST_LOCATION ); + application.Render(16);//glGenTextures 3 + DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 7, TEST_LOCATION ); + dummyControl.Unparent(); } - tet_infoline("Test that removing the visual from stage deletes all textures"); + tet_infoline("Test that removing the visual from window deletes all textures"); application.SendNotification(); application.Render(16); DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 0, TEST_LOCATION ); @@ -545,7 +864,7 @@ int UtcDaliAnimatedImageVisualMultiImage03(void) Impl::DummyControl& dummyImpl1 = static_cast(dummyControl1.GetImplementation()); dummyImpl1.RegisterVisual( DummyControl::Property::TEST_VISUAL, animatedImageVisual1 ); dummyControl1.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - Stage::GetCurrent().Add( dummyControl1 ); + application.GetScene().Add( dummyControl1 ); application.SendNotification(); application.Render(16); @@ -561,7 +880,7 @@ int UtcDaliAnimatedImageVisualMultiImage03(void) Impl::DummyControl& dummyImpl2 = static_cast(dummyControl2.GetImplementation()); dummyImpl2.RegisterVisual( DummyControl::Property::TEST_VISUAL, animatedImageVisual2 ); dummyControl2.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - Stage::GetCurrent().Add( dummyControl2 ); + application.GetScene().Add( dummyControl2 ); application.SendNotification(); application.Render(16); @@ -622,7 +941,7 @@ int UtcDaliAnimatedImageVisualMultiImage04(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - Stage::GetCurrent().Add( dummyControl ); + application.GetScene().Add( dummyControl ); application.SendNotification(); application.Render(16); @@ -708,7 +1027,7 @@ int UtcDaliAnimatedImageVisualMultiImage05(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - Stage::GetCurrent().Add( dummyControl ); + application.GetScene().Add( dummyControl ); application.SendNotification(); application.Render(16); @@ -748,10 +1067,16 @@ void TestLoopCount( ToolkitTestApplication &application, DummyControl &dummyCont TraceCallStack& textureTrace = gl.GetTextureTrace(); textureTrace.Enable(true); - Stage::GetCurrent().Add( dummyControl ); + application.GetScene().Add( dummyControl ); + application.SendNotification(); application.Render(16); + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_INNER_LOCATION( location ) ); + + application.SendNotification(); + application.Render(); + tet_infoline( "Test that a timer has been created" ); DALI_TEST_EQUALS( Test::GetTimerCount(), 1, TEST_INNER_LOCATION( location ) ); @@ -767,10 +1092,15 @@ void TestLoopCount( ToolkitTestApplication &application, DummyControl &dummyCont Test::EmitGlobalTimerSignal(); application.SendNotification(); application.Render(16); - DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 1, TEST_INNER_LOCATION( location ) ); + + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_INNER_LOCATION( location ) ); + + application.SendNotification(); + application.Render(); + DALI_TEST_EQUALS( gl.GetNumGeneratedTextures(), 2, TEST_INNER_LOCATION( location ) ); DALI_TEST_EQUALS( Test::AreTimersRunning(), true, TEST_INNER_LOCATION( location ) ); } - tet_printf( "\nTest Loop %u \n", i ); + tet_printf( "Test Loop %u \n\n", i + 1u ); } tet_printf( "Test that after %u loops, and we have no frame. Timer should stop \n", loopCount ); @@ -808,6 +1138,12 @@ int UtcDaliAnimatedImageVisualLoopCount(void) TestLoopCount( application, dummyControl, 4, 0, TEST_LOCATION ); + dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL ); + animatedImageVisual.Reset(); + + application.SendNotification(); + application.Render(16); + // Test with no (1) loop count. Request AnimatedImageVisual with a property map animatedImageVisual = factory.CreateVisual( Property::Map() @@ -822,6 +1158,12 @@ int UtcDaliAnimatedImageVisualLoopCount(void) TestLoopCount( application, dummyControl, 4, 1, TEST_LOCATION ); + dummyImpl.UnregisterVisual( DummyControl::Property::TEST_VISUAL ); + animatedImageVisual.Reset(); + + application.SendNotification(); + application.Render(16); + // Test with no (100) loop count. Request AnimatedImageVisual with a property map animatedImageVisual = factory.CreateVisual( Property::Map() @@ -836,7 +1178,6 @@ int UtcDaliAnimatedImageVisualLoopCount(void) TestLoopCount( application, dummyControl, 4, 100, TEST_LOCATION ); } - END_TEST; } @@ -867,16 +1208,26 @@ int UtcDaliAnimatedImageVisualPlayback(void) dummyControl.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); textureTrace.Enable(true); - Stage::GetCurrent().Add( dummyControl ); + application.GetScene().Add( dummyControl ); application.SendNotification(); application.Render(16); + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); + + application.SendNotification(); + application.Render(); + tet_infoline( "Test that a timer has been created" ); DALI_TEST_EQUALS( Test::GetTimerCount(), 1, TEST_LOCATION ); Test::EmitGlobalTimerSignal(); application.SendNotification(); application.Render(16); + + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + + application.SendNotification(); + application.Render(); DALI_TEST_EQUALS( Test::AreTimersRunning(), true, TEST_LOCATION ); Property::Map attributes; @@ -892,6 +1243,11 @@ int UtcDaliAnimatedImageVisualPlayback(void) Test::EmitGlobalTimerSignal(); application.SendNotification(); application.Render(16); + + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + + application.SendNotification(); + application.Render(); DALI_TEST_EQUALS( Test::AreTimersRunning(), true, TEST_LOCATION ); tet_infoline( "Test Stop action. Timer should stop after Stop action" ); @@ -906,6 +1262,11 @@ int UtcDaliAnimatedImageVisualPlayback(void) Test::EmitGlobalTimerSignal(); application.SendNotification(); application.Render(16); + + DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + + application.SendNotification(); + application.Render(); DALI_TEST_EQUALS( Test::AreTimersRunning(), true, TEST_LOCATION ); dummyControl.Unparent();