fix some tests now that we have better error checking
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/fde03868 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/fde03868 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/fde03868 Branch: refs/heads/master Commit: fde038685889b3d9e821937143e14bb5fd9e7cbb Parents: 445854b Author: Alex Harui <[email protected]> Authored: Tue Mar 7 22:34:03 2017 -0800 Committer: Alex Harui <[email protected]> Committed: Tue Mar 7 22:34:03 2017 -0800 ---------------------------------------------------------------------- .../mxml/flexjs/TestFlexJSMXMLApplication.java | 44 ++++++++++++++++---- 1 file changed, 36 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/fde03868/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java index 8cb54be..d49661d 100644 --- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java +++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java @@ -297,7 +297,7 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase String code = "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\"; xmlns:basic=\"library://ns.apache.org/flexjs/basic\">" + "<fx:Script><![CDATA[" + " import org.apache.flex.net.HTTPConstants;" - + "]]></fx:Script><basic:initialView><basic:Label text=\"{HTTPConstants.GET}\"/></basic:initialView></basic:Application>"; + + "]]></fx:Script><basic:initialView><basic:View><basic:Label text=\"{HTTPConstants.GET}\"/></basic:View></basic:initialView></basic:Application>"; IMXMLDocumentNode dnode = (IMXMLDocumentNode) getNode(code, IMXMLDocumentNode.class, FlexJSTestBase.WRAP_LEVEL_NONE); @@ -316,6 +316,7 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase "goog.provide('AppName');\n" + "\n" + "goog.require('org.apache.flex.core.Application');\n" + + "goog.require('org.apache.flex.core.View');\n" + "goog.require('org.apache.flex.html.Label');\n" + "goog.require('org.apache.flex.net.HTTPConstants');\n" + "\n" + @@ -330,6 +331,12 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase " \n" + " /**\n" + " * @private\n" + + " * @type {org.apache.flex.core.View}\n" + + " */\n" + + " this.$ID1_;\n" + + " \n" + + " /**\n" + + " * @private\n" + " * @type {org.apache.flex.html.Label}\n" + " */\n" + " this.$ID0_;\n" + @@ -350,7 +357,7 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase " ([1,\n" + "'initialView',\n" + "false,\n" + - "[org.apache.flex.html.Label, 1, '_id', true, '$ID0', 0, 0, null],\n" + + "[org.apache.flex.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.flex.html.Label, 1, '_id', true, '$ID0', 0, 0, null]],\n" + "0,\n" + "0\n" + " ]);\n" + @@ -412,7 +419,7 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase String code = "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\"; xmlns:basic=\"library://ns.apache.org/flexjs/basic\">" + "<fx:Script><![CDATA[" + " import org.apache.flex.net.HTTPConstants;" - + "]]></fx:Script><basic:initialView><basic:Label text=\"{org.apache.flex.net.HTTPConstants.GET}\"/></basic:initialView></basic:Application>"; + + "]]></fx:Script><basic:initialView><basic:View><basic:Label text=\"{org.apache.flex.net.HTTPConstants.GET}\"/></basic:View></basic:initialView></basic:Application>"; IMXMLDocumentNode dnode = (IMXMLDocumentNode) getNode(code, IMXMLDocumentNode.class, FlexJSTestBase.WRAP_LEVEL_NONE); @@ -431,6 +438,7 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase "goog.provide('AppName');\n" + "\n" + "goog.require('org.apache.flex.core.Application');\n" + + "goog.require('org.apache.flex.core.View');\n" + "goog.require('org.apache.flex.html.Label');\n" + "goog.require('org.apache.flex.net.HTTPConstants');\n" + "\n" + @@ -445,6 +453,12 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase " \n" + " /**\n" + " * @private\n" + + " * @type {org.apache.flex.core.View}\n" + + " */\n" + + " this.$ID1_;\n" + + " \n" + + " /**\n" + + " * @private\n" + " * @type {org.apache.flex.html.Label}\n" + " */\n" + " this.$ID0_;\n" + @@ -465,7 +479,7 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase " ([1,\n" + "'initialView',\n" + "false,\n" + - "[org.apache.flex.html.Label, 1, '_id', true, '$ID0', 0, 0, null],\n" + + "[org.apache.flex.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.flex.html.Label, 1, '_id', true, '$ID0', 0, 0, null]],\n" + "0,\n" + "0\n" + " ]);\n" + @@ -528,7 +542,7 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase + "<fx:Script><![CDATA[" + " import binding.ComplexValueObject;\n" + " public var firstOne:ComplexValueObject;\n" - + "]]></fx:Script><basic:initialView><basic:Label text=\"{firstOne.subObject.labelText}\"/></basic:initialView></basic:Application>"; + + "]]></fx:Script><basic:initialView><basic:View><basic:Label text=\"{firstOne.subObject.labelText}\"/></basic:View></basic:initialView></basic:Application>"; IMXMLDocumentNode dnode = (IMXMLDocumentNode) getNode(code, IMXMLDocumentNode.class, FlexJSTestBase.WRAP_LEVEL_NONE); @@ -547,6 +561,7 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase "goog.provide('AppName');\n" + "\n" + "goog.require('org.apache.flex.core.Application');\n" + + "goog.require('org.apache.flex.core.View');\n" + "goog.require('org.apache.flex.html.Label');\n" + "goog.require('binding.ComplexValueObject');\n" + "\n" + @@ -561,6 +576,12 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase " \n" + " /**\n" + " * @private\n" + + " * @type {org.apache.flex.core.View}\n" + + " */\n" + + " this.$ID1_;\n" + + " \n" + + " /**\n" + + " * @private\n" + " * @type {org.apache.flex.html.Label}\n" + " */\n" + " this.$ID0_;\n" + @@ -581,7 +602,7 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase " ([1,\n" + "'initialView',\n" + "false,\n" + - "[org.apache.flex.html.Label, 1, '_id', true, '$ID0', 0, 0, null],\n" + + "[org.apache.flex.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.flex.html.Label, 1, '_id', true, '$ID0', 0, 0, null]],\n" + "0,\n" + "0\n" + " ]);\n" + @@ -676,7 +697,7 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase String code = "<basic:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\"; xmlns:basic=\"library://ns.apache.org/flexjs/basic\">" + "<fx:Script><![CDATA[" + " public var xml:XML = new XML();\n" - + "]]></fx:Script><basic:initialView><basic:Label text=\"Hello World\"/></basic:initialView></basic:Application>"; + + "]]></fx:Script><basic:initialView><basic:View><basic:Label text=\"Hello World\"/></basic:View></basic:initialView></basic:Application>"; IMXMLDocumentNode dnode = (IMXMLDocumentNode) getNode(code, IMXMLDocumentNode.class, FlexJSTestBase.WRAP_LEVEL_NONE); @@ -695,6 +716,7 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase "goog.provide('AppName');\n" + "\n" + "goog.require('org.apache.flex.core.Application');\n" + + "goog.require('org.apache.flex.core.View');\n" + "goog.require('org.apache.flex.html.Label');\n" + "goog.require('XML');\n" + "goog.require('XML');\n" + @@ -711,6 +733,12 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase " this.xml = new XML();\n" + " /**\n" + " * @private\n" + + " * @type {org.apache.flex.core.View}\n" + + " */\n" + + " this.$ID1_;\n" + + " \n" + + " /**\n" + + " * @private\n" + " * @type {org.apache.flex.html.Label}\n" + " */\n" + " this.$ID0_;\n" + @@ -731,7 +759,7 @@ public class TestFlexJSMXMLApplication extends FlexJSTestBase " ([1,\n" + "'initialView',\n" + "false,\n" + - "[org.apache.flex.html.Label, 2, '_id', true, '$ID0', 'text', true, 'Hello World', 0, 0, null],\n" + + "[org.apache.flex.core.View, 1, '_id', true, '$ID1', 0, 0, [org.apache.flex.html.Label, 2, '_id', true, '$ID0', 'text', true, 'Hello World', 0, 0, null]],\n" + "0,\n" + "0\n" + " ]);\n" +
