fix the tests that don't use exteral files
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/92bace80 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/92bace80 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/92bace80 Branch: refs/heads/develop Commit: 92bace80cfefdf8bb72c983f5e5e01aeb3cca4c8 Parents: e0eca56 Author: Alex Harui <[email protected]> Authored: Tue Jan 27 17:21:55 2015 -0800 Committer: Alex Harui <[email protected]> Committed: Tue Jan 27 17:21:55 2015 -0800 ---------------------------------------------------------------------- .../codegen/js/flexjs/TestFlexJSClass.java | 126 +++++++++++++++---- .../codegen/js/flexjs/TestFlexJSEmiter.java | 42 ++++++- .../js/flexjs/TestFlexJSExpressions.java | 28 ++--- .../js/flexjs/TestFlexJSGlobalClasses.java | 2 +- .../js/flexjs/TestFlexJSGlobalFunctions.java | 6 +- .../codegen/js/flexjs/TestFlexJSPackage.java | 6 +- .../codegen/js/vf2js/TestVF2JSExpressions.java | 6 +- .../codegen/js/vf2js/TestVF2JSStatements.java | 2 +- 8 files changed, 164 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/92bace80/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java index fa9768a..fd121ea 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java @@ -37,7 +37,7 @@ public class TestFlexJSClass extends TestGoogClass { IClassNode node = getClassNode("public class A {public function A() { super(); }}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n ;\n};"); + assertOut("/**\n * @constructor\n */\norg_apache_flex_A = function() {\n ;\n};"); } @Override @@ -46,7 +46,7 @@ public class TestFlexJSClass extends TestGoogClass { IClassNode node = getClassNode("public class A extends Button {public function A() {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n */\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {spark_components_Button}\n */\norg_apache_flex_A = function() {\n org_apache_flex_A.base(this, 'constructor');\n};\ngoog.inherits(org_apache_flex_A, spark_components_Button);"); } @Override @@ -55,7 +55,7 @@ public class TestFlexJSClass extends TestGoogClass { IClassNode node = getClassNode("public class A extends Button implements IEventDispatcher {public function A() {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n * @implements {flash.events.IEventDispatcher}\n */\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {spark_components_Button}\n * @implements {flash_events_IEventDispatcher}\n */\norg_apache_flex_A = function() {\n org_apache_flex_A.base(this, 'constructor');\n};\ngoog.inherits(org_apache_flex_A, spark_components_Button);"); } @Override @@ -64,7 +64,7 @@ public class TestFlexJSClass extends TestGoogClass { IClassNode node = getClassNode("public class A extends Button implements IEventDispatcher, ILogger {public function A() {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n * @implements {flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n */\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {spark_components_Button}\n * @implements {flash_events_IEventDispatcher}\n * @implements {mx_logging_ILogger}\n */\norg_apache_flex_A = function() {\n org_apache_flex_A.base(this, 'constructor');\n};\ngoog.inherits(org_apache_flex_A, spark_components_Button);"); } @Override @@ -73,7 +73,7 @@ public class TestFlexJSClass extends TestGoogClass { IClassNode node = getClassNode("public final class A extends Button implements IEventDispatcher, ILogger {public function A() {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n * @implements {flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n */\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {spark_components_Button}\n * @implements {flash_events_IEventDispatcher}\n * @implements {mx_logging_ILogger}\n */\norg_apache_flex_A = function() {\n org_apache_flex_A.base(this, 'constructor');\n};\ngoog.inherits(org_apache_flex_A, spark_components_Button);"); } @Override @@ -82,7 +82,7 @@ public class TestFlexJSClass extends TestGoogClass { IClassNode node = getClassNode("public class A extends spark.components.Button implements flash.events.IEventDispatcher, mx.logging.ILogger {public function A() {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n * @implements {flash.events.IEventDispatcher}\n * @implements {mx.logging.ILogger}\n */\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, 'constructor');\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {spark_components_Button}\n * @implements {flash_events_IEventDispatcher}\n * @implements {mx_logging_ILogger}\n */\norg_apache_flex_A = function() {\n org_apache_flex_A.base(this, 'constructor');\n};\ngoog.inherits(org_apache_flex_A, spark_components_Button);"); } @Override @@ -91,7 +91,7 @@ public class TestFlexJSClass extends TestGoogClass { IClassNode node = getClassNode("public class A extends spark.components.Button { public function A() { super('foo', 42);}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n */\norg.apache.flex.A = function() {\n org.apache.flex.A.base(this, 'constructor', 'foo', 42);\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {spark_components_Button}\n */\norg_apache_flex_A = function() {\n org_apache_flex_A.base(this, 'constructor', 'foo', 42);\n};\ngoog.inherits(org_apache_flex_A, spark_components_Button);"); } @Test @@ -99,7 +99,7 @@ public class TestFlexJSClass extends TestGoogClass { IClassNode node = getClassNode("public class B {public function B(arg1:String) {this.arg1 = arg1}; public var arg1:String;}"); asBlockWalker.visitClass(node); - String expected = "/**\n * @constructor\n * @param {string} arg1\n */\norg.apache.flex.B = function(arg1) {\n this.arg1 = arg1;\n};\n\n\n/**\n * @expose\n * @type {string}\n */\norg.apache.flex.B.prototype.arg1;"; + String expected = "/**\n * @constructor\n * @param {string} arg1\n */\norg_apache_flex_B = function(arg1) {\n this.arg1 = arg1;\n};\n\n\n/**\n * @expose\n * @type {string}\n */\norg_apache_flex_B.prototype.arg1;"; assertOut(expected); } @@ -108,7 +108,7 @@ public class TestFlexJSClass extends TestGoogClass { IClassNode node = getClassNode("public class B {public function B() {}; public var button:Button = new Button(); public function foo():String {return button.label;};}"); asBlockWalker.visitClass(node); - String expected = "/**\n * @constructor\n */\norg.apache.flex.B = function() {\n};\n\n\n/**\n * @expose\n * @type {spark.components.Button}\n */\norg.apache.flex.B.prototype.button = new spark.components.Button();\n\n\n/**\n * @expose\n * @return {string}\n */\norg.apache.flex.B.prototype.foo = function() {\n return this.button.get_label();\n};"; + String expected = "/**\n * @constructor\n */\norg_apache_flex_B = function() {\n};\n\n\n/**\n * @expose\n * @type {spark_components_Button}\n */\norg_apache_flex_B.prototype.button = new spark_components_Button();\n\n\n/**\n * @expose\n * @return {string}\n */\norg_apache_flex_B.prototype.foo = function() {\n return this.button.get_label();\n};"; assertOut(expected); } @@ -117,7 +117,7 @@ public class TestFlexJSClass extends TestGoogClass { IClassNode node = getClassNode("public class B {public function B() {}; public function foo():void {};}"); asBlockWalker.visitClass(node); - String expected = "/**\n * @constructor\n */\norg.apache.flex.B = function() {\n};\n\n\n/**\n * @expose\n */\norg.apache.flex.B.prototype.foo = function() {\n};"; + String expected = "/**\n * @constructor\n */\norg_apache_flex_B = function() {\n};\n\n\n/**\n * @expose\n */\norg_apache_flex_B.prototype.foo = function() {\n};"; assertOut(expected); } @@ -126,7 +126,7 @@ public class TestFlexJSClass extends TestGoogClass { IClassNode node = getClassNode("public class B {public function B() {}; override public function foo():void {};}"); asBlockWalker.visitClass(node); - String expected = "/**\n * @constructor\n */\norg.apache.flex.B = function() {\n};\n\n\n/**\n * @expose\n * @override\n */\norg.apache.flex.B.prototype.foo = function() {\n};"; + String expected = "/**\n * @constructor\n */\norg_apache_flex_B = function() {\n};\n\n\n/**\n * @expose\n * @override\n */\norg_apache_flex_B.prototype.foo = function() {\n};"; assertOut(expected); } @@ -135,7 +135,7 @@ public class TestFlexJSClass extends TestGoogClass { IClassNode node = getClassNode("public class B {public function B() {}; override public function foo(value:Object):void {baz = ''};}"); asBlockWalker.visitClass(node); - String expected = "/**\n * @constructor\n */\norg.apache.flex.B = function() {\n};\n\n\n/**\n * @expose\n * @param {Object} value\n * @override\n */\norg.apache.flex.B.prototype.foo = function(value) {\n baz = '';\n};"; + String expected = "/**\n * @constructor\n */\norg_apache_flex_B = function() {\n};\n\n\n/**\n * @expose\n * @param {Object} value\n * @override\n */\norg_apache_flex_B.prototype.foo = function(value) {\n baz = '';\n};"; assertOut(expected); } @@ -144,7 +144,7 @@ public class TestFlexJSClass extends TestGoogClass { IClassNode node = getClassNode("public class B {public function B() {}; override public function foo():void {super.foo();};}"); asBlockWalker.visitClass(node); - String expected = "/**\n * @constructor\n */\norg.apache.flex.B = function() {\n};\n\n\n/**\n * @expose\n * @override\n */\norg.apache.flex.B.prototype.foo = function() {\n org.apache.flex.B.base(this, 'foo');\n};"; + String expected = "/**\n * @constructor\n */\norg_apache_flex_B = function() {\n};\n\n\n/**\n * @expose\n * @override\n */\norg_apache_flex_B.prototype.foo = function() {\n org_apache_flex_B.base(this, 'foo');\n};"; assertOut(expected); } @@ -153,7 +153,7 @@ public class TestFlexJSClass extends TestGoogClass { IClassNode node = getClassNode("public class B {public function B() {}; public function set baz(value:Object):void {}; public function set foo(value:Object):void {baz = value;};}"); asBlockWalker.visitClass(node); - String expected = "/**\n * @constructor\n */\norg.apache.flex.B = function() {\n};\n\n\n/**\n * @expose\n * @param {Object} value\n */\norg.apache.flex.B.prototype.set_baz = function(value) {\n};\n\n\n/**\n * @expose\n * @param {Object} value\n */\norg.apache.flex.B.prototype.set_foo = function(value) {\n this.set_baz(value);\n};"; + String expected = "/**\n * @constructor\n */\norg_apache_flex_B = function() {\n};\n\n\n/**\n * @expose\n * @param {Object} value\n */\norg_apache_flex_B.prototype.set_baz = function(value) {\n};\n\n\n/**\n * @expose\n * @param {Object} value\n */\norg_apache_flex_B.prototype.set_foo = function(value) {\n this.set_baz(value);\n};"; assertOut(expected); } @@ -162,7 +162,7 @@ public class TestFlexJSClass extends TestGoogClass { IClassNode node = getClassNode("public class B {public function B() {}; override public function set foo(value:Object):void {super.foo = value;};}"); asBlockWalker.visitClass(node); - String expected = "/**\n * @constructor\n */\norg.apache.flex.B = function() {\n};\n\n\n/**\n * @expose\n * @param {Object} value\n * @override\n */\norg.apache.flex.B.prototype.set_foo = function(value) {\n org.apache.flex.B.base(this, 'set_foo', value);\n};"; + String expected = "/**\n * @constructor\n */\norg_apache_flex_B = function() {\n};\n\n\n/**\n * @expose\n * @param {Object} value\n * @override\n */\norg_apache_flex_B.prototype.set_foo = function(value) {\n org_apache_flex_B.base(this, 'set_foo', value);\n};"; assertOut(expected); } @@ -172,7 +172,7 @@ public class TestFlexJSClass extends TestGoogClass { IClassNode node = getClassNode("public class A extends spark.components.Button {public function A(arg1:String, arg2:int) {}}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n * @param {string} arg1\n * @param {number} arg2\n */\norg.apache.flex.A = function(arg1, arg2) {\n org.apache.flex.A.base(this, 'constructor', arg1, arg2);\n};\ngoog.inherits(org.apache.flex.A, spark.components.Button);"); + assertOut("/**\n * @constructor\n * @extends {spark_components_Button}\n * @param {string} arg1\n * @param {number} arg2\n */\norg_apache_flex_A = function(arg1, arg2) {\n org_apache_flex_A.base(this, 'constructor', arg1, arg2);\n};\ngoog.inherits(org_apache_flex_A, spark_components_Button);"); } @Override @@ -182,7 +182,7 @@ public class TestFlexJSClass extends TestGoogClass IClassNode node = getClassNode("public class A {public var a:Object;protected var b:String; " + "private var c:int; internal var d:uint; var e:Number}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};\n\n\n/**\n * @expose\n * @type {Object}\n */\norg.apache.flex.A.prototype.a;\n\n\n/**\n * @protected\n * @type {string}\n */\norg.apache.flex.A.prototype.b;\n\n\n/**\n * @private\n * @type {number}\n */\norg.apache.flex.A.prototype.c;\n\n\n/**\n * @expose\n * @type {number}\n */\norg.apache.flex.A.prototype.d;\n\n\n/**\n * @expose\n * @type {number}\n */\norg.apache.flex.A.prototype.e;"); + assertOut("/**\n * @constructor\n */\norg_apache_flex_A = function() {\n};\n\n\n/**\n * @expose\n * @type {Object}\n */\norg_apache_flex_A.prototype.a;\n\n\n/**\n * @protected\n * @type {string}\n */\norg_apache_flex_A.prototype.b;\n\n\n/**\n * @private\n * @type {number}\n */\norg_apache_flex_A.prototype.c;\n\n\n/**\n * @expose\n * @type {number}\n */\norg_apache_flex_A.prototype.d;\n\n\n/**\n * @expose\n * @type {number}\n */\norg_apache_flex_A.prototype.e;"); } @Override @@ -195,7 +195,7 @@ public class TestFlexJSClass extends TestGoogClass + "private static const C:Number = 42;" + "foo_bar static const C:String = 'me' + 'you';"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};\n\n\n/**\n * @expose\n * @const\n * @type {number}\n */\norg.apache.flex.A.A = 42;\n\n\n/**\n * @protected\n * @const\n * @type {number}\n */\norg.apache.flex.A.B = 42;\n\n\n/**\n * @private\n * @const\n * @type {number}\n */\norg.apache.flex.A.C = 42;\n\n\n/**\n * @expose\n * @const\n * @type {string}\n */\norg.apache.flex.A.C = 'me' + 'you';"); + assertOut("/**\n * @constructor\n */\norg_apache_flex_A = function() {\n};\n\n\n/**\n * @expose\n * @const\n * @type {number}\n */\norg_apache_flex_A.A = 42;\n\n\n/**\n * @protected\n * @const\n * @type {number}\n */\norg_apache_flex_A.B = 42;\n\n\n/**\n * @private\n * @const\n * @type {number}\n */\norg_apache_flex_A.C = 42;\n\n\n/**\n * @expose\n * @const\n * @type {string}\n */\norg_apache_flex_A.C = 'me' + 'you';"); } @Override @@ -214,7 +214,7 @@ public class TestFlexJSClass extends TestGoogClass + "foo_bar function get foo6():Object{return null;}" + "foo_bar function set foo6(value:Object):void{}" + "}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};\n\n\n/**\n * @expose\n * @return {Object}\n */\norg.apache.flex.A.prototype.get_foo1 = function() {\n return null;\n};\n\n\n/**\n * @expose\n * @param {Object} value\n */\norg.apache.flex.A.prototype.set_foo1 = function(value) {\n};\n\n\n/**\n * @protected\n * @return {Object}\n */\norg.apache.flex.A.prototype.get_foo2 = function() {\n return null;\n};\n\n\n/**\n * @protected\n * @param {Object} value\n */\norg.apache.flex.A.prototype.set_foo2 = function(value) {\n};\n\n\n/**\n * @private\n * @return {Object}\n */\norg.apache.flex.A.prototype.get_foo3 = function() {\n return null;\n};\n\n\n/**\n * @private\n * @param {Object} value\n */\norg.apache.flex.A.prototype.set_foo3 = function(value) {\n};\n\n\n/**\n * @return {Object}\n */\norg.apache.flex.A.prototype.get_foo5 = function() {\n return null;\n};\n\n\n/**\n * @param {Object} value\n */\norg.apache.flex.A.prototype.set_foo5 = function(value) {\n};\n\n\n/**\n * @return {Object}\n */\norg.apache.flex.A.prototype.get_foo6 = function() {\n return null;\n};\n\n\n/**\n * @param {Object} value\n */\norg.apache.flex.A.prototype.set_foo6 = function(value) {\n};"); + assertOut("/**\n * @constructor\n */\norg_apache_flex_A = function() {\n};\n\n\n/**\n * @expose\n * @return {Object}\n */\norg_apache_flex_A.prototype.get_foo1 = function() {\n return null;\n};\n\n\n/**\n * @expose\n * @param {Object} value\n */\norg_apache_flex_A.prototype.set_foo1 = function(value) {\n};\n\n\n/**\n * @protected\n * @return {Object}\n */\norg_apache_flex_A.prototype.get_foo2 = function() {\n return null;\n};\n\n\n/**\n * @protected\n * @param {Object} value\n */\norg_apache_flex_A.prototype.set_foo2 = function(value) {\n};\n\n\n/**\n * @private\n * @return {Object}\n */\norg_apache_flex_A.prototype.get_foo3 = function() {\n return null;\n};\n\n\n/**\n * @private\n * @param {Object} value\n */\norg_apache_flex_A.prototype.set_foo3 = function(value) {\n};\n\n\n/**\n * @return {Object}\n */\norg_apache_flex_A.prototype.get_foo5 = function() {\n return null;\n};\n\n\n/**\n * @param {Object} value\n */\norg_apache_flex_A.prototype.set_foo5 = function(value) {\n};\n\n\n/**\n * @return {Object}\n */\norg_apache_flex_A.prototype.get_foo6 = function() {\n return null;\n};\n\n\n/**\n * @param {Object} value\n */\norg_apache_flex_A.prototype.set_foo6 = function(value) {\n};"); } @Override @@ -232,7 +232,7 @@ public class TestFlexJSClass extends TestGoogClass + "public static function foo7(value:Object):void{}" + "foo_bar static function foo7(value:Object):void{}" + "}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};\n\n\n/**\n * @expose\n * @return {Object}\n */\norg.apache.flex.A.prototype.foo1 = function() {\n return null;\n};\n\n\n/**\n * @expose\n * @return {Object}\n */\norg.apache.flex.A.prototype.foo1a = function() {\n return null;\n};\n\n\n/**\n * @expose\n * @return {Object}\n * @override\n */\norg.apache.flex.A.prototype.foo1b = function() {\n return org.apache.flex.A.base(this, 'foo1b');\n};\n\n\n/**\n * @protected\n * @param {Object} value\n */\norg.apache.flex.A.prototype.foo2 = function(value) {\n};\n\n\n/**\n * @private\n * @param {Object} value\n */\norg.apache.flex.A.prototype.foo3 = function(value) {\n};\n\n\n/**\n * @param {Object} value\n */\norg.apache.flex.A.prototype.foo5 = function(value) {\n};\n\n\n/**\n * @param {Object} value\n */\norg.apache.flex.A.prototype.foo6 = function(value) {\n};\n\n\n/**\n * @expose\n * @param {Object} value\n */\norg.apache.flex.A.foo7 = function(value) {\n };\n\n\n/**\n * @param {Object} value\n */\norg.apache.flex.A.foo7 = function(value) {\n};"); + assertOut("/**\n * @constructor\n */\norg_apache_flex_A = function() {\n};\n\n\n/**\n * @expose\n * @return {Object}\n */\norg_apache_flex_A.prototype.foo1 = function() {\n return null;\n};\n\n\n/**\n * @expose\n * @return {Object}\n */\norg_apache_flex_A.prototype.foo1a = function() {\n return null;\n};\n\n\n/**\n * @expose\n * @return {Object}\n * @override\n */\norg_apache_flex_A.prototype.foo1b = function() {\n return org_apache_flex_A.base(this, 'foo1b');\n};\n\n\n/**\n * @protected\n * @param {Object} value\n */\norg_apache_flex_A.prototype.foo2 = function(value) {\n};\n\n\n/**\n * @private\n * @param {Object} value\n */\norg_apache_flex_A.prototype.foo3 = function(value) {\n};\n\n\n/**\n * @param {Object} value\n */\norg_apache_flex_A.prototype.foo5 = function(value) {\n};\n\n\n/**\n * @param {Object} value\n */\norg_apache_flex_A.prototype.foo6 = function(value) {\n};\n\n\n/**\n * @expose\n * @param {Object} value\n */\norg_apache_flex_A.foo7 = function(value) {\n };\n\n\n/**\n * @param {Object} value\n */\norg_apache_flex_A.foo7 = function(value) {\n};"); } @Test @@ -243,7 +243,7 @@ public class TestFlexJSClass extends TestGoogClass + "public function foo2():Object{function bar2(param1:Object):Object {return null;}; return bar2('foo');}" + "}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n */\norg.apache.flex.B = function() {\n};\n\n\n/**\n * @expose\n * @return {Object}\n */\norg.apache.flex.B.prototype.foo1 = function() {\n function bar1() {\n return null;\n };\n return goog.bind(bar1, this)();\n};\n\n\n/**\n * @expose\n * @return {Object}\n */\norg.apache.flex.B.prototype.foo2 = function() {\n function bar2(param1) {\n return null;\n };\n return goog.bind(bar2, this)('foo');\n};"); + assertOut("/**\n * @constructor\n */\norg_apache_flex_B = function() {\n};\n\n\n/**\n * @expose\n * @return {Object}\n */\norg_apache_flex_B.prototype.foo1 = function() {\n function bar1() {\n return null;\n };\n return goog.bind(bar1, this)();\n};\n\n\n/**\n * @expose\n * @return {Object}\n */\norg_apache_flex_B.prototype.foo2 = function() {\n function bar2(param1) {\n return null;\n };\n return goog.bind(bar2, this)('foo');\n};"); } @Test @@ -255,7 +255,7 @@ public class TestFlexJSClass extends TestGoogClass + "public function foo2():String{function bar2(param1:String):String {return param1 + baz1;}; return bar2('foo');}" + "}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n */\norg.apache.flex.B = function() {\n};\n\n\n/**\n * @expose\n * @type {string}\n */\norg.apache.flex.B.prototype.baz1;\n\n\n/**\n * @expose\n * @return {string}\n */\norg.apache.flex.B.prototype.foo1 = function() {\n function bar1() {\n return this.baz1;\n };\n return goog.bind(bar1, this)();\n};\n\n\n/**\n * @expose\n * @return {string}\n */\norg.apache.flex.B.prototype.foo2 = function() {\n function bar2(param1) {\n return param1 + this.baz1;\n };\n return goog.bind(bar2, this)('foo');\n};"); + assertOut("/**\n * @constructor\n */\norg_apache_flex_B = function() {\n};\n\n\n/**\n * @expose\n * @type {string}\n */\norg_apache_flex_B.prototype.baz1;\n\n\n/**\n * @expose\n * @return {string}\n */\norg_apache_flex_B.prototype.foo1 = function() {\n function bar1() {\n return this.baz1;\n };\n return goog.bind(bar1, this)();\n};\n\n\n/**\n * @expose\n * @return {string}\n */\norg_apache_flex_B.prototype.foo2 = function() {\n function bar2(param1) {\n return param1 + this.baz1;\n };\n return goog.bind(bar2, this)('foo');\n};"); } @Test @@ -275,9 +275,89 @@ public class TestFlexJSClass extends TestGoogClass + "public function clone():B { return new B() }" + "}"); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n */\norg.apache.flex.B = function() {\n};\n\n\n/**\n * @expose\n * @return {org.apache.flex.B}\n */\norg.apache.flex.B.prototype.clone = function() {\n return new org.apache.flex.B();\n};"); + assertOut("/**\n * @constructor\n */\norg_apache_flex_B = function() {\n};\n\n\n/**\n * @expose\n * @return {org_apache_flex_B}\n */\norg_apache_flex_B.prototype.clone = function() {\n return new org_apache_flex_B();\n};"); } + @Override + @Test + public void testSimple() + { + IClassNode node = getClassNode("public class A{}"); + asBlockWalker.visitClass(node); + assertOut("/**\n * @constructor\n */\norg_apache_flex_A = function() {\n};"); + } + + @Override + @Test + public void testSimpleInternal() + { + // (erikdebruin) the AS compiler will enforce 'internal' namespace, + // in JS we ignore it + IClassNode node = getClassNode("internal class A{}"); + asBlockWalker.visitClass(node); + assertOut("/**\n * @constructor\n */\norg_apache_flex_A = function() {\n};"); + } + + @Override + @Test + public void testSimpleFinal() + { + // (erikdebruin) the AS compiler will enforce the 'final' keyword, + // in JS we ignore it + IClassNode node = getClassNode("public final class A{}"); + asBlockWalker.visitClass(node); + assertOut("/**\n * @constructor\n */\norg_apache_flex_A = function() {\n};"); + } + + @Override + @Test + public void testSimpleDynamic() + { + // (erikdebruin) all JS objects are 'dynamic' by design + IClassNode node = getClassNode("public dynamic class A{}"); + asBlockWalker.visitClass(node); + assertOut("/**\n * @constructor\n */\norg_apache_flex_A = function() {\n};"); + } + + @Override + @Test + public void testSimpleImplements() + { + IClassNode node = getClassNode("public class A implements IEventDispatcher {public function A() {}}"); + asBlockWalker.visitClass(node); + assertOut("/**\n * @constructor\n * @implements {flash_events_IEventDispatcher}\n */\norg_apache_flex_A = function() {\n};"); + } + + @Override + @Test + public void testSimpleImplementsMultiple() + { + IClassNode node = getClassNode("public class A implements IEventDispatcher, ILogger {public function A() {}}"); + asBlockWalker.visitClass(node); + assertOut("/**\n * @constructor\n * @implements {flash_events_IEventDispatcher}\n * @implements {mx_logging_ILogger}\n */\norg_apache_flex_A = function() {\n};"); + } + + + @Override + @Test + public void testConstructor() + { + IClassNode node = getClassNode("public class A {public function A() { }}"); + asBlockWalker.visitClass(node); + assertOut("/**\n * @constructor\n */\norg_apache_flex_A = function() {\n};"); + } + + + @Override + @Test + public void testConstructor_withArguments() + { + IClassNode node = getClassNode("public class A {public function A(arg1:String, arg2:int) {}}"); + asBlockWalker.visitClass(node); + assertOut("/**\n * @constructor\n * @param {string} arg1\n * @param {number} arg2\n */\norg_apache_flex_A = function(arg1, arg2) {\n};"); + } + + protected IBackend createBackend() { return new FlexJSBackend(); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/92bace80/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmiter.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmiter.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmiter.java index 8cf66a7..fa8c339 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmiter.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmiter.java @@ -54,7 +54,7 @@ public class TestFlexJSEmiter extends TestGoogEmiter + "return \"Don't \" + _privateVar + value; }"; IFileNode node = compileAS(code); asBlockWalker.visitFile(node); - assertOut("/**\n * com.example.components.MyTextButton\n *\n * @fileoverview\n *\n * @suppress {checkTypes}\n */\n\ngoog.provide('com.example.components.MyTextButton');\n\n\n\n/**\n * @constructor\n * @extends {spark.components.Button}\n */\ncom.example.components.MyTextButton = function() {\n com.example.components.MyTextButton.base(this, 'constructor');\n if (foo() != 42) {\n bar();\n }\n};\ngoog.inherits(com.example.components.MyTextButton, spark.components.Button);\n\n\n/**\n * @private\n * @type {string}\n */\ncom.example.components.MyTextButton.prototype._privateVar = \"do \";\n\n\n/**\n * @expose\n * @type {number}\n */\ncom.example.components.MyTextButton.prototype.publicProperty = 100;\n\n\n/**\n * @expose\n * @param {string} value\n * @return {string}\n */\ncom.example.components.MyTextButton.prototype.myFunction = function(value) {\n return \"Don't \" + this._privateVar + value;\n};\n\n\n/**\n * Metadata\n *\n * @type {Object.<string, Array.<Object>>}\n */\ ncom.example.components.MyTextButton.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'MyTextButton', qName: 'com.example.components.MyTextButton'}] };\n"); + assertOut("/**\n * com.example.components.MyTextButton\n *\n * @fileoverview\n *\n * @suppress {checkTypes}\n */\n\ngoog.provide('com_example_components_MyTextButton');\n\n\n\n/**\n * @constructor\n * @extends {spark_components_Button}\n */\ncom_example_components_MyTextButton = function() {\n com_example_components_MyTextButton.base(this, 'constructor');\n if (foo() != 42) {\n bar();\n }\n};\ngoog.inherits(com_example_components_MyTextButton, spark_components_Button);\n\n\n/**\n * @private\n * @type {string}\n */\ncom_example_components_MyTextButton.prototype._privateVar = \"do \";\n\n\n/**\n * @expose\n * @type {number}\n */\ncom_example_components_MyTextButton.prototype.publicProperty = 100;\n\n\n/**\n * @expose\n * @param {string} value\n * @return {string}\n */\ncom_example_components_MyTextButton.prototype.myFunction = function(value) {\n return \"Don't \" + this._privateVar + value;\n};\n\n\n/**\n * Metadata\n *\n * @type {Object.<string, Array.<Object>>}\n */\ ncom_example_components_MyTextButton.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'MyTextButton', qName: 'com_example_components_MyTextButton'}] };\n"); } @Override @@ -65,7 +65,7 @@ public class TestFlexJSEmiter extends TestGoogEmiter + "public interface TestInterface { } }"; IFileNode node = compileAS(code); asBlockWalker.visitFile(node); - assertOut("/**\n * com.example.components.TestInterface\n *\n * @fileoverview\n *\n * @suppress {checkTypes}\n */\n\ngoog.provide('com.example.components.TestInterface');\n\n\n\n/**\n * @interface\n */\ncom.example.components.TestInterface = function() {\n};\n\n\n/**\n * Metadata\n *\n * @type {Object.<string, Array.<Object>>}\n */\ncom.example.components.TestInterface.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'TestInterface', qName: 'com.example.components.TestInterface'}] };\n"); + assertOut("/**\n * com.example.components.TestInterface\n *\n * @fileoverview\n *\n * @suppress {checkTypes}\n */\n\ngoog.provide('com_example_components_TestInterface');\n\n\n\n/**\n * @interface\n */\ncom_example_components_TestInterface = function() {\n};\n\n\n/**\n * Metadata\n *\n * @type {Object.<string, Array.<Object>>}\n */\ncom_example_components_TestInterface.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'TestInterface', qName: 'com_example_components_TestInterface'}] };\n"); } @Override @@ -76,7 +76,7 @@ public class TestFlexJSEmiter extends TestGoogEmiter + "public class TestClass { } }"; IFileNode node = compileAS(code); asBlockWalker.visitFile(node); - assertOut("/**\n * com.example.components.TestClass\n *\n * @fileoverview\n *\n * @suppress {checkTypes}\n */\n\ngoog.provide('com.example.components.TestClass');\n\n\n\n/**\n * @constructor\n */\ncom.example.components.TestClass = function() {\n};\n\n\n/**\n * Metadata\n *\n * @type {Object.<string, Array.<Object>>}\n */\ncom.example.components.TestClass.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'TestClass', qName: 'com.example.components.TestClass'}] };\n"); + assertOut("/**\n * com.example.components.TestClass\n *\n * @fileoverview\n *\n * @suppress {checkTypes}\n */\n\ngoog.provide('com_example_components_TestClass');\n\n\n\n/**\n * @constructor\n */\ncom_example_components_TestClass = function() {\n};\n\n\n/**\n * Metadata\n *\n * @type {Object.<string, Array.<Object>>}\n */\ncom_example_components_TestClass.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'TestClass', qName: 'com_example_components_TestClass'}] };\n"); } @Override @@ -86,7 +86,7 @@ public class TestFlexJSEmiter extends TestGoogEmiter IFunctionNode node = getMethodWithPackage("function method1(p1:int, p2:int, p3:int = 3, p4:int = 4):int{return p1 + p2 + p3 + p4;}"); asBlockWalker.visitFunction(node); assertOut("/**\n * @param {number} p1\n * @param {number} p2\n * @param {number=} p3\n * @param {number=} p4\n * @return {number}\n */\n" - + "foo.bar.FalconTest_A.prototype.method1 = function(p1, p2, p3, p4) {\n" + + "foo_bar_FalconTest_A.prototype.method1 = function(p1, p2, p3, p4) {\n" + " p3 = typeof p3 !== 'undefined' ? p3 : 3;\n" + " p4 = typeof p4 !== 'undefined' ? p4 : 4;\n" + " return p1 + p2 + p3 + p4;\n}"); @@ -99,7 +99,7 @@ public class TestFlexJSEmiter extends TestGoogEmiter IFunctionNode node = getMethodWithPackage("function method1(bar:int = 42, bax:int = 4):void{if (a) foo();}"); asBlockWalker.visitFunction(node); assertOut("/**\n * @param {number=} bar\n * @param {number=} bax\n */\n" - + "foo.bar.FalconTest_A.prototype.method1 = function(bar, bax) {\n" + + "foo_bar_FalconTest_A.prototype.method1 = function(bar, bax) {\n" + " bar = typeof bar !== 'undefined' ? bar : 42;\n" + " bax = typeof bax !== 'undefined' ? bax : 4;\n" + " if (a)\n foo();\n}"); @@ -112,12 +112,42 @@ public class TestFlexJSEmiter extends TestGoogEmiter IFunctionNode node = getMethodWithPackage("function method1(p1:int, p2:int, p3:int = 3, p4:int = 4):int{}"); asBlockWalker.visitFunction(node); assertOut("/**\n * @param {number} p1\n * @param {number} p2\n * @param {number=} p3\n * @param {number=} p4\n * @return {number}\n */\n" - + "foo.bar.FalconTest_A.prototype.method1 = function(p1, p2, p3, p4) {\n" + + "foo_bar_FalconTest_A.prototype.method1 = function(p1, p2, p3, p4) {\n" + " p3 = typeof p3 !== 'undefined' ? p3 : 3;\n" + " p4 = typeof p4 !== 'undefined' ? p4 : 4;\n}"); } @Override + @Test + public void testSimpleParameterReturnType() + { + IFunctionNode node = getMethodWithPackage("function method1(bar:int):int{\n}"); + asBlockWalker.visitFunction(node); + assertOut("/**\n * @param {number} bar\n * @return {number}\n */\n" + + "foo_bar_FalconTest_A.prototype.method1 = function(bar) {\n}"); + } + + @Override + @Test + public void testSimpleMultipleParameter() + { + IFunctionNode node = getMethodWithPackage("function method1(bar:int, baz:String, goo:Array):void{\n}"); + asBlockWalker.visitFunction(node); + assertOut("/**\n * @param {number} bar\n * @param {string} baz\n * @param {Array} goo\n */\n" + + "foo_bar_FalconTest_A.prototype.method1 = function(bar, baz, goo) {\n}"); + } + + @Override + @Test + public void testSimpleMultipleParameter_JSDoc() + { + IFunctionNode node = getMethodWithPackage("function method1(bar:int, baz:String, goo:Array):void{\n}"); + asBlockWalker.visitFunction(node); + assertOut("/**\n * @param {number} bar\n * @param {string} baz\n * @param {Array} goo\n */\n" + + "foo_bar_FalconTest_A.prototype.method1 = function(bar, baz, goo) {\n}"); + } + + @Override protected IBackend createBackend() { return new FlexJSBackend(); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/92bace80/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java index ecfbb62..84ddd03 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java @@ -434,7 +434,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions IBinaryOperatorNode bnode = (IBinaryOperatorNode) findFirstDescendantOfType( node, IBinaryOperatorNode.class); asBlockWalker.visitBinaryOperator(bnode); - assertOut("foo.bar.B.set_b(1)"); + assertOut("foo_bar_B.set_b(1)"); } @Test @@ -446,7 +446,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions IBinaryOperatorNode bnode = (IBinaryOperatorNode) findFirstDescendantOfType( node, IBinaryOperatorNode.class); asBlockWalker.visitBinaryOperator(bnode); - assertOut("foo.bar.B.set_b(1)"); + assertOut("foo_bar_B.set_b(1)"); } @Test @@ -458,7 +458,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions IBinaryOperatorNode bnode = (IBinaryOperatorNode) findFirstDescendantOfType( node, IBinaryOperatorNode.class); asBlockWalker.visitBinaryOperator(bnode); - assertOut("foo.bar.B.get_d().set_b(1)"); + assertOut("foo_bar_B.get_d().set_b(1)"); } @Test @@ -482,7 +482,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions ((JSFlexJSEmitter)asEmitter).thisClass = def; asBlockWalker.visitBinaryOperator(bnode); - assertOut("foo.bar.B.get_d().set_b(1)"); + assertOut("foo_bar_B.get_d().set_b(1)"); } @Test @@ -494,7 +494,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions IBinaryOperatorNode bnode = (IBinaryOperatorNode) findFirstDescendantOfType( node, IBinaryOperatorNode.class); asBlockWalker.visitBinaryOperator(bnode); - assertOut("foo.bar.B.set_b(foo.bar.B.get_b() + 1)"); + assertOut("foo_bar_B.set_b(foo_bar_B.get_b() + 1)"); } @Test @@ -542,7 +542,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions ((JSFlexJSEmitter)asEmitter).thisClass = def; asBlockWalker.visitBinaryOperator(bnode); - assertOut("org.apache.flex.utils.Language.as(this.model, foo.bar.E, true).set_labelText(null)"); + assertOut("org_apache_flex_utils_Language.as(this.model, foo_bar_E, true).set_labelText(null)"); } @Test @@ -602,7 +602,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions "public class B {static public function b() { function c(f:Function):void {}; c(b); }}", IFunctionNode.class, WRAP_LEVEL_PACKAGE, true); asBlockWalker.visitFunction(node); - assertOut("/**\n * @expose\n */\nfoo.bar.B.b = function() {\n function c(f) {\n };\n goog.bind(c, this)(foo.bar.B.b);\n}"); + assertOut("/**\n * @expose\n */\nfoo_bar_B.b = function() {\n function c(f) {\n };\n goog.bind(c, this)(foo_bar_B.b);\n}"); } @Test @@ -613,7 +613,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions IFunctionNode.class, WRAP_LEVEL_PACKAGE, true); asBlockWalker.visitFunction(node); // String.length is a getter but is a property in JS, so don't generate set_length() call. - assertOut("/**\n * @expose\n * @return {number}\n */\nfoo.bar.B.prototype.b = function() {\n var /** @type {string} */ s;\n return s.length;\n}"); + assertOut("/**\n * @expose\n * @return {number}\n */\nfoo_bar_B.prototype.b = function() {\n var /** @type {string} */ s;\n return s.length;\n}"); } @Test @@ -624,7 +624,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions IFunctionNode.class, WRAP_LEVEL_PACKAGE, true); asBlockWalker.visitFunction(node); // String.length is a getter but is a property in JS, so don't generate set_length() call. - assertOut("/**\n * @expose\n * @return {number}\n */\nfoo.bar.B.prototype.b = function() {\n var /** @type {Vector.<string>} */ a;\n return a.length;\n}"); + assertOut("/**\n * @expose\n * @return {number}\n */\nfoo_bar_B.prototype.b = function() {\n var /** @type {Vector.<string>} */ a;\n return a.length;\n}"); } //---------------------------------- @@ -636,7 +636,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions { IClassNode node = (IClassNode) getNode("import spark.components.Button; public class B implements Button { public function B() { Button(b).label = ''; } }", ClassNode.class, WRAP_LEVEL_PACKAGE); asBlockWalker.visitClass(node); - assertOut("/**\n * @constructor\n * @implements {spark.components.Button}\n */\nB = function() {\n org.apache.flex.utils.Language.as(b, spark.components.Button, true).set_label('');\n};"); + assertOut("/**\n * @constructor\n * @implements {spark_components_Button}\n */\nB = function() {\n org_apache_flex_utils_Language.as(b, spark_components_Button, true).set_label('');\n};"); } @Test @@ -644,7 +644,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions { IFunctionNode node = getMethod("function foo(){var foo:Object = FalconTest_A(bar).bar = '';}; public function get bar():Object { return this; };"); asBlockWalker.visitFunction(node); - assertOut("FalconTest_A.prototype.foo = function() {\n var /** @type {Object} */ foo = org.apache.flex.utils.Language.as(this.get_bar(), FalconTest_A, true).set_bar('');\n}"); + assertOut("FalconTest_A.prototype.foo = function() {\n var /** @type {Object} */ foo = org_apache_flex_utils_Language.as(this.get_bar(), FalconTest_A, true).set_bar('');\n}"); } @Test @@ -691,7 +691,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions { IBinaryOperatorNode node = getBinaryNode("a as b"); asBlockWalker.visitBinaryOperator(node); - assertOut("org.apache.flex.utils.Language.as(a, b)"); + assertOut("org_apache_flex_utils_Language.as(a, b)"); } @Test @@ -701,7 +701,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions "public class B {public function b(o:Object):int { var a:B; a = o as B; }}", IFunctionNode.class, WRAP_LEVEL_PACKAGE, true); asBlockWalker.visitFunction(node); - assertOut("/**\n * @expose\n * @param {Object} o\n * @return {number}\n */\nfoo.bar.B.prototype.b = function(o) {\n var /** @type {foo.bar.B} */ a;\n a = org.apache.flex.utils.Language.as(o, foo.bar.B);\n}"); + assertOut("/**\n * @expose\n * @param {Object} o\n * @return {number}\n */\nfoo_bar_B.prototype.b = function(o) {\n var /** @type {foo_bar_B} */ a;\n a = org_apache_flex_utils_Language.as(o, foo_bar_B);\n}"); } @Override @@ -710,7 +710,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions { IBinaryOperatorNode node = getBinaryNode("a is b"); asBlockWalker.visitBinaryOperator(node); - assertOut("org.apache.flex.utils.Language.is(a, b)"); + assertOut("org_apache_flex_utils_Language.is(a, b)"); } protected IBackend createBackend() http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/92bace80/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java index 2b2176c..8641690 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java @@ -44,7 +44,7 @@ public class TestFlexJSGlobalClasses extends TestGoogGlobalClasses { IFunctionNode node = getMethod("function a():void { trace(arguments);}"); asBlockWalker.visitFunction(node); - assertOut("FalconTest_A.prototype.a = function() {\n org.apache.flex.utils.Language.trace(arguments);\n}"); + assertOut("FalconTest_A.prototype.a = function() {\n org_apache_flex_utils_Language.trace(arguments);\n}"); } @Override http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/92bace80/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java index 298ef08..5ef7127 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java @@ -56,7 +56,7 @@ public class TestFlexJSGlobalFunctions extends TestGoogGlobalFunctions { IVariableNode node = getVariable("var a:int = int(1.8);"); asBlockWalker.visitVariable(node); - assertOut("var /** @type {number} */ a = org.apache.flex.utils.Language._int(1.8)"); + assertOut("var /** @type {number} */ a = org_apache_flex_utils_Language._int(1.8)"); } @Override @@ -66,7 +66,7 @@ public class TestFlexJSGlobalFunctions extends TestGoogGlobalFunctions IFunctionCallNode node = (IFunctionCallNode) getNode( "trace('Hello World');", IFunctionCallNode.class); asBlockWalker.visitFunctionCall(node); - assertOut("org.apache.flex.utils.Language.trace('Hello World')"); + assertOut("org_apache_flex_utils_Language.trace('Hello World')"); } @Override @@ -75,7 +75,7 @@ public class TestFlexJSGlobalFunctions extends TestGoogGlobalFunctions { IVariableNode node = getVariable("var a:uint = uint(-100);"); asBlockWalker.visitVariable(node); - assertOut("var /** @type {number} */ a = org.apache.flex.utils.Language.uint(-100)"); + assertOut("var /** @type {number} */ a = org_apache_flex_utils_Language.uint(-100)"); } @Override http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/92bace80/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java index 48759f6..ba4b71d 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java @@ -62,7 +62,7 @@ public class TestFlexJSPackage extends TestGoogPackage { IFileNode node = compileAS("package foo.bar.baz {public class A{}}"); asBlockWalker.visitFile(node); - assertOut("/**\n * foo.bar.baz.A\n *\n * @fileoverview\n *\n * @suppress {checkTypes}\n */\n\ngoog.provide('foo.bar.baz.A');\n\n\n\n/**\n * @constructor\n */\nfoo.bar.baz.A = function() {\n};\n\n\n/**\n * Metadata\n *\n * @type {Object.<string, Array.<Object>>}\n */\nfoo.bar.baz.A.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'A', qName: 'foo.bar.baz.A'}] };\n"); + assertOut("/**\n * foo.bar.baz.A\n *\n * @fileoverview\n *\n * @suppress {checkTypes}\n */\n\ngoog.provide('foo_bar_baz_A');\n\n\n\n/**\n * @constructor\n */\nfoo_bar_baz_A = function() {\n};\n\n\n/**\n * Metadata\n *\n * @type {Object.<string, Array.<Object>>}\n */\nfoo_bar_baz_A.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'A', qName: 'foo_bar_baz_A'}] };\n"); } @Override @@ -71,7 +71,7 @@ public class TestFlexJSPackage extends TestGoogPackage { IFileNode node = compileAS("package foo.bar.baz {public class A{public function A(){}}}"); asBlockWalker.visitFile(node); - assertOut("/**\n * foo.bar.baz.A\n *\n * @fileoverview\n *\n * @suppress {checkTypes}\n */\n\ngoog.provide('foo.bar.baz.A');\n\n\n\n/**\n * @constructor\n */\nfoo.bar.baz.A = function() {\n};\n\n\n/**\n * Metadata\n *\n * @type {Object.<string, Array.<Object>>}\n */\nfoo.bar.baz.A.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'A', qName: 'foo.bar.baz.A'}] };\n"); + assertOut("/**\n * foo.bar.baz.A\n *\n * @fileoverview\n *\n * @suppress {checkTypes}\n */\n\ngoog.provide('foo_bar_baz_A');\n\n\n\n/**\n * @constructor\n */\nfoo_bar_baz_A = function() {\n};\n\n\n/**\n * Metadata\n *\n * @type {Object.<string, Array.<Object>>}\n */\nfoo_bar_baz_A.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'A', qName: 'foo_bar_baz_A'}] };\n"); } @Override @@ -80,7 +80,7 @@ public class TestFlexJSPackage extends TestGoogPackage { IFileNode node = compileAS("package foo.bar.baz {public class A{public function A(){if (a){for (var i:Object in obj){doit();}}}}}"); asBlockWalker.visitFile(node); - assertOut("/**\n * foo.bar.baz.A\n *\n * @fileoverview\n *\n * @suppress {checkTypes}\n */\n\ngoog.provide('foo.bar.baz.A');\n\n\n\n/**\n * @constructor\n */\nfoo.bar.baz.A = function() {\n if (a) {\n for (var /** @type {Object} */ i in obj) {\n doit();\n }\n }\n};\n\n\n/**\n * Metadata\n *\n * @type {Object.<string, Array.<Object>>}\n */\nfoo.bar.baz.A.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'A', qName: 'foo.bar.baz.A'}] };\n"); + assertOut("/**\n * foo.bar.baz.A\n *\n * @fileoverview\n *\n * @suppress {checkTypes}\n */\n\ngoog.provide('foo_bar_baz_A');\n\n\n\n/**\n * @constructor\n */\nfoo_bar_baz_A = function() {\n if (a) {\n for (var /** @type {Object} */ i in obj) {\n doit();\n }\n }\n};\n\n\n/**\n * Metadata\n *\n * @type {Object.<string, Array.<Object>>}\n */\nfoo_bar_baz_A.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'A', qName: 'foo_bar_baz_A'}] };\n"); } @Override http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/92bace80/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSExpressions.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSExpressions.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSExpressions.java index e340fc7..1abf203 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSExpressions.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSExpressions.java @@ -94,7 +94,7 @@ public class TestVF2JSExpressions extends TestGoogExpressions { IBinaryOperatorNode node = getBinaryNode("a as b"); asBlockWalker.visitBinaryOperator(node); - assertOut("org.apache.flex.utils.Language.as(a, b)"); + assertOut("org_apache_flex_utils_Language.as(a, b)"); } @Test @@ -104,7 +104,7 @@ public class TestVF2JSExpressions extends TestGoogExpressions "public class B {public function b(o:Object):int { var a:B; a = o as B; }}", IFunctionNode.class, WRAP_LEVEL_PACKAGE, true); asBlockWalker.visitFunction(node); - assertOut("/**\n * @expose\n * @param {Object} o\n * @return {number}\n */\nfoo.bar.B.prototype.b = function(o) {\n var /** @type {foo.bar.B} */ a;\n a = org.apache.flex.utils.Language.as(o, foo.bar.B);\n}"); + assertOut("/**\n * @expose\n * @param {Object} o\n * @return {number}\n */\nfoo.bar.B.prototype.b = function(o) {\n var /** @type {foo.bar.B} */ a;\n a = org_apache_flex_utils_Language.as(o, foo.bar.B);\n}"); } @Override @@ -113,7 +113,7 @@ public class TestVF2JSExpressions extends TestGoogExpressions { IBinaryOperatorNode node = getBinaryNode("a is b"); asBlockWalker.visitBinaryOperator(node); - assertOut("org.apache.flex.utils.Language.is(a, b)"); + assertOut("org_apache_flex_utils_Language.is(a, b)"); } protected IBackend createBackend() http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/92bace80/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java index 431d01d..3385b47 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java @@ -346,7 +346,7 @@ public class TestVF2JSStatements extends TestGoogStatements IIfNode node = (IIfNode) getNode( "if (numChildren == 0) { if (!typeDescription.@dynamic) { trace(\"warning: no describeType entry for '\" + childName + \"' on non-dynamic type '\" + typeDescription.@name + \"'\"); } }", IIfNode.class); asBlockWalker.visitIf(node); - assertOut("if (numChildren == 0) {\n if (!this.typeDescription['E4XOperator']) {\n org.apache.flex.utils.Language.trace(\"warning: no describeType entry for '\" + childName + \"' on non-dynamic type '\" + this.typeDescription['E4XOperator'] + \"'\");\n }\n}"); + assertOut("if (numChildren == 0) {\n if (!this.typeDescription['E4XOperator']) {\n org_apache_flex_utils_Language.trace(\"warning: no describeType entry for '\" + childName + \"' on non-dynamic type '\" + this.typeDescription['E4XOperator'] + \"'\");\n }\n}"); } @Test
