You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2019/05/22 15:53:22 UTC
[royale-asjs] branch develop updated: Tests: some tweaks necessary
to get library tests building/running in JS
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new d2c7d3f Tests: some tweaks necessary to get library tests building/running in JS
d2c7d3f is described below
commit d2c7d3f5708cd465bd0a7b05a9216b15118f9869
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Wed May 22 08:52:57 2019 -0700
Tests: some tweaks necessary to get library tests building/running in JS
---
.../royale/FlexUnitRoyaleApplication-config.xml | 27 +++++++-------------
.../src/test/royale/FlexUnitRoyaleApplication.mxml | 11 ++++++--
.../projects/Basic/src/test/royale/build.xml | 5 +---
.../royale/FlexUnitRoyaleApplication-config.xml | 29 ++++++++--------------
.../src/test/royale/FlexUnitRoyaleApplication.mxml | 11 ++++++--
frameworks/projects/Core/src/test/royale/build.xml | 5 +---
.../royale/FlexUnitRoyaleApplication-config.xml | 27 +++++++-------------
.../src/test/royale/FlexUnitRoyaleApplication.mxml | 11 ++++++--
.../projects/RoyaleUnit/src/test/royale/build.xml | 5 +---
9 files changed, 58 insertions(+), 73 deletions(-)
diff --git a/frameworks/projects/Basic/src/test/royale/FlexUnitRoyaleApplication-config.xml b/frameworks/projects/Basic/src/test/royale/FlexUnitRoyaleApplication-config.xml
index 5d914d7..c50250a 100644
--- a/frameworks/projects/Basic/src/test/royale/FlexUnitRoyaleApplication-config.xml
+++ b/frameworks/projects/Basic/src/test/royale/FlexUnitRoyaleApplication-config.xml
@@ -21,7 +21,6 @@
<compiler>
<accessible>false</accessible>
- <!-- build both SWF and JS. -->
<targets>
<target>SWF</target>
</targets>
@@ -41,6 +40,7 @@
<path-element>../../../../../libs/Core.swc</path-element>
<path-element>../../../../../libs/Graphics.swc</path-element>
<path-element>../../../../../libs/Collections.swc</path-element>
+ <path-element>../../../../../libs/Language.swc</path-element>
<path-element>../../../../../libs/Reflection.swc</path-element>
<path-element>../../../../../libs/RoyaleUnit.swc</path-element>
</library-path>
@@ -51,29 +51,21 @@
<path-element>../../../../../js/libs/CoreJS.swc</path-element>
<path-element>../../../../../js/libs/GraphicsJS.swc</path-element>
<path-element>../../../../../js/libs/CollectionsJS.swc</path-element>
+ <path-element>../../../../../js/libs/LanguageJS.swc</path-element>
<path-element>../../../../../js/libs/ReflectionJS.swc</path-element>
<path-element>../../../../../js/libs/RoyaleUnitJS.swc</path-element>
</js-library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
- <mxml>
- <children-as-data>true</children-as-data>
- </mxml>
- <binding-value-change-event>org.apache.royale.events.ValueChangeEvent</binding-value-change-event>
- <binding-value-change-event-kind>org.apache.royale.events.ValueChangeEvent</binding-value-change-event-kind>
- <binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <mxml>
+ <children-as-data>true</children-as-data>
+ </mxml>
+ <binding-value-change-event>org.apache.royale.events.ValueChangeEvent</binding-value-change-event>
+ <binding-value-change-event-kind>org.apache.royale.events.ValueChangeEvent</binding-value-change-event-kind>
+ <binding-value-change-event-type>valueChange</binding-value-change-event-type>
<fxg-base-class>flash.display.Sprite</fxg-base-class>
- <define>
- <name>COMPILE::SWF</name>
- <value>true</value>
- </define>
- <define>
- <name>COMPILE::JS</name>
- <value>false</value>
- </define>
-
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -92,7 +84,7 @@
<name>Suite</name>
<name>RunWith</name>
</keep-as3-metadata>
-
+
<locale/>
<library-path/>
@@ -116,6 +108,5 @@
</compiler>
<target-player>${playerglobal.version}</target-player>
-
</royale-config>
diff --git a/frameworks/projects/Basic/src/test/royale/FlexUnitRoyaleApplication.mxml b/frameworks/projects/Basic/src/test/royale/FlexUnitRoyaleApplication.mxml
index 242765b..9e2e355 100644
--- a/frameworks/projects/Basic/src/test/royale/FlexUnitRoyaleApplication.mxml
+++ b/frameworks/projects/Basic/src/test/royale/FlexUnitRoyaleApplication.mxml
@@ -28,10 +28,14 @@ limitations under the License.
</fx:Declarations>
<fx:Script>
<![CDATA[
- import flash.system.fscommand;
+ COMPILE::SWF
+ {
+ import flash.system.fscommand;
+ }
import flexUnitTests.DataGridColumnTester;
+ import org.apache.royale.events.Event;
import org.apache.royale.test.listeners.CIListener;
public function runTests():void
@@ -43,7 +47,10 @@ limitations under the License.
private function core_completeHandler(event:Event):void
{
- fscommand("quit");
+ COMPILE::SWF
+ {
+ fscommand("quit");
+ }
}
]]>
diff --git a/frameworks/projects/Basic/src/test/royale/build.xml b/frameworks/projects/Basic/src/test/royale/build.xml
index 3f6cef7..37755ea 100644
--- a/frameworks/projects/Basic/src/test/royale/build.xml
+++ b/frameworks/projects/Basic/src/test/royale/build.xml
@@ -103,10 +103,7 @@
haltonfailure="false"
verbose="true"
localTrusted="true"
- timeout="90000">
- <source dir="${ROYALE_HOME}/frameworks/projects/Basic/src/main/royale" />
- <library dir="${ROYALE_HOME}/frameworks/libs" />
- </royaleunit>
+ timeout="90000" />
<!-- Generate readable JUnit-style reports -->
<junitreport todir="${report.dir}">
diff --git a/frameworks/projects/Core/src/test/royale/FlexUnitRoyaleApplication-config.xml b/frameworks/projects/Core/src/test/royale/FlexUnitRoyaleApplication-config.xml
index 6eeb8d5..8027f99 100644
--- a/frameworks/projects/Core/src/test/royale/FlexUnitRoyaleApplication-config.xml
+++ b/frameworks/projects/Core/src/test/royale/FlexUnitRoyaleApplication-config.xml
@@ -21,7 +21,6 @@
<compiler>
<accessible>false</accessible>
- <!-- build both SWF and JS. -->
<targets>
<target>SWF</target>
</targets>
@@ -41,6 +40,7 @@
<path-element>../../../../../libs/Core.swc</path-element>
<path-element>../../../../../libs/Graphics.swc</path-element>
<path-element>../../../../../libs/Collections.swc</path-element>
+ <path-element>../../../../../libs/Language.swc</path-element>
<path-element>../../../../../libs/Reflection.swc</path-element>
<path-element>../../../../../libs/RoyaleUnit.swc</path-element>
</library-path>
@@ -51,28 +51,20 @@
<path-element>../../../../../js/libs/CoreJS.swc</path-element>
<path-element>../../../../../js/libs/GraphicsJS.swc</path-element>
<path-element>../../../../../js/libs/CollectionsJS.swc</path-element>
+ <path-element>../../../../../js/libs/LanguageJS.swc</path-element>
<path-element>../../../../../js/libs/ReflectionJS.swc</path-element>
<path-element>../../../../../js/libs/RoyaleUnitJS.swc</path-element>
</js-library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
-
- <mxml>
- <children-as-data>true</children-as-data>
- </mxml>
- <binding-value-change-event>org.apache.royale.events.ValueChangeEvent</binding-value-change-event>
- <binding-value-change-event-kind>org.apache.royale.events.ValueChangeEvent</binding-value-change-event-kind>
- <binding-value-change-event-type>valueChange</binding-value-change-event-type>
- <fxg-base-class>flash.display.Sprite</fxg-base-class>
- <define>
- <name>COMPILE::SWF</name>
- <value>true</value>
- </define>
- <define>
- <name>COMPILE::JS</name>
- <value>false</value>
- </define>
+ <mxml>
+ <children-as-data>true</children-as-data>
+ </mxml>
+ <binding-value-change-event>org.apache.royale.events.ValueChangeEvent</binding-value-change-event>
+ <binding-value-change-event-kind>org.apache.royale.events.ValueChangeEvent</binding-value-change-event-kind>
+ <binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <fxg-base-class>flash.display.Sprite</fxg-base-class>
<keep-as3-metadata>
<name>Bindable</name>
@@ -92,7 +84,7 @@
<name>Suite</name>
<name>RunWith</name>
</keep-as3-metadata>
-
+
<locale/>
<library-path/>
@@ -108,6 +100,5 @@
</compiler>
<target-player>${playerglobal.version}</target-player>
-
</royale-config>
diff --git a/frameworks/projects/Core/src/test/royale/FlexUnitRoyaleApplication.mxml b/frameworks/projects/Core/src/test/royale/FlexUnitRoyaleApplication.mxml
index 604c550..3512e39 100644
--- a/frameworks/projects/Core/src/test/royale/FlexUnitRoyaleApplication.mxml
+++ b/frameworks/projects/Core/src/test/royale/FlexUnitRoyaleApplication.mxml
@@ -28,10 +28,14 @@ limitations under the License.
</fx:Declarations>
<fx:Script>
<![CDATA[
- import flash.system.fscommand;
+ COMPILE::SWF
+ {
+ import flash.system.fscommand;
+ }
import flexUnitTests.CoreTester;
+ import org.apache.royale.events.Event;
import org.apache.royale.test.listeners.CIListener;
public function runTests():void
@@ -43,7 +47,10 @@ limitations under the License.
private function core_completeHandler(event:Event):void
{
- fscommand("quit");
+ COMPILE::SWF
+ {
+ fscommand("quit");
+ }
}
]]>
diff --git a/frameworks/projects/Core/src/test/royale/build.xml b/frameworks/projects/Core/src/test/royale/build.xml
index d98403b..d2eb644 100644
--- a/frameworks/projects/Core/src/test/royale/build.xml
+++ b/frameworks/projects/Core/src/test/royale/build.xml
@@ -108,10 +108,7 @@
haltonfailure="false"
verbose="true"
localTrusted="true"
- timeout="90000">
- <source dir="${ROYALE_HOME}/frameworks/projects/Core/src/main/royale" />
- <library dir="${ROYALE_HOME}/frameworks/libs" />
- </royaleunit>
+ timeout="90000" />
<!-- Generate readable JUnit-style reports -->
<junitreport todir="${report.dir}">
diff --git a/frameworks/projects/RoyaleUnit/src/test/royale/FlexUnitRoyaleApplication-config.xml b/frameworks/projects/RoyaleUnit/src/test/royale/FlexUnitRoyaleApplication-config.xml
index 35f42eb..a74b668 100644
--- a/frameworks/projects/RoyaleUnit/src/test/royale/FlexUnitRoyaleApplication-config.xml
+++ b/frameworks/projects/RoyaleUnit/src/test/royale/FlexUnitRoyaleApplication-config.xml
@@ -21,7 +21,6 @@
<compiler>
<accessible>false</accessible>
- <!-- build both SWF and JS. -->
<targets>
<target>SWF</target>
</targets>
@@ -38,6 +37,7 @@
<library-path>
<path-element>../../../../../libs/Basic.swc</path-element>
<path-element>../../../../../libs/Core.swc</path-element>
+ <path-element>../../../../../libs/Language.swc</path-element>
<path-element>../../../../../libs/Reflection.swc</path-element>
<path-element>../../../../../libs/RoyaleUnit.swc</path-element>
</library-path>
@@ -45,29 +45,21 @@
<js-library-path>
<path-element>../../../../../js/libs/BasicJS.swc</path-element>
<path-element>../../../../../js/libs/CoreJS.swc</path-element>
+ <path-element>../../../../../js/libs/LanguageJS.swc</path-element>
<path-element>../../../../../js/libs/ReflectionJS.swc</path-element>
<path-element>../../../../../js/libs/RoyaleUnitJS.swc</path-element>
</js-library-path>
<allow-subclass-overrides>true</allow-subclass-overrides>
- <mxml>
- <children-as-data>true</children-as-data>
- </mxml>
- <binding-value-change-event>org.apache.royale.events.ValueChangeEvent</binding-value-change-event>
- <binding-value-change-event-kind>org.apache.royale.events.ValueChangeEvent</binding-value-change-event-kind>
- <binding-value-change-event-type>valueChange</binding-value-change-event-type>
+ <mxml>
+ <children-as-data>true</children-as-data>
+ </mxml>
+ <binding-value-change-event>org.apache.royale.events.ValueChangeEvent</binding-value-change-event>
+ <binding-value-change-event-kind>org.apache.royale.events.ValueChangeEvent</binding-value-change-event-kind>
+ <binding-value-change-event-type>valueChange</binding-value-change-event-type>
<fxg-base-class>flash.display.Sprite</fxg-base-class>
- <define>
- <name>COMPILE::SWF</name>
- <value>true</value>
- </define>
- <define>
- <name>COMPILE::JS</name>
- <value>false</value>
- </define>
-
<keep-as3-metadata>
<name>Bindable</name>
<name>Managed</name>
@@ -86,7 +78,7 @@
<name>Suite</name>
<name>RunWith</name>
</keep-as3-metadata>
-
+
<locale/>
<library-path/>
@@ -95,6 +87,5 @@
</compiler>
<target-player>${playerglobal.version}</target-player>
-
</royale-config>
diff --git a/frameworks/projects/RoyaleUnit/src/test/royale/FlexUnitRoyaleApplication.mxml b/frameworks/projects/RoyaleUnit/src/test/royale/FlexUnitRoyaleApplication.mxml
index 3c7a0e7..d921be9 100644
--- a/frameworks/projects/RoyaleUnit/src/test/royale/FlexUnitRoyaleApplication.mxml
+++ b/frameworks/projects/RoyaleUnit/src/test/royale/FlexUnitRoyaleApplication.mxml
@@ -28,10 +28,14 @@ limitations under the License.
</fx:Declarations>
<fx:Script>
<![CDATA[
- import flash.system.fscommand;
+ COMPILE::SWF
+ {
+ import flash.system.fscommand;
+ }
import tests.RoyaleUnitSuite;
+ import org.apache.royale.events.Event;
import org.apache.royale.test.listeners.CIListener;
public function runTests():void
@@ -43,7 +47,10 @@ limitations under the License.
private function core_completeHandler(event:Event):void
{
- fscommand("quit");
+ COMPILE::SWF
+ {
+ fscommand("quit");
+ }
}
]]>
diff --git a/frameworks/projects/RoyaleUnit/src/test/royale/build.xml b/frameworks/projects/RoyaleUnit/src/test/royale/build.xml
index 2001d6b..945590f 100644
--- a/frameworks/projects/RoyaleUnit/src/test/royale/build.xml
+++ b/frameworks/projects/RoyaleUnit/src/test/royale/build.xml
@@ -108,10 +108,7 @@
haltonfailure="false"
verbose="true"
localTrusted="true"
- timeout="90000">
- <source dir="${ROYALE_HOME}/frameworks/projects/RoyaleUnit/src/main/royale" />
- <library dir="${ROYALE_HOME}/frameworks/libs" />
- </royaleunit>
+ timeout="90000" />
<!-- Generate readable JUnit-style reports -->
<junitreport todir="${report.dir}">