flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject svn commit: r1394278 - in /incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan: ManagerTests/ RSLs/ SWFs/
Date Thu, 04 Oct 2012 21:35:52 GMT
Author: aharui
Date: Thu Oct  4 21:35:52 2012
New Revision: 1394278

URL: http://svn.apache.org/viewvc?rev=1394278&view=rev
Log:
Fix up Marshall Plan tests to handle HTTP port other than 80

Modified:
    incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/ManagerTests/bootstrap_FocusManager_Tests.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/ManagerTests/bootstrap_NestedSWF_FocusManager_Tests.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/RSLs/allowDomain_Tests.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/AllowDomainBug.compile
    incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/AllowDomainBug.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/AllowDomainFalse.compile
    incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/Bootstrap_FocusManager_Nested.as
    incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/Bootstrap_Managers.as
    incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/Bootstrap_PopUpManager.as
    incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/air_Bootstrap_Managers.as

Modified: incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/ManagerTests/bootstrap_FocusManager_Tests.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/ManagerTests/bootstrap_FocusManager_Tests.mxml?rev=1394278&r1=1394277&r2=1394278&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/ManagerTests/bootstrap_FocusManager_Tests.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/ManagerTests/bootstrap_FocusManager_Tests.mxml
Thu Oct  4 21:35:52 2012
@@ -170,7 +170,7 @@
 			    <SetProperty target="swf1" propertyName="autoLoad" value="false" />
 				<SetProperty target="swf1" propertyName="source" value="http://localhost:{portNumber}/MarshallPlan/SWFs/assets/simpleForms.swf?153_13?153_13?153_13"
/>
 				<SetProperty target="swf1" propertyName="autoLoad" value="true"
-					waitTarget="swf1" waitEvent="complete"/>
+					waitTarget="swf1" waitEvent="complete" timeout="5000" />
 			</setup>
 			<body>
 			    <WaitForSandboxApp target="swf1" />
@@ -198,7 +198,7 @@
 			    <SetProperty target="swf1" propertyName="autoLoad" value="false" />
 				<SetProperty target="swf1" propertyName="source" value="http://localhost:{portNumber}/MarshallPlan/SWFs/assets/simpleForms.swf?181_13?181_13?181_13"
waitTarget="swf1" waitEvent="updateComplete"/>
 				<SetProperty target="swf1" propertyName="autoLoad" value="true"
-					waitTarget="swf1" waitEvent="complete"/>
+					waitTarget="swf1" waitEvent="complete" timeout="5000" />
 			</setup>
 			<body>
 			    <WaitForSandboxApp target="swf1" />
@@ -334,7 +334,7 @@
 			    <SetProperty target="swf1" propertyName="autoLoad" value="false" />
 		   	    <SetProperty target="swf1" propertyName="source" value="http://localhost:{portNumber}/MarshallPlan/SWFs/assets/simpleForms.swf?317_13?317_13?317_13"
/>
 				<SetProperty target="swf1" propertyName="autoLoad" value="true"
-					waitTarget="swf1" waitEvent="complete"/>
+					waitTarget="swf1" waitEvent="complete" timeout="5000" />
 			</setup>
 			<body>
 			    <WaitForSandboxApp target="swf1" />
@@ -362,7 +362,7 @@
 			    <SetProperty target="swf1" propertyName="autoLoad" value="false" />
 				<SetProperty target="swf1" propertyName="source" value="http://localhost:{portNumber}/MarshallPlan/SWFs/assets/simpleForms.swf?345_13?345_13?345_13"
waitTarget="swf1" waitEvent="updateComplete"/>
 				<SetProperty target="swf1" propertyName="autoLoad" value="true"
-					waitTarget="swf1" waitEvent="complete"/>
+					waitTarget="swf1" waitEvent="complete" timeout="5000" />
 			</setup>
 			<body>
 			    <WaitForSandboxApp target="swf1" />

Modified: incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/ManagerTests/bootstrap_NestedSWF_FocusManager_Tests.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/ManagerTests/bootstrap_NestedSWF_FocusManager_Tests.mxml?rev=1394278&r1=1394277&r2=1394278&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/ManagerTests/bootstrap_NestedSWF_FocusManager_Tests.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/ManagerTests/bootstrap_NestedSWF_FocusManager_Tests.mxml
Thu Oct  4 21:35:52 2012
@@ -252,7 +252,7 @@
 			   <SetProperty target="topSWF" propertyName="loadForCompatibility" value="false" />
 		   	   <SetProperty target="topSWF" propertyName="source" value="http://localhost:{portNumber}/MarshallPlan/SWFs/assets/simpleLoader.swf?233_14?233_14?233_14"
/>
 			   <SetProperty target="topSWF" propertyName="autoLoad" value="true"
-					waitTarget="topSWF" waitEvent="complete"/>
+					waitTarget="topSWF" waitEvent="complete" timeout="5000" />
 			   <DispatchMouseEvent target="topSWF" type="mouseMove" localX="10" localY="55" waitTarget="topSWF.mx_internal:contentHolder.contentLoaderInfo.sharedEvents"
waitEvent="mustellaStarted" timeout="3000" />
 			   <DispatchMouseEvent target="control1" type="mouseMove" localX="12" localY="55"
 					waitTarget="topSWF.content" waitEvent="applicationComplete"/>
@@ -260,7 +260,7 @@
 			   <SetProperty target="topSWF.content.document.swf1" propertyName="loadForCompatibility"
value="false" />
 		   	   <SetProperty target="topSWF.content.document.swf1" propertyName="source" value="http://localhost:{portNumber}/MarshallPlan/SWFs/assets/simpleForms.swf?241_14?241_14?241_14"
/>
 			   <SetProperty target="topSWF.content.document.swf1" propertyName="autoLoad" value="true"
-					waitTarget="topSWF.content.document.swf1" waitEvent="complete"/>
+					waitTarget="topSWF.content.document.swf1" waitEvent="complete" timeout="5000" />
 			</setup>
 			<body>
 			    <DispatchMouseEvent target="control1" type="mouseMove" localX="12" localY="55"
@@ -417,7 +417,7 @@
 			   <SetProperty target="topSWF" propertyName="autoLoad" value="false" />
 			   <SetProperty target="topSWF" propertyName="source" value="http://localhost:{portNumber}/MarshallPlan/SWFs/assets/simpleLoader.swf?398_14?398_14?398_14"
/>
 			   <SetProperty target="topSWF" propertyName="autoLoad" value="true"
-					waitTarget="topSWF" waitEvent="complete"/>
+					waitTarget="topSWF" waitEvent="complete" timeout="5000" />
 			   <DispatchMouseEvent target="topSWF" type="mouseMove" localX="10" localY="55" waitTarget="topSWF.mx_internal:contentHolder.contentLoaderInfo.sharedEvents"
waitEvent="mustellaStarted" timeout="3000" />
 			   <DispatchMouseEvent target="control1" type="mouseMove" localX="12" localY="55"
 					waitTarget="topSWF.content" waitEvent="applicationComplete"/>
@@ -425,7 +425,7 @@
 			   <SetProperty target="topSWF.content.document.swf1" propertyName="loadForCompatibility"
value="false" />
 		   	   <SetProperty target="topSWF.content.document.swf1" propertyName="source" value="http://localhost:{portNumber}/MarshallPlan/SWFs/assets/simpleForms.swf?406_14?406_14?406_14"
/>
 			   <SetProperty target="topSWF.content.document.swf1" propertyName="autoLoad" value="true"
-					waitTarget="topSWF.content.document.swf1" waitEvent="complete"/>
+					waitTarget="topSWF.content.document.swf1" waitEvent="complete" timeout="5000" />
 			</setup>
 			<body>
 			    <DispatchMouseEvent target="control1" type="mouseMove" localX="12" localY="55"
@@ -456,7 +456,7 @@
 			   <SetProperty target="topSWF" propertyName="autoLoad" value="false" />
 			   <SetProperty target="topSWF" propertyName="source" value="http://localhost:{portNumber}/MarshallPlan/SWFs/assets/simpleLoader.swf?437_14?437_14?437_14"
/>
 			   <SetProperty target="topSWF" propertyName="autoLoad" value="true"
-					waitTarget="topSWF" waitEvent="complete"/>
+					waitTarget="topSWF" waitEvent="complete" timeout="5000" />
 			   <DispatchMouseEvent target="topSWF" type="mouseMove" localX="10" localY="55" waitTarget="topSWF.mx_internal:contentHolder.contentLoaderInfo.sharedEvents"
waitEvent="mustellaStarted" timeout="3000" />
 			   <DispatchMouseEvent target="control1" type="mouseMove" localX="12" localY="55"
 					waitTarget="topSWF.content" waitEvent="applicationComplete"/>
@@ -464,7 +464,7 @@
 			   <SetProperty target="topSWF.content.document.swf1" propertyName="loadForCompatibility"
value="false" />
 		   	   <SetProperty target="topSWF.content.document.swf1" propertyName="source" value="http://localhost:{portNumber}/MarshallPlan/SWFs/assets/simpleForms.swf?445_14?445_14?445_14"
/>
 			   <SetProperty target="topSWF.content.document.swf1" propertyName="autoLoad" value="true"
-					waitTarget="topSWF.content.document.swf1" waitEvent="complete"/>
+					waitTarget="topSWF.content.document.swf1" waitEvent="complete" timeout="5000" />
 			</setup>
 			<body>
 			    <DispatchMouseEvent target="control1" type="mouseMove" localX="12" localY="55"
@@ -519,14 +519,14 @@
 			   <SetProperty target="topSWF" propertyName="autoLoad" value="false" />
 			   <SetProperty target="topSWF" propertyName="source" value="simpleLoader.swf" />
 			   <SetProperty target="topSWF" propertyName="autoLoad" value="true"
-					waitTarget="topSWF" waitEvent="complete"/>
+					waitTarget="topSWF" waitEvent="complete" timeout="5000" />
 			   <DispatchMouseEvent target="control1" type="mouseMove" localX="12" localY="55"
 					waitTarget="topSWF.content" waitEvent="applicationComplete"/>
 			   <SetProperty target="topSWF.content.document.swf1" propertyName="autoLoad" value="false"
/>
 			   <SetProperty target="topSWF.content.document.swf1" propertyName="loadForCompatibility"
value="false" />
 		   	   <SetProperty target="topSWF.content.document.swf1" propertyName="source" value="http://localhost:{portNumber}/MarshallPlan/SWFs/assets/simpleForms.swf?507_14?507_14?507_14"
/>
 			   <SetProperty target="topSWF.content.document.swf1" propertyName="autoLoad" value="true"
-					waitTarget="topSWF.content.document.swf1" waitEvent="complete"/>
+					waitTarget="topSWF.content.document.swf1" waitEvent="complete" timeout="5000" />
 			</setup>
 			<body>
 			    <DispatchMouseEvent target="topSWF" type="mouseMove" localX="10" localY="55" waitTarget="topSWF.content.document.swf1.mx_internal:contentHolder.contentLoaderInfo.sharedEvents"
waitEvent="mustellaStarted" timeout="3000" />
@@ -558,14 +558,14 @@
 			   <SetProperty target="topSWF" propertyName="autoLoad" value="false" />
 			   <SetProperty target="topSWF" propertyName="source" value="simpleLoader.swf" />
 			   <SetProperty target="topSWF" propertyName="autoLoad" value="true"
-					waitTarget="topSWF" waitEvent="complete"/>
+					waitTarget="topSWF" waitEvent="complete" timeout="5000" />
 			   <DispatchMouseEvent target="control1" type="mouseMove" localX="12" localY="55"
 					waitTarget="topSWF.content" waitEvent="applicationComplete"/>
 			   <SetProperty target="topSWF.content.document.swf1" propertyName="autoLoad" value="false"
/>
 			   <SetProperty target="topSWF.content.document.swf1" propertyName="loadForCompatibility"
value="false" />
 		   	   <SetProperty target="topSWF.content.document.swf1" propertyName="source" value="http://localhost:{portNumber}/MarshallPlan/SWFs/assets/simpleForms.swf?546_14?546_14?546_14"
/>
 			   <SetProperty target="topSWF.content.document.swf1" propertyName="autoLoad" value="true"
-					waitTarget="topSWF.content.document.swf1" waitEvent="complete"/>
+					waitTarget="topSWF.content.document.swf1" waitEvent="complete" timeout="5000" />
 			</setup>
 			<body>
 			    <DispatchMouseEvent target="topSWF" type="mouseMove" localX="10" localY="55" waitTarget="topSWF.content.document.swf1.mx_internal:contentHolder.contentLoaderInfo.sharedEvents"
waitEvent="mustellaStarted" timeout="3000" />

Modified: incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/RSLs/allowDomain_Tests.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/RSLs/allowDomain_Tests.mxml?rev=1394278&r1=1394277&r2=1394278&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/RSLs/allowDomain_Tests.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/RSLs/allowDomain_Tests.mxml
Thu Oct  4 21:35:52 2012
@@ -9,7 +9,7 @@
     <mx:Metadata><![CDATA[[Mixin]]]></mx:Metadata>
     <testCases>
 
-		<TestCase testID="allowDomain_rsl" description="Test loading of untursted sub app which
depends upon rsl loaded in trusted domain."
+		<TestCase testID="allowDomain_rsl" description="Test loading of untursted sub app which
depends upon class loaded in trusted domain."
 		  keywords="[RSL]">
 			<setup>
 			

Modified: incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/AllowDomainBug.compile
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/AllowDomainBug.compile?rev=1394278&r1=1394277&r2=1394278&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/AllowDomainBug.compile
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/AllowDomainBug.compile
Thu Oct  4 21:35:52 2012
@@ -1 +1 @@
- -includes=mx.managers.systemClasses.MarshallingSupport -static-link-runtime-shared-libraries=false
-rslp=assets/MyUtils,assets/MyUtils/library.swf  -remove-unused-rsls=true
\ No newline at end of file
+ -includes=mx.managers.systemClasses.MarshallingSupport -source-path+=assets
\ No newline at end of file

Modified: incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/AllowDomainBug.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/AllowDomainBug.mxml?rev=1394278&r1=1394277&r2=1394278&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/AllowDomainBug.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/AllowDomainBug.mxml
Thu Oct  4 21:35:52 2012
@@ -30,11 +30,13 @@
             import mx.events.FlexEvent;
             import mx.events.RSLEvent;
             
+			
             protected function application1_applicationCompleteHandler(event:FlexEvent):void
             {
                 systemManager.allowDomain("127.0.0.1");
             }
 
+			private var myUtils:MyUtils;
         ]]>
     </fx:Script>
     

Modified: incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/AllowDomainFalse.compile
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/AllowDomainFalse.compile?rev=1394278&r1=1394277&r2=1394278&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/AllowDomainFalse.compile
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/AllowDomainFalse.compile
Thu Oct  4 21:35:52 2012
@@ -1 +1 @@
- -includes=mx.managers.systemClasses.MarshallingSupport -static-link-runtime-shared-libraries=false
-rslp=assets/MyUtils,assets/MyUtils/library.swf  -remove-unused-rsls=true
\ No newline at end of file
+ -includes=mx.managers.systemClasses.MarshallingSupport
\ No newline at end of file

Modified: incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/Bootstrap_FocusManager_Nested.as
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/Bootstrap_FocusManager_Nested.as?rev=1394278&r1=1394277&r2=1394278&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/Bootstrap_FocusManager_Nested.as
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/Bootstrap_FocusManager_Nested.as
Thu Oct  4 21:35:52 2012
@@ -118,7 +118,7 @@ public class Bootstrap_FocusManager_Nest
         addChild(loader);
         loader.contentLoaderInfo.addEventListener(
             Event.COMPLETE, completeHandler);
-        loader.load(new URLRequest(applicationURL+"?port=" + portNumber));
+        loader.load(new URLRequest(applicationURL));
         loader.addEventListener("mx.managers.SystemManager.isBootstrapRoot", bootstrapRootHandler);
         loader.addEventListener("mx.managers.SystemManager.isStageRoot", stageRootHandler);
 

Modified: incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/Bootstrap_Managers.as
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/Bootstrap_Managers.as?rev=1394278&r1=1394277&r2=1394278&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/Bootstrap_Managers.as
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/Bootstrap_Managers.as
Thu Oct  4 21:35:52 2012
@@ -117,7 +117,7 @@ public class Bootstrap_Managers extends 
         addChild(loader);
         loader.contentLoaderInfo.addEventListener(
             Event.COMPLETE, completeHandler);
-        loader.load(new URLRequest(applicationURL+"?port=" + portNumber));
+        loader.load(new URLRequest(applicationURL));
         loader.addEventListener("mx.managers.SystemManager.isBootstrapRoot", bootstrapRootHandler);
         loader.addEventListener("mx.managers.SystemManager.isStageRoot", stageRootHandler);
 

Modified: incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/Bootstrap_PopUpManager.as
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/Bootstrap_PopUpManager.as?rev=1394278&r1=1394277&r2=1394278&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/Bootstrap_PopUpManager.as
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/Bootstrap_PopUpManager.as
Thu Oct  4 21:35:52 2012
@@ -117,7 +117,7 @@ public class Bootstrap_PopUpManager exte
         addChild(loader);
         loader.contentLoaderInfo.addEventListener(
             Event.COMPLETE, completeHandler);
-        loader.load(new URLRequest(applicationURL+"?port=" + portNumber));
+        loader.load(new URLRequest(applicationURL));
         loader.addEventListener("mx.managers.SystemManager.isBootstrapRoot", bootstrapRootHandler);
         loader.addEventListener("mx.managers.SystemManager.isStageRoot", stageRootHandler);
 

Modified: incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/air_Bootstrap_Managers.as
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/air_Bootstrap_Managers.as?rev=1394278&r1=1394277&r2=1394278&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/air_Bootstrap_Managers.as
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/MarshallPlan/SWFs/air_Bootstrap_Managers.as
Thu Oct  4 21:35:52 2012
@@ -117,7 +117,7 @@ public class air_Bootstrap_Managers exte
         addChild(loader);
         loader.contentLoaderInfo.addEventListener(
             Event.COMPLETE, completeHandler);
-        loader.load(new URLRequest(applicationURL+"?port=" + portNumber));
+        loader.load(new URLRequest(applicationURL));
         loader.addEventListener("mx.managers.SystemManager.isBootstrapRoot", bootstrapRootHandler);
         loader.addEventListener("mx.managers.SystemManager.isStageRoot", stageRootHandler);
 



Mime
View raw message