incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1394281 - in /incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid: DataGrid_HaloSkin/Properties/ DataGrid_HaloSkin/Properties/Baselines/ DataGrid_HaloSkin/Styles/ DataGrid_HaloSkin/Styles/Baselines/ DataGrid_SparkSkin/Pr...
Date Thu, 04 Oct 2012 21:40:02 GMT
Author: cframpton
Date: Thu Oct  4 21:40:01 2012
New Revision: 1394281

URL: http://svn.apache.org/viewvc?rev=1394281&view=rev
Log:
Remove os specific baselines.

Removed:
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/Baselines/datagrid_dragenabled_dropenabled_inprogress_halo@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/Baselines/lockedColumnCount_config8_dragDropInLockedColumnArea_inProgress_halo@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/Baselines/lockedColumnCount_config8_dragDropInUnlockedColumnArea_inProgress_halo@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/Baselines/lockedColumnCount_config8_multipleDragsInProgress_halo@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/Baselines/lockedRowCount_config1_dragDropInLockedRowArea_inProgress_halo@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/Baselines/lockedRowCount_config1_dragDropInUnlockedRowArea_inProgress_halo@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/Baselines/lockedRowCount_config2_dragDropInLockedRowArea_inProgress_halo@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/Baselines/lockedRowCount_config2_dragDropInUnlockedRowArea_inProgress_halo@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/Baselines/property_dragEnabled_dropEnabled_InProgress_halo@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Styles/Baselines/styleName_multiple_precedence_halo@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/Baselines/datagrid_dragenabled@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/Baselines/datagrid_dragenabled_dropenabled_inprogress@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/Baselines/lockedColumnCount_config8_dragDropInLockedColumnArea_inProgress@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/Baselines/lockedColumnCount_config8_dragDropInUnlockedColumnArea_inProgress@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/Baselines/lockedColumnCount_config8_dragDropUnlockedToLockedColumnArea@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/Baselines/lockedColumnCount_config8_multipleDragsInProgress@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/Baselines/lockedRowCount_config1_dragDropInLockedRowArea_inProgress@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/Baselines/lockedRowCount_config1_dragDropInUnlockedRowArea_inProgress@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/Baselines/lockedRowCount_config2_dragDropInLockedRowArea_inProgress@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/Baselines/lockedRowCount_config2_dragDropInUnlockedRowArea_inProgress@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/Baselines/property_dragEnabled@mac.png
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/Baselines/property_dragEnabled_dropEnabled_InProgress@mac.png
Modified:
    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_lockedColumnCount_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_HaloSkin/Styles/datagrid_Styles_styleName_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_lockedColumnCount.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_lockedRowCount.mxml

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=1394281&r1=1394280&r2=1394281&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
Thu Oct  4 21:40:01 2012
@@ -348,9 +348,7 @@
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="115"
waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="125"
waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
         		<WaitForEffectsToEnd />
-                <CompareBitmap target="mydatagrid" url="../Properties/Baselines/">
-                	<ConditionalValue os="mac"/>
-                </CompareBitmap>
+                <CompareBitmap target="mydatagrid" url="../Properties/Baselines/$testID.png"/>
             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="150" stageY="125"/>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/datagrid_properties_lockedColumnCount_halo.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/datagrid_properties_lockedColumnCount_halo.mxml?rev=1394281&r1=1394280&r2=1394281&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/datagrid_properties_lockedColumnCount_halo.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Properties/datagrid_properties_lockedColumnCount_halo.mxml
Thu Oct  4 21:40:01 2012
@@ -2973,9 +2973,8 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedColumns.listItems.1.0"
localX="2" localY="20" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedColumns.listItems.1.0"
localX="2" localY="30" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <WaitForEffectsToEnd />
-                <CompareBitmap target="dg1" url="../Properties/Baselines/"  numColorVariances="4"
ignoreMaxColorVariance="true">
-                	<ConditionalValue os="mac"/>
-                </CompareBitmap>
+                <WaitForLayoutManager/>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
 numColorVariances="4" maxColorVariance="1"/>
             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />
@@ -3037,9 +3036,8 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:rendererArray.1.0"
localX="2" localY="20" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:rendererArray.1.0"
localX="2" localY="30" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <WaitForEffectsToEnd />
-                <CompareBitmap target="dg1" url="../Properties/Baselines/"  numColorVariances="4"
ignoreMaxColorVariance="true">
-                	<ConditionalValue os="mac"/>
-                </CompareBitmap>
+                <WaitForLayoutManager/>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
 numColorVariances="4" maxColorVariance="1"/>
         </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />
@@ -3182,10 +3180,9 @@ is still in "drag mode".  It's a known M
 				<Pause timeout="250" />
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedColumns.listItems.0.1"
localX="2" localY="10" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedColumns.listItems.1.1"
localX="2" localY="10" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-				<Pause timeout="250" />
-                <CompareBitmap target="dg1" url="../Properties/Baselines/"  numColorVariances="4"
ignoreMaxColorVariance="true">
-                	<ConditionalValue os="mac"/>
-                </CompareBitmap>
+				<WaitForEffectsToEnd/>
+                <WaitForLayoutManager/>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
 numColorVariances="4" maxColorVariance="1"/>
             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />

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=1394281&r1=1394280&r2=1394281&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
Thu Oct  4 21:40:01 2012
@@ -88,10 +88,8 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedRows.listItems.0.0"
localX="2" localY="30" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <WaitForEffectsToEnd />
                 <WaitForLayoutManager/>
-                <CompareBitmap target="dg1" url="../Properties/Baselines/" numColorVariances="5"
ignoreMaxColorVariance="true">
-                	<ConditionalValue os="mac"/>
-                </CompareBitmap>
-            </body>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
numColorVariances="20" maxColorVariance="1"/>
+             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />
             </cleanup>
@@ -155,9 +153,7 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:rendererArray.1.0"
localX="2" localY="30" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <WaitForEffectsToEnd />
                 <WaitForLayoutManager/>
-                <CompareBitmap target="dg1" url="../Properties/Baselines/">
-                	<ConditionalValue os="mac"/>
-                </CompareBitmap>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
numColorVariances="20" maxColorVariance="1"/>
             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />
@@ -310,10 +306,8 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedRows.listItems.0.0"
localX="2" localY="30" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <WaitForEffectsToEnd />
                 <Pause timeout="1" />
-                <CompareBitmap target="dg1" url="../Properties/Baselines/" numColorVariances="5"
ignoreMaxColorVariance="true">
-                	<ConditionalValue os="mac"/>
-                </CompareBitmap>
-            </body>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
numColorVariances="20" maxColorVariance="1"/>
+             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />
             </cleanup>
@@ -379,10 +373,8 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:rendererArray.1.0"
localX="2" localY="30" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <WaitForEffectsToEnd />
                 <Pause timeout="1" />
-                <CompareBitmap target="dg1" url="../Properties/Baselines/">
-                	<ConditionalValue os="mac"/>
-                </CompareBitmap>
-            </body>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
numColorVariances="20" maxColorVariance="1"/>
+             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />
             </cleanup>

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Styles/datagrid_Styles_styleName_halo.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Styles/datagrid_Styles_styleName_halo.mxml?rev=1394281&r1=1394280&r2=1394281&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Styles/datagrid_Styles_styleName_halo.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_HaloSkin/Styles/datagrid_Styles_styleName_halo.mxml
Thu Oct  4 21:40:01 2012
@@ -72,13 +72,11 @@
             </setup>
             <body>
                  <SetStyle target="gridInCanvas" value="redText italicText boldBig" styleName="styleName"
waitEvent="updateComplete" waitTarget="gridInCanvas" />
-                 <CompareBitmap target="gridInCanvas.getChildAt(0).mx_internal:rendererArray.1.0"
url="../Styles/baselines/" timeout="5000" >
-                     <ConditionalValue os="mac" />
-                 </CompareBitmap>
-			</body>
+                 <CompareBitmap target="gridInCanvas.getChildAt(0).mx_internal:rendererArray.1.0"
url="../Styles/baselines/$testID.png" timeout="5000"/>
+ 			</body>
          </TestCase>
 
-<TestCase testID="styleName_multiple_precedence_mac_halo" description="Test multiple styleNames
for DataGrid. This test will only work with Flex 4 and newer."
+        <TestCase testID="styleName_multiple_precedence_mac_halo" description="Test multiple
styleNames for DataGrid. This test will only work with Flex 4 and newer."
             keywords="[DataGrid, styleName, CSS]" >
             <setup>
                  <ResetComponent target="gridInCanvas" className="comps.dataGridInCanvasComp"
waitEvent="updateComplete" waitTarget="gridInCanvas" />

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=1394281&r1=1394280&r2=1394281&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
Thu Oct  4 21:40:01 2012
@@ -324,10 +324,9 @@
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="mydatagrid"
localX="250" localY="95" />
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="mydatagrid"
localX="250" localY="98" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <WaitForEffectsToEnd />
-                <CompareBitmap target="mydatagrid" url="../Properties/Baselines/" numColorVariances="8"
ignoreMaxColorVariance="true">
-                	<ConditionalValue os="mac"/>
-                </CompareBitmap>
-            </body>
+                <WaitForLayoutManager/>
+                <CompareBitmap target="mydatagrid" url="../Properties/Baselines/$testID.png"
numColorVariances="8" maxColorVariance="1"/>
+             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="150" stageY="125"/>
             </cleanup>
@@ -352,9 +351,8 @@
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="115"
waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="125"
waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
      		    <WaitForEffectsToEnd />
-                <CompareBitmap target="mydatagrid" url="../Properties/Baselines/" numColorVariances="8"
ignoreMaxColorVariance="true">
-                	<ConditionalValue os="mac"/>
-                </CompareBitmap>
+                <WaitForLayoutManager/>
+                <CompareBitmap target="mydatagrid" url="../Properties/Baselines/$testID.png"
numColorVariances="8" maxColorVariance="1"/>
             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="150" stageY="125"/>
@@ -381,37 +379,38 @@
                 <WaitForEffectsToEnd />
                 <DispatchMouseEvent type="mouseUp" stageX="150" stageY="125"/>
                 <WaitForEffectsToEnd />
+                <WaitForLayoutManager/>
                 <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_dragenabled_dropenabled_dropcomplete.png"
numColorVariances="8" ignoreMaxColorVariance="true"/>
             </body>
         </TestCase>
 
-    <TestCase testID="property_dragMoveEnabled_DragInProgress" keywords="[DataGrid,properties,dragMoveEnabled]">
-        <setup>
+        <TestCase testID="property_dragMoveEnabled_DragInProgress" keywords="[DataGrid,properties,dragMoveEnabled]">
+            <setup>
                 <DispatchMouseEvent type="mouseUp" stageX="150" stageY="125"/>
-        <ResetComponent target="mydatagrid" className="mx.controls.DataGrid" waitTarget="mydatagrid"
waitEvent="updateComplete"/>        
+                <ResetComponent target="mydatagrid" className="mx.controls.DataGrid" waitTarget="mydatagrid"
waitEvent="updateComplete"/>        
                 <SetProperty target="mydatagrid" propertyName="dataProvider" valueExpression="value=ObjectUtil.copy(application.dataArray1)"
waitEvent="updateComplete" />
-        <SetProperty propertyName="dragEnabled" value="true" target="mydatagrid" />
-        <SetProperty propertyName="dragMoveEnabled" value="true" target="mydatagrid"/>
-        <SetProperty propertyName="dropEnabled" value="true" target="mydatagrid"/>
-        </setup>
-        <body>
-        <DispatchMouseEvent type="mouseDown" stageX="150" stageY="55"/>
-        <WaitForEffectsToEnd />
-        <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="60"
/>
-        <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="65"
waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-        <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="75"
waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-        <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="85"
waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-        <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="95"
waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-        <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="105"
waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-        <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="115"
waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-        <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="125"
waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
-        <WaitForEffectsToEnd />
-        <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_dragmoveenabled_draginprogress.png"
numColorVariances="8" ignoreMaxColorVariance="true"/>
-        </body>
+                <SetProperty propertyName="dragEnabled" value="true" target="mydatagrid"
/>
+                <SetProperty propertyName="dragMoveEnabled" value="true" target="mydatagrid"/>
+                <SetProperty propertyName="dropEnabled" value="true" target="mydatagrid"/>
+            </setup>
+            <body>
+                <DispatchMouseEvent type="mouseDown" stageX="150" stageY="55"/>
+                <WaitForEffectsToEnd />
+                <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="60"
/>
+                <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="65"
waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="75"
waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="85"
waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="95"
waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="105"
waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="115"
waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <DispatchMouseEvent type="mouseMove" buttonDown="true" stageX="150" stageY="125"
waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
+                <WaitForEffectsToEnd />
+                <CompareBitmap target="mydatagrid" url="../Properties/Baselines/datagrid_dragmoveenabled_draginprogress.png"
numColorVariances="8" ignoreMaxColorVariance="true"/>
+            </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="150" stageY="125"/>
             </cleanup>
-    </TestCase>
+        </TestCase>
 
 
         <TestCase testID="property_dragMoveEnabled_DragComplete" keywords="[DataGrid,properties,dragMoveEnabled]">

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_lockedColumnCount.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_lockedColumnCount.mxml?rev=1394281&r1=1394280&r2=1394281&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_lockedColumnCount.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_lockedColumnCount.mxml
Thu Oct  4 21:40:01 2012
@@ -2957,8 +2957,7 @@ do its cleanup, the next test case that 
 is still in "drag mode".  It's a known Mustella issue.  Be aware!
 ================================================================================
 -->
-	<!--FIXME: rename bitmap since test works on both platforms -->
-        <TestCase testID="lockedColumnCount_config8_dragDropInLockedColumnArea_inProgress"
keywords="[DataGrid,properties,lockedColumnCount]">
+       <TestCase testID="lockedColumnCount_config8_dragDropInLockedColumnArea_inProgress"
keywords="[DataGrid,properties,lockedColumnCount]">
             <setup>
                 <ResetComponent target="dg1" className="mx.controls.DataGrid" waitEvent="updateComplete"
/>
                 <RunCode code="application.showOnlyTheseDataGrids([FlexGlobals.topLevelApplication.dg1])"
/>
@@ -2978,10 +2977,9 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedColumns.listItems.1.0"
localX="2" localY="20" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedColumns.listItems.1.0"
localX="2" localY="30" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <WaitForEffectsToEnd />
-                <CompareBitmap target="dg1" url="../Properties/Baselines/">
-                	<ConditionalValue os="mac"/>
-                </CompareBitmap>
-            </body>
+                <WaitForLayoutManager/>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"/>
+             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />
             </cleanup>
@@ -3042,8 +3040,8 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:rendererArray.1.0"
localX="2" localY="20" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:rendererArray.1.0"
localX="2" localY="30" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <WaitForEffectsToEnd />
-                <CompareBitmap target="dg1" url="../Properties/Baselines/" numColorVariances="5"
ignoreMaxColorVariance="true">
-                	<ConditionalValue os="mac"/>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
numColorVariances="5" ignoreMaxColorVariance="true">
+                	<!--ConditionalValue os="mac"/-->
                 </CompareBitmap>
             </body>
             <cleanup>
@@ -3149,8 +3147,8 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedColumns.listItems.0.1"
localX="10" localY="10" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseUp" target="dg1.mx_internal:dataGridLockedColumns.listItems.0.1"
localX="2" localY="2" />
                 <Pause timeout="500" />
-                <CompareBitmap target="dg1" url="../Properties/Baselines/" numColorVariances="5"
ignoreMaxColorVariance="true">
-                	<ConditionalValue os="mac"/>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
numColorVariances="5" ignoreMaxColorVariance="true">
+                	<!--ConditionalValue os="mac"/-->
                 </CompareBitmap>
             </body>
             <cleanup>
@@ -3192,8 +3190,8 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedColumns.listItems.0.1"
localX="2" localY="10" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedColumns.listItems.1.1"
localX="2" localY="10" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
 				<Pause timeout="250" />
-                <CompareBitmap target="dg1" url="../Properties/Baselines/" numColorVariances="5"
ignoreMaxColorVariance="true">
-                	<ConditionalValue os="mac"/>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
numColorVariances="5" ignoreMaxColorVariance="true">
+                	<!--ConditionalValue os="mac"/-->
                 </CompareBitmap>
             </body>
             <cleanup>

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=1394281&r1=1394280&r2=1394281&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
Thu Oct  4 21:40:01 2012
@@ -89,9 +89,7 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedRows.listItems.0.0"
localX="2" localY="30" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <WaitForEffectsToEnd />
                 <Pause timeout="1" />
-                <CompareBitmap target="dg1" url="../Properties/Baselines/" numColorVariances="5"
ignoreMaxColorVariance="true">
-                	<ConditionalValue os="mac"/>
-                </CompareBitmap>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
numColorVariances="20" maxColorVariance="1"/>
             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />
@@ -156,9 +154,7 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:rendererArray.1.0"
localX="2" localY="30" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <WaitForEffectsToEnd />
                 <Pause timeout="1" />
-                <CompareBitmap target="dg1" url="../Properties/Baselines/" numColorVariances="5"
ignoreMaxColorVariance="true">
-                	<ConditionalValue os="mac"/>
-                </CompareBitmap>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
numColorVariances="20" maxColorVariance="1"/>
             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />
@@ -313,10 +309,8 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedRows.listItems.0.0"
localX="2" localY="30" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <WaitForEffectsToEnd />
                 <Pause timeout="1" />
-                <CompareBitmap target="dg1" url="../Properties/Baselines/" numColorVariances="2"
ignoreMaxColorVariance="true">
-                	<ConditionalValue os="mac"/>
-                </CompareBitmap>
-            </body>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
numColorVariances="20" maxColorVariance="1"/>
+             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />
             </cleanup>
@@ -383,10 +377,8 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:rendererArray.1.0"
localX="2" localY="30" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <WaitForEffectsToEnd />
                 <Pause timeout="1" />
-                <CompareBitmap target="dg1" url="../Properties/Baselines/" numColorVariances="5"
ignoreMaxColorVariance="true">
-                	<ConditionalValue os="mac"/>
-                </CompareBitmap>
-            </body>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
numColorVariances="20" maxColorVariance="1"/>
+             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />
             </cleanup>



Mime
View raw message