get mustella to compile so release package can build
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ae54bb71 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ae54bb71 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ae54bb71 Branch: refs/heads/packaging Commit: ae54bb713b8dea5cfe45b0df57de77546aed8c0a Parents: 7de98aa Author: Alex Harui <aha...@apache.org> Authored: Thu Sep 21 22:46:07 2017 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Thu Sep 21 22:46:07 2017 -0700 ---------------------------------------------------------------------- build.xml | 9 +- mustella/src/main/config/compile-swf-config.xml | 98 ++++++++++++-------- mustella/src/main/flex/ConditionalValue.as | 4 +- mustella/src/main/flex/DispatchKeyEvent.as | 2 +- .../src/main/flex/DispatchMouseClickEvent.as | 4 +- mustella/src/main/flex/DispatchMouseEvent.as | 4 +- mustella/src/main/flex/TestCase.as | 10 +- mustella/src/main/flex/UnitTester.as | 89 +++++++++++------- 8 files changed, 141 insertions(+), 79 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ae54bb71/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index f0387c8..66b544e 100644 --- a/build.xml +++ b/build.xml @@ -43,6 +43,11 @@ <property name="strict" value="true"/> <property name="javac.src" value="1.5"/> + <condition property="kit.prefix" value="apache-flex-jsonly-${release.version}"> + <not> + <isset property="env.AIR_HOME" /> + </not> + </condition> <property name="kit.prefix" value="apache-flex-flexjs-${release.version}"/> <property name="source.kit" value="${kit.prefix}-src"/> <property name="binary.kit" value="${kit.prefix}-bin"/> @@ -1237,7 +1242,7 @@ </target> <target name="basictests" depends="load-task" description="run basic tests using mustella" if="env.AIR_HOME"> - + <property name="FALCONJX_HOME" value="${basedir}/js" /> <property name="FLEX_HOME" value="${basedir}" /> <mxmlc fork="true" debug="true" closure-lib="${env.GOOG_HOME}" @@ -1292,7 +1297,7 @@ <java classname="mustella.MustellaResultsParser" failonerror="true"> <sysproperty key="APPDATA" value="${env.APPDATA}"/> <classpath> - <pathelement location="${FLEXJS_HOME}/mustella/target"/> + <pathelement location="${FLEXJS_HOME}/mustella/target/classes"/> </classpath> </java> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ae54bb71/mustella/src/main/config/compile-swf-config.xml ---------------------------------------------------------------------- diff --git a/mustella/src/main/config/compile-swf-config.xml b/mustella/src/main/config/compile-swf-config.xml index 5c87682..5545c8c 100644 --- a/mustella/src/main/config/compile-swf-config.xml +++ b/mustella/src/main/config/compile-swf-config.xml @@ -61,7 +61,9 @@ <locale/> - <library-path/> + <library-path> + <path-element>../../../../frameworks/libs/Core.swc</path-element> + </library-path> <namespaces> <!-- @@ -83,60 +85,78 @@ </compiler> <include-classes> - <class>ApolloFilePath</class> + <!-- + <class>ApolloFilePath</class> + --> <class>Assert</class> - <class>AssertError</class> - <class>AssertEvent</class> - <class>AssertEventPropertyValue</class> - <class>AssertMethodValue</class> - <class>AssertNoEvent</class> - <class>AssertPixelValue</class> + <!-- + <class>AssertError</class> + <class>AssertEvent</class> + <class>AssertEventPropertyValue</class> + <class>AssertMethodValue</class> + <class>AssertNoEvent</class> + <class>AssertPixelValue</class> + --> <class>AssertPropertyValue</class> - <class>AssertStyleValue</class> - <class>AssertTitle</class> - <class>AssertType</class> - <class>AssertURL</class> - <class>CheckEmbeddedFonts</class> - <class>ChangeState</class> - <class>CompareBitmap</class> - <class>CreateBitmapReferences</class> + <!-- + <class>AssertStyleValue</class> + <class>AssertTitle</class> + <class>AssertType</class> + <class>AssertURL</class> + <class>CheckEmbeddedFonts</class> + <class>ChangeState</class> + <class>CompareBitmap</class> + <class>CreateBitmapReferences</class> + --> <class>DispatchEvent</class> <class>DispatchKeyEvent</class> <class>DispatchMouseClickEvent</class> <class>DispatchMouseEvent</class> - <class>ExcludeFileLocation</class> - <class>ExcludeFileLocationApollo</class> + <!-- + <class>ExcludeFileLocation</class> + <class>ExcludeFileLocationApollo</class> + --> <class>ExitWhenDone</class> - <class>IncludeListTextFile</class> - <class>IncludeFileLocation</class> - <class>Localhost8080</class> - <class>MustellaPNGEncoder</class> - <class>Pause</class> - <class>ResetComponent</class> + <!-- + <class>IncludeListTextFile</class> + <class>IncludeFileLocation</class> + <class>Localhost8080</class> + <class>MustellaPNGEncoder</class> + <class>Pause</class> + <class>ResetComponent</class> + --> <class>RunCode</class> - <class>RunCodeEvent</class> - <class>SaveBitmapFailures</class> - <class>ScriptRunner</class> + <!-- + <class>RunCodeEvent</class> + <class>SaveBitmapFailures</class> + <class>ScriptRunner</class> + --> <class>SendFormattedResultsToLog</class> <class>SendResultsToRunner</class> <class>SetProperty</class> - <class>SetStyle</class> - <class>SetShowRTE</class> - <class>SetURL</class> - <class>SocketAddress</class> + <!-- + <class>SetStyle</class> + <class>SetShowRTE</class> + <class>SetURL</class> + <class>SocketAddress</class> + --> <class>TestCase</class> <class>TestOutput</class> <class>TestResult</class> <class>TestStep</class> - <class>TypeInfo</class> + <!-- + <class>TypeInfo</class> + --> <class>UnitTester</class> - <class>VerboseMode</class> - <class>WaitForCondition</class> - <class>WaitForEffectsToEnd</class> - <class>WaitForEvent</class> - <class>WaitForLayoutManager</class> - <class>WaitForSandboxApp</class> - <class>WaitForWindow</class> + <!-- + <class>VerboseMode</class> + <class>WaitForCondition</class> + <class>WaitForEffectsToEnd</class> + <class>WaitForEvent</class> + <class>WaitForLayoutManager</class> + <class>WaitForSandboxApp</class> + <class>WaitForWindow</class> + --> </include-classes> <target-player>20.0</target-player> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ae54bb71/mustella/src/main/flex/ConditionalValue.as ---------------------------------------------------------------------- diff --git a/mustella/src/main/flex/ConditionalValue.as b/mustella/src/main/flex/ConditionalValue.as index b5edc4d..3b48e68 100644 --- a/mustella/src/main/flex/ConditionalValue.as +++ b/mustella/src/main/flex/ConditionalValue.as @@ -21,7 +21,6 @@ package COMPILE::SWF { import flash.events.*; - import mx.utils.*; } COMPILE::JS { @@ -200,6 +199,7 @@ COMPILE::JS * Populate values from a filename. **/ public function parseFilename(filename:String):Boolean{ + /* TODO (aharui) later COMPILE::SWF { var tokens:Array = null; @@ -326,8 +326,8 @@ COMPILE::JS } COMPILE::JS { + */ return false; - } } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ae54bb71/mustella/src/main/flex/DispatchKeyEvent.as ---------------------------------------------------------------------- diff --git a/mustella/src/main/flex/DispatchKeyEvent.as b/mustella/src/main/flex/DispatchKeyEvent.as index a8d5b48..1595822 100644 --- a/mustella/src/main/flex/DispatchKeyEvent.as +++ b/mustella/src/main/flex/DispatchKeyEvent.as @@ -510,7 +510,7 @@ public class DispatchKeyEvent extends TestStep thisRoot = context.stringToObject(window).root; } else - thisRoot = root; + thisRoot = root as DisplayObject; try { thisRoot.stage.dispatchEvent(new FocusEvent(FocusEvent.KEY_FOCUS_CHANGE, true, true, InteractiveObject(actualTarget), shiftKey, Keyboard.TAB)); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ae54bb71/mustella/src/main/flex/DispatchMouseClickEvent.as ---------------------------------------------------------------------- diff --git a/mustella/src/main/flex/DispatchMouseClickEvent.as b/mustella/src/main/flex/DispatchMouseClickEvent.as index 3f4574a..d8f6837 100644 --- a/mustella/src/main/flex/DispatchMouseClickEvent.as +++ b/mustella/src/main/flex/DispatchMouseClickEvent.as @@ -108,6 +108,7 @@ public class DispatchMouseClickEvent extends TestStep { stagePt = actualTarget.localToGlobal(new Point(0, 0)); } + /* TODO (aharui) later try { root[mouseX] = stagePt.x; root[mouseY] = stagePt.y; @@ -118,7 +119,8 @@ public class DispatchMouseClickEvent extends TestStep root["topLevelSystemManager"][mouseY] = stagePt.y; } } catch (e:Error) {} // some scenarios don't support this - + */ + if (actualTarget is DisplayObjectContainer) { var targets:Array = actualTarget.stage.getObjectsUnderPoint(stagePt); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ae54bb71/mustella/src/main/flex/DispatchMouseEvent.as ---------------------------------------------------------------------- diff --git a/mustella/src/main/flex/DispatchMouseEvent.as b/mustella/src/main/flex/DispatchMouseEvent.as index 39f8e5d..5337e65 100644 --- a/mustella/src/main/flex/DispatchMouseEvent.as +++ b/mustella/src/main/flex/DispatchMouseEvent.as @@ -103,6 +103,7 @@ public class DispatchMouseEvent extends TestStep { stagePt = actualTarget.localToGlobal(new Point(0, 0)); } + /* TODO (aharui) try { root[mouseX] = stagePt.x; root[mouseY] = stagePt.y; @@ -111,8 +112,9 @@ public class DispatchMouseEvent extends TestStep { root["topLevelSystemManager"][mouseX] = stagePt.x; root["topLevelSystemManager"][mouseY] = stagePt.y; - } + } } catch (e:Error) {}; // some scenarios don't support this + */ if (actualTarget is DisplayObjectContainer) { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ae54bb71/mustella/src/main/flex/TestCase.as ---------------------------------------------------------------------- diff --git a/mustella/src/main/flex/TestCase.as b/mustella/src/main/flex/TestCase.as index 7a063f1..62e5df9 100644 --- a/mustella/src/main/flex/TestCase.as +++ b/mustella/src/main/flex/TestCase.as @@ -199,7 +199,7 @@ public class TestCase extends EventDispatcher _testResult.context = context; this.timer = timer; this.timer.addEventListener("timer", timerHandler); - this.root = root; + this.root = root as DisplayObject; this.context = context; if (UnitTester.hasRTE) @@ -217,8 +217,10 @@ public class TestCase extends EventDispatcher { for (i = 0; i < setup.length; i++) { + /* TODO (aharui) later if (setup[i] is ResetComponent) needWaitEvent = true; + */ if (needWaitEvent) { if (setup[i].waitEvent) @@ -235,14 +237,16 @@ public class TestCase extends EventDispatcher needWaitEvent = false; for (i = 0; i < body.length; i++) { - if (body[i] is SetProperty || body[i] is SetStyle) + if (body[i] is SetProperty/* || body[i] is SetStyle*/) needWaitEvent = true; if (!(body[i] is Assert)) allAsserts = false; + /* TODO (aharui) later if (allAsserts && body[i] is AssertEvent) { TestOutput.logResult("WARNING: Test " + getQualifiedClassName(context) + "." + testID + " no non-Assert steps in body before AssertEvent\n"); } + */ if (needWaitEvent) { if (body[i].waitEvent) @@ -410,6 +414,7 @@ public class TestCase extends EventDispatcher if (nextStep is Assert) { Assert(nextStep).preview(root, context, this, testResult); + /* TODO (aharui) later // do a check to be sure folks are using AssertEventPropertyValue correctly if (nextStep is AssertEventPropertyValue) { @@ -422,6 +427,7 @@ public class TestCase extends EventDispatcher if (step is SetProperty) SetProperty(step).expectError = true; } + */ } else break; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ae54bb71/mustella/src/main/flex/UnitTester.as ---------------------------------------------------------------------- diff --git a/mustella/src/main/flex/UnitTester.as b/mustella/src/main/flex/UnitTester.as index 206b211..5fbbaf5 100644 --- a/mustella/src/main/flex/UnitTester.as +++ b/mustella/src/main/flex/UnitTester.as @@ -305,7 +305,7 @@ public class UnitTester extends EventDispatcher sandboxHelper = new UnitTester(); root.loaderInfo.sharedEvents.addEventListener(MustellaSandboxEvent.STRING_TO_OBJECT, sandboxStringToObjectHandler); root.loaderInfo.sharedEvents.addEventListener(MustellaSandboxEvent.GET_BITMAP, sandboxGetBitmapHandler); - root.loaderInfo.sharedEvents.addEventListener(MustellaSandboxEvent.GET_EFFECTS, sandboxGetEffectsHandler); + //root.loaderInfo.sharedEvents.addEventListener(MustellaSandboxEvent.GET_EFFECTS, sandboxGetEffectsHandler); root.loaderInfo.sharedEvents.addEventListener(MustellaSandboxEvent.GET_OBJECTS_UNDER_POINT, sandboxObjectsUnderPointHandler); root.loaderInfo.sharedEvents.addEventListener(MustellaSandboxEvent.RESET_COMPONENT, sandboxResetComponentHandler); root.loaderInfo.sharedEvents.addEventListener(MustellaSandboxEvent.MOUSEXY, sandboxMouseXYHandler); @@ -320,7 +320,7 @@ public class UnitTester extends EventDispatcher } else if(root.parent != root.stage && root.loaderInfo.applicationDomain != root.parent.parent.loaderInfo.applicationDomain) { - root.loaderInfo.sharedEvents.addEventListener(MustellaSandboxEvent.GET_EFFECTS, sandboxGetEffectsHandler); + //root.loaderInfo.sharedEvents.addEventListener(MustellaSandboxEvent.GET_EFFECTS, sandboxGetEffectsHandler); root.loaderInfo.sharedEvents.addEventListener(MustellaSandboxEvent.MOUSEXY, sandboxMouseXYHandler); root.addEventListener("applicationComplete", applicationCompleteHandler); root.loaderInfo.sharedEvents.addEventListener(MustellaSandboxEvent.APP_READY, sandboxAppReadyHandler); @@ -371,6 +371,7 @@ public class UnitTester extends EventDispatcher _root.addEventListener("activate", activateBlockingHandler, true); } + /* TODO (aharui) not needed? if (appdom.hasDefinition("spark.components.supportClasses.RichEditableTextContainerManager")) { g = Class(appdom.getDefinition("spark.components.supportClasses.RichEditableTextContainerManager")); @@ -379,7 +380,8 @@ public class UnitTester extends EventDispatcher var q:QName = new QName(mx_internal, "hideCursor"); g[q] = true; } - } + } + */ } COMPILE::JS @@ -615,6 +617,7 @@ public class UnitTester extends EventDispatcher COMPILE::SWF public static function setMouseXY(stagePt:Point):void { + /* TODO (aharui) later for (var p:* in swfLoaders) { var swfLoader:Object = p; @@ -645,6 +648,7 @@ public class UnitTester extends EventDispatcher } } } + */ } COMPILE::JS @@ -704,10 +708,10 @@ public class UnitTester extends EventDispatcher return arr; } - COMPILE::SWF - private static var effectsInEffect:QName = new QName(mx_internal, "effectsInEffect"); - COMPILE::SWF - private static var activeTweens:QName = new QName(mx_internal, "activeTweens"); + // TODO (aharui) not needed? + // private static var effectsInEffect:QName = new QName(mx_internal, "effectsInEffect"); + // TODO (aharui) not needed? + // private static var activeTweens:QName = new QName(mx_internal, "activeTweens"); /** * ask other sandboxes if they are running effects @@ -958,6 +962,7 @@ public class UnitTester extends EventDispatcher var eventObj:Object = event; var stagePt:Point = Point(eventObj.obj); + /* TODO (aharui) later if (stagePt) { var pt:Point = _root.globalToLocal(stagePt); @@ -969,6 +974,7 @@ public class UnitTester extends EventDispatcher _root[mouseX] = undefined; _root[mouseY] = undefined; } + */ } /** @@ -977,6 +983,7 @@ public class UnitTester extends EventDispatcher COMPILE::SWF private static function sandboxResetComponentHandler(event:Event):void { + /* TODO (aharui) later // if we sent it, ignore it if (event is MustellaSandboxEvent) return; @@ -987,6 +994,7 @@ public class UnitTester extends EventDispatcher sandboxHelper.startTests(); rc.execute(_root, sandboxHelper, new TestCase(), new TestResult()); + */ } /** @@ -1029,7 +1037,7 @@ public class UnitTester extends EventDispatcher /** * get bitmap as bytearray */ - COMPILE::SWF + /* TODO (aharui) not needed private static function sandboxGetEffectsHandler(event:Event):void { // if we sent it, ignore it @@ -1057,6 +1065,7 @@ public class UnitTester extends EventDispatcher if (effects) event["obj"] = true; } + */ /** * Handle request from main Mustella UnitTester @@ -1099,6 +1108,7 @@ public class UnitTester extends EventDispatcher if (!obj.visible) return; + /* try { if (!obj[$visible]) @@ -1107,7 +1117,8 @@ public class UnitTester extends EventDispatcher catch (e:Error) { } - + */ + if (obj.hitTestPoint(pt.x, pt.y, true)) { arr.push(obj); @@ -1241,9 +1252,11 @@ public class UnitTester extends EventDispatcher COMPILE::SWF public static function pre_startEventHandler(event:Event):void { + /* TODO (aharui) later if ("topLevelSystemManager" in _root) _root["topLevelSystemManager"].addEventListener("callLaterError", callLaterErrorDefaultHandler, false, -1); - + */ + if (event.type == "applicationComplete") { sawStartEvent=true; @@ -1349,6 +1362,7 @@ public class UnitTester extends EventDispatcher _root = originalRoot; TestOutput.logResult("ScriptComplete: completely done"); + /* try { _root[mouseX] = undefined; _root[mouseY] = undefined; @@ -1357,6 +1371,7 @@ public class UnitTester extends EventDispatcher { // not all use cases support this } + */ _root.removeEventListener("focusIn", focusBlockingHandler, true); _root.removeEventListener("focusOut", focusBlockingHandler, true); _root.removeEventListener("deactivate", activateBlockingHandler, true); @@ -1424,21 +1439,21 @@ public class UnitTester extends EventDispatcher COMPILE::SWF public static var exit:Function = function ():void { fscommand ("quit"); }; - COMPILE::SWF - private static var layoutManager:QName = new QName(mx_internal, "layoutManager"); - COMPILE::SWF - private static var getTextField:QName = new QName(mx_internal, "getTextField"); - COMPILE::SWF - private static var getTextInput:QName = new QName(mx_internal, "getTextInput"); - COMPILE::SWF - private static var getLabel:QName = new QName(mx_internal, "getLabel"); + // TODO (aharui) not needed? + // private static var layoutManager:QName = new QName(mx_internal, "layoutManager"); + // TODO (aharui) not needed? + // private static var getTextField:QName = new QName(mx_internal, "getTextField"); + // TODO (aharui) not needed? + // private static var getTextInput:QName = new QName(mx_internal, "getTextInput"); + // TODO (aharui) not needed? + // private static var getLabel:QName = new QName(mx_internal, "getLabel"); - COMPILE::SWF - private static var mouseX:QName = new QName(mx_internal, "_mouseX"); - COMPILE::SWF - private static var mouseY:QName = new QName(mx_internal, "_mouseY"); - COMPILE::SWF - private static var $visible:QName = new QName(mx_internal, "$visible"); + // TODO (aharui) not needed? + // private static var mouseX:QName = new QName(mx_internal, "_mouseX"); + // TODO (aharui) not needed? + // private static var mouseY:QName = new QName(mx_internal, "_mouseY"); + // TODO (aharui) not needed? + // private static var $visible:QName = new QName(mx_internal, "$visible"); /** * The list of tests to run by start event @@ -1816,6 +1831,7 @@ public class UnitTester extends EventDispatcher s = s.substring(0, s.indexOf(")")); obj = obj.getElementAt(parseInt(s)); } + /* else if (s is String && s == "getTextField()") { obj = obj[getTextField](); @@ -1828,6 +1844,7 @@ public class UnitTester extends EventDispatcher { obj = obj[getLabel](); } + */ else if (s is String && s == "getTextFormat()") { obj = obj.getTextFormat(); @@ -1857,6 +1874,7 @@ public class UnitTester extends EventDispatcher } catch (se:SecurityError) { + /* try { test = obj[q]; @@ -1865,6 +1883,7 @@ public class UnitTester extends EventDispatcher { return null; } + */ var event:MustellaSandboxEvent = new MustellaSandboxEvent(MustellaSandboxEvent.STRING_TO_OBJECT); event.string = list.join("."); if (!swfLoaders[obj]) @@ -1880,6 +1899,7 @@ public class UnitTester extends EventDispatcher { return null; } + /* // hunt for other swfloaders with other application domains // we shouldn't get here if the object is in another security domain // unless the object is sandboxed but the loading app is coming from file:: @@ -1902,6 +1922,7 @@ public class UnitTester extends EventDispatcher catch (e:Error) { } + */ } return obj; } @@ -1992,8 +2013,8 @@ public class UnitTester extends EventDispatcher // if (RTESocket) // RTESocket.addEventListener(ProgressEvent.SOCKET_DATA, RTEHandler); - if ("topLevelSystemManager" in _root) - _root["topLevelSystemManager"].addEventListener("callLaterError", callLaterErrorHandler); + //if ("topLevelSystemManager" in _root) + // _root["topLevelSystemManager"].addEventListener("callLaterError", callLaterErrorHandler); if (testCases) numTests = testCases.length; @@ -2127,8 +2148,8 @@ public class UnitTester extends EventDispatcher // if (RTESocket) // RTESocket.removeEventListener(ProgressEvent.SOCKET_DATA, RTEHandler); - if ("topLevelSystemManager" in _root) - _root["topLevelSystemManager"].removeEventListener("callLaterError", callLaterErrorHandler); + //if ("topLevelSystemManager" in _root) + // _root["topLevelSystemManager"].removeEventListener("callLaterError", callLaterErrorHandler); TestOutput.logResult("testComplete"); dispatchEvent(new Event("testComplete")); } @@ -2201,6 +2222,7 @@ public class UnitTester extends EventDispatcher } } + */ protected function addMXMLChildren(comps:Array):void { @@ -2242,8 +2264,10 @@ public class UnitTester extends EventDispatcher } comp[name] = value; } + /* TODO (aharui) later? if (comp is IMXMLObject) comp.initialized(document, id); + */ return comp; } @@ -2330,10 +2354,12 @@ public class UnitTester extends EventDispatcher if (id) { document[id] = comp; - mx.binding.BindingManager.executeBindings(document, id, comp); + // TODO (aharui) later + // mx.binding.BindingManager.executeBindings(document, id, comp); } - if (comp is IMXMLObject) - comp.initialized(document, id); + // TODO (aharui) later + // if (comp is IMXMLObject) + // comp.initialized(document, id); comps.push(comp); } return comps; @@ -2407,6 +2433,7 @@ public class UnitTester extends EventDispatcher } } + /* mx_internal function setupBindings(bindingData:Array):void { var fieldWatcher:Object;
