incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject svn commit: r1418450 - in /incubator/flex/sdk/branches/develop: frameworks/tests/basicTests/ frameworks/tests/basicTests/halo/scripts/ mustella/as3/src/mustella/
Date Fri, 07 Dec 2012 19:25:23 GMT
Author: aharui
Date: Fri Dec  7 19:25:23 2012
New Revision: 1418450

URL: http://svn.apache.org/viewvc?rev=1418450&view=rev
Log:
merge 1418421 to develop branch

Modified:
    incubator/flex/sdk/branches/develop/frameworks/tests/basicTests/BasicTests-config.xml
    incubator/flex/sdk/branches/develop/frameworks/tests/basicTests/basicLoader.as
    incubator/flex/sdk/branches/develop/frameworks/tests/basicTests/halo/scripts/SWFLoaderTestScript.mxml
    incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/UnitTester.as

Modified: incubator/flex/sdk/branches/develop/frameworks/tests/basicTests/BasicTests-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/tests/basicTests/BasicTests-config.xml?rev=1418450&r1=1418449&r2=1418450&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/tests/basicTests/BasicTests-config.xml
(original)
+++ incubator/flex/sdk/branches/develop/frameworks/tests/basicTests/BasicTests-config.xml
Fri Dec  7 19:25:23 2012
@@ -96,6 +96,7 @@
         From mustella.swc
     -->
         <symbol>ExitWhenDone</symbol>
+        <symbol>SetShowRTE</symbol>
         <symbol>SendFormattedResultsToLog</symbol>
     </includes>
 </flex-config>

Modified: incubator/flex/sdk/branches/develop/frameworks/tests/basicTests/basicLoader.as
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/tests/basicTests/basicLoader.as?rev=1418450&r1=1418449&r2=1418450&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/tests/basicTests/basicLoader.as (original)
+++ incubator/flex/sdk/branches/develop/frameworks/tests/basicTests/basicLoader.as Fri Dec
 7 19:25:23 2012
@@ -33,8 +33,8 @@ public class basicLoader extends MovieCl
 		super();
 		
 		text = new TextField();
-		text.width = stage.stageWidth;
-		text.height = stage.stageHeight;
+		text.width = 176;
+		text.height = 81;
 		
 		var tf:TextFormat;
 		tf = new TextFormat;

Modified: incubator/flex/sdk/branches/develop/frameworks/tests/basicTests/halo/scripts/SWFLoaderTestScript.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/tests/basicTests/halo/scripts/SWFLoaderTestScript.mxml?rev=1418450&r1=1418449&r2=1418450&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/tests/basicTests/halo/scripts/SWFLoaderTestScript.mxml
(original)
+++ incubator/flex/sdk/branches/develop/frameworks/tests/basicTests/halo/scripts/SWFLoaderTestScript.mxml
Fri Dec  7 19:25:23 2012
@@ -51,7 +51,7 @@
 		</TestCase>
 		<TestCase testID="SWFLoaderTest1">
 			<body>
-				<AssertPixelValue target="haloSWFLoaderTests.testLoader" x="10" y="10" value="0x0066CC"
/>
+				<AssertPixelValue target="haloSWFLoaderTests.testLoader" x="10" y="10" value="0xFF9933"
/>
 			</body>
 		</TestCase>
 	</testCases>

Modified: incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/UnitTester.as
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/UnitTester.as?rev=1418450&r1=1418449&r2=1418450&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/UnitTester.as (original)
+++ incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/UnitTester.as Fri Dec  7
19:25:23 2012
@@ -1873,6 +1873,8 @@ public class UnitTester extends EventDis
 				var tr:TestResult = currentTest.testResult;
 				if (!tr.hasStatus())
 					tr.result = TestResult.PASS;
+				if (hasRTE)
+					tr.result = TestResult.FAIL;
 				tr.endTime = new Date().time;
 				TestOutput.logResult (tr.toString());
 				if (hasRTE)



Mime
View raw message