Return-Path: X-Original-To: apmail-incubator-flex-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-flex-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9EE2EDFF1 for ; Mon, 17 Dec 2012 13:55:40 +0000 (UTC) Received: (qmail 3586 invoked by uid 500); 17 Dec 2012 13:55:40 -0000 Delivered-To: apmail-incubator-flex-commits-archive@incubator.apache.org Received: (qmail 3564 invoked by uid 500); 17 Dec 2012 13:55:40 -0000 Mailing-List: contact flex-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: flex-dev@incubator.apache.org Delivered-To: mailing list flex-commits@incubator.apache.org Received: (qmail 3382 invoked by uid 99); 17 Dec 2012 13:55:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Dec 2012 13:55:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Dec 2012 13:55:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1C7C6238899C; Mon, 17 Dec 2012 13:55:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1422932 - in /incubator/flex/whiteboard/mschmalle/falconjx/compiler.jx.tests/src/org/apache/flex/js/internal/driver: TestBase.java TestExpressions.java Date: Mon, 17 Dec 2012 13:55:02 -0000 To: flex-commits@incubator.apache.org From: mschmalle@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121217135503.1C7C6238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mschmalle Date: Mon Dec 17 13:55:02 2012 New Revision: 1422932 URL: http://svn.apache.org/viewvc?rev=1422932&view=rev Log: Flex:FalconJx - TestExpressions.java subclasses TestWalkerBase - TestBase; removed extraneous ) in the getNode methods Modified: incubator/flex/whiteboard/mschmalle/falconjx/compiler.jx.tests/src/org/apache/flex/js/internal/driver/TestBase.java incubator/flex/whiteboard/mschmalle/falconjx/compiler.jx.tests/src/org/apache/flex/js/internal/driver/TestExpressions.java Modified: incubator/flex/whiteboard/mschmalle/falconjx/compiler.jx.tests/src/org/apache/flex/js/internal/driver/TestBase.java URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/mschmalle/falconjx/compiler.jx.tests/src/org/apache/flex/js/internal/driver/TestBase.java?rev=1422932&r1=1422931&r2=1422932&view=diff ============================================================================== --- incubator/flex/whiteboard/mschmalle/falconjx/compiler.jx.tests/src/org/apache/flex/js/internal/driver/TestBase.java (original) +++ incubator/flex/whiteboard/mschmalle/falconjx/compiler.jx.tests/src/org/apache/flex/js/internal/driver/TestBase.java Mon Dec 17 13:55:02 2012 @@ -172,7 +172,7 @@ public class TestBase protected IASNode getNode(String code, Class type) { String source = "package {public class A {function a():void {" + code - + "}})"; + + "}}"; IFileNode node = getFileNode(source); if (type.isInstance(node)) return node; @@ -184,7 +184,7 @@ public class TestBase Class type) { String source = "package {public class A {function a():void {" + code - + "}})"; + + "}}"; IFileNode node = getFileNode(source); IExpressionNode child = (IExpressionNode) findFirstDescendantOfType( node, type); @@ -194,7 +194,7 @@ public class TestBase protected IUnaryOperatorNode getUnaryNode(String code) { String source = "package {public class A {function a():void {" + code - + "}})"; + + "}}"; IFileNode node = getFileNode(source); IUnaryOperatorNode child = (IUnaryOperatorNode) findFirstDescendantOfType( node, IUnaryOperatorNode.class); @@ -204,7 +204,7 @@ public class TestBase protected IBinaryOperatorNode getBinaryNode(String code) { String source = "package {public class A {function a():void {" + code - + "}})"; + + "}}"; IFileNode node = getFileNode(source); IBinaryOperatorNode child = (IBinaryOperatorNode) findFirstDescendantOfType( node, IBinaryOperatorNode.class); @@ -214,7 +214,7 @@ public class TestBase protected IDynamicAccessNode getDynamicAccessNode(String code) { String source = "package {public class A {function a():void {" + code - + "}})"; + + "}}"; IFileNode node = getFileNode(source); IDynamicAccessNode child = (IDynamicAccessNode) findFirstDescendantOfType( node, IDynamicAccessNode.class); Modified: incubator/flex/whiteboard/mschmalle/falconjx/compiler.jx.tests/src/org/apache/flex/js/internal/driver/TestExpressions.java URL: http://svn.apache.org/viewvc/incubator/flex/whiteboard/mschmalle/falconjx/compiler.jx.tests/src/org/apache/flex/js/internal/driver/TestExpressions.java?rev=1422932&r1=1422931&r2=1422932&view=diff ============================================================================== --- incubator/flex/whiteboard/mschmalle/falconjx/compiler.jx.tests/src/org/apache/flex/js/internal/driver/TestExpressions.java (original) +++ incubator/flex/whiteboard/mschmalle/falconjx/compiler.jx.tests/src/org/apache/flex/js/internal/driver/TestExpressions.java Mon Dec 17 13:55:02 2012 @@ -19,15 +19,6 @@ package org.apache.flex.js.internal.driver; -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; - -import java.io.StringWriter; -import java.io.Writer; - -import org.apache.flex.compiler.clients.IBackend; -import org.apache.flex.compiler.internal.driver.JSBackend; -import org.apache.flex.compiler.internal.js.codgen.JSFilterWriter; import org.apache.flex.compiler.internal.tree.as.ArrayLiteralNode; import org.apache.flex.compiler.internal.tree.as.NamespaceAccessExpressionNode; import org.apache.flex.compiler.internal.tree.as.ObjectLiteralNode; @@ -39,43 +30,14 @@ import org.apache.flex.compiler.tree.as. import org.apache.flex.compiler.tree.as.IReturnNode; import org.apache.flex.compiler.tree.as.ITernaryOperatorNode; import org.apache.flex.compiler.tree.as.IUnaryOperatorNode; -import org.apache.flex.compiler.visitor.IASBlockVisitor; -import org.junit.After; import org.junit.Ignore; import org.junit.Test; /** * @author Michael Schmalle */ -public class TestExpressions extends TestBase +public class TestExpressions extends TestWalkerBase { - private IASBlockVisitor visitor; - - private Writer out; - - private IBackend backend; - - private JSFilterWriter writer; - - @Override - public void setUp() - { - super.setUp(); - - backend = new JSBackend(); - out = new StringWriter(); - writer = new JSFilterWriter(out); - visitor = backend.createWalker(project, errors, writer); - } - - @After - public void tearDown() - { - backend = null; - out = null; - writer = null; - visitor = null; - } // ILanguageIdentifierNode -> IIdentifierNode @@ -716,9 +678,4 @@ public class TestExpressions extends Tes visitor.visitReturn(node); assertOut("return"); } - - private void assertOut(String code) - { - assertThat(out.toString(), is(code)); - } }