incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1394328 - in /incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid: DataGrid_HaloSkin/Properties/ DataGrid_HaloSkin/Styles/ DataGrid_SparkSkin/Properties/
Date Thu, 04 Oct 2012 23:43:04 GMT
Author: cframpton
Date: Thu Oct  4 23:43:03 2012
New Revision: 1394328

URL: http://svn.apache.org/viewvc?rev=1394328&view=rev
Log:
Fix commit 1394281.

Modified:
    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/Styles/datagrid_Styles_styleName_halo.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_lockedColumnCount.mxml

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=1394328&r1=1394327&r2=1394328&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 23:43:03 2012
@@ -2974,7 +2974,7 @@ 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="30" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <WaitForEffectsToEnd />
                 <WaitForLayoutManager/>
-                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
 numColorVariances="4" maxColorVariance="1"/>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
 numColorVariances="20" maxColorVariance="1"/>
             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />
@@ -3037,7 +3037,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/$testID.png"
 numColorVariances="4" maxColorVariance="1"/>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
 numColorVariances="20" maxColorVariance="1"/>
         </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />
@@ -3182,7 +3182,7 @@ is still in "drag mode".  It's a known M
                 <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"/>
 				<WaitForEffectsToEnd/>
                 <WaitForLayoutManager/>
-                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
 numColorVariances="4" maxColorVariance="1"/>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
 numColorVariances="20" maxColorVariance="1"/>
             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />

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=1394328&r1=1394327&r2=1394328&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 23:43:03 2012
@@ -72,7 +72,7 @@
             </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/$testID.png" timeout="5000"/>
+                 <CompareBitmap target="gridInCanvas.getChildAt(0).mx_internal:rendererArray.1.0"
url="../Styles/baselines/$testID.png" numColorVariances="5" ignoreMaxColorVariance="true"/>
  			</body>
          </TestCase>
 

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=1394328&r1=1394327&r2=1394328&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 23:43:03 2012
@@ -2977,8 +2977,7 @@ 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 />
-                <WaitForLayoutManager/>
-                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"/>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
numColorVariances="30" maxColorVariance="1"/>
              </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />
@@ -3013,7 +3012,7 @@ is still in "drag mode".  It's a known M
                 <DispatchMouseEvent type="mouseMove" buttonDown="true" target="dg1.mx_internal:dataGridLockedColumns.listItems.3.0"
localX="2" localY="10" waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"/>
                 <DispatchMouseEvent type="mouseUp" target="dg1.mx_internal:dataGridLockedColumns.listItems.3.0"
localX="2" localY="30" />
                 <Pause timeout="500" />
-                <CompareBitmap target="dg1" url="../Properties/Baselines/lockedColumnCount_config8_dragDropInLockedColumnArea_dropComplete.png"
numColorVariances="8" ignoreMaxColorVariance="true"/>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/lockedColumnCount_config8_dragDropInLockedColumnArea_dropComplete.png"
numColorVariances="20" maxColorVariance="1"/>
             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />
@@ -3040,9 +3039,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="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/$testID.png"
numColorVariances="5" ignoreMaxColorVariance="true">
-                	<!--ConditionalValue os="mac"/-->
-                </CompareBitmap>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
numColorVariances="25" ignoreMaxColorVariance="true"/>
             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />
@@ -3147,9 +3144,7 @@ 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/$testID.png"
numColorVariances="5" ignoreMaxColorVariance="true">
-                	<!--ConditionalValue os="mac"/-->
-                </CompareBitmap>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
numColorVariances="5" ignoreMaxColorVariance="true"/>
             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />
@@ -3190,10 +3185,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/$testID.png"
numColorVariances="5" ignoreMaxColorVariance="true">
-                	<!--ConditionalValue os="mac"/-->
-                </CompareBitmap>
-            </body>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/$testID.png"
numColorVariances="25" maxColorVariance="1"/>
+             </body>
             <cleanup>
                 <DispatchMouseEvent type="mouseUp" stageX="5" stageY="5" />
             </cleanup>



Mime
View raw message