Updated test to include both the '_mx' and '_s' namespaces. 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/562d337f Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/562d337f Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/562d337f Branch: refs/heads/develop Commit: 562d337f47a47ad5a6b8c7d3c8fd26661d257ef5 Parents: f100b77 Author: Erik de Bruin <e...@ixsoftware.nl> Authored: Tue Jul 1 10:56:49 2014 +0200 Committer: Erik de Bruin <e...@ixsoftware.nl> Committed: Fri Aug 1 12:59:15 2014 +0200 ---------------------------------------------------------------------- .../test-files/vf2js/files/Simple.mxml | 5 +++- .../test-files/vf2js/files/Simple_result.js | 29 +++++++++++++++----- 2 files changed, 26 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/562d337f/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 index 5356b05..2494f9a 100644 --- a/compiler.jx.tests/test-files/vf2js/files/Simple.mxml +++ b/compiler.jx.tests/test-files/vf2js/files/Simple.mxml @@ -1,6 +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: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/562d337f/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 index 35020e0..cbc2b0c 100644 --- a/compiler.jx.tests/test-files/vf2js/files/Simple_result.js +++ b/compiler.jx.tests/test-files/vf2js/files/Simple_result.js @@ -21,27 +21,34 @@ goog.provide('Simple'); -goog.require('vf2js.components.Application'); -goog.require('vf2js.components.Button'); +goog.require('vf2js_s.components.Application'); +goog.require('vf2js_mx.components.Button'); +goog.require('vf2js_s.components.Button'); /** * @constructor - * @extends {vf2js.components.Application} + * @extends {vf2js_s.components.Application} */ Simple = function() { goog.base(this); /** * @private - * @type {vf2js.components.Button} + * @type {vf2js_mx.components.Button} */ this.$ID0; /** * @private + * @type {vf2js_s.components.Button} + */ + this.$ID1; + + /** + * @private * @type {Array} */ this.mxmldd; @@ -52,7 +59,7 @@ Simple = function() { */ this.mxmldp; }; -goog.inherits(Simple, vf2js.components.Application); +goog.inherits(Simple, vf2js_s.components.Application); /** @@ -75,12 +82,20 @@ Simple.prototype.get_MXMLProperties = function() var arr = goog.base(this, 'get_MXMLProperties'); /** @type {Array} */ var data = [ +2, +vf2js_mx.components.Button, 1, -vf2js.components.Button, -3, '_id', true, '$ID0', +0, +0, +null, +vf2js_s.components.Button, +3, +'_id', +true, +'$ID1', 'label', true, 'hello',