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/12/07 22:59:52 UTC

svn commit: r1418504 - in /incubator/flex/sdk/branches/release4.9: ./ mustella/tests/components/ mustella/tests/components/Charts/Line/Properties/ mustella/tests/components/Charts/Pie/Properties/ mustella/tests/components/Charts/Plot/Properties/

Author: cframpton
Date: Fri Dec  7 21:59:51 2012
New Revision: 1418504

URL: http://svn.apache.org/viewvc?rev=1418504&view=rev
Log:
Merge 1418465 from develop to release4.9. Charts fixes for Windows.

Modified:
    incubator/flex/sdk/branches/release4.9/   (props changed)
    incubator/flex/sdk/branches/release4.9/mustella/tests/components/   (props changed)
    incubator/flex/sdk/branches/release4.9/mustella/tests/components/Charts/Line/Properties/LineProperties.mxml
    incubator/flex/sdk/branches/release4.9/mustella/tests/components/Charts/Pie/Properties/PieProperties.mxml
    incubator/flex/sdk/branches/release4.9/mustella/tests/components/Charts/Plot/Properties/PlotProperties.mxml

Propchange: incubator/flex/sdk/branches/release4.9/
------------------------------------------------------------------------------
  Merged /incubator/flex/sdk/branches/develop:r1418465

Propchange: incubator/flex/sdk/branches/release4.9/mustella/tests/components/
------------------------------------------------------------------------------
  Merged /incubator/flex/sdk/branches/develop/mustella/tests/components:r1418465

Modified: incubator/flex/sdk/branches/release4.9/mustella/tests/components/Charts/Line/Properties/LineProperties.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/release4.9/mustella/tests/components/Charts/Line/Properties/LineProperties.mxml?rev=1418504&r1=1418503&r2=1418504&view=diff
==============================================================================
--- incubator/flex/sdk/branches/release4.9/mustella/tests/components/Charts/Line/Properties/LineProperties.mxml (original)
+++ incubator/flex/sdk/branches/release4.9/mustella/tests/components/Charts/Line/Properties/LineProperties.mxml Fri Dec  7 21:59:51 2012
@@ -348,7 +348,7 @@
 				<SetProperty target="comp.series.0" waitEvent="updateComplete" waitTarget="comp.series.0" propertyName="selectedIndex" value="3" />
 			</setup>
 			<body>
-				<CompareBitmap target="comp"   url="../Properties/Baselines/LineSeries_selectionMode_Single.png"  timeout="5000"/>
+				<CompareBitmap target="comp"   url="../Properties/Baselines/LineSeries_selectionMode_Single.png" timeout="5000" ignoreMaxColorVariance="true" numColorVariances="2"/>
 			</body> 
 		</TestCase>
 
@@ -379,7 +379,7 @@
 				<SetProperty target="comp.series.0" waitEvent="updateComplete" waitTarget="comp.series.0" propertyName="selectedIndices" value="[3,15,9,20]" />
 			</setup>
 			<body>
-				<CompareBitmap target="comp"   url="../Properties/Baselines/LineSeries_selectionMode_Multiple.png"  timeout="5000"/>
+				<CompareBitmap target="comp"   url="../Properties/Baselines/LineSeries_selectionMode_Multiple.png" timeout="5000" ignoreMaxColorVariance="true" numColorVariances="2"/>
 			</body> 
 		</TestCase> 
 

Modified: incubator/flex/sdk/branches/release4.9/mustella/tests/components/Charts/Pie/Properties/PieProperties.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/release4.9/mustella/tests/components/Charts/Pie/Properties/PieProperties.mxml?rev=1418504&r1=1418503&r2=1418504&view=diff
==============================================================================
--- incubator/flex/sdk/branches/release4.9/mustella/tests/components/Charts/Pie/Properties/PieProperties.mxml (original)
+++ incubator/flex/sdk/branches/release4.9/mustella/tests/components/Charts/Pie/Properties/PieProperties.mxml Fri Dec  7 21:59:51 2012
@@ -117,7 +117,7 @@
 				<SetProperty target="comp.series.0" waitEvent="updateComplete" waitTarget="comp.series.0" propertyName="selectedIndex" value="15"  />
 			</setup>
 			<body>
-				<CompareBitmap target="comp"   url="../Properties/Baselines/PieSeries_selectionMode_Single.png"  timeout="5000"/>
+				<CompareBitmap target="comp"   url="../Properties/Baselines/PieSeries_selectionMode_Single.png"  timeout="5000" maxColorVariance="5" numColorVariances="1"/>
 			</body> 
 		</TestCase>
 
@@ -129,10 +129,9 @@
 				<SetProperty target="comp" waitTarget="comp" propertyName="selectionMode" value="none" />				
 				<SetProperty target="comp.series.0" waitTarget="comp.series.0" propertyName="selectable" value="true" /> 
 				<SetProperty target="comp.series.0" waitEvent="updateComplete" waitTarget="comp.series.0" propertyName="selectedIndex" value="3" />
-
 			</setup>
 			<body>
-				<CompareBitmap target="comp"   url="../Properties/Baselines/PieSeries_selectionMode_None.png"  timeout="5000"/> 
+				<CompareBitmap target="comp"   url="../Properties/Baselines/PieSeries_selectionMode_None.png" timeout="5000" maxColorVariance="5" numColorVariances="1"/> 
 			</body> 
 		</TestCase> 
 
@@ -146,7 +145,7 @@
 				<SetProperty target="comp.series.0" waitEvent="updateComplete" waitTarget="comp.series.0" propertyName="selectedIndices" value="[3,15,9,20]" />
 			</setup>
 			<body>
-				<CompareBitmap target="comp"   url="../Properties/Baselines/PieSeries_selectionMode_Multiple.png"  timeout="5000"/>
+				<CompareBitmap target="comp"   url="../Properties/Baselines/PieSeries_selectionMode_Multiple.png"  timeout="5000" maxColorVariance="5" numColorVariances="1"/>
 			</body> 
 		</TestCase>
 

Modified: incubator/flex/sdk/branches/release4.9/mustella/tests/components/Charts/Plot/Properties/PlotProperties.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/release4.9/mustella/tests/components/Charts/Plot/Properties/PlotProperties.mxml?rev=1418504&r1=1418503&r2=1418504&view=diff
==============================================================================
--- incubator/flex/sdk/branches/release4.9/mustella/tests/components/Charts/Plot/Properties/PlotProperties.mxml (original)
+++ incubator/flex/sdk/branches/release4.9/mustella/tests/components/Charts/Plot/Properties/PlotProperties.mxml Fri Dec  7 21:59:51 2012
@@ -418,7 +418,7 @@
                 <RunCode code="MultipleAxesUtils.AxisRenderers('axisAtSeries', application.comp)" waitEvent="updateComplete" waitTarget="comp"/>            
             </setup>
             <body>
-                <CompareBitmap target="comp"   url="../Properties/Baselines/PlotSeries_axisAtSeriesLevel.png" />
+                <CompareBitmap target="comp" url="../Properties/Baselines/PlotSeries_axisAtSeriesLevel.png" ignoreMaxColorVariance="true" numColorVariances="25" />
             </body> 
         </TestCase>
     </testCases>