This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
The following commit(s) were added to refs/heads/develop by this push:
new 2018033 fix jx tests
2018033 is described below
commit 2018033e68980484dbf48b083d125dc4f57d5675
Author: Josh Tynjala <[email protected]>
AuthorDate: Mon Mar 30 18:13:00 2020 -0700
fix jx tests
---
.../compiler/internal/codegen/js/royale/TestRoyaleClass.java | 4 ++--
.../internal/codegen/js/royale/TestRoyaleFieldMembers.java | 8 ++++----
.../compiler/internal/codegen/js/royale/TestRoyalePackage.java | 1 +
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleClass.java
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleClass.java
index 8fbad57..0febdc1 100644
---
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleClass.java
+++
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleClass.java
@@ -653,7 +653,7 @@ public class TestRoyaleClass extends TestGoogClass
+ "private static const C:Number = 42;"
+ "custom_namespace static const C:String = 'me' + 'you';}");
asBlockWalker.visitClass(node);
- assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function()
{\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n
*/\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);\n\n\n/**\n *
@export\n * @const\n * @type {number}\n */\norg.apache.royale.A.A =
42;\n\n\n/**\n * @protected\n * @const\n * @type {number}\n
*/\norg.apache.royale.A.B = 42;\n\n\n/**\n * @private\n * @const\n * @type
{number}\n */\norg.apache.royale.A.C = 42;\n\n\n/**\n * @co [...]
+ assertOut("/**\n * @constructor\n */\norg.apache.royale.A = function()
{\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n
*/\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);\n\n\n/**\n *
@export\n * @nocollapse\n * @const\n * @type {number}\n
*/\norg.apache.royale.A.A = 42;\n\n\n/**\n * @protected\n * @const\n * @type
{number}\n */\norg.apache.royale.A.B = 42;\n\n\n/**\n * @private\n * @const\n *
@type {number}\n */\norg.apache.royale.A.C = 42;\ [...]
}
@Override
@@ -861,7 +861,7 @@ public class TestRoyaleClass extends TestGoogClass
{
IClassNode node = getClassNode("public class A {public static const
NAME:String = 'Dummy'; public function A(arg1:String = NAME) {_name = arg1;}
private var _name:String;}");
asBlockWalker.visitClass(node);
- assertOut("/**\n * @constructor\n * @param {string=} arg1\n
*/\norg.apache.royale.A = function(arg1) {\n arg1 = typeof arg1 !==
'undefined' ? arg1 : org.apache.royale.A.NAME;\n this._name =
arg1;\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n
*/\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);\n\n\n/**\n *
@export\n * @const\n * @type {string}\n */\norg.apache.royale.A.NAME =
'Dummy';\n\n\n/**\n * @private\n * @type {string}\n */\norg.apache [...]
+ assertOut("/**\n * @constructor\n * @param {string=} arg1\n
*/\norg.apache.royale.A = function(arg1) {\n arg1 = typeof arg1 !==
'undefined' ? arg1 : org.apache.royale.A.NAME;\n this._name =
arg1;\n};\n\n\n/**\n * Prevent renaming of class. Needed for reflection.\n
*/\ngoog.exportSymbol('org.apache.royale.A', org.apache.royale.A);\n\n\n/**\n *
@export\n * @nocollapse\n * @const\n * @type {string}\n
*/\norg.apache.royale.A.NAME = 'Dummy';\n\n\n/**\n * @private\n * @type
{string}\ [...]
}
protected IBackend createBackend()
diff --git
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFieldMembers.java
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFieldMembers.java
index 95aa9ca..9502c33 100644
---
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFieldMembers.java
+++
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleFieldMembers.java
@@ -259,7 +259,7 @@ public class TestRoyaleFieldMembers extends
TestGoogFieldMembers
{
IVariableNode node = getField("public static const foo;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @export\n * @const\n * @type {*}\n
*/\nRoyaleTest_A.foo");
+ assertOut("/**\n * @export\n * @nocollapse\n * @const\n * @type {*}\n
*/\nRoyaleTest_A.foo");
}
@Test
@@ -276,7 +276,7 @@ public class TestRoyaleFieldMembers extends
TestGoogFieldMembers
{
IVariableNode node = getField("public static const foo:int;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @export\n * @const\n * @type {number}\n
*/\nRoyaleTest_A.foo = 0");
+ assertOut("/**\n * @export\n * @nocollapse\n * @const\n * @type
{number}\n */\nRoyaleTest_A.foo = 0");
}
@Test
@@ -293,7 +293,7 @@ public class TestRoyaleFieldMembers extends
TestGoogFieldMembers
{
IVariableNode node = getField("public static const foo:int = 420;");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @export\n * @const\n * @type {number}\n
*/\nRoyaleTest_A.foo = 420");
+ assertOut("/**\n * @export\n * @nocollapse\n * @const\n * @type
{number}\n */\nRoyaleTest_A.foo = 420");
}
@Test
@@ -301,7 +301,7 @@ public class TestRoyaleFieldMembers extends
TestGoogFieldMembers
{
IVariableNode node = getField("public static const foo:Number =
parseFloat('1E2');");
asBlockWalker.visitVariable(node);
- assertOut("/**\n * @export\n * @const\n * @type {number}\n
*/\nRoyaleTest_A.foo = parseFloat('1E2')");
+ assertOut("/**\n * @export\n * @nocollapse\n * @const\n * @type
{number}\n */\nRoyaleTest_A.foo = parseFloat('1E2')");
}
@Test
diff --git
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyalePackage.java
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyalePackage.java
index 4ca16da..6e9ebc5 100644
---
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyalePackage.java
+++
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyalePackage.java
@@ -1247,6 +1247,7 @@ public class TestRoyalePackage extends TestGoogPackage
"\n" +
"/**\n" +
" * @export\n" +
+ " * @nocollapse\n" +
" * @const\n" +
" * @type {number}\n" +
" */\n" +
