You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2013/01/17 19:26:10 UTC

svn commit: r1434848 - in /flex/sdk/branches/develop/mustella/tests/mobile/components: CheckBox/styles/ Image/properties/ Image/properties/baselines/ Image/swfs/assets/ RadioButton/styles/ RadioButton/styles/baselines/

Author: aharui
Date: Thu Jan 17 18:26:08 2013
New Revision: 1434848

URL: http://svn.apache.org/viewvc?rev=1434848&view=rev
Log:
Fix more tests.  Image tests using JPG don't always compare the same between mac and win

Added:
    flex/sdk/branches/develop/mustella/tests/mobile/components/Image/swfs/assets/redrect.png   (with props)
    flex/sdk/branches/develop/mustella/tests/mobile/components/Image/swfs/assets/smallorangerect.gif   (with props)
Modified:
    flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/checkbox_styles.mxml
    flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/Image_properties.mxml
    flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_FillModescale_ScaleModezoom@android_240ppi.png
    flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_enabled_test1@android_240ppi.png
    flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_enabled_test2@android_240ppi.png
    flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_heightwidth_test1@android_240ppi.png
    flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_heightwidth_test2@android_240ppi.png
    flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_heightwidth_test3@android_240ppi.png
    flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_heightwidth_test4@android_240ppi.png
    flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_source_test1@android_240ppi.png
    flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_source_test4@android_240ppi.png
    flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_source_test5@android_240ppi.png
    flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/baselines/Mobile_RadioButton_styles_focusColor_set_in_AS@android_240ppi.png
    flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/baselines/Mobile_RadioButton_styles_focus_alpha_thickness_blendmode_default@android_240ppi.png
    flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/radiobutton_styles.mxml

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/checkbox_styles.mxml
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/checkbox_styles.mxml?rev=1434848&r1=1434847&r2=1434848&view=diff
==============================================================================
--- flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/checkbox_styles.mxml (original)
+++ flex/sdk/branches/develop/mustella/tests/mobile/components/CheckBox/styles/checkbox_styles.mxml Thu Jan 17 18:26:08 2013
@@ -496,7 +496,7 @@
 		<SetStyle target="styleComp.cb1" styleName="iconPlacement" value="right" waitEvent="updateComplete" />
 	</setup>
 	<body>
-		<AssertStyleValue target="styleComp.cb1" styleName="fontFamily" value="_sans" />
+		<AssertStyleValue target="styleComp.cb1" styleName="fontFamily" value="MyVeraHalo" />
 		<SetStyle target="styleComp.cb1" styleName="fontFamily" value="Courier New" waitEvent="updateComplete" />
 		<AssertStyleValue target="styleComp.cb1" styleName="fontFamily" value="Courier New" />
 		<CompareBitmap url="../styles/baselines" target="styleComp.grp1" >
@@ -517,7 +517,7 @@
 		<SetProperty target="styleComp.cb1" propertyName="enabled" value="false" waitEvent="updateComplete" />		
 	</setup>
 	<body>
-		<AssertStyleValue target="styleComp.cb1" styleName="fontFamily" value="_sans" />
+		<AssertStyleValue target="styleComp.cb1" styleName="fontFamily" value="MyVeraHalo" />
 		<SetStyle target="styleComp.cb1" styleName="fontFamily" value="Courier New" waitEvent="updateComplete" />
 		<AssertStyleValue target="styleComp.cb1" styleName="fontFamily" value="Courier New" />
 		<CompareBitmap url="../styles/baselines" target="styleComp.grp1" >

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/Image_properties.mxml
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/Image_properties.mxml?rev=1434848&r1=1434847&r2=1434848&view=diff
==============================================================================
--- flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/Image_properties.mxml (original)
+++ flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/Image_properties.mxml Thu Jan 17 18:26:08 2013
@@ -62,7 +62,7 @@
 			</setup>
 			<body>
 				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="enabled" value="false" waitEvent="updateComplete" />
-				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/smallgreenrect.jpg" waitEvent="ready" />
+				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/smallorangerect.gif" waitEvent="ready" />
 				<CompareBitmap url="../properties/baselines/" target="navigator.activeView.imgComp1.img1">
 					<ConditionalValue os="win" deviceDensity="160" />
 					<ConditionalValue os="win" deviceDensity="240" />
@@ -83,7 +83,7 @@
                 <ResetComponent target="navigator.activeView.imgComp1" className="assets.ImageComp1" waitEvent="updateComplete" />
 			</setup>
 			<body>
-				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/smallgreenrect.jpg" waitEvent="ready" />
+				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/smallorangerect.gif" waitEvent="ready" />
 				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="enabled" value="false" waitEvent="updateComplete" />
 				<CompareBitmap url="../properties/baselines/" target="navigator.activeView.imgComp1.img1">
 					<ConditionalValue os="win" deviceDensity="160" />
@@ -183,8 +183,8 @@
                 <ResetComponent target="navigator.activeView.imgComp1" className="assets.ImageComp1" waitEvent="updateComplete" />
 			</setup>
 			<body>
-				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/greenrect.jpg" waitEvent="ready" />
-				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/smallgreenrect.jpg" waitEvent="ready" />
+				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/redrect.png" waitEvent="ready" />
+				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/smallorangerect.gif" waitEvent="ready" />
 				<CompareBitmap url="../properties/baselines/" target="navigator.activeView.imgComp1.img1">
 					<ConditionalValue os="win" deviceDensity="160" />
 					<ConditionalValue os="win" deviceDensity="240" />
@@ -205,8 +205,8 @@
                 <ResetComponent target="navigator.activeView.imgComp1" className="assets.ImageComp1" waitEvent="updateComplete" />
 			</setup>
 			<body>
-				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/smallgreenrect.jpg" waitEvent="ready" />
-				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/greenrect.jpg" waitEvent="ready" />
+				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/smallorangerect.gif" waitEvent="ready" />
+				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/redrect.png" waitEvent="ready" />
 				<CompareBitmap url="../properties/baselines/" target="navigator.activeView.imgComp1.img1">
 					<ConditionalValue os="win" deviceDensity="160" />
 					<ConditionalValue os="win" deviceDensity="240" />
@@ -229,7 +229,7 @@
 				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="width" value="300" waitEvent="updateComplete" />
 			</setup>
 			<body>
-				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/smallgreenrect.jpg" waitEvent="ready" />
+				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/smallorangerect.gif" waitEvent="ready" />
 				<CompareBitmap url="../properties/baselines/" target="navigator.activeView.imgComp1.img1">
 					<ConditionalValue os="win" deviceDensity="160" />
 					<ConditionalValue os="win" deviceDensity="240" />
@@ -252,7 +252,7 @@
 				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="width" value="200" waitEvent="updateComplete" />
 			</setup>
 			<body>
-				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/greenrect.jpg" waitEvent="ready" />
+				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/redrect.png" waitEvent="ready" />
 				<CompareBitmap url="../properties/baselines/" target="navigator.activeView.imgComp1.img1">
 					<ConditionalValue os="win" deviceDensity="160" />
 					<ConditionalValue os="win" deviceDensity="240" />
@@ -404,7 +404,7 @@
                 <ResetComponent target="navigator.activeView.imgComp1" className="assets.ImageComp1" waitEvent="updateComplete" />
 			</setup>
 			<body>
-				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/smallgreenrect.jpg" waitEvent="ready" />
+				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/smallorangerect.gif" waitEvent="ready" />
 				<CompareBitmap url="../properties/baselines/" target="navigator.activeView.imgComp1.img1">
 					<ConditionalValue os="win" deviceDensity="160" />
 					<ConditionalValue os="win" deviceDensity="240" />
@@ -477,7 +477,7 @@
 			</setup>
 			<body>
 				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/doesNotExist.jpg" waitEvent="ioError" />
-				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/smallgreenrect.jpg" waitEvent="ready" />
+				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/smallorangerect.gif" waitEvent="ready" />
 				<CompareBitmap url="../properties/baselines/" target="navigator.activeView.imgComp1.img1">
 					<ConditionalValue os="win" deviceDensity="160" />
 					<ConditionalValue os="win" deviceDensity="240" />
@@ -503,7 +503,7 @@
 				<Pause timeout="1" />			
 				<SetProperty target="navigator.activeView.imgComp1.img1.skin" propertyName="currentState" value="loading" />
 				<RunCode code="FlexGlobals.topLevelApplication.waitForLoadingIndicator()" waitEvent="foundLoadingIndicator" />
-				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/smallgreenrect.jpg" waitEvent="ready" />				
+				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/smallorangerect.gif" waitEvent="ready" />				
 				<CompareBitmap url="../properties/baselines/" target="navigator.activeView.imgComp1.img1">
 					<ConditionalValue os="win" deviceDensity="160" />
 					<ConditionalValue os="win" deviceDensity="240" />
@@ -526,7 +526,7 @@
 				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="width" value="200" waitEvent="updateComplete" />
 				<SetProperty target="navigator.activeView.imgComp1.img1" propertyName="fillMode" value="scale" />
         <SetProperty target="navigator.activeView.imgComp1.img1" propertyName="scaleMode" value="zoom" />
-        <SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/smallgreenrect.jpg" waitEvent="ready" />	
+        <SetProperty target="navigator.activeView.imgComp1.img1" propertyName="source" value="assets/smallorangerect.gif" waitEvent="ready" />	
 			</setup>
 			<body>
 				<CompareBitmap url="../properties/baselines/" target="navigator.activeView.imgComp1.img1">

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_FillModescale_ScaleModezoom@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_FillModescale_ScaleModezoom%40android_240ppi.png?rev=1434848&r1=1434847&r2=1434848&view=diff
==============================================================================
Binary files - no diff available.

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_enabled_test1@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_enabled_test1%40android_240ppi.png?rev=1434848&r1=1434847&r2=1434848&view=diff
==============================================================================
Binary files - no diff available.

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_enabled_test2@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_enabled_test2%40android_240ppi.png?rev=1434848&r1=1434847&r2=1434848&view=diff
==============================================================================
Binary files - no diff available.

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_heightwidth_test1@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_heightwidth_test1%40android_240ppi.png?rev=1434848&r1=1434847&r2=1434848&view=diff
==============================================================================
Binary files - no diff available.

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_heightwidth_test2@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_heightwidth_test2%40android_240ppi.png?rev=1434848&r1=1434847&r2=1434848&view=diff
==============================================================================
Binary files - no diff available.

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_heightwidth_test3@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_heightwidth_test3%40android_240ppi.png?rev=1434848&r1=1434847&r2=1434848&view=diff
==============================================================================
Binary files - no diff available.

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_heightwidth_test4@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_heightwidth_test4%40android_240ppi.png?rev=1434848&r1=1434847&r2=1434848&view=diff
==============================================================================
Binary files - no diff available.

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_source_test1@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_source_test1%40android_240ppi.png?rev=1434848&r1=1434847&r2=1434848&view=diff
==============================================================================
Binary files - no diff available.

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_source_test4@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_source_test4%40android_240ppi.png?rev=1434848&r1=1434847&r2=1434848&view=diff
==============================================================================
Binary files - no diff available.

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_source_test5@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Image/properties/baselines/Image_source_test5%40android_240ppi.png?rev=1434848&r1=1434847&r2=1434848&view=diff
==============================================================================
Binary files - no diff available.

Added: flex/sdk/branches/develop/mustella/tests/mobile/components/Image/swfs/assets/redrect.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Image/swfs/assets/redrect.png?rev=1434848&view=auto
==============================================================================
Binary file - no diff available.

Propchange: flex/sdk/branches/develop/mustella/tests/mobile/components/Image/swfs/assets/redrect.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: flex/sdk/branches/develop/mustella/tests/mobile/components/Image/swfs/assets/redrect.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: flex/sdk/branches/develop/mustella/tests/mobile/components/Image/swfs/assets/smallorangerect.gif
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/Image/swfs/assets/smallorangerect.gif?rev=1434848&view=auto
==============================================================================
Binary file - no diff available.

Propchange: flex/sdk/branches/develop/mustella/tests/mobile/components/Image/swfs/assets/smallorangerect.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/baselines/Mobile_RadioButton_styles_focusColor_set_in_AS@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/baselines/Mobile_RadioButton_styles_focusColor_set_in_AS%40android_240ppi.png?rev=1434848&r1=1434847&r2=1434848&view=diff
==============================================================================
Binary files - no diff available.

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/baselines/Mobile_RadioButton_styles_focus_alpha_thickness_blendmode_default@android_240ppi.png
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/baselines/Mobile_RadioButton_styles_focus_alpha_thickness_blendmode_default%40android_240ppi.png?rev=1434848&r1=1434847&r2=1434848&view=diff
==============================================================================
Binary files - no diff available.

Modified: flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/radiobutton_styles.mxml
URL: http://svn.apache.org/viewvc/flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/radiobutton_styles.mxml?rev=1434848&r1=1434847&r2=1434848&view=diff
==============================================================================
--- flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/radiobutton_styles.mxml (original)
+++ flex/sdk/branches/develop/mustella/tests/mobile/components/RadioButton/styles/radiobutton_styles.mxml Thu Jan 17 18:26:08 2013
@@ -497,7 +497,7 @@
 		<SetStyle target="styleComp.rb1" styleName="iconPlacement" value="right" waitEvent="updateComplete" />
 	</setup>
 	<body>
-		<AssertStyleValue target="styleComp.rb1" styleName="fontFamily" value="_sans" />
+		<AssertStyleValue target="styleComp.rb1" styleName="fontFamily" value="MyVeraHalo" />
 		<SetStyle target="styleComp.rb1" styleName="fontFamily" value="Courier New" waitEvent="updateComplete" />
 		<AssertStyleValue target="styleComp.rb1" styleName="fontFamily" value="Courier New" />
 		<CompareBitmap url="../styles/baselines" target="styleComp.grp1" >
@@ -518,7 +518,7 @@
 		<SetProperty target="styleComp.rb1" propertyName="enabled" value="false" waitEvent="updateComplete" />		
 	</setup>
 	<body>
-		<AssertStyleValue target="styleComp.rb1" styleName="fontFamily" value="_sans" />
+		<AssertStyleValue target="styleComp.rb1" styleName="fontFamily" value="MyVeraHalo" />
 		<SetStyle target="styleComp.rb1" styleName="fontFamily" value="Courier New" waitEvent="updateComplete" />
 		<AssertStyleValue target="styleComp.rb1" styleName="fontFamily" value="Courier New" />
 		<CompareBitmap url="../styles/baselines" target="styleComp.grp1" >