incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject svn commit: r1416108 - in /incubator/flex/sdk/branches/develop/mustella/tests/apollo: DragManager/Spark/ DragManager/Spark/baselines/ Window/Styles/
Date Sun, 02 Dec 2012 05:11:47 GMT
Author: aharui
Date: Sun Dec  2 05:11:46 2012
New Revision: 1416108

URL: http://svn.apache.org/viewvc?rev=1416108&view=rev
Log:
Fix apollo tests on Windows

Modified:
    incubator/flex/sdk/branches/develop/mustella/tests/apollo/DragManager/Spark/DragManager_CustomTests_spark_AIR.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/apollo/DragManager/Spark/baselines/DragManager_custom_defaultDragImageSkin_AIR.png
    incubator/flex/sdk/branches/develop/mustella/tests/apollo/Window/Styles/NewWindow_styles_tester_Spark.mxml

Modified: incubator/flex/sdk/branches/develop/mustella/tests/apollo/DragManager/Spark/DragManager_CustomTests_spark_AIR.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/apollo/DragManager/Spark/DragManager_CustomTests_spark_AIR.mxml?rev=1416108&r1=1416107&r2=1416108&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/apollo/DragManager/Spark/DragManager_CustomTests_spark_AIR.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/apollo/DragManager/Spark/DragManager_CustomTests_spark_AIR.mxml
Sun Dec  2 05:11:46 2012
@@ -17,7 +17,7 @@
   limitations under the License.
 
 -->
-<UnitTester testDir="Managers/DragManager/Spark/"  xmlns:mx="http://www.adobe.com/2006/mxml"
xmlns="*" testSWF="DragManager_Custom_sparkAIR.mxml">
+<UnitTester testDir="apollo/DragManager/Spark/"  xmlns:mx="http://www.adobe.com/2006/mxml"
xmlns="*" testSWF="DragManager_Custom_sparkAIR.mxml">
 
     <mx:Script>
     <![CDATA[
@@ -31,6 +31,29 @@
 
     ]]>
     </mx:Script>
+	<mx:Script>
+		<![CDATA[
+			private function airify(s:String):String
+			{
+				if (ApplicationDomain.currentDomain.hasDefinition("flash.filesystem.File"))
+				{
+					var c:Class = Class(ApplicationDomain.currentDomain.getDefinition("flash.filesystem.File"));
+					var f:Object = c.applicationDirectory;
+					var p:String = f.nativePath;
+					while (s.indexOf("../") == 0)
+					{
+						var dot:int = p.lastIndexOf(File.separator);
+						p = p.substr(0, dot);
+						s = s.substr(3);
+					}
+					f.nativePath = p;
+					f = f.resolvePath(s);
+					return f.url;
+				}
+				return s;				
+			}
+		]]>
+	</mx:Script>
 
     <mx:Metadata>
     <![CDATA[
@@ -96,13 +119,13 @@
                 <ResetComponent target="myImage2" className="mx.controls.Image" waitTarget="myImage2"
waitEvent="updateComplete" />
                 <ResetComponent target="myImage" className="mx.controls.Image" waitTarget="myImage"
waitEvent="updateComplete" />
                 <RunCode code="application.myImage.addEventListener('mouseDown', application.callDrag)"
/>
-                <SetProperty target="myImage" propertyName="source" valueExpression="value='../../../../Assets/Images/unknown.jpg'"
waitEvent="complete" waitTarget="myImage" />
+                <SetProperty target="myImage" propertyName="source" valueExpression="value
= airify('../../../../Assets/Images/unknown.jpg')" waitEvent="complete" waitTarget="myImage"
timeout="2000" />
             </setup>
             <body>
                 <DispatchMouseEvent target="myImage" type="mouseOver" localX="15" localY="15"
 />
                 <DispatchMouseEvent target="myImage" type="mouseDown" localX="15" localY="15"
buttonDown="true" />
                 <DispatchMouseEvent target="v1" type="mouseMove" localX="20" localY="30"
buttonDown="true"
-                    waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"
/>
+                    waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"
/>	
                 <DispatchMouseEvent target="v1" type="mouseMove" localX="50" localY="60"
buttonDown="true"
                     waitTarget="mx.managers::DragManager.mx_internal:dragProxy" waitEvent="move"
/>
                 <DispatchMouseEvent target="v1" type="mouseMove" localX="100" localY="75"
buttonDown="true"

Modified: incubator/flex/sdk/branches/develop/mustella/tests/apollo/DragManager/Spark/baselines/DragManager_custom_defaultDragImageSkin_AIR.png
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/apollo/DragManager/Spark/baselines/DragManager_custom_defaultDragImageSkin_AIR.png?rev=1416108&r1=1416107&r2=1416108&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/flex/sdk/branches/develop/mustella/tests/apollo/Window/Styles/NewWindow_styles_tester_Spark.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/apollo/Window/Styles/NewWindow_styles_tester_Spark.mxml?rev=1416108&r1=1416107&r2=1416108&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/apollo/Window/Styles/NewWindow_styles_tester_Spark.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/apollo/Window/Styles/NewWindow_styles_tester_Spark.mxml
Sun Dec  2 05:11:46 2012
@@ -67,7 +67,7 @@
 			</setup>
 			<body>
 				<AssertStyleValue styleName="buttonAlignment" target="aw" value="auto"/>
-				<CompareBitmap target="aw" url="../baselines/" >
+				<CompareBitmap target="aw" url="../Styles/baselines/" >
 					<ConditionalValue os="win" />
 				</CompareBitmap>
 			</body>
@@ -82,7 +82,7 @@
 				<RunCode code="application.aw.open()" waitEvent="windowComplete" waitTarget="aw"/>
 			</setup>
 			<body>
-				<CompareBitmap target="aw" url="../baselines/" >
+				<CompareBitmap target="aw" url="../Styles/baselines/" >
 					<ConditionalValue os="win" />
 				</CompareBitmap>
 			</body>
@@ -97,7 +97,7 @@
 				<RunCode code="application.aw.open()" waitEvent="windowComplete" waitTarget="aw"/>
 			</setup>
 			<body>
-				<CompareBitmap target="aw" url="../baselines/" >
+				<CompareBitmap target="aw" url="../Styles/baselines/" >
 					<ConditionalValue os="win" />
 				</CompareBitmap>
 			</body>
@@ -112,7 +112,7 @@
 				<RunCode code="application.aw.open()" waitEvent="windowComplete" waitTarget="aw"/>
 			</setup>
 			<body>
-				<CompareBitmap target="aw" url="../baselines/" >
+				<CompareBitmap target="aw" url="../Styles/baselines/" >
 					<ConditionalValue os="win" />
 				</CompareBitmap>
 			</body>
@@ -127,7 +127,7 @@
 				<RunCode code="application.aw.open()" waitEvent="windowComplete" waitTarget="aw"/>
 			</setup>
 			<body>
-				<CompareBitmap target="aw.titleBar" url="../baselines/" >
+				<CompareBitmap target="aw.titleBar" url="../Styles/baselines/" >
 					<ConditionalValue os="win" />
 				</CompareBitmap>
 			</body>
@@ -142,7 +142,7 @@
 				<RunCode code="application.aw.open()" waitEvent="windowComplete" waitTarget="aw"/>
 			</setup>
 			<body>
-				<CompareBitmap target="aw.titleBar" url="../baselines/" >
+				<CompareBitmap target="aw.titleBar" url="../Styles/baselines/" >
 					<ConditionalValue os="win" />
 				</CompareBitmap>
 			</body>
@@ -158,7 +158,7 @@
 				<DispatchMouseClickEvent target="aw.titleBar.maximizeButton" localX="5" localY="5"
waitEvent="updateComplete" waitTarget="aw"/>
 			</setup>
 			<body>
-				<CompareBitmap target="aw.titleBar.maximizeButton" url="../baselines/" >
+				<CompareBitmap target="aw.titleBar.maximizeButton" url="../Styles/baselines/" >
 					<ConditionalValue os="win" />
 				</CompareBitmap>
 			</body>
@@ -174,7 +174,7 @@
 				<RunCode code="application.aw.open()" waitEvent="windowComplete" waitTarget="aw"/>
 			</setup>
 			<body>
-				<CompareBitmap target="aw.titleBar" url="../baselines/" >
+				<CompareBitmap target="aw.titleBar" url="../Styles/baselines/" >
 					<ConditionalValue os="win" />
 				</CompareBitmap>
 			</body>
@@ -190,7 +190,7 @@
 				<RunCode code="application.aw.open()" waitEvent="windowComplete" waitTarget="aw"/>
 			</setup>
 			<body>
-				<CompareBitmap target="aw" url="../baselines/" >
+				<CompareBitmap target="aw" url="../Styles/baselines/" >
 					<ConditionalValue os="win" />
 				</CompareBitmap>
 			</body>
@@ -217,7 +217,7 @@
 				<RunCode code="application.aw.open()" waitEvent="windowComplete" waitTarget="aw"/>
 			</setup>
 			<body>
-				<CompareBitmap target="aw" url="../baselines/" >
+				<CompareBitmap target="aw" url="../Styles/baselines/" >
 					<ConditionalValue os="win" />
 				</CompareBitmap>
 			</body>
@@ -232,7 +232,7 @@
 				<SetStyle target="aw" styleName="statusBarBackgroundSkin" value="{kb}" waitEvent="updateComplete"
waitTarget="aw" />
 			</setup>
 			<body>
-				<CompareBitmap target="aw" url="../baselines/" >
+				<CompareBitmap target="aw" url="../Styles/baselines/" >
 					<ConditionalValue os="win" />
 				</CompareBitmap>
 			</body>
@@ -247,7 +247,7 @@
 				<RunCode code="application.aw.open()" waitEvent="windowComplete" waitTarget="aw"/>
 			</setup>
 			<body>
-				<CompareBitmap target="aw" url="../baselines/" >
+				<CompareBitmap target="aw" url="../Styles/baselines/" >
 					<ConditionalValue os="win" />
 				</CompareBitmap>
 			</body>
@@ -263,7 +263,7 @@
 				<RunCode code="application.aw.open()" waitEvent="windowComplete" waitTarget="aw"/>
 			</setup>
 			<body>
-				<CompareBitmap target="aw" url="../baselines/" >
+				<CompareBitmap target="aw" url="../Styles/baselines/" >
 					<ConditionalValue os="win" />
 				</CompareBitmap>
 			</body>
@@ -292,7 +292,7 @@
 				<RunCode code="application.aw.open()" waitEvent="windowComplete" waitTarget="aw"/>
 			</setup>
 			<body>
-				<CompareBitmap target="aw.titleBar" url="../baselines/" >
+				<CompareBitmap target="aw.titleBar" url="../Styles/baselines/" >
 					<ConditionalValue os="win" />
 				</CompareBitmap>
 			</body>
@@ -308,7 +308,7 @@
 				<RunCode code="application.aw.open()" waitEvent="windowComplete" waitTarget="aw"/>
 			</setup>
 			<body>
-				<CompareBitmap target="aw.titleBar" url="../baselines/" >
+				<CompareBitmap target="aw.titleBar" url="../Styles/baselines/" >
 					<ConditionalValue os="win" />
 				</CompareBitmap>
 			</body>
@@ -324,7 +324,7 @@
 				<RunCode code="application.aw.open()" waitEvent="windowComplete" waitTarget="aw"/>
 			</setup>
 			<body>
-				<CompareBitmap target="aw.titleBar" url="../baselines/" >
+				<CompareBitmap target="aw.titleBar" url="../Styles/baselines/" >
 					<ConditionalValue os="win" />
 				</CompareBitmap>
 			</body>
@@ -340,7 +340,7 @@
 				<RunCode code="application.aw.open()" waitEvent="windowComplete" waitTarget="aw"/>
 			</setup>
 			<body>
-				<CompareBitmap target="aw.titleBar" url="../baselines/" >
+				<CompareBitmap target="aw.titleBar" url="../Styles/baselines/" >
 					<ConditionalValue os="win" />
 				</CompareBitmap>
 			</body>
@@ -356,7 +356,7 @@
 				<RunCode code="application.aw.open()" waitEvent="windowComplete" waitTarget="aw"/>
 			</setup>
 			<body>
-				<CompareBitmap target="aw.titleBar" url="../baselines/" >
+				<CompareBitmap target="aw.titleBar" url="../Styles/baselines/" >
 					<ConditionalValue os="win" />
 				</CompareBitmap>
 			</body>



Mime
View raw message