-refactored ant builds of manual tests to be closer to examples, and support for 'maven_compat' from test level ant scripts. -renamed GenericTests to UnitTests and fixed some display issues due to layout changes etc
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/523eac21 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/523eac21 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/523eac21 Branch: refs/heads/develop Commit: 523eac21fa4dff0ac0199cf0a8b0e11506e5859f Parents: af7f5cd Author: greg-dove <greg.d...@gmail.com> Authored: Tue Aug 22 11:33:40 2017 +1200 Committer: greg-dove <greg.d...@gmail.com> Committed: Tue Aug 22 11:33:40 2017 +1200 ---------------------------------------------------------------------- manualtests/BubbleTest/build.xml | 44 +- manualtests/ContainerTest/build.xml | 40 +- manualtests/CursorTest/build.xml | 44 +- manualtests/DataBindingTestbed/build.xml | 41 +- manualtests/DataGridXcompile/build.xml | 39 +- manualtests/DateChooserExample/build.xml | 38 +- manualtests/EffectsExample/build.xml | 43 +- manualtests/FlexJSTest_HTML5/build.xml | 36 +- manualtests/FlexJSTest_Panel/build.xml | 35 +- manualtests/FlexJSTest_SVG/build.xml | 37 +- manualtests/FlexJSTest_basic/build.xml | 36 +- manualtests/FlexJSTest_createjs/build.xml | 41 +- manualtests/FlexJSTest_jquery/build.xml | 38 +- manualtests/FormExample/build.xml | 45 +- manualtests/FormatExample/build.xml | 43 +- manualtests/GenericTests/build.xml | 76 --- manualtests/GenericTests/src/GenericTests.mxml | 39 -- manualtests/GenericTests/src/MyInitialView.mxml | 193 ------- manualtests/GenericTests/src/README.txt | 61 -- manualtests/GenericTests/src/TestClasses.as | 37 -- .../src/flexUnitTests/CoreTester.as | 43 -- .../src/flexUnitTests/JiraIssuesTester.as | 29 - .../src/flexUnitTests/ObservedBugsTester.as | 33 -- .../src/flexUnitTests/ReflectionTester.as | 38 -- .../flexUnitTests/core/BinaryDataTesterTest.as | 567 ------------------- .../src/flexUnitTests/core/StrandTesterTest.as | 55 -- .../src/flexUnitTests/jira/JiraTesterTest.as | 73 --- .../observedbugs/ObservedBugTests.as | 101 ---- .../reflection/ReflectionTesterTest.as | 373 ------------ .../reflection/ReflectionTesterTestAlias.as | 90 --- .../reflection/ReflectionTesterTestUseCache.as | 93 --- .../reflection/support/ITestInterface.as | 27 - .../reflection/support/ITestInterface2.as | 29 - .../reflection/support/ITestInterface3.as | 27 - .../reflection/support/ITestInterface4.as | 29 - .../reflection/support/TestClass1.as | 91 --- .../reflection/support/TestClass2.as | 103 ---- .../reflection/support/TestClass3.as | 39 -- .../reflection/support/TestClass4.as | 95 ---- .../src/flexunit/framework/Assert.as | 305 ---------- .../flexunit/framework/AssertionFailedError.as | 39 -- .../src/testshim/FlexJSUnitTestRunner.as | 186 ------ .../GenericTests/src/testshim/TestResult.as | 56 -- .../GenericTests/testsview/image/Flex.png | Bin 3526 -> 0 bytes manualtests/GenericTests/testsview/index.html | 128 ----- manualtests/ImageTest/build.xml | 37 +- manualtests/LanguageTests/build.xml | 37 +- manualtests/ListsTest/build.xml | 35 +- manualtests/ProxyTest/build.xml | 38 +- manualtests/ReflectionTest/build.xml | 38 +- manualtests/RollEventsTest/build.xml | 37 +- manualtests/TLFEditTestFlexJS/build.xml | 36 +- manualtests/UnitTests/README.txt | 61 ++ manualtests/UnitTests/build.xml | 58 ++ manualtests/UnitTests/src/README.txt | 61 ++ .../src/main/config/compile-app-config.xml | 25 + .../UnitTests/src/main/flex/MyInitialView.mxml | 190 +++++++ manualtests/UnitTests/src/main/flex/README.txt | 61 ++ .../UnitTests/src/main/flex/TestClasses.as | 37 ++ .../UnitTests/src/main/flex/UnitTests.mxml | 39 ++ .../src/main/flex/flexUnitTests/CoreTester.as | 43 ++ .../main/flex/flexUnitTests/JiraIssuesTester.as | 29 + .../flex/flexUnitTests/ObservedBugsTester.as | 33 ++ .../main/flex/flexUnitTests/ReflectionTester.as | 38 ++ .../flexUnitTests/core/BinaryDataTesterTest.as | 567 +++++++++++++++++++ .../flex/flexUnitTests/core/StrandTesterTest.as | 55 ++ .../flex/flexUnitTests/jira/JiraTesterTest.as | 73 +++ .../observedbugs/ObservedBugTests.as | 91 +++ .../reflection/ReflectionTesterTest.as | 373 ++++++++++++ .../reflection/ReflectionTesterTestAlias.as | 90 +++ .../reflection/ReflectionTesterTestUseCache.as | 93 +++ .../reflection/support/ITestInterface.as | 27 + .../reflection/support/ITestInterface2.as | 29 + .../reflection/support/ITestInterface3.as | 27 + .../reflection/support/ITestInterface4.as | 29 + .../reflection/support/TestClass1.as | 91 +++ .../reflection/support/TestClass2.as | 103 ++++ .../reflection/support/TestClass3.as | 39 ++ .../reflection/support/TestClass4.as | 95 ++++ .../reflection/support/TestClass5.as | 82 +++ .../src/main/flex/flexunit/framework/Assert.as | 305 ++++++++++ .../flexunit/framework/AssertionFailedError.as | 39 ++ .../main/flex/testshim/FlexJSUnitTestRunner.as | 186 ++++++ .../src/main/flex/testshim/TestResult.as | 56 ++ manualtests/UnitTests/testsview/image/Flex.png | Bin 0 -> 3526 bytes manualtests/UnitTests/testsview/index.html | 129 +++++ manualtests/XMLTest/build.xml | 40 +- manualtests/build.xml | 18 +- manualtests/build_example.xml | 540 ++++++++++++------ 89 files changed, 3753 insertions(+), 4012 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/BubbleTest/build.xml ---------------------------------------------------------------------- diff --git a/manualtests/BubbleTest/build.xml b/manualtests/BubbleTest/build.xml index 6cea9d2..8b013cf 100644 --- a/manualtests/BubbleTest/build.xml +++ b/manualtests/BubbleTest/build.xml @@ -22,52 +22,26 @@ <project name="bubbletest" default="main" basedir="."> <property name="FLEXJS_HOME" location="../.."/> <property name="example" value="BubbleTest" /> - <property name="swf.version" value="11" /> - - <property environment="env"/> - <property file="${FLEXJS_HOME}/build.properties"/> - <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> + <!-- use this to add keep metadata option --> <property name="theme_arg" value="-keep-as3-metadata+=Event" /> - <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${env.FALCON_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/> - - <available file="${env.FALCONJX_HOME}/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${env.FALCONJX_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/> - - <available file="${env.GOOG_HOME}/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${env.GOOG_HOME}"/> - - <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${FLEXJS_HOME}/js/lib/google/closure-library"/> + + <property file="${FLEXJS_HOME}/env.properties"/> + <property environment="env"/> + <property file="${FLEXJS_HOME}/build.properties"/> + <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> + <include file="${basedir}/../build_example.xml" /> - <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of FlexJSUI.swc"> + <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}"> </target> <target name="clean"> <delete dir="${basedir}/bin" failonerror="false" /> <delete dir="${basedir}/bin-debug" failonerror="false" /> <delete dir="${basedir}/bin-release" failonerror="false" /> + <delete dir="${basedir}/target" failonerror="false" /> </target> </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/ContainerTest/build.xml ---------------------------------------------------------------------- diff --git a/manualtests/ContainerTest/build.xml b/manualtests/ContainerTest/build.xml index c39c049..6ab2b67 100644 --- a/manualtests/ContainerTest/build.xml +++ b/manualtests/ContainerTest/build.xml @@ -22,52 +22,24 @@ <project name="containertest" default="main" basedir="."> <property name="FLEXJS_HOME" location="../.."/> <property name="example" value="ContainerTest" /> - <property name="swf.version" value="11" /> + <property file="${FLEXJS_HOME}/env.properties"/> <property environment="env"/> <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> - <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${env.FALCON_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/> - - <available file="${env.FALCONJX_HOME}/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${env.FALCONJX_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/> - - <available file="${env.GOOG_HOME}/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${env.GOOG_HOME}"/> - - <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${FLEXJS_HOME}/js/lib/google/closure-library"/> - + + <include file="${basedir}/../build_example.xml" /> - -<!-- temp remove build_example.compilejs --> - <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}"> + + <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}"> </target> <target name="clean"> <delete dir="${basedir}/bin" failonerror="false" /> <delete dir="${basedir}/bin-debug" failonerror="false" /> <delete dir="${basedir}/bin-release" failonerror="false" /> + <delete dir="${basedir}/target" failonerror="false" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/CursorTest/build.xml ---------------------------------------------------------------------- diff --git a/manualtests/CursorTest/build.xml b/manualtests/CursorTest/build.xml index c0f971f..3c61362 100644 --- a/manualtests/CursorTest/build.xml +++ b/manualtests/CursorTest/build.xml @@ -22,52 +22,26 @@ <project name="cursortest" default="main" basedir="."> <property name="FLEXJS_HOME" location="../.."/> <property name="example" value="CursorTest" /> - <property name="swf.version" value="11" /> - + + <!-- use this to add keep metadata option --> + <property name="theme_arg" value="-keep-as3-metadata+=Event" /> + + <property file="${FLEXJS_HOME}/env.properties"/> <property environment="env"/> - <property file="${FLEXJS_HOME}/build.properties"/> + <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> - <!-- use this to add keep metadata option --> - <property name="theme_arg" value="-keep-as3-metadata+=Event" /> - <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${env.FALCON_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/> - - <available file="${env.FALCONJX_HOME}/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${env.FALCONJX_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/> - - <available file="${env.GOOG_HOME}/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${env.GOOG_HOME}"/> - - <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${FLEXJS_HOME}/js/lib/google/closure-library"/> + <include file="${basedir}/../build_example.xml" /> - <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of FlexJSUI.swc"> + <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}"> </target> <target name="clean"> <delete dir="${basedir}/bin" failonerror="false" /> <delete dir="${basedir}/bin-debug" failonerror="false" /> <delete dir="${basedir}/bin-release" failonerror="false" /> + <delete dir="${basedir}/target" failonerror="false" /> </target> </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/DataBindingTestbed/build.xml ---------------------------------------------------------------------- diff --git a/manualtests/DataBindingTestbed/build.xml b/manualtests/DataBindingTestbed/build.xml index 9c4ed2d..5fc23e6 100644 --- a/manualtests/DataBindingTestbed/build.xml +++ b/manualtests/DataBindingTestbed/build.xml @@ -22,53 +22,24 @@ <project name="databindingexample" default="main" basedir="."> <property name="FLEXJS_HOME" location="../.."/> <property name="example" value="DataBindingTestbed" /> - <property name="swf.version" value="11" /> - + <property file="${FLEXJS_HOME}/env.properties"/> <property environment="env"/> - <property file="${FLEXJS_HOME}/build.properties"/> + <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> - <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${env.FALCON_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/> - - <available file="${env.FALCONJX_HOME}/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${env.FALCONJX_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/> - - <available file="${env.GOOG_HOME}/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${env.GOOG_HOME}"/> - - <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${FLEXJS_HOME}/js/lib/google/closure-library"/> + <include file="${basedir}/../build_example.xml" /> - <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}"> + <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}"> </target> <target name="clean"> <delete dir="${basedir}/bin" failonerror="false" /> <delete dir="${basedir}/bin-debug" failonerror="false" /> <delete dir="${basedir}/bin-release" failonerror="false" /> - </target> - + <delete dir="${basedir}/target" failonerror="false" /> + </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/DataGridXcompile/build.xml ---------------------------------------------------------------------- diff --git a/manualtests/DataGridXcompile/build.xml b/manualtests/DataGridXcompile/build.xml index ccc86f8..a8c716c 100644 --- a/manualtests/DataGridXcompile/build.xml +++ b/manualtests/DataGridXcompile/build.xml @@ -23,49 +23,22 @@ <property name="FLEXJS_HOME" location="../.."/> <property name="example" value="DataGridXcompile" /> - <property file="${FLEXJS_HOME}/env.properties"/> + <property file="${FLEXJS_HOME}/env.properties"/> <property environment="env"/> - <property file="${FLEXJS_HOME}/build.properties"/> + <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> - <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${env.FALCON_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/> - - <available file="${env.FALCONJX_HOME}/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${env.FALCONJX_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/> - - <available file="${env.GOOG_HOME}/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${env.GOOG_HOME}"/> - - <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${FLEXJS_HOME}/js/lib/google/closure-library"/> + <include file="${basedir}/../build_example.xml" /> - <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}"> + <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}"> </target> <target name="clean"> <delete dir="${basedir}/bin" failonerror="false" /> <delete dir="${basedir}/bin-debug" failonerror="false" /> <delete dir="${basedir}/bin-release" failonerror="false" /> - </target> + <delete dir="${basedir}/target" failonerror="false" /> + </target> </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/DateChooserExample/build.xml ---------------------------------------------------------------------- diff --git a/manualtests/DateChooserExample/build.xml b/manualtests/DateChooserExample/build.xml index c4e09af..84ab9b3 100644 --- a/manualtests/DateChooserExample/build.xml +++ b/manualtests/DateChooserExample/build.xml @@ -25,49 +25,21 @@ <property file="${FLEXJS_HOME}/env.properties"/> <property environment="env"/> - <property file="${FLEXJS_HOME}/build.properties"/> + <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> - <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${env.FALCON_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/> - - <available file="${env.FALCONJX_HOME}/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${env.FALCONJX_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/> - - <available file="${env.GOOG_HOME}/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${env.GOOG_HOME}"/> - - <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${FLEXJS_HOME}/js/lib/google/closure-library"/> + <include file="${basedir}/../build_example.xml" /> - - <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}"> + + <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}"> </target> <target name="clean"> <delete dir="${basedir}/bin" failonerror="false" /> <delete dir="${basedir}/bin-debug" failonerror="false" /> <delete dir="${basedir}/bin-release" failonerror="false" /> + <delete dir="${basedir}/target" failonerror="false" /> </target> - </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/EffectsExample/build.xml ---------------------------------------------------------------------- diff --git a/manualtests/EffectsExample/build.xml b/manualtests/EffectsExample/build.xml index de6a574..b16f1ac 100644 --- a/manualtests/EffectsExample/build.xml +++ b/manualtests/EffectsExample/build.xml @@ -25,53 +25,20 @@ <property file="${FLEXJS_HOME}/env.properties"/> <property environment="env"/> - <property file="${FLEXJS_HOME}/build.properties"/> + <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> - <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${env.FALCON_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/> - - <available file="${env.FALCONJX_HOME}/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${env.FALCONJX_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/> - - <available file="${env.GOOG_HOME}/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${env.GOOG_HOME}"/> - - <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${FLEXJS_HOME}/js/lib/google/closure-library"/> + <include file="${basedir}/../build_example.xml" /> - - <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}"> - </target> - <!-- Uncomment to reproduce cross-compilation error in compilejs step - <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}"> + + <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}"> </target> - --> <target name="clean"> <delete dir="${basedir}/bin" failonerror="false" /> <delete dir="${basedir}/bin-debug" failonerror="false" /> <delete dir="${basedir}/bin-release" failonerror="false" /> + <delete dir="${basedir}/target" failonerror="false" /> </target> - - </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/FlexJSTest_HTML5/build.xml ---------------------------------------------------------------------- diff --git a/manualtests/FlexJSTest_HTML5/build.xml b/manualtests/FlexJSTest_HTML5/build.xml index 4faedac..0253696 100644 --- a/manualtests/FlexJSTest_HTML5/build.xml +++ b/manualtests/FlexJSTest_HTML5/build.xml @@ -23,48 +23,22 @@ <property name="FLEXJS_HOME" location="../.."/> <property name="example" value="FlexJSTest_HTML5" /> + <property file="${FLEXJS_HOME}/env.properties"/> <property environment="env"/> - <property file="${FLEXJS_HOME}/build.properties"/> + <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> - <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${env.FALCON_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/> - - <available file="${env.FALCONJX_HOME}/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${env.FALCONJX_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/> - - <available file="${env.GOOG_HOME}/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${env.GOOG_HOME}"/> - - <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${FLEXJS_HOME}/js/lib/google/closure-library"/> + <include file="${basedir}/../build_example.xml" /> - <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}"> + <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}"> </target> <target name="clean"> <delete dir="${basedir}/bin" failonerror="false" /> <delete dir="${basedir}/bin-debug" failonerror="false" /> <delete dir="${basedir}/bin-release" failonerror="false" /> + <delete dir="${basedir}/target" failonerror="false" /> </target> </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/FlexJSTest_Panel/build.xml ---------------------------------------------------------------------- diff --git a/manualtests/FlexJSTest_Panel/build.xml b/manualtests/FlexJSTest_Panel/build.xml index 267a21d..23e3886 100644 --- a/manualtests/FlexJSTest_Panel/build.xml +++ b/manualtests/FlexJSTest_Panel/build.xml @@ -25,47 +25,20 @@ <property file="${FLEXJS_HOME}/env.properties"/> <property environment="env"/> - <property file="${FLEXJS_HOME}/build.properties"/> + <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> - <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${env.FALCON_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/> - - <available file="${env.FALCONJX_HOME}/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${env.FALCONJX_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/> - - <available file="${env.GOOG_HOME}/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${env.GOOG_HOME}"/> - - <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${FLEXJS_HOME}/js/lib/google/closure-library"/> + <include file="${basedir}/../build_example.xml" /> - <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}"> + <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}"> </target> <target name="clean"> <delete dir="${basedir}/bin" failonerror="false" /> <delete dir="${basedir}/bin-debug" failonerror="false" /> <delete dir="${basedir}/bin-release" failonerror="false" /> + <delete dir="${basedir}/target" failonerror="false" /> </target> </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/FlexJSTest_SVG/build.xml ---------------------------------------------------------------------- diff --git a/manualtests/FlexJSTest_SVG/build.xml b/manualtests/FlexJSTest_SVG/build.xml index b273902..b714ff5 100644 --- a/manualtests/FlexJSTest_SVG/build.xml +++ b/manualtests/FlexJSTest_SVG/build.xml @@ -23,49 +23,22 @@ <property name="FLEXJS_HOME" location="../.."/> <property name="example" value="FlexJSTest_SVG" /> - <property file="${FLEXJS_HOME}/env.properties"/> + <property file="${FLEXJS_HOME}/env.properties"/> <property environment="env"/> - <property file="${FLEXJS_HOME}/build.properties"/> + <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> - <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${env.FALCON_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/> - - <available file="${env.FALCONJX_HOME}/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${env.FALCONJX_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/> - - <available file="${env.GOOG_HOME}/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${env.GOOG_HOME}"/> - - <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${FLEXJS_HOME}/js/lib/google/closure-library"/> + <include file="${basedir}/../build_example.xml" /> - <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}"> + <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}"> </target> <target name="clean"> <delete dir="${basedir}/bin" failonerror="false" /> <delete dir="${basedir}/bin-debug" failonerror="false" /> <delete dir="${basedir}/bin-release" failonerror="false" /> + <delete dir="${basedir}/target" failonerror="false" /> </target> </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/FlexJSTest_basic/build.xml ---------------------------------------------------------------------- diff --git a/manualtests/FlexJSTest_basic/build.xml b/manualtests/FlexJSTest_basic/build.xml index 313fe90..d39eeb0 100644 --- a/manualtests/FlexJSTest_basic/build.xml +++ b/manualtests/FlexJSTest_basic/build.xml @@ -23,48 +23,22 @@ <property name="FLEXJS_HOME" location="../.."/> <property name="example" value="FlexJSTest_basic" /> + <property file="${FLEXJS_HOME}/env.properties"/> <property environment="env"/> - <property file="${FLEXJS_HOME}/build.properties"/> + <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> - <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${env.FALCON_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/> - - <available file="${env.FALCONJX_HOME}/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${env.FALCONJX_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/> - - <available file="${env.GOOG_HOME}/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${env.GOOG_HOME}"/> - - <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${FLEXJS_HOME}/js/lib/google/closure-library"/> + <include file="${basedir}/../build_example.xml" /> - <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of FlexJSUI.swc"> + <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}"> </target> <target name="clean"> <delete dir="${basedir}/bin" failonerror="false" /> <delete dir="${basedir}/bin-debug" failonerror="false" /> <delete dir="${basedir}/bin-release" failonerror="false" /> + <delete dir="${basedir}/target" failonerror="false" /> </target> </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/FlexJSTest_createjs/build.xml ---------------------------------------------------------------------- diff --git a/manualtests/FlexJSTest_createjs/build.xml b/manualtests/FlexJSTest_createjs/build.xml index b8cda4e..2a3018e 100644 --- a/manualtests/FlexJSTest_createjs/build.xml +++ b/manualtests/FlexJSTest_createjs/build.xml @@ -22,51 +22,24 @@ <project name="flexjstest_createjs" default="main" basedir="."> <property name="FLEXJS_HOME" location="../.."/> <property name="example" value="CreateJSExample" /> + + <property name="extlib_arg" value="-js-external-library-path+=../../js/libs/createjs.swc"/> + <property file="${FLEXJS_HOME}/env.properties"/> <property environment="env"/> - <property file="${FLEXJS_HOME}/build.properties"/> + <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> - <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${env.FALCON_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/> - - <available file="${env.FALCONJX_HOME}/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${env.FALCONJX_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/> - - <available file="${env.GOOG_HOME}/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${env.GOOG_HOME}"/> - - <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${FLEXJS_HOME}/js/lib/google/closure-library"/> - - <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/createjs/target/createjs.swc"/> + <include file="${basedir}/../build_example.xml" /> - <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}"> + <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}"> </target> <target name="clean"> <delete dir="${basedir}/bin" failonerror="false" /> <delete dir="${basedir}/bin-debug" failonerror="false" /> <delete dir="${basedir}/bin-release" failonerror="false" /> + <delete dir="${basedir}/target" failonerror="false" /> </target> - </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/FlexJSTest_jquery/build.xml ---------------------------------------------------------------------- diff --git a/manualtests/FlexJSTest_jquery/build.xml b/manualtests/FlexJSTest_jquery/build.xml index d408541..ca1f272 100644 --- a/manualtests/FlexJSTest_jquery/build.xml +++ b/manualtests/FlexJSTest_jquery/build.xml @@ -23,48 +23,22 @@ <property name="FLEXJS_HOME" location="../.."/> <property name="example" value="jQuerySample" /> + <property file="${FLEXJS_HOME}/env.properties"/> <property environment="env"/> - <property file="${FLEXJS_HOME}/build.properties"/> + <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> - <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${env.FALCON_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/> - - <available file="${env.FALCONJX_HOME}/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${env.FALCONJX_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/> - - <available file="${env.GOOG_HOME}/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${env.GOOG_HOME}"/> - - <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${FLEXJS_HOME}/js/lib/google/closure-library"/> + <include file="${basedir}/../build_example.xml" /> - <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}"> + <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}"> </target> <target name="clean"> <delete dir="${basedir}/bin" failonerror="false" /> <delete dir="${basedir}/bin-debug" failonerror="false" /> <delete dir="${basedir}/bin-release" failonerror="false" /> + <delete dir="${basedir}/target" failonerror="false" /> </target> - + </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/FormExample/build.xml ---------------------------------------------------------------------- diff --git a/manualtests/FormExample/build.xml b/manualtests/FormExample/build.xml index 9e18f17..d482901 100644 --- a/manualtests/FormExample/build.xml +++ b/manualtests/FormExample/build.xml @@ -23,55 +23,22 @@ <property name="FLEXJS_HOME" location="../.."/> <property name="example" value="FormExample" /> - <property file="${FLEXJS_HOME}/env.properties"/> + <property file="${FLEXJS_HOME}/env.properties"/> <property environment="env"/> - <property file="${FLEXJS_HOME}/build.properties"/> + <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> - <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${env.FALCON_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/> - - <available file="${env.FALCONJX_HOME}/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${env.FALCONJX_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/> - - <available file="${env.GOOG_HOME}/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${env.GOOG_HOME}"/> - - <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${FLEXJS_HOME}/js/lib/google/closure-library"/> + <include file="${basedir}/../build_example.xml" /> - - <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}"> - </target> - <!-- Uncomment to reproduce cross-compilation error in compilejs step - <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}"> + + <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}"> </target> - --> <target name="clean"> <delete dir="${basedir}/bin" failonerror="false" /> <delete dir="${basedir}/bin-debug" failonerror="false" /> <delete dir="${basedir}/bin-release" failonerror="false" /> + <delete dir="${basedir}/target" failonerror="false" /> </target> - - </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/FormatExample/build.xml ---------------------------------------------------------------------- diff --git a/manualtests/FormatExample/build.xml b/manualtests/FormatExample/build.xml index 00c6a9e..c3c7b08 100644 --- a/manualtests/FormatExample/build.xml +++ b/manualtests/FormatExample/build.xml @@ -23,55 +23,22 @@ <property name="FLEXJS_HOME" location="../.."/> <property name="example" value="FormatExample" /> - <property file="${FLEXJS_HOME}/env.properties"/> + <property file="${FLEXJS_HOME}/env.properties"/> <property environment="env"/> - <property file="${FLEXJS_HOME}/build.properties"/> + <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> - <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${env.FALCON_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/> - - <available file="${env.FALCONJX_HOME}/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${env.FALCONJX_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/> - - <available file="${env.GOOG_HOME}/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${env.GOOG_HOME}"/> - - <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${FLEXJS_HOME}/js/lib/google/closure-library"/> + <include file="${basedir}/../build_example.xml" /> - + <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}"> </target> - <!-- Uncomment to reproduce cross-compilation error in compilejs step - <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}"> - </target> - --> <target name="clean"> <delete dir="${basedir}/bin" failonerror="false" /> <delete dir="${basedir}/bin-debug" failonerror="false" /> <delete dir="${basedir}/bin-release" failonerror="false" /> + <delete dir="${basedir}/target" failonerror="false" /> </target> - - </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/GenericTests/build.xml ---------------------------------------------------------------------- diff --git a/manualtests/GenericTests/build.xml b/manualtests/GenericTests/build.xml deleted file mode 100644 index 7213c68..0000000 --- a/manualtests/GenericTests/build.xml +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ---> - - -<project name="GenericTests" default="main" basedir="."> - <property name="FLEXJS_HOME" location="../.."/> - <property name="example" value="GenericTests" /> - <property name="swf.version" value="11" /> - - <!-- adding flexuint style meta collection, and additional testing meta tags (Event,Bindable,TestMeta)--> - <property name="theme_arg" value="-keep-as3-metadata+=Test,BeforeClass,AfterClass,Before,After,TestVariance,Event,Bindable,TestMeta" /> - <!-- adding flexuint style meta collection, and additional testing meta tags (Event,Bindable,TestMeta)--> - <property name="extlib_arg" value="-keep-code-with-metadata=Test,BeforeClass,AfterClass,Before,After,TestVariance,TestMeta" /> - <property file="${FLEXJS_HOME}/env.properties"/> - <property environment="env"/> - <property file="${FLEXJS_HOME}/build.properties"/> - <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> - <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${env.FALCON_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar" - type="file" - property="FALCON_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/> - - <available file="${env.FALCONJX_HOME}/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${env.FALCONJX_HOME}"/> - - <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar" - type="file" - property="FALCONJX_HOME" - value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/> - - <available file="${env.GOOG_HOME}/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${env.GOOG_HOME}"/> - - <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" - type="file" - property="GOOG_HOME" - value="${FLEXJS_HOME}/js/lib/google/closure-library"/> - - <include file="${basedir}/../build_example.xml" /> - - <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of GenericTests"> - </target> - - <target name="clean"> - <delete dir="${basedir}/bin" failonerror="false" /> - <delete dir="${basedir}/bin-debug" failonerror="false" /> - <delete dir="${basedir}/bin-release" failonerror="false" /> - </target> - -</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/GenericTests/src/GenericTests.mxml ---------------------------------------------------------------------- diff --git a/manualtests/GenericTests/src/GenericTests.mxml b/manualtests/GenericTests/src/GenericTests.mxml deleted file mode 100644 index 0db0af9..0000000 --- a/manualtests/GenericTests/src/GenericTests.mxml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!--- -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to You under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -//////////////////////////////////////////////////////////////////////////////// ---> -<js:Application xmlns:fx="http://ns.adobe.com/mxml/2009" - xmlns:local="*" - xmlns:models="models.*" - xmlns:controllers="controllers.*" - xmlns:js="library://ns.apache.org/flexjs/basic" - > - <fx:Style> - @namespace js "library://ns.apache.org/flexjs/basic"; - js|Application { - background-color:#ffffff ; - } - </fx:Style> - <js:valuesImpl> - <js:SimpleCSSValuesImpl /> - </js:valuesImpl> - <js:initialView> - <local:MyInitialView /> - </js:initialView> -</js:Application> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/GenericTests/src/MyInitialView.mxml ---------------------------------------------------------------------- diff --git a/manualtests/GenericTests/src/MyInitialView.mxml b/manualtests/GenericTests/src/MyInitialView.mxml deleted file mode 100644 index af4aea7..0000000 --- a/manualtests/GenericTests/src/MyInitialView.mxml +++ /dev/null @@ -1,193 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - -Licensed to the Apache Software Foundation (ASF) under one or more -contributor license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright ownership. -The ASF licenses this file to You under the Apache License, Version 2.0 -(the "License"); you may not use this file except in compliance with -the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - ---> -<js:View xmlns:fx="http://ns.adobe.com/mxml/2009" - xmlns:js="library://ns.apache.org/flexjs/basic" - xmlns:local="*" - xmlns:acc="org.apache.flex.html.accessories.*" - initComplete="runTests()" -> - - <fx:Style> - .title { - font-size: 14pt; - font-weight: bold; - } - .body { - left:10px; - right:10px; - } - </fx:Style> - - <fx:Script> - <![CDATA[ - import org.apache.flex.html.Label; - import org.apache.flex.reflection.VariableDefinition; - import org.apache.flex.reflection.getDefinitionByName; - import org.apache.flex.reflection.describeType; - import org.apache.flex.reflection.TypeDefinition; - - import testshim.FlexJSUnitTestRunner; - import testshim.TestResult; - - - - private var _tests:Array; - - public function runTests():void { - var label:Label; - var groups:Array = TestClasses.testClasses; - var spaces:String = PLATFORM == "JS" ? " " : " "; - while (groups.length) { - var testGroupClass:Class = groups.shift() as Class; - var td:TypeDefinition = describeType(testGroupClass); - label = new Label(); - label.text = "Running " + td.name + " Tests"; - output.addElement(label); - var testClasses:Array = td.variables; - testClasses.sortOn("name"); - var i:uint = 0, l:uint = testClasses.length; - if (l == 0) { - label = new Label(); - label.text = spaces+ "[Zero tests detected]"; - output.addElement(label); - continue; - } - for (; i < l; i++) { - var varDef:VariableDefinition = testClasses[i]; - - var testClass:Class = getDefinitionByName(varDef.type.qualifiedName) as Class; - fails = []; - passes = []; - variances = []; - warnings = []; - var runner:FlexJSUnitTestRunner = new FlexJSUnitTestRunner(testClass, onTestResult); - runner.runTests(); - label = new Label(); - - label.text = "TEST: " + runner.testingName + spaces + "Passed:" + runner.successCount + ", Failed:" + runner.failCount + ", assertions made:" + runner.successfulAssertions; - label.style = {color: runner.failCount == 0 ? "green" : "red"}; - output.addElement(label); - if (runner.failCount > 0 || fails.length) { - //show any failing test details - appendTestResults(fails); - } - if (variances.length) { - appendTestResults(variances); - } - if (warnings.length) { - appendTestResults(warnings); - } - } - } - - } - - - private var fails:Array; - private var passes:Array; - private var variances:Array; - private var warnings:Array; - public function onTestResult(result:TestResult):void { - if (result.pass) passes.push(result); - else fails.push(result); - - if (result.hasVariance && result.pass) { - if (result.varianceTarget.indexOf(PLATFORM) != -1) { - //variance applies to this target - variances.push(result); - } - } - - if (result.warning!=null && result.pass && !result.hasVariance) { - // a test result that would otherwise indicate a pass, but has a warning - warnings.push(result); - } - } - - public function appendTestResults(array:Array):void { - array = array.slice(); - var spaces:String = " "; - var newline:String = "\n" ; - while (array.length) { - var result:TestResult = array.shift(); - var label:Label = new Label(); - //label.x=10; <- fails in js, using 'spaces' below instead - var message:String = spaces + result.toString(newline +spaces); - - if (result.hasVariance) - message = spaces + "VARIANCE:" + result.varianceDescription + newline + message ; - if (result.warning != null) { - message = spaces + result.warning +newline +message; - } - if (PLATFORM == "JS") { - message = escapeForHtml(message); - var jsSpaces:String = spaces.split(" ").join(" "); - message = message.split(spaces).join(jsSpaces); - } - - label.text = message; - - if (result.pass) { - var showOrange:Boolean = false; - if (result.hasVariance || result.warning!=null) showOrange = true; - label.style = {color: showOrange ? 0xFFA500 : "green"}; - } else label.style = {color: "red"}; - output.addElement(label); - } - } - - private static function escapeForHtml( string : String ) : String { - return string.split("<").join("<").split(">").join(">").split("\n").join("<br/>"); - } - - - private static function getPlatform():String { - try { - var check:* = getDefinitionByName("flash.system.Capabilities"); - } catch (e:Error) { - return "JS"; - } - //if this next reference to 'check' is not included, then the above try/catch code - // appears to be optimized away in js-release mode - //[this issue was added to ObservedBugs Tests] - if (check == null) { - return "JS"; - } - return "SWF"; - } - - public static const PLATFORM:String = getPlatform(); - ]]> - </fx:Script> - <js:beads> - <js:ViewDataBinding/> - </js:beads> - <js:Group id="cont" height="50" className="body"> - <js:beads> - <js:VerticalFlexLayout /> - </js:beads> - <js:Label text="{PLATFORM} Cross-compiled Unit Tests" className="title" /> - </js:Group> - <js:Group id="output" height="700" y="50" className="body"> - <js:beads> - <js:VerticalFlexLayout /> - </js:beads> - </js:Group> -</js:View> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/GenericTests/src/README.txt ---------------------------------------------------------------------- diff --git a/manualtests/GenericTests/src/README.txt b/manualtests/GenericTests/src/README.txt deleted file mode 100644 index 4ef6e3f..0000000 --- a/manualtests/GenericTests/src/README.txt +++ /dev/null @@ -1,61 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to You under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -//////////////////////////////////////////////////////////////////////////////// - -DESCRIPTION - -The GenericTests application is a very basic form of unit testing primarily -intended for FlexJS framework developers. It is a 'lite' version of a small portion of -Flexunit code to support basic assertion tests. - -This Flex application may be run as a Flash SWF or cross-compiled (using Falcon JX) -into JavaScript and HTML and run without Flash. - -There is a convenience html page for hosting the tests side-by-side that permits developers -to refresh the test builds simultaneously and compare results in the browser, including the -ability to toggle between JS-Debug and JS-Release builds. -While this is primarily intended for framework developers, it may be useful as a starting point -for cross-compiled unit testing (during development only) in regular FlexJS projects. - -FRAMEWORK DEVELOPER NOTES -To add new tests, follow the examples inside the flexUnitTests package, and add any new Test -group or category level class (the classes directly inside flexUnitTests package) into the top -level TestClasses.as file. This should be all that is necessary to add new tests. - -MetaData -[BeforeClass] -same as flexunit (typical: 'setupBeforClass')- runs a static method before the test class is instantiated -[AfterClass] -same as flexunit (typical: 'tearDownAfterClass')- runs a static method after the test class has been processed -[Before] -same as flexunit (typical: 'setup') - runs an instance method before the test class' test methods are processed -[After] -same as flexunit (typical: 'tearDown') - runs an instance method after the test class' test methods are processed -[Test] -same as flexunit (typical: 'testXXXX') - denotes a test method. No assumption about order of test methods being called should be made - -[TestVariance(variance="JS",description="Reason for variation in JS expected results")] -The above is specific to this test app, and permits annotation of test methods where the expected results are different between compiler targets. -The variance key in the meta data should be either "SWF" or "JS". This is the compiler target with the result that is considered to be different -to what it ideally 'should be', but correct as per the current implementation of the framework. Usually this will be "JS". It indicates a known -but currently acceptable difference between compiler targets. - - -GENERAL NOTES - -In its first working version this app only supports synchronous simple assertions and -is intended to use test classes that are compatible with the flexunit tests that are -used in the full framework build. Future versions may include more advanced features. - -The cross-compilation to JavaScript often results in non-fatal warnings. Some of these warnings -should be addressed in future releases of the Falcon JX compiler. http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/GenericTests/src/TestClasses.as ---------------------------------------------------------------------- diff --git a/manualtests/GenericTests/src/TestClasses.as b/manualtests/GenericTests/src/TestClasses.as deleted file mode 100644 index f7273c0..0000000 --- a/manualtests/GenericTests/src/TestClasses.as +++ /dev/null @@ -1,37 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to You under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -//////////////////////////////////////////////////////////////////////////////// -package -{ - //test groups - import flexUnitTests.*; - - - public class TestClasses - { - - public static function get testClasses():Array { - return [ - CoreTester, - ReflectionTester, - ObservedBugsTester, - JiraIssuesTester - ]; - } - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/GenericTests/src/flexUnitTests/CoreTester.as ---------------------------------------------------------------------- diff --git a/manualtests/GenericTests/src/flexUnitTests/CoreTester.as b/manualtests/GenericTests/src/flexUnitTests/CoreTester.as deleted file mode 100644 index 9af36e3..0000000 --- a/manualtests/GenericTests/src/flexUnitTests/CoreTester.as +++ /dev/null @@ -1,43 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to You under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -//////////////////////////////////////////////////////////////////////////////// -package flexUnitTests -{ - import flexUnitTests.core.* - - [Suite] - [RunWith("org.flexunit.runners.Suite")] - public class CoreTester - { - public function CoreTester() - { - // for JS, force-link these classes in the output - var arr:Array = [StrandTesterTest, BinaryDataTesterTest]; - } - - // in JS, using a class as a type won't include the class in - // the output since types are not chcked in JS. It is when - // the actual class is referenced that it will be included - // in the output. - // Is there a reason to use reflection to gather the set - // of tests? I would think an array of tests would wokr - // better and allow you to define order. - public var strandTesterTest:StrandTesterTest; - public var binaryDataTesterTest:BinaryDataTesterTest; - } -} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/GenericTests/src/flexUnitTests/JiraIssuesTester.as ---------------------------------------------------------------------- diff --git a/manualtests/GenericTests/src/flexUnitTests/JiraIssuesTester.as b/manualtests/GenericTests/src/flexUnitTests/JiraIssuesTester.as deleted file mode 100644 index fc37533..0000000 --- a/manualtests/GenericTests/src/flexUnitTests/JiraIssuesTester.as +++ /dev/null @@ -1,29 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to You under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -//////////////////////////////////////////////////////////////////////////////// -package flexUnitTests -{ - import flexUnitTests.jira.* - - [Suite] - [RunWith("org.flexunit.runners.Suite")] - public class JiraIssuesTester - { - - } -} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/GenericTests/src/flexUnitTests/ObservedBugsTester.as ---------------------------------------------------------------------- diff --git a/manualtests/GenericTests/src/flexUnitTests/ObservedBugsTester.as b/manualtests/GenericTests/src/flexUnitTests/ObservedBugsTester.as deleted file mode 100644 index 11f62e3..0000000 --- a/manualtests/GenericTests/src/flexUnitTests/ObservedBugsTester.as +++ /dev/null @@ -1,33 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to You under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -//////////////////////////////////////////////////////////////////////////////// -package flexUnitTests -{ - import flexUnitTests.observedbugs.* - - [Suite] - [RunWith("org.flexunit.runners.Suite")] - public class ObservedBugsTester - { - public function ObservedBugsTester() - { - var arr:Array = [ObservedBugTests]; - } - public var observedBugsTest1:ObservedBugTests; - } -} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/GenericTests/src/flexUnitTests/ReflectionTester.as ---------------------------------------------------------------------- diff --git a/manualtests/GenericTests/src/flexUnitTests/ReflectionTester.as b/manualtests/GenericTests/src/flexUnitTests/ReflectionTester.as deleted file mode 100644 index 74c5b4d..0000000 --- a/manualtests/GenericTests/src/flexUnitTests/ReflectionTester.as +++ /dev/null @@ -1,38 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to You under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -//////////////////////////////////////////////////////////////////////////////// -package flexUnitTests -{ - import flexUnitTests.reflection.*; - - [Suite] - [RunWith("org.flexunit.runners.Suite")] - public class ReflectionTester - { - public function ReflectionTester() - { - // see notes in CoreTester - var arr:Array = [ReflectionTesterTest, ReflectionTesterTestUseCache, ReflectionTesterTestAlias]; - } - - public var reflectionTesterCacheTest:ReflectionTesterTestUseCache; - public var reflectionTesterTest:ReflectionTesterTest; - - public var reflectionTesterAliasTest:ReflectionTesterTestAlias; - } -}