From 9dfa3d108e6d0da9a3c497890ad80ff90441c5ba Mon Sep 17 00:00:00 2001 From: David Steele Date: Fri, 6 Nov 2020 11:12:05 +0000 Subject: [PATCH] Fixed non-deterministic test case SVG now processes results from the rasterizing thread on both the event trigger and the core process events. In the test harness, this means that either application.SendNotification, or Test::WaitForEventThreadTrigger will complete the rasterizing task. Added comment to remind testers about this timing, and moved the test check prior to application.SendNotification. Change-Id: If2d4298cd38af4f2c3c298f6010f321becfbdaf1 --- automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp index ad0dc43..faae3fe 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp @@ -1131,9 +1131,9 @@ int UtcDaliVisualFactoryGetSvgVisual(void) application.GetScene().Add( actor ); visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f) ); + // Either application.SendNotification() or the trigger can now complete the task. application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); // renderer is added to actor @@ -1167,9 +1167,9 @@ int UtcDaliVisualFactoryGetSvgVisualLarge(void) dummyImpl.RegisterVisual( DummyControl::Property::TEST_VISUAL, visual ); application.GetScene().Add( actor ); + // Either application.SendNotification() or the trigger can now complete the task. application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); // renderer is added to actor @@ -1210,12 +1210,10 @@ int UtcDaliVisualFactoryGetSvgVisualAtlas(void) application.GetScene().Add( actor ); visual.SetTransformAndSize(DefaultTransform(), Vector2(200.f, 200.f) ); + // Either application.SendNotification() or the trigger can now complete the task. + DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); application.SendNotification(); application.Render(); - - // renderer is not added to actor until the rasterization is completed. - DALI_TEST_CHECK( actor.GetRendererCount() == 0u ); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); // renderer is added to actor -- 2.7.4