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
commit ff44a05ee783b3f9070ccbbaa59df3d74fc773c0 Author: Josh Tynjala <[email protected]> AuthorDate: Thu Feb 6 09:50:50 2020 -0800 Revert "fix royale.dependent.tests" This reverts commit 9a81ddee759c03144f9ef482200cf6ba433d8425. --- .../mxml/royale/TestRoyaleMXMLApplication.java | 36 ++--- .../resources/royale/files/MyInitialView_result.js | 157 ++++++++++----------- .../royale/files/RoyaleTest_again_result.js | 12 +- 3 files changed, 102 insertions(+), 103 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 be9fafa..dca288f 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" + - "goog.reflect.objectProperty('initialView', this),\n" + + "'initialView',\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" + - "goog.reflect.objectProperty('initialView', this),\n" + + "'initialView',\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" + - "goog.reflect.objectProperty('initialView', this),\n" + + "'initialView',\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" + - "goog.reflect.objectProperty('initialView', this),\n" + + "'initialView',\n" + "false,\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" + + "[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" + "0,\n" + "0\n" + " ]);\n" + @@ -913,9 +913,9 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase "\n" + " this.generateMXMLAttributes\n" + " ([1,\n" + - "goog.reflect.objectProperty('initialView', this),\n" + + "'initialView',\n" + "false,\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" + + "[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" + "0,\n" + "0\n" + " ]);\n" + @@ -1037,9 +1037,9 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase "\n" + " this.generateMXMLAttributes\n" + " ([1,\n" + - "goog.reflect.objectProperty('initialView', this),\n" + + "'initialView',\n" + "false,\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" + + "[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" + "0,\n" + "0\n" + " ]);\n" + @@ -1163,9 +1163,9 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase "\n" + " this.generateMXMLAttributes\n" + " ([1,\n" + - "goog.reflect.objectProperty('initialView', this),\n" + + "'initialView',\n" + "false,\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" + + "[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" + "0,\n" + "0\n" + " ]);\n" + @@ -1288,9 +1288,9 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase "\n" + " this.generateMXMLAttributes\n" + " ([1,\n" + - "goog.reflect.objectProperty('initialView', this),\n" + + "'initialView',\n" + "false,\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" + + "[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" + "0,\n" + "0\n" + " ]);\n" + @@ -1576,8 +1576,8 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase "\n" + " this.generateMXMLAttributes\n" + " ([1,\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" + + "'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" + "0,\n" + "0\n" + " ]);\n" + @@ -1693,8 +1693,8 @@ public class TestRoyaleMXMLApplication extends RoyaleTestBase "\n" + " this.generateMXMLAttributes\n" + " ([1,\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" + + "'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" + "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 bfa76c7..ef25817 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', -goog.reflect.objectProperty('x', this), +'x', true, 100, -goog.reflect.objectProperty('y', this), +'y', true, 25, -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], +'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], 0, 0, null, @@ -490,13 +490,13 @@ org.apache.royale.html.TextButton, '_id', true, '$ID1', -goog.reflect.objectProperty('text', this), +'text', true, 'Let\'s Start Timer', -goog.reflect.objectProperty('x', this), +'x', true, 100, -goog.reflect.objectProperty('y', this), +'y', true, 75, 0, @@ -509,13 +509,13 @@ org.apache.royale.html.TextButton, '_id', true, '$ID2', -goog.reflect.objectProperty('text', this), +'text', true, 'Stop Timer', -goog.reflect.objectProperty('x', this), +'x', true, 100, -goog.reflect.objectProperty('y', this), +'y', true, 100, 0, @@ -528,10 +528,10 @@ org.apache.royale.html.Label, 'id', true, 'timerLabel', -goog.reflect.objectProperty('x', this), +'x', true, 100, -goog.reflect.objectProperty('y', this), +'y', true, 125, 0, @@ -542,20 +542,20 @@ org.apache.royale.html.List, 'id', true, 'cityList', -goog.reflect.objectProperty('x', this), +'x', true, 200, -goog.reflect.objectProperty('y', this), +'y', true, 75, -goog.reflect.objectProperty('width', this), +'width', true, 100, -goog.reflect.objectProperty('height', this), +'height', true, 75, -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], +'beads', +null, [org.apache.royale.binding.ConstantBinding, 4, '_id', true, '$ID3', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'cities', 'destinationPropertyName', true, 'dataProvider', 0, 0, null], 0, 1, 'change', @@ -566,20 +566,20 @@ org.apache.royale.html.TextArea, '_id', true, '$ID5', -goog.reflect.objectProperty('x', this), +'x', true, 320, -goog.reflect.objectProperty('y', this), +'y', true, 25, -goog.reflect.objectProperty('width', this), +'width', true, 150, -goog.reflect.objectProperty('height', this), +'height', true, 75, -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], +'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], 0, 0, null, @@ -588,10 +588,10 @@ org.apache.royale.html.TextInput, 'id', true, 'input', -goog.reflect.objectProperty('x', this), +'x', true, 320, -goog.reflect.objectProperty('y', this), +'y', true, 110, 0, @@ -602,13 +602,13 @@ org.apache.royale.html.TextButton, '_id', true, '$ID6', -goog.reflect.objectProperty('text', this), +'text', true, 'Transfer', -goog.reflect.objectProperty('x', this), +'x', true, 320, -goog.reflect.objectProperty('y', this), +'y', true, 138, 0, @@ -621,13 +621,13 @@ org.apache.royale.html.CheckBox, 'id', true, 'checkbox', -goog.reflect.objectProperty('x', this), +'x', true, 320, -goog.reflect.objectProperty('y', this), +'y', true, 170, -goog.reflect.objectProperty('text', this), +'text', true, 'Check Me', 0, @@ -638,19 +638,19 @@ org.apache.royale.html.RadioButton, '_id', true, '$ID7', -goog.reflect.objectProperty('groupName', this), +'groupName', true, 'group1', -goog.reflect.objectProperty('text', this), +'text', true, 'Apples', -goog.reflect.objectProperty('value', this), +'value', true, 0, -goog.reflect.objectProperty('x', this), +'x', true, 100, -goog.reflect.objectProperty('y', this), +'y', true, 150, 0, @@ -661,22 +661,22 @@ org.apache.royale.html.RadioButton, '_id', true, '$ID8', -goog.reflect.objectProperty('groupName', this), +'groupName', true, 'group1', -goog.reflect.objectProperty('text', this), +'text', true, 'Oranges', -goog.reflect.objectProperty('value', this), +'value', true, 1, -goog.reflect.objectProperty('x', this), +'x', true, 100, -goog.reflect.objectProperty('y', this), +'y', true, 170, -goog.reflect.objectProperty('selected', this), +'selected', true, true, 0, @@ -687,19 +687,19 @@ org.apache.royale.html.RadioButton, '_id', true, '$ID9', -goog.reflect.objectProperty('groupName', this), +'groupName', true, 'group1', -goog.reflect.objectProperty('text', this), +'text', true, 'Grapes', -goog.reflect.objectProperty('value', this), +'value', true, 2, -goog.reflect.objectProperty('x', this), +'x', true, 100, -goog.reflect.objectProperty('y', this), +'y', true, 190, 0, @@ -710,22 +710,22 @@ org.apache.royale.html.RadioButton, '_id', true, '$ID10', -goog.reflect.objectProperty('groupName', this), +'groupName', true, 'group2', -goog.reflect.objectProperty('text', this), +'text', true, 'Red', -goog.reflect.objectProperty('value', this), +'value', true, 16711680, -goog.reflect.objectProperty('x', this), +'x', true, 100, -goog.reflect.objectProperty('y', this), +'y', true, 250, -goog.reflect.objectProperty('selected', this), +'selected', true, true, 0, @@ -736,19 +736,19 @@ org.apache.royale.html.RadioButton, '_id', true, '$ID11', -goog.reflect.objectProperty('groupName', this), +'groupName', true, 'group2', -goog.reflect.objectProperty('text', this), +'text', true, 'Green', -goog.reflect.objectProperty('value', this), +'value', true, 32768, -goog.reflect.objectProperty('x', this), +'x', true, 100, -goog.reflect.objectProperty('y', this), +'y', true, 270, 0, @@ -759,19 +759,19 @@ org.apache.royale.html.RadioButton, '_id', true, '$ID12', -goog.reflect.objectProperty('groupName', this), +'groupName', true, 'group2', -goog.reflect.objectProperty('text', this), +'text', true, 'Blue', -goog.reflect.objectProperty('value', this), +'value', true, 255, -goog.reflect.objectProperty('x', this), +'x', true, 100, -goog.reflect.objectProperty('y', this), +'y', true, 290, 0, @@ -782,20 +782,20 @@ org.apache.royale.html.DropDownList, 'id', true, 'list', -goog.reflect.objectProperty('x', this), +'x', true, 200, -goog.reflect.objectProperty('y', this), +'y', true, 200, -goog.reflect.objectProperty('width', this), +'width', true, 100, -goog.reflect.objectProperty('height', this), +'height', true, 24, -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], +'beads', +null, [org.apache.royale.binding.ConstantBinding, 4, '_id', true, '$ID13', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'strings', 'destinationPropertyName', true, 'dataProvider', 0, 0, null], 0, 1, 'change', @@ -806,13 +806,13 @@ org.apache.royale.html.TextButton, '_id', true, '$ID14', -goog.reflect.objectProperty('text', this), +'text', true, 'OK', -goog.reflect.objectProperty('x', this), +'x', true, 200, -goog.reflect.objectProperty('y', this), +'y', true, 230, 0, @@ -825,17 +825,17 @@ org.apache.royale.html.ComboBox, 'id', true, 'comboBox', -goog.reflect.objectProperty('x', this), +'x', true, 320, -goog.reflect.objectProperty('y', this), +'y', true, 200, -goog.reflect.objectProperty('width', this), +'width', true, 100, -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], +'beads', +null, [org.apache.royale.binding.ConstantBinding, 4, '_id', true, '$ID15', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'cities', 'destinationPropertyName', true, 'dataProvider', 0, 0, null], 0, 1, 'change', @@ -900,4 +900,3 @@ 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 6161a0b..bf05d8d 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, -goog.reflect.objectProperty('model', this), +'model', false, [models.MyModel, 1, '_id', true, '$ID2', 0, 0, null], -goog.reflect.objectProperty('valuesImpl', this), +'valuesImpl', false, [org.apache.royale.core.SimpleCSSValuesImpl, 1, '_id', true, '$ID0', 0, 0, null], -goog.reflect.objectProperty('initialView', this), +'initialView', false, [MyInitialView, 1, '_id', true, '$ID1', 0, 0, null], -goog.reflect.objectProperty('controller', this), +'controller', false, [controllers.MyController, 1, '_id', true, '$ID3', 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], +'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], 0, 1, 'initialize',
