Renamed test files to allow for simple AS test ;-) Signed-off-by: Erik de Bruin <e...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c8e8929c Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c8e8929c Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c8e8929c Branch: refs/heads/develop Commit: c8e8929c4475be341509f622eac05e87dbcb4510 Parents: 562d337 Author: Erik de Bruin <e...@ixsoftware.nl> Authored: Tue Jul 1 11:10:59 2014 +0200 Committer: Erik de Bruin <e...@ixsoftware.nl> Committed: Fri Aug 1 12:59:15 2014 +0200 ---------------------------------------------------------------------- .../mxml/vf2js/TestVF2JSMXMLApplication.java | 2 +- .../test-files/vf2js/files/Simple.mxml | 9 -- .../test-files/vf2js/files/SimpleMXML.mxml | 9 ++ .../test-files/vf2js/files/SimpleMXML_result.js | 118 +++++++++++++++++++ .../test-files/vf2js/files/Simple_result.js | 118 ------------------- 5 files changed, 128 insertions(+), 128 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c8e8929c/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/TestVF2JSMXMLApplication.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/TestVF2JSMXMLApplication.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/TestVF2JSMXMLApplication.java index 159d3c4..27b7f78 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/TestVF2JSMXMLApplication.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/TestVF2JSMXMLApplication.java @@ -28,7 +28,7 @@ public class TestVF2JSMXMLApplication extends VF2JSTestBase @Test public void testSimple() { - String fileName = "Simple"; + String fileName = "SimpleMXML"; IMXMLFileNode node = compileMXML(fileName, true, "test-files/vf2js/files", false); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c8e8929c/compiler.jx.tests/test-files/vf2js/files/Simple.mxml ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/vf2js/files/Simple.mxml b/compiler.jx.tests/test-files/vf2js/files/Simple.mxml deleted file mode 100644 index 2494f9a..0000000 --- a/compiler.jx.tests/test-files/vf2js/files/Simple.mxml +++ /dev/null @@ -1,9 +0,0 @@ -<vf2js_s:Application xmlns:fx="http://ns.adobe.com/mxml/2009" - xmlns:vf2js_mx="http://flex.apache.org/vf2js_mx/ns" - xmlns:vf2js_s="http://flex.apache.org/vf2js_s/ns" - - <vf2js_mx:Button invalidAttr="nope" /> - - <vf2js_s:Button label="hello" x="100" invalidAttr="nope" /> - -</vf2js_s:Application> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c8e8929c/compiler.jx.tests/test-files/vf2js/files/SimpleMXML.mxml ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/vf2js/files/SimpleMXML.mxml b/compiler.jx.tests/test-files/vf2js/files/SimpleMXML.mxml new file mode 100644 index 0000000..2494f9a --- /dev/null +++ b/compiler.jx.tests/test-files/vf2js/files/SimpleMXML.mxml @@ -0,0 +1,9 @@ +<vf2js_s:Application xmlns:fx="http://ns.adobe.com/mxml/2009" + xmlns:vf2js_mx="http://flex.apache.org/vf2js_mx/ns" + xmlns:vf2js_s="http://flex.apache.org/vf2js_s/ns" + + <vf2js_mx:Button invalidAttr="nope" /> + + <vf2js_s:Button label="hello" x="100" invalidAttr="nope" /> + +</vf2js_s:Application> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c8e8929c/compiler.jx.tests/test-files/vf2js/files/SimpleMXML_result.js ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/vf2js/files/SimpleMXML_result.js b/compiler.jx.tests/test-files/vf2js/files/SimpleMXML_result.js new file mode 100644 index 0000000..cbc2b0c --- /dev/null +++ b/compiler.jx.tests/test-files/vf2js/files/SimpleMXML_result.js @@ -0,0 +1,118 @@ +/** + * Licensed 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. + */ +/** + * Simple + * + * @fileoverview + * + * @suppress {checkTypes} + */ + +goog.provide('Simple'); + +goog.require('vf2js_s.components.Application'); +goog.require('vf2js_mx.components.Button'); +goog.require('vf2js_s.components.Button'); + + + + +/** + * @constructor + * @extends {vf2js_s.components.Application} + */ +Simple = function() { + goog.base(this); + + /** + * @private + * @type {vf2js_mx.components.Button} + */ + this.$ID0; + + /** + * @private + * @type {vf2js_s.components.Button} + */ + this.$ID1; + + /** + * @private + * @type {Array} + */ + this.mxmldd; + + /** + * @private + * @type {Array} + */ + this.mxmldp; +}; +goog.inherits(Simple, vf2js_s.components.Application); + + +/** + * Metadata + * + * @type {Object.<string, Array.<Object>>} + */ +Simple.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'Simple', qName: 'Simple' }] }; + + +/** + * @override + * @return {Array} the Array of UI element descriptors. + */ +Simple.prototype.get_MXMLProperties = function() +{ + if (this.mxmldp == undefined) + { + /** @type {Array} */ + var arr = goog.base(this, 'get_MXMLProperties'); + /** @type {Array} */ + var data = [ +2, +vf2js_mx.components.Button, +1, +'_id', +true, +'$ID0', +0, +0, +null, +vf2js_s.components.Button, +3, +'_id', +true, +'$ID1', +'label', +true, +'hello', +'x', +true, +100, +0, +0, +null0, +0 +]; + + if (arr) + this.mxmldp = arr.concat(data); + else + this.mxmldp = data; + } + return this.mxmldp; +}; + http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c8e8929c/compiler.jx.tests/test-files/vf2js/files/Simple_result.js ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/vf2js/files/Simple_result.js b/compiler.jx.tests/test-files/vf2js/files/Simple_result.js deleted file mode 100644 index cbc2b0c..0000000 --- a/compiler.jx.tests/test-files/vf2js/files/Simple_result.js +++ /dev/null @@ -1,118 +0,0 @@ -/** - * Licensed 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. - */ -/** - * Simple - * - * @fileoverview - * - * @suppress {checkTypes} - */ - -goog.provide('Simple'); - -goog.require('vf2js_s.components.Application'); -goog.require('vf2js_mx.components.Button'); -goog.require('vf2js_s.components.Button'); - - - - -/** - * @constructor - * @extends {vf2js_s.components.Application} - */ -Simple = function() { - goog.base(this); - - /** - * @private - * @type {vf2js_mx.components.Button} - */ - this.$ID0; - - /** - * @private - * @type {vf2js_s.components.Button} - */ - this.$ID1; - - /** - * @private - * @type {Array} - */ - this.mxmldd; - - /** - * @private - * @type {Array} - */ - this.mxmldp; -}; -goog.inherits(Simple, vf2js_s.components.Application); - - -/** - * Metadata - * - * @type {Object.<string, Array.<Object>>} - */ -Simple.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'Simple', qName: 'Simple' }] }; - - -/** - * @override - * @return {Array} the Array of UI element descriptors. - */ -Simple.prototype.get_MXMLProperties = function() -{ - if (this.mxmldp == undefined) - { - /** @type {Array} */ - var arr = goog.base(this, 'get_MXMLProperties'); - /** @type {Array} */ - var data = [ -2, -vf2js_mx.components.Button, -1, -'_id', -true, -'$ID0', -0, -0, -null, -vf2js_s.components.Button, -3, -'_id', -true, -'$ID1', -'label', -true, -'hello', -'x', -true, -100, -0, -0, -null0, -0 -]; - - if (arr) - this.mxmldp = arr.concat(data); - else - this.mxmldp = data; - } - return this.mxmldp; -}; -