incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1394585 [1/3] - in /incubator/flex/sdk/branches/develop/mustella: as3/src/mustella/ tests/components/DataGrid/DataGrid_SparkSkin/Properties/ tests/components/RadioButton/Integration/ tests/gumbo/components/ListDragDrop/SparkDND/ tests/mx/e...
Date Fri, 05 Oct 2012 15:25:25 GMT
Author: cframpton
Date: Fri Oct  5 15:25:25 2012
New Revision: 1394585

URL: http://svn.apache.org/viewvc?rev=1394585&view=rev
Log:
Add some trace statements to compareWithVariances to help figure out what the correct values
should be.  Add some tolerances to tests which failed bitmap cmpares on Windows.

Modified:
    incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/CompareBitmap.as
    incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_scrollPolicies.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/components/RadioButton/Integration/RadioButton_Integration_spark.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/gumbo/components/ListDragDrop/SparkDND/SparkDNDList_main.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/mx/effects/effectClasses/AddRemoveEffectTargetFilter/usability/AddRemoveEffectTargetFilter_usability.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/spark/collections/Sort/GumboComponents/SF_ORIG_list_keyboardNavigation_tester.mxml

Modified: incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/CompareBitmap.as
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/CompareBitmap.as?rev=1394585&r1=1394584&r2=1394585&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/CompareBitmap.as (original)
+++ incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/CompareBitmap.as Fri Oct
 5 15:25:25 2012
@@ -858,7 +858,8 @@ public class CompareBitmap extends Asser
 	private function compareWithVariances(bm:BitmapData):Object
 	{
 
-		var allowed:int = numColorVariances * UnitTester.pixelToleranceMultiplier;
+		var totalAllowed:int = numColorVariances * UnitTester.pixelToleranceMultiplier;
+		var allowed:int = totalAllowed;
 		var n:int = bm.height;
 		var m:int = bm.width;
 
@@ -884,17 +885,22 @@ public class CompareBitmap extends Asser
 							blue > maxColorVariance ||
 							green > maxColorVariance)
 						{
+							var max:int = Math.max(Math.max(red, blue), green);
+							trace("CompareBitmap: exceeded maxColorVariance=" + maxColorVariance + " max(red,green,blue)="
+ max);
 							return bm;
 						}
 					}
 					allowed--;
 					if (allowed < 0)
 					{
+						trace("CompareBitmap: exceeded numColorVariances=" + numColorVariances);
 						return bm;
 					}
 				}
 			}
 		}
+		
+		trace("CompareBitmap: numColorVariances seen=" + String(totalAllowed - allowed));
 		return 0;
 	}
 

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_scrollPolicies.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_scrollPolicies.mxml?rev=1394585&r1=1394584&r2=1394585&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_scrollPolicies.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/DataGrid/DataGrid_SparkSkin/Properties/datagrid_properties_scrollPolicies.mxml
Fri Oct  5 15:25:25 2012
@@ -155,7 +155,8 @@ vertical, becomes (un)needed: Change the
                 <RunCode code="FlexGlobals.topLevelApplication.dg1.dataProvider.removeItemAt(0)"
waitTarget="dg1" waitEvent="updateComplete" />
                 <RunCode code="FlexGlobals.topLevelApplication.dg1.dataProvider.removeItemAt(0)"
waitTarget="dg1" waitEvent="updateComplete" />
                 <AssertPropertyValue target="dg1.mx_internal:vScrollBar" propertyName="visible"
value="true" />
-                <CompareBitmap target="dg1" url="../Properties/Baselines/verticalScrollPolicy_notVisibleBitmapCalibration2.png"
numColorVariances="2"/>
+                <CompareBitmap target="dg1" url="../Properties/Baselines/verticalScrollPolicy_notVisibleBitmapCalibration2.png"

+							   numColorVariances="2" maxColorVariance="1"/>
             </body>
         </TestCase>
 

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/RadioButton/Integration/RadioButton_Integration_spark.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/RadioButton/Integration/RadioButton_Integration_spark.mxml?rev=1394585&r1=1394584&r2=1394585&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/RadioButton/Integration/RadioButton_Integration_spark.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/RadioButton/Integration/RadioButton_Integration_spark.mxml
Fri Oct  5 15:25:25 2012
@@ -61,7 +61,7 @@
 		<body>
 			<DispatchKeyEvent keys="[TAB, TAB, RIGHT, RIGHT, RIGHT ]" waitEvent="focusIn" waitTarget="tn.rb7"/>
 			<AssertPropertyValue target="tn.rb7" propertyName="selected" value="true" />
-			<CompareBitmap target="tn.int2" url="../Integration/baselines/layout_integration_spark.png"
timeout="5000" numColorVariances="1"/>  
+			<CompareBitmap target="tn.int2" url="../Integration/baselines/layout_integration_spark.png"
numColorVariances="1" maxColorVariance="1"/>  
 		</body>
 	</TestCase>	
 



Mime
View raw message