Author: hdu
Date: Mon Sep 2 13:06:42 2013
New Revision: 1519425
URL: http://svn.apache.org/r1519425
Log:
#i123160# fix race-condition in fvt.gui.sd.shape.ShapeTypes
The two fvt.gui.sd.shape.ShapeTypes tests (for callout and star shapes)
often fail because the tests expects three items in the navigator as a
precondition. These three items are only shown there if filter->shapes
and then all-shapes has been selected.
There is a race condition: The click on filter->shapes fails when the
window-manager hasn't focussed the Navigator window. Then the precondition
that all shapes are selected fails.
Modified:
openoffice/trunk/test/testgui/source/fvt/gui/sd/shape/ShapeTypes.java
Modified: openoffice/trunk/test/testgui/source/fvt/gui/sd/shape/ShapeTypes.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/test/testgui/source/fvt/gui/sd/shape/ShapeTypes.java?rev=1519425&r1=1519424&r2=1519425&view=diff
==============================================================================
--- openoffice/trunk/test/testgui/source/fvt/gui/sd/shape/ShapeTypes.java
(original)
+++ openoffice/trunk/test/testgui/source/fvt/gui/sd/shape/ShapeTypes.java Mon
Sep 2 13:06:42 2013
@@ -78,6 +78,7 @@ public class ShapeTypes {
impress.focus();
//before insert CallOut Shape
sdNavigator.focus();
+ sdNavigator.waitForEnabled( 2.0, 0.1);
sdNavigatorShapeFilter.click();
typeKeys("<down><down>");
typeKeys("<enter>");
@@ -91,6 +92,7 @@ public class ShapeTypes {
impress.focus();
impress.drag(100, 100, 200, 200);
sdNavigatorDlg.focus();
+ sdNavigator.waitForEnabled( 2.0, 0.1);
sdNavigatorShapeFilter.click();
typeKeys("<down><down>");
typeKeys("<enter>");
@@ -112,6 +114,7 @@ public class ShapeTypes {
impress.focus();
//before insert CallOut Shape
sdNavigator.focus();
+ sdNavigator.waitForEnabled( 2.0, 0.1);
sdNavigatorShapeFilter.click();
typeKeys("<down><down>");
typeKeys("<enter>");
@@ -125,6 +128,7 @@ public class ShapeTypes {
impress.focus();
impress.drag(100, 100, 200, 200);
sdNavigatorDlg.focus();
+ sdNavigator.waitForEnabled( 2.0, 0.1);
sdNavigatorShapeFilter.click();
typeKeys("<down><down>");
typeKeys("<enter>");