You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cf...@apache.org on 2012/10/03 22:22:36 UTC

svn commit: r1393742 - in /incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid: DataGrid_HaloSkin/Bugs/ DataGrid_HaloSkin/Properties/ DataGrid_SparkSkin/Properties/ DataGrid_SparkSkin/Styles/ DataGrid_WireframeSkin/Styles/

Author: cframpton
Date: Wed Oct  3 20:22:35 2012
New Revision: 1393742

URL: http://svn.apache.org/viewvc?rev=1393742&view=rev
Log:
Remove/replace some more <Pause> tags.

Modified:
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Bugs/Datagrid_Bug_ResizeHDBox_halo.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Bugs/Datagrid_Bug_Styles_halo.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/datagrid_properties_halo.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/datagrid_properties_listbase_halo.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/datagrid_properties_lockedRowCount_halo.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_listbase.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_lockedRowCount.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Styles/datagrid_styles_mirroring.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_WireframeSkin/Styles/datagrid_styles_mirroring_wireframe.mxml

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Bugs/Datagrid_Bug_ResizeHDBox_halo.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Bugs/Datagrid_Bug_ResizeHDBox_halo.mxml?rev=1393742&r1=1393741&r2=1393742&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Bugs/Datagrid_Bug_ResizeHDBox_halo.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Bugs/Datagrid_Bug_ResizeHDBox_halo.mxml Wed Oct  3 20:22:35 2012
@@ -91,7 +91,8 @@
 				<DispatchMouseEvent target="HDBox" type="mouseMove" stageX="280" stageY="160" waitEvent="mouseMove" waitTarget="HDBox"/>
 				<DispatchMouseEvent target="HDBox" type="mouseUp" stageX="280" stageY="160" />
 				<DispatchMouseClickEvent target="HDBox" localX="280" localY="160" />
-				<Pause timeout="200"/>
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
 				<CompareBitmap target="HDBox" url="../Bugs/baselines/Bug_144334_ResizeHDBox_Sort.png" timeout="5000" numColorVariances="5" ignoreMaxColorVariance="true"/>
 		        </body>
 	        </TestCase>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Bugs/Datagrid_Bug_Styles_halo.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Bugs/Datagrid_Bug_Styles_halo.mxml?rev=1393742&r1=1393741&r2=1393742&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Bugs/Datagrid_Bug_Styles_halo.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Bugs/Datagrid_Bug_Styles_halo.mxml Wed Oct  3 20:22:35 2012
@@ -101,7 +101,8 @@
 			</setup>
 			<body>
 				<DispatchMouseClickEvent target="dg1" localX="46" localY="72" waitEvent="mouseUp" waitTarget="dg1"/>
-				<Pause timeout="200"/>
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
 				<CompareBitmap target="dg1" url="../Bugs/baselines/Bug_139322_textSelectedColor.png" timeout="5000" numColorVariances="2" ignoreMaxColorVariance="true"/>
 		        </body> 
 	        </TestCase>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/datagrid_properties_halo.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/datagrid_properties_halo.mxml?rev=1393742&r1=1393741&r2=1393742&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/datagrid_properties_halo.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/datagrid_properties_halo.mxml Wed Oct  3 20:22:35 2012
@@ -188,7 +188,8 @@
                 <DispatchMouseEvent target="mydatagrid" type="mouseMove" buttonDown="true" localX="112" localY="14"/>
                 <DispatchMouseEvent target="mydatagrid" type="mouseMove" buttonDown="true" localX="87" localY="14"/>
                 <DispatchMouseEvent target="mydatagrid" type="mouseUp" buttonDown="true" localX="87" localY="14"/>
-                <Pause timeout="100"/>
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
                 <CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"  target="mydatagrid" url="../Properties/Baselines/datagrid_draggablecolumns_state2.png"/>
             </body>
         </TestCase>
@@ -206,7 +207,8 @@
                 <DispatchMouseEvent target="mydatagrid" type="mouseMove" buttonDown="true" localX="112" localY="14"/>
                 <DispatchMouseEvent target="mydatagrid" type="mouseMove" buttonDown="true" localX="87" localY="14"/>
                 <DispatchMouseEvent target="mydatagrid" type="mouseUp" buttonDown="true" localX="87" localY="14"/>
-                <Pause timeout="100"/>
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
                 <CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"  target="mydatagrid" url="../Properties/Baselines/datagrid_draggablecolumns_false_state2.png"/>
             </body>
         </TestCase>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/datagrid_properties_listbase_halo.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/datagrid_properties_listbase_halo.mxml?rev=1393742&r1=1393741&r2=1393742&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/datagrid_properties_listbase_halo.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/datagrid_properties_listbase_halo.mxml Wed Oct  3 20:22:35 2012
@@ -256,7 +256,8 @@
                 <RunCode code="setItemRenderer()"/>          
             </setup>
             <body>
-                <Pause timeout="100"/>
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
                 <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_itemrenderer.png"/>        
             </body>
         </TestCase>
@@ -268,7 +269,8 @@
                 <RunCode code="setLabelFunction()"/>          
             </setup>
             <body>
-                <Pause timeout="100"/>
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
                 <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_labelfunc.png"/>        
             </body>
         </TestCase>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/datagrid_properties_lockedRowCount_halo.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/datagrid_properties_lockedRowCount_halo.mxml?rev=1393742&r1=1393741&r2=1393742&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/datagrid_properties_lockedRowCount_halo.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/datagrid_properties_lockedRowCount_halo.mxml Wed Oct  3 20:22:35 2012
@@ -124,7 +124,7 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedRows.listItems.2.0" localX="2" localY="0" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedRows.listItems.2.0" localX="2" localY="10" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseUp" target="dg1.mx_internal:dataGridLockedRows.listItems.2.0" localX="2" localY="30" />
-                <Pause timeout="500" />
+                <WaitForLayoutManager />
                 <CompareBitmap target="dg1" url="../Properties/Baselines/lockedRowCount_config1_dragDropInLockedRowArea_dropComplete.png" numColorVariances="4" ignoreMaxColorVariance="true"/>
             </body>
             <cleanup>
@@ -190,7 +190,7 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:rendererArray.3.0" localX="2" localY="0" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:rendererArray.3.0" localX="2" localY="10" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseUp" target="dg1.mx_internal:rendererArray.3.0" localX="2" localY="0" />
-                <Pause timeout="500" />
+                <WaitForLayoutManager />
                 <CompareBitmap target="dg1" url="../Properties/Baselines/lockedRowCount_config1_dragDropInUnlockedRowArea_dropComplete.png" />
             </body>
             <cleanup>
@@ -228,7 +228,7 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:rendererArray.2.0" localX="2" localY="0" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:rendererArray.2.0" localX="2" localY="10" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseUp" target="dg1.mx_internal:rendererArray.2.0" localX="2" localY="0" />
-                <Pause timeout="500" />
+                <WaitForLayoutManager />
                 <CompareBitmap target="dg1" url="../Properties/Baselines/lockedRowCount_config1_dragDropLockedToUnlockedRow.png" />
             </body>
             <cleanup>
@@ -268,7 +268,7 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedRows.listItems.1.0" localX="2" localY="10" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedRows.listItems.1.0" localX="2" localY="0" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseUp" target="dg1.mx_internal:dataGridLockedRows.listItems.1.0" localX="2" localY="2" />
-                <Pause timeout="500" />
+                <WaitForLayoutManager />
                 <CompareBitmap target="dg1" url="../Properties/Baselines/lockedRowCount_config1_dragDropUnlockedToLockedRowArea.png" numColorVariances="4" ignoreMaxColorVariance="true"/>
             </body>
             <cleanup>
@@ -343,7 +343,7 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedRows.listItems.2.0" localX="2" localY="0" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedRows.listItems.2.0" localX="2" localY="10" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseUp" target="dg1.mx_internal:dataGridLockedRows.listItems.2.0" localX="2" localY="30" />
-                <Pause timeout="500" />
+                <WaitForLayoutManager />
                 <CompareBitmap target="dg1" url="../Properties/Baselines/lockedRowCount_config2_dragDropInLockedRowArea_dropComplete.png" numColorVariances="4" ignoreMaxColorVariance="true" />
             </body>
             <cleanup>
@@ -411,7 +411,7 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:rendererArray.3.0" localX="2" localY="0" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:rendererArray.3.0" localX="2" localY="10" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseUp" target="dg1.mx_internal:rendererArray.3.0" localX="2" localY="0" />
-                <Pause timeout="500" />
+                <WaitForLayoutManager />
                 <CompareBitmap target="dg1" url="../Properties/Baselines/lockedRowCount_config2_dragDropInUnlockedRowArea_dropComplete.png" />
             </body>
             <cleanup>
@@ -450,7 +450,7 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:rendererArray.2.0" localX="2" localY="0" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:rendererArray.2.0" localX="2" localY="10" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseUp" target="dg1.mx_internal:rendererArray.2.0" localX="2" localY="0" />
-                <Pause timeout="500" />
+                <WaitForLayoutManager />
                 <CompareBitmap target="dg1" url="../Properties/Baselines/lockedRowCount_config2_dragDropLockedToUnlockedRow.png" numColorVariances="4" ignoreMaxColorVariance="true"/>
             </body>
             <cleanup>
@@ -491,7 +491,7 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedRows.listItems.1.0" localX="2" localY="10" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedRows.listItems.1.0" localX="2" localY="0" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseUp" target="dg1.mx_internal:dataGridLockedRows.listItems.1.0" localX="2" localY="2" />
-                <Pause timeout="500" />
+                <WaitForLayoutManager />
                 <CompareBitmap target="dg1" url="../Properties/Baselines/lockedRowCount_config2_dragDropUnlockedToLockedRowArea.png" numColorVariances="4" ignoreMaxColorVariance="true"/>
             </body>
             <cleanup>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_listbase.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_listbase.mxml?rev=1393742&r1=1393741&r2=1393742&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_listbase.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_listbase.mxml Wed Oct  3 20:22:35 2012
@@ -256,7 +256,8 @@
                 <RunCode code="setItemRenderer()"/>          
             </setup>
             <body>
-                <Pause timeout="100"/>
+                <WaitForEffectsToEnd />
+                <WaitForLayoutManager />
                 <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_itemrenderer.png" numColorVariances="8" ignoreMaxColorVariance="true"/>        
             </body>
         </TestCase>
@@ -268,7 +269,8 @@
                 <RunCode code="setLabelFunction()"/>          
             </setup>
             <body>
-                <Pause timeout="100"/>
+                <WaitForEffectsToEnd />
+                <WaitForLayoutManager />
                 <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_labelfunc.png" numColorVariances="8" ignoreMaxColorVariance="true"/>        
             </body>
         </TestCase>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_lockedRowCount.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_lockedRowCount.mxml?rev=1393742&r1=1393741&r2=1393742&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_lockedRowCount.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_lockedRowCount.mxml Wed Oct  3 20:22:35 2012
@@ -571,7 +571,7 @@ multiple drags and scrolling
                 <SetProperty target="dg3" propertyName="width" value="600" />
                 <SetProperty target="dg3" propertyName="height" value="250" waitEvent="updateComplete" />
 
-                <Pause timeout="1000" />
+                <WaitForLayoutManager />
 
             </setup>
             <body>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Styles/datagrid_styles_mirroring.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Styles/datagrid_styles_mirroring.mxml?rev=1393742&r1=1393741&r2=1393742&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Styles/datagrid_styles_mirroring.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Styles/datagrid_styles_mirroring.mxml Wed Oct  3 20:22:35 2012
@@ -179,7 +179,7 @@
 		</setup>
 		<body>
 			<DispatchMouseClickEvent target="container1.dg1.mx_internal:rendererArray.1.0" localX="2" localY="2" waitTarget="container1.dg1" waitEvent="itemEditBegin" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchKeyEvent char="hello" waitTarget="container1.dg1.itemEditorInstance" waitEvent="change" />
 			<DispatchKeyEvent keys="[TAB]" waitTarget="container1.dg1" waitEvent="itemEditEnd" />
 			<Pause timeout="1" />
@@ -200,7 +200,7 @@
 			<DispatchMouseClickEvent target="container1.dg1.mx_internal:rendererArray.1.2" localX="2" localY="2" waitTarget="container1.dg1" waitEvent="itemEditBegin" />
 			<DispatchKeyEvent char="hello" waitTarget="container1.dg1.itemEditorInstance" waitEvent="change" />
 			<DispatchKeyEvent keys="[TAB]" waitTarget="container1.dg1" waitEvent="itemEditEnd" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<AssertPropertyValue target="container1.dg1.mx_internal:rendererArray.1.2" propertyName="text" value="hello"/>
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
@@ -216,7 +216,7 @@
 		</setup>
 		<body>
 			<DispatchKeyEvent keys="[TAB]" waitTarget="container1.dg1" waitEvent="itemEditBegin" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>
@@ -233,7 +233,7 @@
 			<DispatchKeyEvent keys="[TAB]" waitTarget="container1.dg1" waitEvent="itemEditBegin" />
 			<DispatchKeyEvent keys="[TAB]" waitTarget="container1.dg1" waitEvent="itemEditBegin" />
 			<DispatchKeyEvent keys="[TAB]" waitTarget="container1.dg1" waitEvent="itemEditBegin" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<Pause timeout="1" />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
@@ -250,9 +250,9 @@
 		<body>
 			<DispatchKeyEvent keys="[TAB]" waitTarget="container1.dg1" waitEvent="focusIn" />
 			<DispatchKeyEvent keys="[DOWN]" waitTarget="container1.dg1" waitEvent="change" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchKeyEvent keys="[DOWN]" waitTarget="container1.dg1" waitEvent="change" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>
@@ -267,15 +267,15 @@
 		<body>
 			<DispatchKeyEvent keys="[TAB]" waitTarget="container1.dg1" waitEvent="focusIn" />
 			<DispatchKeyEvent keys="[DOWN]" waitTarget="container1.dg1" waitEvent="change" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchKeyEvent keys="[DOWN]" waitTarget="container1.dg1" waitEvent="change" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchKeyEvent keys="[DOWN]" waitTarget="container1.dg1" waitEvent="change" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchKeyEvent keys="[UP]" waitTarget="container1.dg1" waitEvent="change" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchKeyEvent keys="[UP]" waitTarget="container1.dg1" waitEvent="change" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>
@@ -384,7 +384,7 @@
 		</setup>
 		<body>
 			<DispatchMouseEvent type="mouseDown" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.0" localX="5" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.0" localX="60" localY="2" />
 			<Pause timeout="1" />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.0" localX="50" localY="2" />
@@ -415,7 +415,7 @@
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.1" localX="0" localY="2" />
 			<Pause timeout="1" />
 			<DispatchMouseEvent type="mouseUp" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.1" localX="90" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<Pause timeout="1" />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
@@ -431,7 +431,7 @@
 		</setup>
 		<body>
 			<DispatchMouseEvent type="mouseDown" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.0" localX="0" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.1" localX="60" localY="2" />
 			<Pause timeout="1" />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.1" localX="50" localY="2" />
@@ -439,7 +439,7 @@
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.1" localX="40" localY="2" />
 			<Pause timeout="1" />
 			<DispatchMouseEvent type="mouseUp" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.1" localX="40" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<Pause timeout="1" />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
@@ -456,7 +456,7 @@
 		</setup>
 		<body>
 			<DispatchMouseEvent type="mouseDown" target="container1.dg1.mx_internal:dataGridLockedColumnHeader.mx_internal:rendererArray.0" localX="5" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<Pause timeout="1" />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridLockedColumnHeader.mx_internal:rendererArray.0" localX="60" localY="2" />
 			<Pause timeout="1" />
@@ -479,7 +479,7 @@
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.0" localX="40" localY="2" />
 			<Pause timeout="1" />
 			<DispatchMouseEvent type="mouseUp" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.0" localX="40" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<Pause timeout="1" />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
@@ -496,7 +496,7 @@
 		</setup>
 		<body>
 			<DispatchMouseEvent type="mouseDown" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.0" localX="55" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<Pause timeout="1" />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridLockedColumnHeader.mx_internal:rendererArray.0" localX="0" localY="2" />
 			<Pause timeout="1" />
@@ -514,7 +514,7 @@
 			<Pause timeout="1" />
 			<DispatchMouseEvent type="mouseUp" target="container1.dg1.mx_internal:dataGridLockedColumnHeader.mx_internal:rendererArray.0" localX="60" localY="2" />
 			<Pause timeout="1" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>
@@ -591,7 +591,7 @@
 		</setup>
 		<body>
 			<DispatchMouseEvent type="mouseDown" target="container1.dg1.mx_internal:rendererArray.1.0" localX="2" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1" localX="5" localY="10" />
 			<Pause timeout="1" />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1" localX="5" localY="20" />
@@ -641,7 +641,7 @@
 		</setup>
 		<body>
 			<DispatchMouseEvent type="mouseDown" target="container1.dg1.mx_internal:rendererArray.1.0" localX="2" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1" localX="5" localY="10" />
 			<Pause timeout="1" />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1" localX="5" localY="20" />
@@ -673,8 +673,8 @@
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg2" localX="5" localY="50" />
 			<Pause timeout="1" />
 			<DispatchMouseEvent type="mouseUp" target="container1.dg2" localX="5" localY="50" />
-			<Pause timeout="100" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForLayoutManager />
+			<WaitForEffectsToEnd />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>
@@ -694,7 +694,7 @@
 		</setup>
 		<body>
 			<DispatchMouseEvent type="mouseDown" target="container1.dg1.mx_internal:rendererArray.1.0" localX="2" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1" localX="5" localY="10" />
 			<Pause timeout="1" />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1" localX="5" localY="20" />
@@ -726,7 +726,7 @@
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg2" localX="5" localY="50" />
 			<Pause timeout="1" />
 			<DispatchMouseEvent type="mouseUp" target="container1.dg2" localX="5" localY="50" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>
@@ -746,7 +746,7 @@
 		</setup>
 		<body>
 			<DispatchMouseEvent type="mouseDown" target="container1.dg1.mx_internal:rendererArray.1.0" localX="2" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1" localX="5" localY="10" />
 			<Pause timeout="1" />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1" localX="5" localY="20" />
@@ -778,7 +778,7 @@
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg2" localX="5" localY="50" />
 			<Pause timeout="1" />
 			<DispatchMouseEvent type="mouseUp" target="container1.dg2" localX="5" localY="50" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_WireframeSkin/Styles/datagrid_styles_mirroring_wireframe.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_WireframeSkin/Styles/datagrid_styles_mirroring_wireframe.mxml?rev=1393742&r1=1393741&r2=1393742&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_WireframeSkin/Styles/datagrid_styles_mirroring_wireframe.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_WireframeSkin/Styles/datagrid_styles_mirroring_wireframe.mxml Wed Oct  3 20:22:35 2012
@@ -136,7 +136,7 @@
 		</setup>
 		<body>
 			<DispatchMouseClickEvent target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.0" localX="5" localY="2" waitTarget="container1.dg1" waitEvent="updateComplete" />
-			<Pause timeout="100"/>
+			<WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>
@@ -151,7 +151,7 @@
 		<body>
 			<DispatchMouseClickEvent target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.0" localX="5" localY="2" waitTarget="container1.dg1" waitEvent="updateComplete" />
 			<DispatchMouseClickEvent target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.0" localX="5" localY="2" waitTarget="container1.dg1" waitEvent="updateComplete" />
-			<Pause timeout="100"/>
+			<WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>
@@ -167,7 +167,7 @@
 		<body>
 			<DispatchMouseClickEvent target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.0" localX="5" localY="2" waitTarget="container1.dg1" waitEvent="updateComplete" />
 			<DispatchMouseClickEvent target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.1" localX="5" localY="2" waitTarget="container1.dg1" waitEvent="updateComplete" />
-			<Pause timeout="100"/>
+			<WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>
@@ -182,10 +182,10 @@
 		</setup>
 		<body>
 			<DispatchMouseClickEvent target="container1.dg1.mx_internal:rendererArray.1.0" localX="2" localY="2" waitTarget="container1.dg1" waitEvent="itemEditBegin" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchKeyEvent char="hello" waitTarget="container1.dg1.itemEditorInstance" waitEvent="change" />
 			<DispatchKeyEvent keys="[TAB]" waitTarget="container1.dg1" waitEvent="itemEditEnd" />
-			<Pause timeout="50" />
+            <WaitForLayoutManager />
 			<AssertPropertyValue target="container1.dg1.mx_internal:rendererArray.1.0" propertyName="text" value="hello"/>
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
@@ -203,7 +203,7 @@
 			<DispatchMouseClickEvent target="container1.dg1.mx_internal:rendererArray.1.2" localX="2" localY="2" waitTarget="container1.dg1" waitEvent="itemEditBegin" />
 			<DispatchKeyEvent char="hello" waitTarget="container1.dg1.itemEditorInstance" waitEvent="change" />
 			<DispatchKeyEvent keys="[TAB]" waitTarget="container1.dg1" waitEvent="itemEditEnd" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<AssertPropertyValue target="container1.dg1.mx_internal:rendererArray.1.2" propertyName="text" value="hello"/>
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
@@ -219,7 +219,7 @@
 		</setup>
 		<body>
 			<DispatchKeyEvent keys="[TAB]" waitTarget="container1.dg1" waitEvent="itemEditBegin" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>
@@ -236,8 +236,7 @@
 			<DispatchKeyEvent keys="[TAB]" waitTarget="container1.dg1" waitEvent="itemEditBegin" />
 			<DispatchKeyEvent keys="[TAB]" waitTarget="container1.dg1" waitEvent="itemEditBegin" />
 			<DispatchKeyEvent keys="[TAB]" waitTarget="container1.dg1" waitEvent="itemEditBegin" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
-			<Pause timeout="50" />
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>
@@ -253,9 +252,9 @@
 		<body>
 			<DispatchKeyEvent keys="[TAB]" waitTarget="container1.dg1" waitEvent="focusIn" />
 			<DispatchKeyEvent keys="[DOWN]" waitTarget="container1.dg1" waitEvent="change" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchKeyEvent keys="[DOWN]" waitTarget="container1.dg1" waitEvent="change" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>
@@ -270,15 +269,15 @@
 		<body>
 			<DispatchKeyEvent keys="[TAB]" waitTarget="container1.dg1" waitEvent="focusIn" />
 			<DispatchKeyEvent keys="[DOWN]" waitTarget="container1.dg1" waitEvent="change" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchKeyEvent keys="[DOWN]" waitTarget="container1.dg1" waitEvent="change" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchKeyEvent keys="[DOWN]" waitTarget="container1.dg1" waitEvent="change" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchKeyEvent keys="[UP]" waitTarget="container1.dg1" waitEvent="change" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchKeyEvent keys="[UP]" waitTarget="container1.dg1" waitEvent="change" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>
@@ -387,7 +386,7 @@
 		</setup>
 		<body>
 			<DispatchMouseEvent type="mouseDown" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.0" localX="5" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.0" localX="60" localY="2" />
 			<Pause timeout="50" />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.0" localX="50" localY="2" />
@@ -418,8 +417,7 @@
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.1" localX="0" localY="2" />
 			<Pause timeout="50" />
 			<DispatchMouseEvent type="mouseUp" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.1" localX="90" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
-			<Pause timeout="50" />
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>
@@ -434,7 +432,7 @@
 		</setup>
 		<body>
 			<DispatchMouseEvent type="mouseDown" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.0" localX="0" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.1" localX="60" localY="2" />
 			<Pause timeout="50" />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.1" localX="50" localY="2" />
@@ -442,8 +440,7 @@
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.1" localX="40" localY="2" />
 			<Pause timeout="50" />
 			<DispatchMouseEvent type="mouseUp" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.1" localX="40" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
-			<Pause timeout="50" />
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>
@@ -459,7 +456,7 @@
 		</setup>
 		<body>
 			<DispatchMouseEvent type="mouseDown" target="container1.dg1.mx_internal:dataGridLockedColumnHeader.mx_internal:rendererArray.0" localX="5" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridLockedColumnHeader.mx_internal:rendererArray.0" localX="60" localY="2" />
 			<Pause timeout="50" />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridLockedColumnHeader.mx_internal:rendererArray.0" localX="50" localY="2" />
@@ -482,8 +479,7 @@
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.0" localX="40" localY="2" />
 			<Pause timeout="50" />
 			<DispatchMouseEvent type="mouseUp" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.0" localX="40" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
-			<Pause timeout="500" />
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>
@@ -499,7 +495,7 @@
 		</setup>
 		<body>
 			<DispatchMouseEvent type="mouseDown" target="container1.dg1.mx_internal:dataGridHeader.mx_internal:rendererArray.0" localX="55" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridLockedColumnHeader.mx_internal:rendererArray.0" localX="0" localY="2" />
 			<Pause timeout="50" />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1.mx_internal:dataGridLockedColumnHeader.mx_internal:rendererArray.0" localX="10" localY="2" />
@@ -516,8 +512,7 @@
 			<Pause timeout="50" />
 			<DispatchMouseEvent type="mouseUp" target="container1.dg1.mx_internal:dataGridLockedColumnHeader.mx_internal:rendererArray.0" localX="60" localY="2" />
 			<Pause timeout="50" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
-			<Pause timeout="500" />
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1.dg1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>
@@ -594,7 +589,7 @@
 		</setup>
 		<body>
 			<DispatchMouseEvent type="mouseDown" target="container1.dg1.mx_internal:rendererArray.1.0" localX="2" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1" localX="5" localY="10" />
 			<Pause timeout="50" />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1" localX="5" localY="20" />
@@ -624,7 +619,7 @@
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg2" localX="5" localY="40" />
 			<Pause timeout="50" />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg2" localX="5" localY="50" />
-			<Pause timeout="100"/>
+            <WaitForEffectsToEnd /><WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1" url="../Styles/Baselines/$testID.png"  />
 			<DispatchMouseEvent type="mouseUp" target="container1.dg2" localX="5" localY="50" />
 		</body>
@@ -644,7 +639,7 @@
 		</setup>
 		<body>
 			<DispatchMouseEvent type="mouseDown" target="container1.dg1.mx_internal:rendererArray.1.0" localX="2" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1" localX="5" localY="10" />
 			<Pause timeout="50" />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1" localX="5" localY="20" />
@@ -676,7 +671,7 @@
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg2" localX="5" localY="50" />
 			<Pause timeout="50" />
 			<DispatchMouseEvent type="mouseUp" target="container1.dg2" localX="5" localY="50" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>
@@ -696,7 +691,7 @@
 		</setup>
 		<body>
 			<DispatchMouseEvent type="mouseDown" target="container1.dg1.mx_internal:rendererArray.1.0" localX="2" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1" localX="5" localY="10" />
 			<Pause timeout="50" />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1" localX="5" localY="20" />
@@ -728,7 +723,7 @@
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg2" localX="5" localY="50" />
 			<Pause timeout="50" />
 			<DispatchMouseEvent type="mouseUp" target="container1.dg2" localX="5" localY="50" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>
@@ -748,7 +743,7 @@
 		</setup>
 		<body>
 			<DispatchMouseEvent type="mouseDown" target="container1.dg1.mx_internal:rendererArray.1.0" localX="2" localY="2" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1" localX="5" localY="10" />
 			<Pause timeout="50" />
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg1" localX="5" localY="20" />
@@ -780,7 +775,7 @@
 			<DispatchMouseEvent type="mouseMove" buttonDown="true" target="container1.dg2" localX="5" localY="50" />
 			<Pause timeout="50" />
 			<DispatchMouseEvent type="mouseUp" target="container1.dg2" localX="5" localY="50" />
-			<WaitForEffectsToEnd /><Pause timeout="100"/>
+			<WaitForEffectsToEnd /><WaitForLayoutManager />
 			<CompareBitmap numColorVariances="5" ignoreMaxColorVariance="true"   target="container1" url="../Styles/Baselines/$testID.png"  />
 		</body>
 	</TestCase>