You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2020/01/22 18:04:29 UTC
[royale-compiler] branch develop updated: fix royale.dependent.tests
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 9a81dde fix royale.dependent.tests
9a81dde is described below
commit 9a81ddee759c03144f9ef482200cf6ba433d8425
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Wed Jan 22 10:04:22 2020 -0800
fix royale.dependent.tests
---
.../mxml/royale/TestRoyaleMXMLApplication.java | 36 ++---
.../resources/royale/files/MyInitialView_result.js | 157 +++++++++++----------
.../royale/files/RoyaleTest_again_result.js | 12 +-
3 files changed, 103 insertions(+), 102 deletions(-)
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java
index dca288f..be9fafa 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java
@@ -375,7 +375,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
"\n" +
" this.generateMXMLAttributes\n" +
" ([1,\n" +
- "'initialView',\n" +
+ "goog.reflect.objectProperty('initialView', this),\n" +
"false,\n" +
"[org.apache.royale.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.royale.html.Label, 1, '_id', true, '$ID0', 0, 0, null]],\n" +
"0,\n" +
@@ -500,7 +500,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
"\n" +
" this.generateMXMLAttributes\n" +
" ([1,\n" +
- "'initialView',\n" +
+ "goog.reflect.objectProperty('initialView', this),\n" +
"false,\n" +
"[org.apache.royale.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.royale.html.Label, 1, '_id', true, '$ID0', 0, 0, null]],\n" +
"0,\n" +
@@ -626,7 +626,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
"\n" +
" this.generateMXMLAttributes\n" +
" ([1,\n" +
- "'initialView',\n" +
+ "goog.reflect.objectProperty('initialView', this),\n" +
"false,\n" +
"[org.apache.royale.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.royale.html.Label, 1, '_id', true, '$ID0', 0, 0, null]],\n" +
"0,\n" +
@@ -787,9 +787,9 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
"\n" +
" this.generateMXMLAttributes\n" +
" ([1,\n" +
- "'initialView',\n" +
+ "goog.reflect.objectProperty('initialView', this),\n" +
"false,\n" +
- "[org.apache.royale.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.royale.html.Label, 2, '_id', true, '$ID0', 'text', true, 'Hello World', 0, 0, null]],\n" +
+ "[org.apache.royale.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.royale.html.Label, 2, '_id', true, '$ID0', goog.reflect.objectProperty('text', this), true, 'Hello World', 0, 0, null]],\n" +
"0,\n" +
"0\n" +
" ]);\n" +
@@ -913,9 +913,9 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
"\n" +
" this.generateMXMLAttributes\n" +
" ([1,\n" +
- "'initialView',\n" +
+ "goog.reflect.objectProperty('initialView', this),\n" +
"false,\n" +
- "[org.apache.royale.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.royale.html.DropDownList, 2, '_id', true, '$ID0', 'dataProvider', true, ['Hello','World'], 0, 0, null]],\n" +
+ "[org.apache.royale.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.royale.html.DropDownList, 2, '_id', true, '$ID0', goog.reflect.objectProperty('dataProvider', this), true, ['Hello','World'], 0, 0, null]],\n" +
"0,\n" +
"0\n" +
" ]);\n" +
@@ -1037,9 +1037,9 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
"\n" +
" this.generateMXMLAttributes\n" +
" ([1,\n" +
- "'initialView',\n" +
+ "goog.reflect.objectProperty('initialView', this),\n" +
"false,\n" +
- "[org.apache.royale.core.View, 1, '_id', true, '$ID3', 0, 0, [org.apache.royale.html.DropDownList, 2, '_id', true, '$ID2', 'dataProvider', true, ['Hello','World'], 0, 0, null]],\n" +
+ "[org.apache.royale.core.View, 1, '_id', true, '$ID3', 0, 0, [org.apache.royale.html.DropDownList, 2, '_id', true, '$ID2', goog.reflect.objectProperty('dataProvider', this), true, ['Hello','World'], 0, 0, null]],\n" +
"0,\n" +
"0\n" +
" ]);\n" +
@@ -1163,9 +1163,9 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
"\n" +
" this.generateMXMLAttributes\n" +
" ([1,\n" +
- "'initialView',\n" +
+ "goog.reflect.objectProperty('initialView', this),\n" +
"false,\n" +
- "[org.apache.royale.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.royale.html.DropDownList, 2, '_id', true, '$ID0', 'dataProvider', true, ['Hello','World'], 0, 0, null]],\n" +
+ "[org.apache.royale.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.royale.html.DropDownList, 2, '_id', true, '$ID0', goog.reflect.objectProperty('dataProvider', this), true, ['Hello','World'], 0, 0, null]],\n" +
"0,\n" +
"0\n" +
" ]);\n" +
@@ -1288,9 +1288,9 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
"\n" +
" this.generateMXMLAttributes\n" +
" ([1,\n" +
- "'initialView',\n" +
+ "goog.reflect.objectProperty('initialView', this),\n" +
"false,\n" +
- "[org.apache.royale.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.royale.html.DropDownList, 2, '_id', true, '$ID0', 'dataProvider', true, ['Hello','World'], 0, 0, null]],\n" +
+ "[org.apache.royale.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.royale.html.DropDownList, 2, '_id', true, '$ID0', goog.reflect.objectProperty('dataProvider', this), true, ['Hello','World'], 0, 0, null]],\n" +
"0,\n" +
"0\n" +
" ]);\n" +
@@ -1576,8 +1576,8 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
"\n" +
" this.generateMXMLAttributes\n" +
" ([1,\n" +
- "'beads',\n" +
- "null, [org.apache.royale.charts.beads.DataTipBead, 2, '_id', true, '$ID0', 'labelFunction', true, org.apache.royale.utils.Language.closure(this.fn_test, this, '__org.apache.royale.utils.Language.closure__fn_test'), 0, 0, null],\n" +
+ "goog.reflect.objectProperty('beads', this),\n" +
+ "null, [org.apache.royale.charts.beads.DataTipBead, 2, '_id', true, '$ID0', goog.reflect.objectProperty('labelFunction', this), true, org.apache.royale.utils.Language.closure(this.fn_test, this, '__org.apache.royale.utils.Language.closure__fn_test'), 0, 0, null],\n" +
"0,\n" +
"0\n" +
" ]);\n" +
@@ -1693,8 +1693,8 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
"\n" +
" this.generateMXMLAttributes\n" +
" ([1,\n" +
- "'beads',\n" +
- "null, [org.apache.royale.charts.beads.DataTipBead, 2, '_id', true, '$ID0', 'labelFunction', true, org.apache.royale.utils.Language.closure(this.AppName_fn_test, this, '__org.apache.royale.utils.Language.closure__fn_test'), 0, 0, null],\n" +
+ "goog.reflect.objectProperty('beads', this),\n" +
+ "null, [org.apache.royale.charts.beads.DataTipBead, 2, '_id', true, '$ID0', goog.reflect.objectProperty('labelFunction', this), true, org.apache.royale.utils.Language.closure(this.AppName_fn_test, this, '__org.apache.royale.utils.Language.closure__fn_test'), 0, 0, null],\n" +
"0,\n" +
"0\n" +
" ]);\n" +
@@ -1789,7 +1789,7 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase
args[4] = "-library-path+=" + new File(FilenameNormalization.normalize(env.ASJS + "/frameworks/libs/Network.swc")).getPath();
args[5] = "-library-path+=" + new File(FilenameNormalization.normalize(env.ASJS + "/frameworks/libs/Collections.swc")).getPath();
args[6] = "-library-path+=" + new File(FilenameNormalization.normalize(env.ASJS + "/frameworks/libs/Basic.swc")).getPath();
- args[7] = "-external-library-path+=" + testAdapter.getPlayerglobal().getPath();
+ args[7] = "-external-library-path+=" + testAdapter.getPlayerglobal().getPath();
args[8] = "-output=" + new File(testAdapter.getTempDir(), "bin-debug/RoyaleTest_again_Flash.swf").getPath();
if (env.GOOG != null)
args[9] = "-closure-lib=" + new File(FilenameNormalization.normalize(env.GOOG)).getPath();
diff --git a/compiler-jx/src/test/resources/royale/files/MyInitialView_result.js b/compiler-jx/src/test/resources/royale/files/MyInitialView_result.js
index ef25817..bfa76c7 100644
--- a/compiler-jx/src/test/resources/royale/files/MyInitialView_result.js
+++ b/compiler-jx/src/test/resources/royale/files/MyInitialView_result.js
@@ -474,14 +474,14 @@ Object.defineProperties(MyInitialView.prototype, /** @lends {MyInitialView.proto
'id',
true,
'lbl',
-'x',
+goog.reflect.objectProperty('x', this),
true,
100,
-'y',
+goog.reflect.objectProperty('y', this),
true,
25,
-'beads',
-null, [org.apache.royale.binding.SimpleBinding, 5, '_id', true, '$ID0', 'eventName', true, 'labelTextChanged', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'labelText', 'destinationPropertyName', true, 'text', 0, 0, null],
+goog.reflect.objectProperty('beads', this),
+null, [org.apache.royale.binding.SimpleBinding, 5, '_id', true, '$ID0', goog.reflect.objectProperty('eventName', this), true, 'labelTextChanged', goog.reflect.objectProperty('sourceID', this), true, 'applicationModel', goog.reflect.objectProperty('sourcePropertyName', this), true, 'labelText', goog.reflect.objectProperty('destinationPropertyName', this), true, 'text', 0, 0, null],
0,
0,
null,
@@ -490,13 +490,13 @@ org.apache.royale.html.TextButton,
'_id',
true,
'$ID1',
-'text',
+goog.reflect.objectProperty('text', this),
true,
'Let\'s Start Timer',
-'x',
+goog.reflect.objectProperty('x', this),
true,
100,
-'y',
+goog.reflect.objectProperty('y', this),
true,
75,
0,
@@ -509,13 +509,13 @@ org.apache.royale.html.TextButton,
'_id',
true,
'$ID2',
-'text',
+goog.reflect.objectProperty('text', this),
true,
'Stop Timer',
-'x',
+goog.reflect.objectProperty('x', this),
true,
100,
-'y',
+goog.reflect.objectProperty('y', this),
true,
100,
0,
@@ -528,10 +528,10 @@ org.apache.royale.html.Label,
'id',
true,
'timerLabel',
-'x',
+goog.reflect.objectProperty('x', this),
true,
100,
-'y',
+goog.reflect.objectProperty('y', this),
true,
125,
0,
@@ -542,20 +542,20 @@ org.apache.royale.html.List,
'id',
true,
'cityList',
-'x',
+goog.reflect.objectProperty('x', this),
true,
200,
-'y',
+goog.reflect.objectProperty('y', this),
true,
75,
-'width',
+goog.reflect.objectProperty('width', this),
true,
100,
-'height',
+goog.reflect.objectProperty('height', this),
true,
75,
-'beads',
-null, [org.apache.royale.binding.ConstantBinding, 4, '_id', true, '$ID3', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'cities', 'destinationPropertyName', true, 'dataProvider', 0, 0, null],
+goog.reflect.objectProperty('beads', this),
+null, [org.apache.royale.binding.ConstantBinding, 4, '_id', true, '$ID3', goog.reflect.objectProperty('sourceID', this), true, 'applicationModel', goog.reflect.objectProperty('sourcePropertyName', this), true, 'cities', goog.reflect.objectProperty('destinationPropertyName', this), true, 'dataProvider', 0, 0, null],
0,
1,
'change',
@@ -566,20 +566,20 @@ org.apache.royale.html.TextArea,
'_id',
true,
'$ID5',
-'x',
+goog.reflect.objectProperty('x', this),
true,
320,
-'y',
+goog.reflect.objectProperty('y', this),
true,
25,
-'width',
+goog.reflect.objectProperty('width', this),
true,
150,
-'height',
+goog.reflect.objectProperty('height', this),
true,
75,
-'beads',
-null, [org.apache.royale.binding.SimpleBinding, 5, '_id', true, '$ID4', 'eventName', true, 'labelTextChanged', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'labelText', 'destinationPropertyName', true, 'text', 0, 0, null],
+goog.reflect.objectProperty('beads', this),
+null, [org.apache.royale.binding.SimpleBinding, 5, '_id', true, '$ID4', goog.reflect.objectProperty('eventName', this), true, 'labelTextChanged', goog.reflect.objectProperty('sourceID', this), true, 'applicationModel', goog.reflect.objectProperty('sourcePropertyName', this), true, 'labelText', goog.reflect.objectProperty('destinationPropertyName', this), true, 'text', 0, 0, null],
0,
0,
null,
@@ -588,10 +588,10 @@ org.apache.royale.html.TextInput,
'id',
true,
'input',
-'x',
+goog.reflect.objectProperty('x', this),
true,
320,
-'y',
+goog.reflect.objectProperty('y', this),
true,
110,
0,
@@ -602,13 +602,13 @@ org.apache.royale.html.TextButton,
'_id',
true,
'$ID6',
-'text',
+goog.reflect.objectProperty('text', this),
true,
'Transfer',
-'x',
+goog.reflect.objectProperty('x', this),
true,
320,
-'y',
+goog.reflect.objectProperty('y', this),
true,
138,
0,
@@ -621,13 +621,13 @@ org.apache.royale.html.CheckBox,
'id',
true,
'checkbox',
-'x',
+goog.reflect.objectProperty('x', this),
true,
320,
-'y',
+goog.reflect.objectProperty('y', this),
true,
170,
-'text',
+goog.reflect.objectProperty('text', this),
true,
'Check Me',
0,
@@ -638,19 +638,19 @@ org.apache.royale.html.RadioButton,
'_id',
true,
'$ID7',
-'groupName',
+goog.reflect.objectProperty('groupName', this),
true,
'group1',
-'text',
+goog.reflect.objectProperty('text', this),
true,
'Apples',
-'value',
+goog.reflect.objectProperty('value', this),
true,
0,
-'x',
+goog.reflect.objectProperty('x', this),
true,
100,
-'y',
+goog.reflect.objectProperty('y', this),
true,
150,
0,
@@ -661,22 +661,22 @@ org.apache.royale.html.RadioButton,
'_id',
true,
'$ID8',
-'groupName',
+goog.reflect.objectProperty('groupName', this),
true,
'group1',
-'text',
+goog.reflect.objectProperty('text', this),
true,
'Oranges',
-'value',
+goog.reflect.objectProperty('value', this),
true,
1,
-'x',
+goog.reflect.objectProperty('x', this),
true,
100,
-'y',
+goog.reflect.objectProperty('y', this),
true,
170,
-'selected',
+goog.reflect.objectProperty('selected', this),
true,
true,
0,
@@ -687,19 +687,19 @@ org.apache.royale.html.RadioButton,
'_id',
true,
'$ID9',
-'groupName',
+goog.reflect.objectProperty('groupName', this),
true,
'group1',
-'text',
+goog.reflect.objectProperty('text', this),
true,
'Grapes',
-'value',
+goog.reflect.objectProperty('value', this),
true,
2,
-'x',
+goog.reflect.objectProperty('x', this),
true,
100,
-'y',
+goog.reflect.objectProperty('y', this),
true,
190,
0,
@@ -710,22 +710,22 @@ org.apache.royale.html.RadioButton,
'_id',
true,
'$ID10',
-'groupName',
+goog.reflect.objectProperty('groupName', this),
true,
'group2',
-'text',
+goog.reflect.objectProperty('text', this),
true,
'Red',
-'value',
+goog.reflect.objectProperty('value', this),
true,
16711680,
-'x',
+goog.reflect.objectProperty('x', this),
true,
100,
-'y',
+goog.reflect.objectProperty('y', this),
true,
250,
-'selected',
+goog.reflect.objectProperty('selected', this),
true,
true,
0,
@@ -736,19 +736,19 @@ org.apache.royale.html.RadioButton,
'_id',
true,
'$ID11',
-'groupName',
+goog.reflect.objectProperty('groupName', this),
true,
'group2',
-'text',
+goog.reflect.objectProperty('text', this),
true,
'Green',
-'value',
+goog.reflect.objectProperty('value', this),
true,
32768,
-'x',
+goog.reflect.objectProperty('x', this),
true,
100,
-'y',
+goog.reflect.objectProperty('y', this),
true,
270,
0,
@@ -759,19 +759,19 @@ org.apache.royale.html.RadioButton,
'_id',
true,
'$ID12',
-'groupName',
+goog.reflect.objectProperty('groupName', this),
true,
'group2',
-'text',
+goog.reflect.objectProperty('text', this),
true,
'Blue',
-'value',
+goog.reflect.objectProperty('value', this),
true,
255,
-'x',
+goog.reflect.objectProperty('x', this),
true,
100,
-'y',
+goog.reflect.objectProperty('y', this),
true,
290,
0,
@@ -782,20 +782,20 @@ org.apache.royale.html.DropDownList,
'id',
true,
'list',
-'x',
+goog.reflect.objectProperty('x', this),
true,
200,
-'y',
+goog.reflect.objectProperty('y', this),
true,
200,
-'width',
+goog.reflect.objectProperty('width', this),
true,
100,
-'height',
+goog.reflect.objectProperty('height', this),
true,
24,
-'beads',
-null, [org.apache.royale.binding.ConstantBinding, 4, '_id', true, '$ID13', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'strings', 'destinationPropertyName', true, 'dataProvider', 0, 0, null],
+goog.reflect.objectProperty('beads', this),
+null, [org.apache.royale.binding.ConstantBinding, 4, '_id', true, '$ID13', goog.reflect.objectProperty('sourceID', this), true, 'applicationModel', goog.reflect.objectProperty('sourcePropertyName', this), true, 'strings', goog.reflect.objectProperty('destinationPropertyName', this), true, 'dataProvider', 0, 0, null],
0,
1,
'change',
@@ -806,13 +806,13 @@ org.apache.royale.html.TextButton,
'_id',
true,
'$ID14',
-'text',
+goog.reflect.objectProperty('text', this),
true,
'OK',
-'x',
+goog.reflect.objectProperty('x', this),
true,
200,
-'y',
+goog.reflect.objectProperty('y', this),
true,
230,
0,
@@ -825,17 +825,17 @@ org.apache.royale.html.ComboBox,
'id',
true,
'comboBox',
-'x',
+goog.reflect.objectProperty('x', this),
true,
320,
-'y',
+goog.reflect.objectProperty('y', this),
true,
200,
-'width',
+goog.reflect.objectProperty('width', this),
true,
100,
-'beads',
-null, [org.apache.royale.binding.ConstantBinding, 4, '_id', true, '$ID15', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'cities', 'destinationPropertyName', true, 'dataProvider', 0, 0, null],
+goog.reflect.objectProperty('beads', this),
+null, [org.apache.royale.binding.ConstantBinding, 4, '_id', true, '$ID15', goog.reflect.objectProperty('sourceID', this), true, 'applicationModel', goog.reflect.objectProperty('sourcePropertyName', this), true, 'cities', goog.reflect.objectProperty('destinationPropertyName', this), true, 'dataProvider', 0, 0, null],
0,
1,
'change',
@@ -900,3 +900,4 @@ MyInitialView.prototype.ROYALE_REFLECTION_INFO = function () {
MyInitialView.prototype.ROYALE_COMPILE_FLAGS = 9;
+
\ No newline at end of file
diff --git a/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js b/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js
index bf05d8d..6161a0b 100644
--- a/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js
+++ b/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js
@@ -103,20 +103,20 @@ RoyaleTest_again = function() {
this.generateMXMLAttributes
([5,
-'model',
+goog.reflect.objectProperty('model', this),
false,
[models.MyModel, 1, '_id', true, '$ID2', 0, 0, null],
-'valuesImpl',
+goog.reflect.objectProperty('valuesImpl', this),
false,
[org.apache.royale.core.SimpleCSSValuesImpl, 1, '_id', true, '$ID0', 0, 0, null],
-'initialView',
+goog.reflect.objectProperty('initialView', this),
false,
[MyInitialView, 1, '_id', true, '$ID1', 0, 0, null],
-'controller',
+goog.reflect.objectProperty('controller', this),
false,
[controllers.MyController, 1, '_id', true, '$ID3', 0, 0, null],
-'beads',
-null, [org.apache.royale.net.HTTPService, 2, 'id', true, 'service', 'beads', null, [org.apache.royale.collections.LazyCollection, 3, 'id', true, 'collection', 'inputParser', false, [org.apache.royale.collections.parsers.JSONInputParser, 1, '_id', true, '$ID4', 0, 0, null], 'itemConverter', false, [StockDataJSONItemConverter, 1, '_id', true, '$ID5', 0, 0, null], 0, 0, null], 0, 0, null],
+goog.reflect.objectProperty('beads', this),
+null, [org.apache.royale.net.HTTPService, 2, 'id', true, 'service', goog.reflect.objectProperty('beads', this), null, [org.apache.royale.collections.LazyCollection, 3, 'id', true, 'collection', goog.reflect.objectProperty('inputParser', this), false, [org.apache.royale.collections.parsers.JSONInputParser, 1, '_id', true, '$ID4', 0, 0, null], goog.reflect.objectProperty('itemConverter', this), false, [StockDataJSONItemConverter, 1, '_id', true, '$ID5', 0, 0, null], 0, 0, null], 0, 0, null],
0,
1,
'initialize',