flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1392613 - in /incubator/flex/sdk/branches/develop/mustella/tests/components: DateChooser/properties/ Label/styles/ List/Styles/ MenuBar/Halo/Styles/
Date Mon, 01 Oct 2012 21:17:06 GMT
Author: cframpton
Date: Mon Oct  1 21:17:06 2012
New Revision: 1392613

URL: http://svn.apache.org/viewvc?rev=1392613&view=rev
Log:
Updates for Windows.

Modified:
    incubator/flex/sdk/branches/develop/mustella/tests/components/DateChooser/properties/DateChooser_Properties.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/components/Label/styles/Label_styles_tester_Spark.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/components/List/Styles/ListStyleTester_spark.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/components/MenuBar/Halo/Styles/MenuBar_StylesAS.mxml

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/DateChooser/properties/DateChooser_Properties.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/DateChooser/properties/DateChooser_Properties.mxml?rev=1392613&r1=1392612&r2=1392613&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/DateChooser/properties/DateChooser_Properties.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/DateChooser/properties/DateChooser_Properties.mxml
Mon Oct  1 21:17:06 2012
@@ -588,13 +588,18 @@
 				<AssertPropertyValue target="dcc.dc" propertyName="width" value="172"/>
 			</body>
 		</TestCase>
+		
+		<!-- FIXME: rename since this test works on both platforms despite the name  -->
 		<TestCase testID="DateChooser_Property_width_Default_macOnly" keywords="[width, DateChooser]">
 			<setup>
 				<ResetComponent target="dcc" className="DateChooserCustomComponent" />
 				<SetProperty target="dcc.dc" propertyName="selectedDate" valueExpression="value=new
Date(2005, 2, 5)" waitEvent="updateComplete" waitTarget="dcc.dc" />
 			</setup>
 			<body>
-				<AssertPropertyValue target="dcc.dc" propertyName="width" value="172"/>
+				<AssertPropertyValue target="dcc.dc" propertyName="width" value="172">
+					<ConditionalValue os="mac" value="172"/>
+					<ConditionalValue os="win" value="174"/>
+				</AssertPropertyValue>
 			</body>
 		</TestCase>		
 		<TestCase testID="DateChooser_Property_width1" keywords="[width, DateChooser]">
@@ -873,13 +878,17 @@
 				<AssertPropertyValue target="dcc.dc" propertyName="minWidth" value="84"/>
 			</body>
 		</TestCase>
+		<!-- FIXME: rename since this test works on both platforms despite the name  -->
 		<TestCase testID="DateChooser_Property_minWidth_Default_macOnly" keywords="[minWidth,
DateChooser]">
 			<setup>
 				<ResetComponent target="dcc" className="DateChooserCustomComponent" />
 				<SetProperty target="dcc.dc" propertyName="selectedDate" valueExpression="value=new
Date(2005, 2, 5)" waitEvent="updateComplete" waitTarget="dcc.dc" />
 			</setup>
 			<body>
-				<AssertPropertyValue target="dcc.dc" propertyName="minWidth" value="84"/>
+				<AssertPropertyValue target="dcc.dc" propertyName="minWidth" value="84">
+					<ConditionalValue os="mac" value="84"/>
+					<ConditionalValue os="win" value="98"/>
+				</AssertPropertyValue>
 			</body>
 		</TestCase>		
 		<TestCase testID="DateChooser_Property_minWidth1" keywords="[minWidth, DateChooser]">
@@ -1150,6 +1159,7 @@
 				<AssertPropertyValue target="dcc.dc" propertyName="width" value="140"/>
 			</body>
 		</TestCase>
+		<!-- FIXME: rename since this test works on both platforms despite the name  -->
 		<TestCase testID="DateChooser_BugNumber_142901_macOnly" keywords="[monthNames, width,
DateChooser]">
 			<setup>
 				<ResetComponent target="dcc" className="DateChooserCustomComponent" />
@@ -1157,7 +1167,10 @@
 				<SetProperty target="dcc.dc" propertyName="monthNames" value="['Ja','Fe','Ma','Ap','Ma','Ju','Ju','Au','Se','Oc','No','De']"
waitEvent="updateComplete" waitTarget="dcc.dc"/>
 			</setup>
 			<body>
-				<AssertPropertyValue target="dcc.dc" propertyName="width" value="140"/>
+				<AssertPropertyValue target="dcc.dc" propertyName="width" value="140">
+					<ConditionalValue os="mac" value="140"/>
+					<ConditionalValue os="win" value="154"/>
+				</AssertPropertyValue>
 			</body>
 		</TestCase>		
 <TestCase testID="DateChooser_BugNumber_142901a" keywords="[yearNavigationEnabled, DateChooser]">

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/Label/styles/Label_styles_tester_Spark.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/Label/styles/Label_styles_tester_Spark.mxml?rev=1392613&r1=1392612&r2=1392613&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/Label/styles/Label_styles_tester_Spark.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/Label/styles/Label_styles_tester_Spark.mxml
Mon Oct  1 21:17:06 2012
@@ -665,9 +665,9 @@
 		</TestCase>
 
 
-
 		<TestCase testID="Spark_fontSize_100_Style_Label" description="Tests setting the fontSize
of Label to 100" keywords="[fontSize, Label, Style]">
 
+
 			<setup>
 
 				<ResetComponent target="myLabel" className="mx.controls.Label" waitEvent="updateComplete"
waitTarget="myLabel"/>
@@ -682,7 +682,7 @@
 
 				<AssertStyleValue styleName="fontSize" target="myLabel" value="100"/>
 
-				<CompareBitmap url="../styles/baselines/fontSize_100_Style_Label_Spark.png" target="myLabel"/>
+				<CompareBitmap url="../styles/baselines/fontSize_100_Style_Label_Spark.png" target="myLabel"
numColorVariances="2" maxColorVariance="1"/>
 
 			</body>
 

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/List/Styles/ListStyleTester_spark.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/List/Styles/ListStyleTester_spark.mxml?rev=1392613&r1=1392612&r2=1392613&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/List/Styles/ListStyleTester_spark.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/List/Styles/ListStyleTester_spark.mxml
Mon Oct  1 21:17:06 2012
@@ -87,7 +87,7 @@
                <SetStyle target="mybox.mylist" styleName="fontSize" value="20" waitEvent="updateComplete"
waitTarget="mybox.mylist" />
             </setup>
            <body>
-                <CompareBitmap target="mybox" url="../Styles/Baselines/list_bugs_injection_158616_spark.png"
 />
+                <CompareBitmap target="mybox" url="../Styles/Baselines/list_bugs_injection_158616_spark.png"
 numColorVariances="1" maxColorVariance="1"  />
             </body>
     </TestCase>
 

Modified: incubator/flex/sdk/branches/develop/mustella/tests/components/MenuBar/Halo/Styles/MenuBar_StylesAS.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/components/MenuBar/Halo/Styles/MenuBar_StylesAS.mxml?rev=1392613&r1=1392612&r2=1392613&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/components/MenuBar/Halo/Styles/MenuBar_StylesAS.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/components/MenuBar/Halo/Styles/MenuBar_StylesAS.mxml
Mon Oct  1 21:17:06 2012
@@ -500,7 +500,7 @@
 			    <CompareBitmap target="mb2.menus.1" url="../Styles/baselines/textDecoration_underline_css_submenu.png"
timeout="2500" />
 			</body>
 		</TestCase>
-
+		<!-- FIXME: rename since this test works on both platforms despite the name  -->
 		<TestCase testID="textDecoration_underline_submenu_mac" description="MenuBar style textDecoration=underline."
keywords="[styles, textDecoration, MenuBar]">
 			<setup>
 			    <ResetComponent target="mb2" className="MyMenuBar" waitEvent="updateComplete" waitTarget="mb2"
/>
@@ -511,9 +511,10 @@
 			    <DispatchMouseClickEvent target="mb2" localX="7" localY="10" />
 			    <DispatchKeyEvent keys="[RIGHT]" waitEvent="menuShow" waitTarget="mb2" />
 			    <AssertEvent target="mb2.menus.1.mx_internal:popupTween" eventName="tweenEnd" eventClass="mx.events::TweenEvent"
/>
-			    <CompareBitmap target="mb2.menus.1" url="../Styles/baselines/$testID.png" timeout="2500"
/>
+			    <CompareBitmap target="mb2.menus.1" url="../Styles/baselines/$testID.png" timeout="2500"
numColorVariances="10" ignoreMaxColorVariance="true" />
 			</body>
 		</TestCase>
+		<!-- FIXME: rename since this test works on both platforms despite the name  -->
 		<TestCase testID="textDecoration_css_submenu_mac" description="MenuBar style textDecoration=underline."
keywords="[styles, textDecoration, MenuBar]">
 			<setup>
 			    <ResetComponent target="mb2" className="MyMenuBar" waitEvent="updateComplete" waitTarget="mb2"
/>
@@ -524,7 +525,7 @@
 			    <DispatchMouseClickEvent target="mb2" localX="7" localY="10" />
 			    <DispatchKeyEvent keys="[RIGHT]" waitEvent="menuShow" waitTarget="mb2" />
 			    <AssertEvent target="mb2.menus.1.mx_internal:popupTween" eventName="tweenEnd" eventClass="mx.events::TweenEvent"
/>
-			    <CompareBitmap target="mb2.menus.1" url="../Styles/baselines/$testID.png" timeout="2500"
/>
+			    <CompareBitmap target="mb2.menus.1" url="../Styles/baselines/$testID.png" timeout="2500"
numColorVariances="10" ignoreMaxColorVariance="true" />
 			</body>
 		</TestCase>
 



Mime
View raw message