You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2012/10/04 17:36:57 UTC

svn commit: r1394117 - in /incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic: integration/ integration/baselines/ properties/ properties/baselines/

Author: pent
Date: Thu Oct  4 15:36:56 2012
New Revision: 1394117

URL: http://svn.apache.org/viewvc?rev=1394117&view=rev
Log:
Added os-specific pngs for baselines. Modified some tests to use ConditionalValue os="win"

Added:
    incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/FXG_Matrix3D_AS_rotate@win.png   (with props)
    incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/FXG_Matrix3D_AS_scale@win.png   (with props)
    incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/FXG_Matrix3D_mxml_scale@win.png   (with props)
    incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/GraphicTags_Filters_DropShadowFilter_AS_mac@win.png   (with props)
    incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/properties/baselines/GraphicTags_NestedGroup_rotationXY@win.png   (with props)
Modified:
    incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/FXG_Matrix3D_Tests.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/GraphicTags_FilterTests.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/properties/FXG_GraphicGroup_PropertiesAS.mxml

Modified: incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/FXG_Matrix3D_Tests.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/FXG_Matrix3D_Tests.mxml?rev=1394117&r1=1394116&r2=1394117&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/FXG_Matrix3D_Tests.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/FXG_Matrix3D_Tests.mxml Thu Oct  4 15:36:56 2012
@@ -50,7 +50,9 @@
 	    <body>
 		    <AssertPropertyValue value="3" propertyName="scaleX" target="ellipse1" />
 			<AssertPropertyValue value="0.5" propertyName="scaleY" target="ellipse1" />
-			<CompareBitmap numColorVariances="4" maxColorVariance="7" target="group1" url="../Integration/baselines/$testID.png" timeout="2500" />
+			<CompareBitmap target="group1" url="../Integration/baselines/" timeout="2500">
+				<ConditionalValue os="win" />
+			</CompareBitmap>
 	    </body>
 	  </TestCase>
 	  <TestCase testID="FXG_Matrix3D_AS_scale" description="Test scaling an ellipse using a Matrix3D within a transform at runtime"
@@ -67,7 +69,9 @@
 	            waitEvent="updateComplete" />
 		    <AssertPropertyValue value="1" propertyName="scaleX" target="ellipse1" />
 			<AssertPropertyValue value="1" propertyName="scaleY" target="ellipse1" />
-			<CompareBitmap numColorVariances="4" maxColorVariance="7" target="group1" url="../Integration/baselines/$testID.png" timeout="2500" />
+			<CompareBitmap target="group1" url="../Integration/baselines/" timeout="2500" >
+				<ConditionalValue os="win" />
+			</CompareBitmap>
 	    </body>
 	  </TestCase>
 	  <TestCase testID="FXG_Matrix3D_AS_rotate" description="Test scaling an ellipse using a Matrix3D within a transform at runtime"
@@ -82,7 +86,9 @@
 	    <body>
 	        <SetProperty target="ellipse1.transform" propertyName="matrix3D" valueExpression="value=application.rotate3D" waitTarget="ellipse1"
 	            waitEvent="updateComplete" />
-			<CompareBitmap numColorVariances="8" maxColorVariance="256" target="group1" url="../Integration/baselines/$testID.png" timeout="2500" />
+			<CompareBitmap target="group1" url="../Integration/baselines/" timeout="2500">
+				<ConditionalValue os="win"/>
+			</CompareBitmap>
 	    </body>
 	  </TestCase>
 

Modified: incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/GraphicTags_FilterTests.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/GraphicTags_FilterTests.mxml?rev=1394117&r1=1394116&r2=1394117&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/GraphicTags_FilterTests.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/GraphicTags_FilterTests.mxml Thu Oct  4 15:36:56 2012
@@ -152,7 +152,9 @@
 	        <Pause timeout="300" />
 	    </setup>
 	    <body>
-	  	    <CompareBitmap url="../Integration/baselines/$testID.png" target="graphic9" timeout="2000" />
+	  	    <CompareBitmap url="../Integration/baselines/" target="graphic9" timeout="2000">
+				<ConditionalValue os="win" />
+			</CompareBitmap>
 	    </body>
 	  </TestCase>
 	  <TestCase testID="GraphicTags_Filters_MultipleFilters_AS" description="Test that a multiple filters set on a Graphic looks right" keywords="[DropShadowFilter, BlurFilter, Filters, Graphic, MXMLG-219]">

Added: incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/FXG_Matrix3D_AS_rotate@win.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/FXG_Matrix3D_AS_rotate%40win.png?rev=1394117&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/FXG_Matrix3D_AS_rotate@win.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/FXG_Matrix3D_AS_scale@win.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/FXG_Matrix3D_AS_scale%40win.png?rev=1394117&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/FXG_Matrix3D_AS_scale@win.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/FXG_Matrix3D_mxml_scale@win.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/FXG_Matrix3D_mxml_scale%40win.png?rev=1394117&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/FXG_Matrix3D_mxml_scale@win.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/GraphicTags_Filters_DropShadowFilter_AS_mac@win.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/GraphicTags_Filters_DropShadowFilter_AS_mac%40win.png?rev=1394117&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/integration/baselines/GraphicTags_Filters_DropShadowFilter_AS_mac@win.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/properties/FXG_GraphicGroup_PropertiesAS.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/properties/FXG_GraphicGroup_PropertiesAS.mxml?rev=1394117&r1=1394116&r2=1394117&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/properties/FXG_GraphicGroup_PropertiesAS.mxml (original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/properties/FXG_GraphicGroup_PropertiesAS.mxml Thu Oct  4 15:36:56 2012
@@ -386,7 +386,9 @@
                 <SetProperty value="20" propertyName="rotationX" target="graphic3.getChildAt(0).getElementAt(0).getElementAt(2)" />
                 <Pause timeout="200" />
                 <Pause timeout="300" />
-                 <CompareBitmap numColorVariances="8" ignoreMaxColorVariance="true" url="../Properties/baselines/$testID.png" target="graphic3" timeout="2000" />
+                 <CompareBitmap url="../Properties/baselines/" target="graphic3" timeout="2000">
+					<ConditionalValue os="win" />
+				</CompareBitmap>
             </body>
         </TestCase>
         <TestCase testID="FXG_Properties_visible_lastElement" description="Make the last element in a Graphic visible or invisible."

Added: incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/properties/baselines/GraphicTags_NestedGroup_rotationXY@win.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/properties/baselines/GraphicTags_NestedGroup_rotationXY%40win.png?rev=1394117&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/flex/sdk/branches/develop/mustella/tests/spark/primitives/Graphic/properties/baselines/GraphicTags_NestedGroup_rotationXY@win.png
------------------------------------------------------------------------------
    svn:mime-type = image/png