Return-Path: X-Original-To: apmail-flex-commits-archive@www.apache.org Delivered-To: apmail-flex-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1E75B199B3 for ; Wed, 6 Apr 2016 15:02:19 +0000 (UTC) Received: (qmail 24463 invoked by uid 500); 6 Apr 2016 15:02:11 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 24397 invoked by uid 500); 6 Apr 2016 15:02:11 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 23887 invoked by uid 99); 6 Apr 2016 15:02:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Apr 2016 15:02:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2B598E983B; Wed, 6 Apr 2016 15:02:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aharui@apache.org To: commits@flex.apache.org Date: Wed, 06 Apr 2016 15:02:26 -0000 Message-Id: <1e23244068f745c8866dd851548ae8d5@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [17/50] git commit: [flex-falcon] [refs/heads/master] - fix up tests after making components inner classes fix up tests after making components inner classes Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/82df4765 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/82df4765 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/82df4765 Branch: refs/heads/master Commit: 82df47658fefb9f95ae18cba64df2d01fa1209bf Parents: 47852ab Author: Alex Harui Authored: Mon Feb 29 17:50:12 2016 -0800 Committer: Alex Harui Committed: Mon Feb 29 17:50:29 2016 -0800 ---------------------------------------------------------------------- .../compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java | 2 -- .../internal/codegen/mxml/flexjs/TestFlexJSMXMLScript.java | 4 ++-- .../test-files/flexjs/files/FlexJSTest_again_result.js | 2 +- .../test-files/flexjs/files/MyInitialView_result.js | 2 +- .../test-files/flexjs/files/wildcard_import_result.js | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/82df4765/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 a456900..e6ab1e4 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 @@ -785,7 +785,6 @@ public class TestFlexJSPackage extends TestGoogPackage " return {\n" + " variables: function () {\n" + " return {\n" + - " 'someString': { type: 'String'}\n" + " };\n" + " },\n" + " accessors: function () {\n" + @@ -795,7 +794,6 @@ public class TestFlexJSPackage extends TestGoogPackage " methods: function () {\n" + " return {\n" + " 'InternalClass': { type: '', declaredBy: 'foo.bar.baz.A.InternalClass'},\n" + - " 'someStaticFunction': { type: 'String', declaredBy: 'foo.bar.baz.A.InternalClass'},\n" + " 'someMethod': { type: 'String', declaredBy: 'foo.bar.baz.A.InternalClass'}\n" + " };\n" + " }\n" + http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/82df4765/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLScript.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLScript.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLScript.java index 4a58096..3da0c36 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLScript.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLScript.java @@ -57,7 +57,6 @@ public class TestFlexJSMXMLScript extends FlexJSTestBase "\n" + "\n" + "\n" + - "\n" + "/**\n" + " * @constructor\n" + " * @extends {org.apache.flex.core.Application}\n" + @@ -119,6 +118,7 @@ public class TestFlexJSMXMLScript extends FlexJSTestBase "};\n" + "\n" + "\n" + + "\n" + "/**\n" + " * @export\n" + " * @override\n" + @@ -161,7 +161,6 @@ public class TestFlexJSMXMLScript extends FlexJSTestBase "\n" + "\n" + "\n" + - "\n" + "/**\n" + " * @constructor\n" + " * @extends {org.apache.flex.core.Application}\n" + @@ -223,6 +222,7 @@ public class TestFlexJSMXMLScript extends FlexJSTestBase "};\n" + "\n" + "\n" + + "\n" + "/**\n" + " * @export\n" + " * @type {Array}\n" + http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/82df4765/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js b/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js index bf68564..71eb945 100644 --- a/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js +++ b/compiler.jx.tests/test-files/flexjs/files/FlexJSTest_again_result.js @@ -34,7 +34,6 @@ goog.require('org.apache.flex.events.Event'); - /** * @constructor * @extends {org.apache.flex.core.Application} @@ -169,6 +168,7 @@ FlexJSTest_again.prototype.FLEXJS_REFLECTION_INFO = function () { }; + /** * @export * @param {org.apache.flex.events.Event} event http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/82df4765/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js index 6ba45a3..95b90ce 100644 --- a/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js +++ b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js @@ -40,7 +40,6 @@ goog.require('org.apache.flex.utils.Timer'); - /** * @constructor * @extends {org.apache.flex.core.ViewBase} @@ -259,6 +258,7 @@ MyInitialView.prototype.FLEXJS_REFLECTION_INFO = function () { }; + /** * @private * @type {org.apache.flex.utils.Timer} http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/82df4765/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js b/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js index 43c5780..4ef8a61 100644 --- a/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js +++ b/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js @@ -26,7 +26,6 @@ goog.require('org.apache.flex.html.Button'); - /** * @constructor * @extends {org.apache.flex.core.Application} @@ -87,6 +86,7 @@ wildcard_import.prototype.FLEXJS_REFLECTION_INFO = function () { }; + /** * @private */