flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject svn commit: r1401871 [1/5] - in /incubator/flex/sdk/branches/develop/mustella: ./ as3/src/mustella/ tests/
Date Wed, 24 Oct 2012 20:43:58 GMT
Author: aharui
Date: Wed Oct 24 20:43:57 2012
New Revision: 1401871

URL: http://svn.apache.org/viewvc?rev=1401871&view=rev
Log:
Create a specific set of excludes for AIR.  The main ExcludeListXXX file excludes tests with
_air in the name.  A more intelligent exclude system is needed but we'll define it when we
tackle mobile.

Added:
    incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListMacAIR.txt   (with props)
    incubator/flex/sdk/branches/develop/mustella/tests/ExcludeListWinAIR.txt   (with props)
Modified:
    incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/ConditionalValue.as
    incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/DeviceNames.as
    incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/ExcludeFileLocationApollo.as
    incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/UnitTester.as
    incubator/flex/sdk/branches/develop/mustella/build.xml

Modified: incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/ConditionalValue.as
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/ConditionalValue.as?rev=1401871&r1=1401870&r2=1401871&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/ConditionalValue.as (original)
+++ incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/ConditionalValue.as Wed
Oct 24 20:43:57 2012
@@ -59,7 +59,7 @@ package
 		[Inspectable(enumeration="16,32")]
 		public var color:Number = -1;
 
-		[Inspectable(enumeration="desire,droid,droid2,droidPro,droidX,evo,incredible,iPad,iPad2,iPodTouch3GS,iPodTouch4G,nexusOne,playbook,xoom")]
+		[Inspectable(enumeration="air,desire,droid,droid2,droidPro,droidX,evo,incredible,iPad,iPad2,iPodTouch3GS,iPodTouch4G,nexusOne,playbook,xoom")]
 		public var device:String = null;
 
 		/**

Modified: incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/DeviceNames.as
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/DeviceNames.as?rev=1401871&r1=1401870&r2=1401871&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/DeviceNames.as (original)
+++ incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/DeviceNames.as Wed Oct 24
20:43:57 2012
@@ -35,7 +35,7 @@ public class DeviceNames
 
 	public static const OS_VALUES:Array = [WIN, MAC, ANDROID, IOS, QNX];
 	public static const OS_VERSION_VALUES:Array = ["android22", "android23", "ios3x", "ios40",
"ios41"];
-	public static const DEVICE_VALUES:Array = ["desire","droid","droid2","droidX","evo","incredible","nexusOne","playbook"];
+	public static const DEVICE_VALUES:Array = ["air","desire","droid","droid2","droidX","evo","incredible","nexusOne","playbook"];
 
 	public static function getFromOS ():String 
 	{

Modified: incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/ExcludeFileLocationApollo.as
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/ExcludeFileLocationApollo.as?rev=1401871&r1=1401870&r2=1401871&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/ExcludeFileLocationApollo.as
(original)
+++ incubator/flex/sdk/branches/develop/mustella/as3/src/mustella/ExcludeFileLocationApollo.as
Wed Oct 24 20:43:57 2012
@@ -89,10 +89,10 @@ public class ExcludeFileLocationApollo
 
 			if (os.indexOf ("Windows") != -1) 
 			{
-				excludeFile = "ExcludeListWin.txt";
+				excludeFile = "ExcludeListWinAIR.txt";
 			} else if (os.indexOf ("Mac") != -1) 
 			{
-				excludeFile = "ExcludeListMac.txt";
+				excludeFile = "ExcludeListMacAIR.txt";
 			} else if (os.indexOf ("Linux") != -1) 
 			{
 				excludeFile = "ExcludeListLinux.txt";

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=1401871&r1=1401870&r2=1401871&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 Wed Oct 24
20:43:57 2012
@@ -150,6 +150,12 @@ public class UnitTester extends EventDis
 
 		}
 
+		if (cv.device == null)
+		{
+			if (Security.sandboxType == Security.APPLICATION)
+				cv.device = "air";
+		}
+		
 		if(root.loaderInfo != null && root.loaderInfo.parameters != null)
 		{
 			for (var ix:String in root.loaderInfo.parameters) 

Modified: incubator/flex/sdk/branches/develop/mustella/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/build.xml?rev=1401871&r1=1401870&r2=1401871&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/build.xml (original)
+++ incubator/flex/sdk/branches/develop/mustella/build.xml Wed Oct 24 20:43:57 2012
@@ -160,11 +160,35 @@
     <property name="target_os_name" value="${host_os_name}" />
 
     <condition property="exclude_filename" value="${mustella.dir}/tests/ExcludeListWin.txt"
>
-        <equals arg1="${target_os_name}" arg2="windows" />
+        <and>
+            <equals arg1="${target_os_name}" arg2="windows" />
+            <not>
+                <istrue value="${use_apollo}" />
+            </not>
+        </and>
     </condition>
 
     <condition property="exclude_filename" value="${mustella.dir}/tests/ExcludeListMac.txt"
>
-        <equals arg1="${target_os_name}" arg2="mac" />
+        <and>
+            <equals arg1="${target_os_name}" arg2="mac" />
+            <not>
+                <istrue value="${use_apollo}" />
+            </not>
+        </and>
+    </condition>
+    
+    <condition property="exclude_filename" value="${mustella.dir}/tests/ExcludeListMacAIR.txt"
>
+        <and>
+            <equals arg1="${target_os_name}" arg2="mac" />
+            <istrue value="${use_apollo}" />
+        </and>
+    </condition>
+
+    <condition property="exclude_filename" value="${mustella.dir}/tests/ExcludeListWinAIR.txt"
>
+        <and>
+            <equals arg1="${target_os_name}" arg2="windows" />
+            <istrue value="${use_apollo}" />
+        </and>
     </condition>
 
     <condition property="exclude_filename" value="${mustella.dir}/tests/ExcludeListLinux.txt"
>



Mime
View raw message