royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ha...@apache.org
Subject [royale-asjs] branch feature/testing updated: Fixed Core tests
Date Sun, 05 Nov 2017 18:01:09 GMT
This is an automated email from the ASF dual-hosted git repository.

harbs pushed a commit to branch feature/testing
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/feature/testing by this push:
     new 07d7a07  Fixed Core tests
07d7a07 is described below

commit 07d7a07368290af2c0bc2b4f55773cde504704e8
Author: Harbs <harbs@in-tools.com>
AuthorDate: Sun Nov 5 20:01:04 2017 +0200

    Fixed Core tests
---
 frameworks/projects/Core/build.xml                 |  2 +-
 .../projects/Core/src/main/royale/CoreClasses.as   |  1 +
 frameworks/projects/Core/src/test/royale/build.xml | 30 ++++++++++------------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml
index 9f54129..bb50793 100644
--- a/frameworks/projects/Core/build.xml
+++ b/frameworks/projects/Core/build.xml
@@ -53,7 +53,7 @@
     </target>
     
     <target name="test" depends="check-for-tests" unless="skip-tests">
-        <!--<ant dir="src/test/royale" />-->
+        <ant dir="src/test/royale" />
     </target>
     
     <target name="clean">
diff --git a/frameworks/projects/Core/src/main/royale/CoreClasses.as b/frameworks/projects/Core/src/main/royale/CoreClasses.as
index 9c1b853..b78df0a 100644
--- a/frameworks/projects/Core/src/main/royale/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/royale/CoreClasses.as
@@ -217,6 +217,7 @@ internal class CoreClasses
 	
 	COMPILE::JS
 	{
+		import org.apache.royale.core.WrappedHTMLElement ;WrappedHTMLElement;
 	    import org.apache.royale.core.IRoyaleElement; IRoyaleElement;
 	}
 	//Package Level Functions
diff --git a/frameworks/projects/Core/src/test/royale/build.xml b/frameworks/projects/Core/src/test/royale/build.xml
index ae236a3..cddfe2a 100644
--- a/frameworks/projects/Core/src/test/royale/build.xml
+++ b/frameworks/projects/Core/src/test/royale/build.xml
@@ -28,47 +28,47 @@
     <property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
     <property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
     <property name="target.name" value="Core-${release.version}.swc" />
-    
+
 	<condition property="browser" value="C:/Program Files/Internet Explorer/iexplore.exe">
 		<os family="windows"/>
     </condition>
     <condition property="browser" value="/Applications/Safari.app/Contents/MacOS/Safari">
         <os family="mac"/>
     </condition>
-	
+
     <property name="report.dir" value="${basedir}/out" />
     
     <available file="${ROYALE_HOME}/in/flexunit"
         type="dir"
         property="FLEXUNIT_HOME"
         value="${ROYALE_HOME}/in/flexunit" />
-	
+    
     <available file="${env.FLEXUNIT_HOME}"
         type="dir"
         property="FLEXUNIT_HOME"
         value="${env.FLEXUNIT_HOME}"/>
-    
+
     <available file="${FLEXUNIT_HOME}/FlexUnit4/target"
         type="dir"
         property="FLEXUNIT_LIBPATH1"
-        value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4/target/flexunit-4.3.0-20140410-as3_4.12.0.swc"
/>
-    <property name="FLEXUNIT_LIBPATH1" value="-library-path+=${FLEXUNIT_HOME}/flexunit"
/>
-        
+        value="-swf-library-path+=${FLEXUNIT_HOME}/FlexUnit4/target/flexunit-4.3.0-20140410-as3_4.12.0.swc"
/>
+    <property name="FLEXUNIT_LIBPATH1" value="-swf-library-path+=${FLEXUNIT_HOME}/flexunit"
/>
+
     <available file="${FLEXUNIT_HOME}/FlexUnit4CIListener/target"
         type="dir"
         property="FLEXUNIT_LIBPATH2"
-        value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4CIListener/target" />
+        value="-swf-library-path+=${FLEXUNIT_HOME}/FlexUnit4CIListener/target" />
     <property name="FLEXUNIT_LIBPATH2" value="-define=CONFIG::dummy,false" />
-        
+
     <available file="${FLEXUNIT_HOME}/FlexUnit4AntTasks/target"
         type="dir"
         property="FLEXUNIT_CLASSPATH"
         value="${FLEXUNIT_HOME}/FlexUnit4AntTasks/target" />
     <property name="FLEXUNIT_CLASSPATH" value="${FLEXUNIT_HOME}/flexunit" />
-        
+
     <target name="main" depends="clean,compile,test" description="Clean test of ${target.name}">
     </target>
-
+    
     <target name="clean">
         <delete failonerror="false">
             <fileset dir="${basedir}">
@@ -91,6 +91,7 @@
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
         <echo message="FLEXUNIT_HOME: ${FLEXUNIT_HOME}"/>
+        <echo message="playerglobal.version: ${playerglobal.version}"/>
 
         <!-- Load the <compc> task. We can't do this at the <project> level
-->
         <!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -111,14 +112,11 @@
             file="${basedir}/FlexUnitRoyaleApplication.mxml"
             output="${basedir}/FlexUnitRoyaleApplication.swf">
             <jvmarg line="${mxmlc.jvm.args}"/>
-            <arg value="+royalelib=${ROYALE_HOME}/frameworks" />
             <arg value="-debug" />
-            <arg value="-define=COMPILE::SWF,true" />
-            <arg value="-define=COMPILE::JS,false" />
+            <arg value="-compiler.targets=SWF" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
-            <arg value="-source-path+=${ROYALE_HOME}/frameworks/projects/Core/src/main/royale"
/>
-            <arg value="-library-path+=${ROYALE_HOME}/frameworks/libs" />
+            <arg value="-swf-library-path+=${ROYALE_HOME}/frameworks/libs" />
             <arg value="${FLEXUNIT_LIBPATH1}" />
             <arg value="${FLEXUNIT_LIBPATH2}" />
         </mxmlc>

-- 
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <commits@royale.apache.org>'].

Mime
View raw message