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/09/25 18:41:11 UTC

svn commit: r1389979 [2/2] - /incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ListDragDrop/events/SparkDNDList_events.mxml

Modified: incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ListDragDrop/events/SparkDNDList_events.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ListDragDrop/events/SparkDNDList_events.mxml?rev=1389979&r1=1389978&r2=1389979&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ListDragDrop/events/SparkDNDList_events.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ListDragDrop/events/SparkDNDList_events.mxml Tue Sep 25 16:41:11 2012
@@ -42,57 +42,62 @@
 
   <testCases>
    	<TestCase testID="List_bug25334_copyOnDrop" keywords="[DragDrop, List]" description="">
-              <setup>
-                    <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
-                    <ResetComponent target="l2" className="spark.components.List"      waitEvent="updateComplete" />
-                    <SetProperty target="l1" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l1"/>
-                    <SetProperty target="l1" propertyName="dragEnabled" value="true" />
-                    <SetProperty target="l1" propertyName="dragMoveEnabled" value="false" />
-                    <SetProperty target="l2" propertyName="dropEnabled" value="true" />
-
-               </setup>
-              <body>
-    		<RunCode code="DragManager.endDrag()" />
-    		<DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
-    		<DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
-    		<DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
-     		<DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
-     		<DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" waitEvent="dragStart" />
-     		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
-    		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragOver"/>
-    		<DispatchMouseEvent target="l2" type="mouseUp" localX="5" localY="10"  waitTarget="l1" waitEvent="dragComplete" />
-    		<WaitForEffectsToEnd/>
-    		<AssertMethodValue method="value=(application.l1.dataProvider.getItemAt(0) === application.l2.dataProvider.getItemAt(0) )" value="false" />
-              </body>
+        <setup>
+            <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
+            <ResetComponent target="l2" className="spark.components.List"      waitEvent="updateComplete" />
+            <SetProperty target="l1" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l1"/>
+            <SetProperty target="l1" propertyName="dragEnabled" value="true" />
+            <SetProperty target="l1" propertyName="dragMoveEnabled" value="false" />
+            <SetProperty target="l2" propertyName="dropEnabled" value="true" />
+        
+        </setup>
+        <body>
+            <RunCode code="DragManager.endDrag()" />
+            <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
+            <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
+            <DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
+            <DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
+            <DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" waitEvent="dragStart" />
+            <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
+            <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragOver"/>
+            <DispatchMouseEvent target="l2" type="mouseUp" localX="5" localY="10"  waitTarget="l1" waitEvent="dragComplete" />
+            <WaitForEffectsToEnd/>
+            <AssertMethodValue method="value=(application.l1.dataProvider.getItemAt(0) === application.l2.dataProvider.getItemAt(0) )" value="false" />
+        </body>
+        <cleanup>
+            <RunCode code="DragManager.endDrag()" />
+        </cleanup>
         </TestCase>
+        
   	<TestCase testID="List_NoDP_drop" keywords="[DragDrop, List]" description="">
-             <setup>
-                  <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
-                  <ResetComponent target="l2" className="spark.components.List"      waitEvent="updateComplete" />
-                  <SetProperty target="l1" propertyName="dataProvider" valueExpression="value=application.createAbc()" waitEvent="updateComplete" waitTarget="l1"/>
-                  <SetProperty target="l1" propertyName="dragEnabled" value="true" />
-                  <SetProperty target="l2" propertyName="dropEnabled" value="true" />
-  		  <SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
-
-
-              </setup>
-              <body>
-  		<RunCode code="DragManager.endDrag()" />
-  		<DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
-  		<DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
-  		<DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
-   		<DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
-   		<DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" waitEvent="dragStart" />
-   		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
-  		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragOver"/>
-  		<DispatchMouseEvent target="l2" type="mouseUp" localX="5" localY="10"  waitTarget="l1" waitEvent="dragComplete" />
-  		<WaitForEffectsToEnd/>
-  		<Pause timeout="100"/>
-  		<CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="l2" url="../events/baselines/$testID.png" />
-              </body>
+            <setup>
+                <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
+                <ResetComponent target="l2" className="spark.components.List"      waitEvent="updateComplete" />
+                <SetProperty target="l1" propertyName="dataProvider" valueExpression="value=application.createAbc()" waitEvent="updateComplete" waitTarget="l1"/>
+                <SetProperty target="l1" propertyName="dragEnabled" value="true" />
+                <SetProperty target="l2" propertyName="dropEnabled" value="true" />
+                <SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
+            </setup>
+            <body>
+                <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
+                <DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
+                <DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" waitEvent="dragStart" />
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragOver"/>
+                <DispatchMouseEvent target="l2" type="mouseUp" localX="5" localY="10"  waitTarget="l1" waitEvent="dragComplete" />
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
+                <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="l2" url="../events/baselines/$testID.png" />
+            </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase>
+        
 	<TestCase testID="ListDefaultRenderer_dragComplete" keywords="[DragDrop, List]" description="">
-           <setup>
+            <setup>
                 <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
                 <ResetComponent target="l2" className="spark.components.List"      waitEvent="updateComplete" />
                 <SetProperty target="l1" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l1"/>
@@ -103,25 +108,27 @@
                 <SetProperty target="l1" propertyName="dragEnabled" value="true" />
                 <SetProperty target="l2" propertyName="dragEnabled" value="true" />
                 <SetProperty target="l2" propertyName="dropEnabled" value="true" />
-		<SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
-		<SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
-
+                <SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
+                <SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
             </setup>
             <body>
-		<RunCode code="DragManager.endDrag()" />
-		<DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
-		<DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
-		<DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
- 		<DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
- 		<DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" waitEvent="dragStart" />
- 		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="30"  waitEvent="dragOver"/>
-		<DispatchMouseEvent target="l2" type="mouseUp" localX="50" localY="30"  waitTarget="l1" waitEvent="dragComplete" />
-		<WaitForEffectsToEnd/>
-		<Pause timeout="100"/>
-		<CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
+                <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
+                <DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
+                <DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" waitEvent="dragStart" />
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="30"  waitEvent="dragOver"/>
+                <DispatchMouseEvent target="l2" type="mouseUp" localX="50" localY="30"  waitTarget="l1" waitEvent="dragComplete" />
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
+                <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
             </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase>
+        
 	<TestCase testID="ListDefaultRenderer_dragExit" keywords="[DragDrop, List]" description="">
            <setup>
                 <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
@@ -136,33 +143,36 @@
                 <SetProperty target="l2" propertyName="dropEnabled" value="true" />
 
             	<SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
-	    	<SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
+	    	    <SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
             </setup>
             <body>
-		<RunCode code="DragManager.endDrag()" />
-		<DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
-		<DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
-		<DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
- 		<DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
- 		<DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" waitEvent="dragStart" />
- 		<WaitForEffectsToEnd/>
- 		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
- 		<WaitForEffectsToEnd/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="30"  waitEvent="dragOver"/>
-		<WaitForEffectsToEnd/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="-10" localY="-10"  waitEvent="dragExit"/>
-		<WaitForEffectsToEnd/>
-		<DispatchMouseEvent target="l2" type="mouseUp" localX="50" localY="30"  waitTarget="l1" waitEvent="dragComplete" />
-		<WaitForEffectsToEnd/>
-		<Pause timeout="100"/>
-		<CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
+                <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
+                <DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
+                <DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" waitEvent="dragStart" />
+                <WaitForEffectsToEnd/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
+                <WaitForEffectsToEnd/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="30"  waitEvent="dragOver"/>
+                <WaitForEffectsToEnd/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="-10" localY="-10"  waitEvent="dragExit"/>
+                <WaitForEffectsToEnd/>
+                <DispatchMouseEvent target="l2" type="mouseUp" localX="50" localY="30"  waitTarget="l1" waitEvent="dragComplete" />
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
+                <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
             </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase>
+        
 	<TestCase testID="ListDefaultRenderer_dragDrop" keywords="[DragDrop, List]" description="">
            <setup>
                 <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
                 <ResetComponent target="l2" className="spark.components.List"      waitEvent="updateComplete" />
-
+                
                 <SetProperty target="l1" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l1"/>
                 <SetProperty target="l2" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l2"/>
                 <SetProperty target="l1" propertyName="labelField" value="lastName" waitEvent="updateComplete" waitTarget="l1"/>
@@ -171,31 +181,33 @@
                 <SetProperty target="l1" propertyName="dragEnabled" value="true" />
                 <SetProperty target="l1" propertyName="dragMoveEnabled" value="true" />
                 <SetProperty target="l2" propertyName="dropEnabled" value="true" />
-		<SetProperty target="l1" propertyName="height" value="105" />
-            	<SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
-	    	<SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
+                <SetProperty target="l1" propertyName="height" value="105" />
+                <SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
+                <SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
             </setup>
             <body>
-		<RunCode code="DragManager.endDrag()" />
-		<DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
-		<DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
-		<DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
- 		<DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
- 		<DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" />
- 		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="15" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="updateComplete"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-		<DispatchMouseEvent target="l2" type="mouseUp" localX="50" localY="100"  waitEvent="dragDrop" />
-		<WaitForEffectsToEnd/>
-		<Pause timeout="100"/>
-		<CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
+                <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
+                <DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
+                <DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" />
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="15" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="updateComplete"/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <DispatchMouseEvent target="l2" type="mouseUp" localX="50" localY="100"  waitEvent="dragDrop" />
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
+                <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
             </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase>
 
 	<TestCase testID="ListDefaultRenderer_dragDrop_ctrlKey_multiple" keywords="[DragDrop, List]" description="">
            <setup>
                 <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
                 <ResetComponent target="l2" className="spark.components.List"      waitEvent="updateComplete" />
-
+                
                 <SetProperty target="l1" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l1"/>
                 <SetProperty target="l2" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l2"/>
                 <SetProperty target="l1" propertyName="labelField" value="lastName" waitEvent="updateComplete" waitTarget="l1"/>
@@ -206,34 +218,36 @@
                 <SetProperty target="l1" propertyName="dragEnabled" value="true" />
                 <SetProperty target="l1" propertyName="dragMoveEnabled" value="true" />
                 <SetProperty target="l2" propertyName="dropEnabled" value="true" />
-		<SetProperty target="l1" propertyName="height" value="105" />
-            	<SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
-	    	<SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
+                <SetProperty target="l1" propertyName="height" value="105" />
+                <SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
+                <SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
             </setup>
             <body>
-		<RunCode code="DragManager.endDrag()" />
-		<DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
-		<DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
-		<DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
-		<DispatchKeyEvent keys="[END]"  waitTarget="l1" shiftKey="true" waitEvent="updateComplete"/>
- 		<DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true" ctrlKey="true"  localX="10" localY="10" />
- 		<DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true" ctrlKey="true" localX="50" localY="12" />
- 		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" ctrlKey="true" localX="15" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="updateComplete"/>
- 		<Pause timeout="100"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" ctrlKey="true" localX="50" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-		<Pause timeout="100"/>
-		<DispatchMouseEvent target="l2" type="mouseUp" ctrlKey="true" localX="50" localY="100"  waitEvent="dragDrop" />
-		<WaitForEffectsToEnd/>
-		<Pause timeout="100"/>
-		<CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
+                <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
+                <DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
+                <DispatchKeyEvent keys="[END]"  waitTarget="l1" shiftKey="true" waitEvent="updateComplete"/>
+                <DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true" ctrlKey="true"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true" ctrlKey="true" localX="50" localY="12" />
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" ctrlKey="true" localX="15" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="updateComplete"/>
+                <WaitForLayoutManager/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" ctrlKey="true" localX="50" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <WaitForLayoutManager/>
+                <DispatchMouseEvent target="l2" type="mouseUp" ctrlKey="true" localX="50" localY="100"  waitEvent="dragDrop" />
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
+                <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
             </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase>
 
 	<TestCase testID="ListDefaultRenderer_dragDrop_ctrlKey_singleSel" keywords="[DragDrop, List]" description="">
            <setup>
                 <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
                 <ResetComponent target="l2" className="spark.components.List"      waitEvent="updateComplete" />
-
+                
                 <SetProperty target="l1" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l1"/>
                 <SetProperty target="l2" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l2"/>
                 <SetProperty target="l1" propertyName="labelField" value="lastName" waitEvent="updateComplete" waitTarget="l1"/>
@@ -242,26 +256,28 @@
                 <SetProperty target="l1" propertyName="dragEnabled" value="true" />
                 <SetProperty target="l1" propertyName="dragMoveEnabled" value="true" />
                 <SetProperty target="l2" propertyName="dropEnabled" value="true" />
-		<SetProperty target="l1" propertyName="height" value="105" />
-            	<SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
-	    	<SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
+                <SetProperty target="l1" propertyName="height" value="105" />
+                <SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
+                <SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
             </setup>
             <body>
-		<RunCode code="DragManager.endDrag()" />
-		<DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
-		<DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
-		<DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
-
- 		<DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true" ctrlKey="true"  localX="10" localY="10" />
- 		<DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true" ctrlKey="true" localX="50" localY="12" />
- 		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" ctrlKey="true" localX="15" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="updateComplete"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" ctrlKey="true" localX="50" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-		<WaitForEffectsToEnd/>
-		<DispatchMouseEvent target="l2" type="mouseUp" ctrlKey="true" localX="50" localY="100"  waitEvent="dragDrop" />
-		<WaitForEffectsToEnd/>
-		<Pause timeout="100"/>
-		<CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
+                <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
+                <DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
+        
+                <DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true" ctrlKey="true"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true" ctrlKey="true" localX="50" localY="12" />
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" ctrlKey="true" localX="15" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="updateComplete"/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" ctrlKey="true" localX="50" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <WaitForEffectsToEnd/>
+                <DispatchMouseEvent target="l2" type="mouseUp" ctrlKey="true" localX="50" localY="100"  waitEvent="dragDrop" />
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
+                <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
             </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase>
 
 	<TestCase testID="ListDefaultRenderer_dragDrop_negativeGap" keywords="[DragDrop, List]" description="">
@@ -278,65 +294,69 @@
                 <SetProperty target="l1" propertyName="dragEnabled" value="true" />
                 <SetProperty target="l1" propertyName="dragMoveEnabled" value="true" />
                 <SetProperty target="l2" propertyName="dropEnabled" value="true" />
-		<SetProperty target="l1" propertyName="height" value="105" />
-		<SetProperty target="l2" propertyName="height" value="105" />
+                <SetProperty target="l1" propertyName="height" value="105" />
+                <SetProperty target="l2" propertyName="height" value="105" />
             	<SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
 	    	<SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
             </setup>
             <body>
-		<RunCode code="DragManager.endDrag()" />
-		<DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
-		<DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
-		<DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
- 		<DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
- 		<DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" />
- 		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="15" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="updateComplete"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-		<DispatchMouseEvent target="l2" type="mouseUp" localX="50" localY="100"  waitEvent="dragDrop" />
-		<WaitForEffectsToEnd/>
-		<Pause timeout="100"/>
-		<CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
+                <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
+                <DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
+                <DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" />
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="15" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="updateComplete"/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <DispatchMouseEvent target="l2" type="mouseUp" localX="50" localY="100"  waitEvent="dragDrop" />
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
+                <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
             </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase>
 
 	<TestCase testID="HListDefaultRenderer_dragDrop_negativeGap" keywords="[DragDrop, List]" description="">
            <setup>
                 <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
                 <ResetComponent target="l2" className="spark.components.List"      waitEvent="updateComplete" />
-
+                
                 <SetProperty target="l1" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l1"/>
                 <SetProperty target="l2" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l2"/>
                 <SetProperty    target="l2" propertyName="layout"  valueExpression="value=new HorizontalLayout()" />
                 <SetProperty target="l2.layout" propertyName="gap" value="-2" />
                 <SetProperty target="l1" propertyName="labelField" value="lastName" waitEvent="updateComplete" waitTarget="l1"/>
                 <SetProperty target="l2" propertyName="labelField" value="firstName" waitEvent="updateComplete" waitTarget="l2"/>
-
+                
                 <SetProperty target="l1" propertyName="selectedIndex" value="0" />
                 <SetProperty target="l1" propertyName="dragEnabled" value="true" />
                 <SetProperty target="l1" propertyName="dragMoveEnabled" value="true" />
                 <SetProperty target="l2" propertyName="dropEnabled" value="true" />
-		<SetProperty target="l1" propertyName="height" value="105" />
-		<SetProperty target="l2" propertyName="width" value="105" />
-            	<SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
-	    	<SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
+                <SetProperty target="l1" propertyName="height" value="105" />
+                <SetProperty target="l2" propertyName="width" value="105" />
+                <SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
+                <SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
             </setup>
             <body>
-		<RunCode code="DragManager.endDrag()" />
-		<DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
-		<DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
-		<DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
- 		<DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
- 		<DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" />
- 		<WaitForEffectsToEnd/>
- 		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="100" localY="10" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="updateComplete"/>
- 		<WaitForEffectsToEnd/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="100" localY="9" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-		<WaitForEffectsToEnd/>
-		<DispatchMouseEvent target="l2" type="mouseUp" localX="100" localY="8"  waitEvent="dragDrop" />
-		<WaitForEffectsToEnd/>
-		<Pause timeout="100"/>
-		<CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
+                <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
+                <DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
+                <DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" />
+                <WaitForEffectsToEnd/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="100" localY="10" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="updateComplete"/>
+                <WaitForEffectsToEnd/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="100" localY="9" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <WaitForEffectsToEnd/>
+                <DispatchMouseEvent target="l2" type="mouseUp" localX="100" localY="8"  waitEvent="dragDrop" />
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
+                <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
             </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase>
 
 	<TestCase testID="ListDefaultRenderer_rejectDrop1" keywords="[DragDrop, List]" description="">
@@ -355,19 +375,21 @@
 	     		<SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
             </setup>
             <body>
-		<RunCode code="DragManager.endDrag()" />
-		<DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
-		<DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
-		<DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
- 		<DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
- 		<DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" waitEvent="dragStart" />
- 		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="30"  waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-		<DispatchMouseEvent target="l2" type="mouseUp" localX="50" localY="30"  waitTarget="l1" waitEvent="dragComplete" />
-		<WaitForEffectsToEnd/>
-		<Pause timeout="100"/>
-		<CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
+                <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
+                <DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
+                <DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" waitEvent="dragStart" />
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="30"  waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <DispatchMouseEvent target="l2" type="mouseUp" localX="50" localY="30"  waitTarget="l1" waitEvent="dragComplete" />
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
+                <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
             </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase>
 
 	<TestCase testID="ListDefaultRenderer_rejectDrop2" keywords="[DragDrop, List]" description="">
@@ -386,23 +408,24 @@
 	     		<SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
             </setup>
             <body>
-		<RunCode code="DragManager.endDrag()" />
-		<DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
-		<DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
-		<DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
- 		<DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
- 		<DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" />
- 		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="15" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="updateComplete"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-		<DispatchMouseEvent target="l2" type="mouseUp" localX="50" localY="100" waitTarget="l1" waitEvent="dragComplete" />
-		<WaitForEffectsToEnd/>
-		<Pause timeout="100"/>
-		<CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
+                <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
+                <DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
+                <DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" />
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="15" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="updateComplete"/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="100" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <DispatchMouseEvent target="l2" type="mouseUp" localX="50" localY="100" waitTarget="l1" waitEvent="dragComplete" />
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
+                <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
 
             </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase>
 
-
 	<TestCase testID="ListAbcDND1_dragComplete" keywords="[DragDrop, List]" description="">
            <setup>
                 <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
@@ -422,29 +445,30 @@
 	    	<SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
             </setup>
             <body>
-		<RunCode code="DragManager.endDrag()" />
-		<DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
-		<DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
-		<DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
- 		<DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
- 		<DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" waitEvent="dragStart" />
- 		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="30"  waitEvent="dragOver"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="195" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="197" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="196" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="197" />
-		<WaitForEvent target="l2" eventName="dragOver" numExpectedEvents="2" />
-		<DispatchMouseEvent target="l2" type="mouseUp" localX="50" localY="197"  waitTarget="l1" waitEvent="dragComplete" />
-		<WaitForEffectsToEnd/>
-		<WaitForLayoutManager/>
-		<CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
+                <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
+                <DispatchMouseClickEvent target="l1"    localX="20" localY="10" waitEvent="updateComplete" waitTarget="l1"/>
+                <DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" waitEvent="dragStart" />
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="30"  waitEvent="dragOver"/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="195" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="197" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="196" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="197" />
+                <WaitForEvent target="l2" eventName="dragOver" numExpectedEvents="2" />
+                <DispatchMouseEvent target="l2" type="mouseUp" localX="50" localY="197"  waitTarget="l1" waitEvent="dragComplete" />
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
+                <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
             </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase>
 
 	<TestCase testID="ListAbcDND1_dragDrop" keywords="[DragDrop, List]" description="">
            <setup>
-                <RunCode code="DragManager.endDrag()" />
                 <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
                 <ResetComponent target="l2" className="spark.components.List"      waitEvent="updateComplete" />
                 <SetProperty target="l1" propertyName="itemRenderer"  valueExpression ="value= new ClassFactory( comps.ItemWithBorder )"  />
@@ -479,11 +503,13 @@
                 <WaitForLayoutManager/>
                 <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
             </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase>
 
 	<TestCase testID="ListAbcDND1_rejectDrop1" keywords="[DragDrop, List]" description="">
            <setup>
-		        <RunCode code="DragManager.endDrag()" />
                 <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
                 <ResetComponent target="l2" className="spark.components.List"      waitEvent="updateComplete" />
                 <SetProperty target="l1" propertyName="itemRenderer"  valueExpression ="value= new ClassFactory( comps.ItemWithBorder )"  />
@@ -505,18 +531,20 @@
                 <DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
                 <DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="50" localY="12" waitEvent="dragStart" />
                 <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
-                <Pause timeout="100"/>
+                <WaitForLayoutManager/>
                 <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="199" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="198" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-                <Pause timeout="100"/>
+                <WaitForLayoutManager/>
                 <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="199" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="50" localY="198" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-                <Pause timeout="100"/>
+                <WaitForLayoutManager/>
                 <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
                 <DispatchMouseEvent target="l2" type="mouseUp" localX="50" localY="199"  waitTarget="l1" waitEvent="dragComplete" />
                 <WaitForEffectsToEnd/>
-                <RunCode code="DragManager.endDrag()" />
             </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase>
 
 	<TestCase testID="HListDefaultRenderer_dragComplete" keywords="[DragDrop, List]" description="">
@@ -541,7 +569,6 @@
 	    		<SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
             </setup>
             <body>
-				<RunCode code="DragManager.endDrag()" />
 				<DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
 				<DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
 				<DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
@@ -550,94 +577,102 @@
 				<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="30"  waitEvent="dragOver"/>
 				<DispatchMouseEvent target="l2" type="mouseUp" localX="145" localY="30"  waitTarget="l1" waitEvent="dragComplete" />
 				<WaitForEffectsToEnd/>
-				<Pause timeout="100"/>
+				<WaitForLayoutManager/>
 				<CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
             </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase>
 
 	<TestCase testID="HListDefaultRenderer_dragExit" keywords="[DragDrop, List]" description="">
-           <setup>
-                <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
-		<SetProperty    target="l1" propertyName="layout"  valueExpression="value=new HorizontalLayout()" />
-                <ResetComponent target="l2" className="spark.components.List" waitEvent="updateComplete" />
-		<SetProperty    target="l2" propertyName="layout"  valueExpression="value=new HorizontalLayout()" />
-                <SetProperty target="l1" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l1"/>
-                <SetProperty target="l2" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l2"/>
-                <SetProperty target="l1" propertyName="labelField" value="lastName" waitEvent="updateComplete" waitTarget="l1"/>
-                <SetProperty target="l2" propertyName="labelField" value="firstName" waitEvent="updateComplete" waitTarget="l2"/>
-                <SetProperty target="l1" propertyName="selectedIndex" value="0" />
-                <SetProperty target="l1" propertyName="dragEnabled" value="true" />
-                <SetProperty target="l1" propertyName="dragMoveEnabled" value="true" />
-                <SetProperty target="l2" propertyName="dropEnabled" value="true" />
-		<SetProperty target="l1" propertyName="width" value="150" waitEvent="updateComplete"/>
-		<SetProperty target="l1" propertyName="height" value="50" waitEvent="updateComplete"/>
-		<SetProperty target="l2" propertyName="width" value="150" waitEvent="updateComplete"/>
-		<SetProperty target="l2" propertyName="height" value="50" waitEvent="updateComplete"/>
-            	<SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
-	    	<SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
-            </setup>
-            <body>
-		<RunCode code="DragManager.endDrag()" />
-		<DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
-		<DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
-		<Pause timeout="20"/>
- 		<DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
- 		<DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="145" localY="12" waitEvent="dragStart" />
- 		<Pause timeout="20"/>
- 		<WaitForEffectsToEnd/>
- 		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
- 		<Pause timeout="20"/>
- 		<WaitForEffectsToEnd/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="30"  waitEvent="dragOver"/>
-		<Pause timeout="20"/>
-		<WaitForEffectsToEnd/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="-10" localY="-10"  waitEvent="dragExit"/>
-		<Pause timeout="20"/>
-		<WaitForEffectsToEnd/>
-		<DispatchMouseEvent target="l2" type="mouseUp" localX="145" localY="30"  waitTarget="l1" waitEvent="dragComplete" />
-		<WaitForEffectsToEnd/>
-		<Pause timeout="100"/>
-		<CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
-            </body>
-        </TestCase>
-	<TestCase testID="HListDefaultRenderer_dragDrop" keywords="[DragDrop, List]" description="">
-           <setup>
-                <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
-		<SetProperty    target="l1" propertyName="layout"  valueExpression="value=new HorizontalLayout()" />
-                <ResetComponent target="l2" className="spark.components.List" waitEvent="updateComplete" />
-		<SetProperty    target="l2" propertyName="layout"  valueExpression="value=new HorizontalLayout()" />
-
-                <SetProperty target="l1" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l1"/>
-                <SetProperty target="l2" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l2"/>
-                <SetProperty target="l1" propertyName="labelField" value="lastName" waitEvent="updateComplete" waitTarget="l1"/>
-                <SetProperty target="l2" propertyName="labelField" value="firstName" waitEvent="updateComplete" waitTarget="l2"/>
-                <SetProperty target="l1" propertyName="selectedIndex" value="0" />
-                <SetProperty target="l1" propertyName="dragEnabled" value="true" />
-                <SetProperty target="l1" propertyName="dragMoveEnabled" value="true" />
-                <SetProperty target="l2" propertyName="dropEnabled" value="true" />
-
-		<SetProperty target="l1" propertyName="width" value="150" waitEvent="updateComplete"/>
-		<SetProperty target="l1" propertyName="height" value="50" waitEvent="updateComplete"/>
-		<SetProperty target="l2" propertyName="width" value="150" waitEvent="updateComplete"/>
-		<SetProperty target="l2" propertyName="height" value="50" waitEvent="updateComplete"/>
-            	<SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
-	    	<SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
-            </setup>
-            <body>
-		<RunCode code="DragManager.endDrag()" />
-		<DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
-		<DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
-		<DispatchMouseClickEvent target="l1"    localX="20" localY="10" />
- 		<DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
- 		<DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="145" localY="12" />
- 		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="15" localY="15" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="updateComplete"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="15" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-		<DispatchMouseEvent target="l2" type="mouseUp" localX="145" localY="15"  waitEvent="dragDrop" />
-		<WaitForEffectsToEnd/>
-		<Pause timeout="100"/>
-		<CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
-            </body>
-        </TestCase>
+        <setup>
+            <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
+            <SetProperty    target="l1" propertyName="layout"  valueExpression="value=new HorizontalLayout()" />
+            <ResetComponent target="l2" className="spark.components.List" waitEvent="updateComplete" />
+            <SetProperty    target="l2" propertyName="layout"  valueExpression="value=new HorizontalLayout()" />
+            <SetProperty target="l1" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l1"/>
+            <SetProperty target="l2" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l2"/>
+            <SetProperty target="l1" propertyName="labelField" value="lastName" waitEvent="updateComplete" waitTarget="l1"/>
+            <SetProperty target="l2" propertyName="labelField" value="firstName" waitEvent="updateComplete" waitTarget="l2"/>
+            <SetProperty target="l1" propertyName="selectedIndex" value="0" />
+            <SetProperty target="l1" propertyName="dragEnabled" value="true" />
+            <SetProperty target="l1" propertyName="dragMoveEnabled" value="true" />
+            <SetProperty target="l2" propertyName="dropEnabled" value="true" />
+            <SetProperty target="l1" propertyName="width" value="150" waitEvent="updateComplete"/>
+            <SetProperty target="l1" propertyName="height" value="50" waitEvent="updateComplete"/>
+            <SetProperty target="l2" propertyName="width" value="150" waitEvent="updateComplete"/>
+            <SetProperty target="l2" propertyName="height" value="50" waitEvent="updateComplete"/>
+            <SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
+            <SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
+        </setup>
+        <body>
+            <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
+            <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
+            <WaitForLayoutManager/>
+            <DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
+            <DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="145" localY="12" waitEvent="dragStart" />
+            <WaitForLayoutManager/>
+            <WaitForEffectsToEnd/>
+            <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
+            <WaitForLayoutManager/>
+            <WaitForEffectsToEnd/>
+            <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="30"  waitEvent="dragOver"/>
+            <WaitForLayoutManager/>
+            <WaitForEffectsToEnd/>
+            <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="-10" localY="-10"  waitEvent="dragExit"/>
+            <WaitForLayoutManager/>
+            <WaitForEffectsToEnd/>
+            <DispatchMouseEvent target="l2" type="mouseUp" localX="145" localY="30"  waitTarget="l1" waitEvent="dragComplete" />
+            <WaitForEffectsToEnd/>
+            <WaitForLayoutManager/>
+            <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
+        </body>
+        <cleanup>
+            <RunCode code="DragManager.endDrag()" />
+        </cleanup>
+    </TestCase>
+        
+    <TestCase testID="HListDefaultRenderer_dragDrop" keywords="[DragDrop, List]" description="">
+        <setup>
+            <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
+            <SetProperty    target="l1" propertyName="layout"  valueExpression="value=new HorizontalLayout()" />
+            <ResetComponent target="l2" className="spark.components.List" waitEvent="updateComplete" />
+            <SetProperty    target="l2" propertyName="layout"  valueExpression="value=new HorizontalLayout()" />
+            
+            <SetProperty target="l1" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l1"/>
+            <SetProperty target="l2" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l2"/>
+            <SetProperty target="l1" propertyName="labelField" value="lastName" waitEvent="updateComplete" waitTarget="l1"/>
+            <SetProperty target="l2" propertyName="labelField" value="firstName" waitEvent="updateComplete" waitTarget="l2"/>
+            <SetProperty target="l1" propertyName="selectedIndex" value="0" />
+            <SetProperty target="l1" propertyName="dragEnabled" value="true" />
+            <SetProperty target="l1" propertyName="dragMoveEnabled" value="true" />
+            <SetProperty target="l2" propertyName="dropEnabled" value="true" />
+            
+            <SetProperty target="l1" propertyName="width" value="150" waitEvent="updateComplete"/>
+            <SetProperty target="l1" propertyName="height" value="50" waitEvent="updateComplete"/>
+            <SetProperty target="l2" propertyName="width" value="150" waitEvent="updateComplete"/>
+            <SetProperty target="l2" propertyName="height" value="50" waitEvent="updateComplete"/>
+            <SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
+            <SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
+        </setup>
+        <body>
+            <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
+            <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
+            <DispatchMouseClickEvent target="l1"    localX="20" localY="10" />
+            <DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
+            <DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="145" localY="12" />
+            <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="15" localY="15" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="updateComplete"/>
+            <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="15" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+            <DispatchMouseEvent target="l2" type="mouseUp" localX="145" localY="15"  waitEvent="dragDrop" />
+            <WaitForEffectsToEnd/>
+            <WaitForLayoutManager/>
+            <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
+        </body>
+        <cleanup>
+            <RunCode code="DragManager.endDrag()" />
+        </cleanup>
+    </TestCase>
 
 	<TestCase testID="HListDefaultRenderer_rejectDrop1" keywords="[DragDrop, List]" description="">
            <setup>
@@ -661,7 +696,6 @@
 	     		<SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
             </setup>
             <body>
-                <RunCode code="DragManager.endDrag()" />
                 <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
                 <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
                 <DispatchMouseClickEvent target="l1"    localX="20" localY="10" />
@@ -671,10 +705,12 @@
                 <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="30"  waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent target="l2" type="mouseUp" localX="145" localY="30"  waitTarget="l1" waitEvent="dragComplete" />
                 <WaitForEffectsToEnd/>
-                <Pause timeout="100"/>
+                <WaitForLayoutManager/>
                 <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
-                <RunCode code="DragManager.endDrag()" />
             </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase>
 
 	<TestCase testID="HListDefaultRenderer_rejectDrop2" keywords="[DragDrop, List]" description="">
@@ -699,7 +735,6 @@
 	     		<SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
             </setup>
             <body>
-                <RunCode code="DragManager.endDrag()" />
                 <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
                 <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
                 <DispatchMouseClickEvent target="l1"    localX="20" localY="10" />
@@ -709,14 +744,14 @@
                 <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="15" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent target="l2" type="mouseUp" localX="145" localY="15" waitTarget="l1" waitEvent="dragComplete" />
                 <WaitForEffectsToEnd/>
-                <Pause timeout="100"/>
+                <WaitForLayoutManager/>
                 <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
-                <RunCode code="DragManager.endDrag()" />
-
             </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase>
 
-
 	<TestCase testID="HListAbcDND1_dragComplete" keywords="[DragDrop, List]" description="">
            <setup>
                 <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
@@ -739,7 +774,6 @@
                 <SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
             </setup>
             <body>
-                <RunCode code="DragManager.endDrag()" />
                 <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
                 <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
                 <DispatchMouseClickEvent target="l1"    localX="20" localY="10" />
@@ -757,6 +791,9 @@
                 <WaitForLayoutManager/>
                 <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
             </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase>
 
 	<TestCase testID="HListAbcDND1_dragDrop" keywords="[DragDrop, List]" description="">
@@ -781,7 +818,6 @@
                 <SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
             </setup>
             <body>
-                <RunCode code="DragManager.endDrag()" />
                 <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
                 <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
         
@@ -799,111 +835,117 @@
                 <WaitForLayoutManager/>
                 <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
             </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase>
 
 	<!--TestCase testID="HListAbcDND1_dragExit" keywords="[DragDrop, List]" description="">
            <setup>
                 <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
-		<SetProperty    target="l1" propertyName="layout"  valueExpression="value=new HorizontalLayout()" />
+                <SetProperty    target="l1" propertyName="layout"  valueExpression="value=new HorizontalLayout()" />
                 <ResetComponent target="l2" className="spark.components.List" waitEvent="updateComplete" />
-		<SetProperty    target="l2" propertyName="layout"  valueExpression="value=new HorizontalLayout()" />
+                <SetProperty    target="l2" propertyName="layout"  valueExpression="value=new HorizontalLayout()" />
                 <SetProperty target="l1" propertyName="itemRenderer"  valueExpression ="value= new ClassFactory( comps.ItemWithBorder )"  />
                 <SetProperty target="l2" propertyName="itemRenderer"  valueExpression ="value= new ClassFactory( comps.ItemWithBorder )"  />
                 <SetProperty target="l1" propertyName="dataProvider" valueExpression="value=application.createAbc()" waitEvent="updateComplete" waitTarget="l1"/>
                 <SetProperty target="l2" propertyName="dataProvider" valueExpression="value=application.createAbc()" waitEvent="updateComplete" waitTarget="l2"/>
-               <SetProperty target="l1" propertyName="selectedIndex" value="0" />
+                <SetProperty target="l1" propertyName="selectedIndex" value="0" />
                 <SetProperty target="l1" propertyName="dragEnabled" value="true" />
                 <SetProperty target="l1" propertyName="dragMoveEnabled" value="true" />
                 <SetProperty target="l2" propertyName="dropEnabled" value="true" />
-		<SetProperty target="l1" propertyName="height" value="105" />
-		<SetProperty target="l1" propertyName="width" value="150" waitEvent="updateComplete"/>
-		<SetProperty target="l1" propertyName="height" value="50" waitEvent="updateComplete"/>
-		<SetProperty target="l2" propertyName="width" value="150" waitEvent="updateComplete"/>
-		<SetProperty target="l2" propertyName="height" value="50" waitEvent="updateComplete"/>
-            	<SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
-	    	<SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
+                <SetProperty target="l1" propertyName="height" value="105" />
+                <SetProperty target="l1" propertyName="width" value="150" waitEvent="updateComplete"/>
+                <SetProperty target="l1" propertyName="height" value="50" waitEvent="updateComplete"/>
+                <SetProperty target="l2" propertyName="width" value="150" waitEvent="updateComplete"/>
+                <SetProperty target="l2" propertyName="height" value="50" waitEvent="updateComplete"/>
+                <SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
+                <SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
             </setup>
             <body>
-		<RunCode code="DragManager.endDrag()" />
-		<DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
-		<DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
-
- 		<DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
- 		<DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="145" localY="12" waitEvent="dragStart" />
- 		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="30"  waitEvent="dragOver"/>
-		<Pause timeout="100"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="9" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-		<Pause timeout="100"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="8" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-		<WaitForEffectsToEnd/>
-		<Pause timeout="100"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="9" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-		<WaitForEffectsToEnd/>
-		<Pause timeout="100"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="8" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-		<WaitForEffectsToEnd/>
-		<Pause timeout="100"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" localX="-5" localY="-5"  waitTarget="l2" waitEvent="dragExit" />
-		<WaitForEffectsToEnd/>
-		<Pause timeout="100"/>
-		<CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
-		<DispatchMouseEvent target="l2" type="mouseUp" localX="1" localY="20"  waitTarget="l1" waitEvent="dragComplete" />
-		<WaitForEffectsToEnd/>
+                <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
+        
+                <DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="145" localY="12" waitEvent="dragStart" />
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="30"  waitEvent="dragOver"/>
+                <WaitForLayoutManager/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="9" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <WaitForLayoutManager/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="8" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="9" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="8" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
+                <DispatchMouseEvent target="l2" type="mouseMove" localX="-5" localY="-5"  waitTarget="l2" waitEvent="dragExit" />
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
+                <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
+                <DispatchMouseEvent target="l2" type="mouseUp" localX="1" localY="20"  waitTarget="l1" waitEvent="dragComplete" />
+                <WaitForEffectsToEnd/>
 
             </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase-->
 
 	<TestCase testID="HListAbcDND1_rejectDrop1" keywords="[DragDrop, List]" description="">
            <setup>
                 <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
-		<SetProperty    target="l1" propertyName="layout"  valueExpression="value=new HorizontalLayout()" />
+                <SetProperty    target="l1" propertyName="layout"  valueExpression="value=new HorizontalLayout()" />
                 <ResetComponent target="l2" className="spark.components.List" waitEvent="updateComplete" />
-		<SetProperty    target="l2" propertyName="layout"  valueExpression="value=new HorizontalLayout()" />
+                <SetProperty    target="l2" propertyName="layout"  valueExpression="value=new HorizontalLayout()" />
                 <SetProperty target="l1" propertyName="itemRenderer"  valueExpression ="value= new ClassFactory( comps.ItemWithBorder )"  />
                 <SetProperty target="l2" propertyName="itemRenderer"  valueExpression ="value= new ClassFactory( comps.ItemWithBorder )"  />
                 <SetProperty target="l1" propertyName="dataProvider" valueExpression="value=application.createAbc()" waitEvent="updateComplete" waitTarget="l1"/>
                 <SetProperty target="l2" propertyName="dataProvider" valueExpression="value=application.createAbc()" waitEvent="updateComplete" waitTarget="l2"/>
-		<SetProperty target="l1" propertyName="width" value="150" waitEvent="updateComplete"/>
-		<SetProperty target="l1" propertyName="height" value="50" waitEvent="updateComplete"/>
-		<SetProperty target="l2" propertyName="width" value="150" waitEvent="updateComplete"/>
-		<SetProperty target="l2" propertyName="height" value="50" waitEvent="updateComplete"/>
+                <SetProperty target="l1" propertyName="width" value="150" waitEvent="updateComplete"/>
+                <SetProperty target="l1" propertyName="height" value="50" waitEvent="updateComplete"/>
+                <SetProperty target="l2" propertyName="width" value="150" waitEvent="updateComplete"/>
+                <SetProperty target="l2" propertyName="height" value="50" waitEvent="updateComplete"/>
                 <SetProperty target="l1" propertyName="selectedIndex" value="0" />
                 <SetProperty target="l1" propertyName="dragEnabled" value="true" />
                 <SetProperty target="l1" propertyName="dragMoveEnabled" value="true" />
-             	<SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
-	     	<SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
+                <SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
+                <SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
             </setup>
             <body>
-		<RunCode code="DragManager.endDrag()" />
-		<DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
-		<DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
-
- 		<DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
- 		<DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="145" localY="12" waitEvent="dragStart" />
- 		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
-
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="9" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-		<Pause timeout="100"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="8" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-		<Pause timeout="100"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="9" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-		<Pause timeout="100"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="8" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-		<Pause timeout="100"/>
-		<CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
-		
+                <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
+                
+                <DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="145" localY="12" waitEvent="dragStart" />
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
+                
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="9" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <WaitForLayoutManager/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="8" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <WaitForLayoutManager/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="9" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <WaitForLayoutManager/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="8" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <WaitForLayoutManager/>
+                <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
             </body>
+            <cleanup>
+                <RunCode code="DragManager.endDrag()" />
+            </cleanup>
         </TestCase>
 
 	<TestCase testID="TileListDefaultRenderer_dragComplete" keywords="[DragDrop, List]" description="">
            <setup>
                 <DispatchMouseEvent target="l2" type="mouseUp" localX="145" localY="1"  waitTarget="l1" waitEvent="dragComplete" />
-		<WaitForEffectsToEnd/>
-		<ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
-		<SetProperty    target="l1" propertyName="layout"  valueExpression="value=new TileLayout()" />
+                <WaitForEffectsToEnd/>
+                <ResetComponent target="l1" className="spark.components.List" waitEvent="updateComplete" />
+                <SetProperty    target="l1" propertyName="layout"  valueExpression="value=new TileLayout()" />
                 <ResetComponent target="l2" className="spark.components.List" waitEvent="updateComplete" />
-		<SetProperty    target="l2" propertyName="layout"  valueExpression="value=new TileLayout()" />
+                <SetProperty    target="l2" propertyName="layout"  valueExpression="value=new TileLayout()" />
                 <SetProperty target="l1" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l1"/>
                 <SetProperty target="l2" propertyName="dataProvider" valueExpression="value=application.createPlayersAC()" waitEvent="updateComplete" waitTarget="l2"/>
                 <SetProperty target="l1" propertyName="labelField" value="lastName" waitEvent="updateComplete" waitTarget="l1"/>
@@ -912,34 +954,37 @@
                 <SetProperty target="l1" propertyName="dragEnabled" value="true" />
                 <SetProperty target="l2" propertyName="dragEnabled" value="true" />
                 <SetProperty target="l2" propertyName="dropEnabled" value="true" />
-		<SetProperty target="l1" propertyName="width" value="150" waitEvent="updateComplete"/>
-		<SetProperty target="l1" propertyName="height" value="200" waitEvent="updateComplete"/>
-		<SetProperty target="l2" propertyName="width" value="150" waitEvent="updateComplete"/>
-		<SetProperty target="l2" propertyName="height" value="200" waitEvent="updateComplete"/>
-            	<SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
-	    	<SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
+                <SetProperty target="l1" propertyName="width" value="150" waitEvent="updateComplete"/>
+                <SetProperty target="l1" propertyName="height" value="200" waitEvent="updateComplete"/>
+                <SetProperty target="l2" propertyName="width" value="150" waitEvent="updateComplete"/>
+                <SetProperty target="l2" propertyName="height" value="200" waitEvent="updateComplete"/>
+                <SetProperty target="l1.layout" propertyName="dragScrollInitialDelay" value="0" />
+                <SetProperty target="l2.layout" propertyName="dragScrollInitialDelay" value="0" />
             </setup>
             <body>
-		<RunCode code="DragManager.endDrag()" />
-		<DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
-		<DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
-
- 		<DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
- 		<DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="145" localY="12" waitEvent="dragStart" />
- 		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
-		<DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="30"  waitEvent="dragOver"/>
-		<DispatchMouseEvent target="l2" type="mouseUp" localX="145" localY="30"  waitTarget="l1" waitEvent="dragComplete" />
-		<WaitForEffectsToEnd/>
-		<Pause timeout="100"/>
-		<CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />
+                <DispatchMouseEvent target="l1"  type="mouseUp"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseOver" buttonDown="false" localX="10" localY="10" />
+        
+                <DispatchMouseEvent target="l1"  type="mouseDown" buttonDown="true"  localX="10" localY="10" />
+                <DispatchMouseEvent target="l1"  type="mouseMove" buttonDown="true"  localX="145" localY="12" waitEvent="dragStart" />
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="5" localY="10" waitEvent="dragEnter"/>
+                <DispatchMouseEvent target="l2" type="mouseMove" buttonDown="true" localX="145" localY="30"  waitEvent="dragOver"/>
+                <DispatchMouseEvent target="l2" type="mouseUp" localX="145" localY="30"  waitTarget="l1" waitEvent="dragComplete" />
+                <WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
+                <CompareBitmap numColorVariances="20" ignoreMaxColorVariance="true" target="hg" url="../events/baselines/$testID.png" />

[... 810 lines stripped ...]