Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 22A23200C61 for ; Mon, 10 Apr 2017 13:54:43 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 21384160B85; Mon, 10 Apr 2017 11:54:43 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 727DD160BA7 for ; Mon, 10 Apr 2017 13:54:42 +0200 (CEST) Received: (qmail 79709 invoked by uid 500); 10 Apr 2017 11:54:41 -0000 Mailing-List: contact commits-help@polygene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@polygene.apache.org Delivered-To: mailing list commits@polygene.apache.org Received: (qmail 79665 invoked by uid 99); 10 Apr 2017 11:54:41 -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; Mon, 10 Apr 2017 11:54:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7BA26E9432; Mon, 10 Apr 2017 11:54:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulmerlin@apache.org To: commits@polygene.apache.org Date: Mon, 10 Apr 2017 11:54:46 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/9] polygene-java git commit: Minor, clean up CleanStackTraceTest archived-at: Mon, 10 Apr 2017 11:54:43 -0000 Minor, clean up CleanStackTraceTest Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/7f4048d7 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/7f4048d7 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/7f4048d7 Branch: refs/heads/develop Commit: 7f4048d779753aa90f43eb69531ecc02112a60f4 Parents: 1cf686c Author: Paul Merlin Authored: Mon Apr 10 12:49:10 2017 +0200 Committer: Paul Merlin Committed: Mon Apr 10 12:49:10 2017 +0200 ---------------------------------------------------------------------- .../test/composite/CleanStackTraceTest.java | 26 ++++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7f4048d7/core/runtime/src/test/java/org/apache/polygene/test/composite/CleanStackTraceTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/test/composite/CleanStackTraceTest.java b/core/runtime/src/test/java/org/apache/polygene/test/composite/CleanStackTraceTest.java index c504baf..010f7ae 100644 --- a/core/runtime/src/test/java/org/apache/polygene/test/composite/CleanStackTraceTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/test/composite/CleanStackTraceTest.java @@ -30,7 +30,6 @@ import org.junit.Test; import org.apache.polygene.api.concern.Concerns; import org.apache.polygene.api.concern.GenericConcern; import org.apache.polygene.api.mixin.Mixins; -import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import static org.hamcrest.core.IsNull.notNullValue; @@ -44,19 +43,16 @@ import static org.junit.Assume.assumeTrue; * NOTE: This satisfiedBy MUST NOT be inside package org.apache.polygene.runtime, or it will fail. *

*/ -public class CleanStackTraceTest - extends AbstractPolygeneTest +public class CleanStackTraceTest extends AbstractPolygeneTest { - @BeforeClass public static void beforeClass_IBMJDK() - { + { assumeTrue( !( System.getProperty( "java.vendor" ).contains( "IBM" ) ) ); - } + } @Override public void assemble( ModuleAssembly module ) - throws AssemblyException { module.transients( CleanStackTraceTest.TestComposite.class ); } @@ -82,14 +78,14 @@ public class CleanStackTraceTest { String separator = System.getProperty( "line.separator" ); String correctTrace1 = "java.lang.RuntimeException: level 2" + separator + - "\tat org.apache.polygene.test.composite.CleanStackTraceTest$DoStuffMixin.doStuff(CleanStackTraceTest.java:128)" + separator + - "\tat org.apache.polygene.test.composite.CleanStackTraceTest$NillyWilly.invoke(CleanStackTraceTest.java:141)" + separator + - "\tat org.apache.polygene.test.composite.CleanStackTraceTest.cleanStackTraceOnApplicationException(CleanStackTraceTest.java:79)"; + "\tat org.apache.polygene.test.composite.CleanStackTraceTest$DoStuffMixin.doStuff(CleanStackTraceTest.java:123)" + separator + + "\tat org.apache.polygene.test.composite.CleanStackTraceTest$NillyWilly.invoke(CleanStackTraceTest.java:135)" + separator + + "\tat org.apache.polygene.test.composite.CleanStackTraceTest.cleanStackTraceOnApplicationException(CleanStackTraceTest.java:75)"; assertEquality( e, correctTrace1 ); String correctTrace2 = "java.lang.RuntimeException: level 1" + separator + - "\tat org.apache.polygene.test.composite.CleanStackTraceTest$DoStuffMixin.doStuff(CleanStackTraceTest.java:124)" + separator + - "\tat org.apache.polygene.test.composite.CleanStackTraceTest$NillyWilly.invoke(CleanStackTraceTest.java:141)" + separator + - "\tat org.apache.polygene.test.composite.CleanStackTraceTest.cleanStackTraceOnApplicationException(CleanStackTraceTest.java:79)"; + "\tat org.apache.polygene.test.composite.CleanStackTraceTest$DoStuffMixin.doStuff(CleanStackTraceTest.java:119)" + separator + + "\tat org.apache.polygene.test.composite.CleanStackTraceTest$NillyWilly.invoke(CleanStackTraceTest.java:135)" + separator + + "\tat org.apache.polygene.test.composite.CleanStackTraceTest.cleanStackTraceOnApplicationException(CleanStackTraceTest.java:75)"; assertThat( e.getCause(), notNullValue() ); assertEquality( e.getCause(), correctTrace2 ); } @@ -106,7 +102,7 @@ public class CleanStackTraceTest } @Concerns( NillyWilly.class ) - @Mixins(DoStuffMixin.class) + @Mixins( DoStuffMixin.class ) public interface TestComposite { void doStuff(); @@ -115,7 +111,6 @@ public class CleanStackTraceTest public static class DoStuffMixin implements TestComposite { - @Override public void doStuff() { @@ -133,7 +128,6 @@ public class CleanStackTraceTest static class NillyWilly extends GenericConcern implements InvocationHandler { - @Override public Object invoke( Object proxy, Method method, Object[] args ) throws Throwable