projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fixed non-deterministic test case" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-VisualFactory.cpp
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
(file)
--- 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) );
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();
application.SendNotification();
application.Render();
-
DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
// renderer is added to actor
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 );
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();
application.SendNotification();
application.Render();
-
DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
// renderer is added to actor
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) );
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();
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
DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
// renderer is added to actor