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 42EF7200C70 for ; Thu, 4 May 2017 19:12:46 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 41855160BB0; Thu, 4 May 2017 17:12:46 +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 61B6E160B9B for ; Thu, 4 May 2017 19:12:45 +0200 (CEST) Received: (qmail 64721 invoked by uid 500); 4 May 2017 17:12:44 -0000 Mailing-List: contact commits-help@tomee.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tomee.apache.org Delivered-To: mailing list commits@tomee.apache.org Received: (qmail 64712 invoked by uid 99); 4 May 2017 17:12:44 -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; Thu, 04 May 2017 17:12:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6C1C0DFD70; Thu, 4 May 2017 17:12:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rmannibucau@apache.org To: commits@tomee.apache.org Message-Id: <787d9eca2c7249aab894047f1de37950@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: tomee git commit: dont assume libs we use in tests have the righ asm version Date: Thu, 4 May 2017 17:12:44 +0000 (UTC) archived-at: Thu, 04 May 2017 17:12:46 -0000 Repository: tomee Updated Branches: refs/heads/master c26f5923d -> d39434836 dont assume libs we use in tests have the righ asm version Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d3943483 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d3943483 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d3943483 Branch: refs/heads/master Commit: d3943483627ab97e251f6360f24d51391ed4bb00 Parents: c26f592 Author: rmannibucau Authored: Thu May 4 19:12:37 2017 +0200 Committer: rmannibucau Committed: Thu May 4 19:12:37 2017 +0200 ---------------------------------------------------------------------- arquillian/arquillian-tomee-remote/pom.xml | 10 ++++++++-- .../apache/openejb/arquillian/AdditionalLibsTest.java | 5 +++-- .../apache/openejb/arquillian/CheckServerInfoTest.java | 3 ++- .../openejb/arquillian/javaagent/JavaagentTest.java | 11 +++++++---- .../src/test/resources/arquillian.xml | 5 +++-- .../java/org/apache/tomee/catalina/ServerListener.java | 2 +- 6 files changed, 24 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/d3943483/arquillian/arquillian-tomee-remote/pom.xml ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-remote/pom.xml b/arquillian/arquillian-tomee-remote/pom.xml index 2556566..b3eaf03 100644 --- a/arquillian/arquillian-tomee-remote/pom.xml +++ b/arquillian/arquillian-tomee-remote/pom.xml @@ -166,8 +166,14 @@ org.apache.sirona - sirona-web - 0.2-incubating + sirona-api + 0.3-incubating + test + + + com.github.testdriven + cfgagent + 1.0.0 test http://git-wip-us.apache.org/repos/asf/tomee/blob/d3943483/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/AdditionalLibsTest.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/AdditionalLibsTest.java b/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/AdditionalLibsTest.java index 6dcd604..3a21bc8 100644 --- a/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/AdditionalLibsTest.java +++ b/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/AdditionalLibsTest.java @@ -16,7 +16,8 @@ */ package org.apache.openejb.arquillian; -import org.apache.sirona.web.servlet.SironaFilter; +import org.apache.sirona.Role; +import org.apache.sirona.counters.Unit; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.Archive; @@ -49,7 +50,7 @@ public class AdditionalLibsTest { }); assertEquals(1, sirona.length); // web - assertNotNull(new SironaFilter()); // would fail if libs are missing + assertNotNull(new Role("test", Unit.UNARY)); // would fail if libs are missing } private static class Tester { http://git-wip-us.apache.org/repos/asf/tomee/blob/d3943483/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/CheckServerInfoTest.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/CheckServerInfoTest.java b/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/CheckServerInfoTest.java index 266c3d2..b40917d 100644 --- a/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/CheckServerInfoTest.java +++ b/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/CheckServerInfoTest.java @@ -37,6 +37,7 @@ public class CheckServerInfoTest { @Test public void checkServerInfo() { - assertTrue(ServerInfo.getServerInfo().startsWith("Apache Tomcat (TomEE)/")); + final String serverInfo = ServerInfo.getServerInfo(); + assertTrue(serverInfo, serverInfo.startsWith("Apache Tomcat")); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/d3943483/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/javaagent/JavaagentTest.java ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/javaagent/JavaagentTest.java b/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/javaagent/JavaagentTest.java index 6ef2951..821e4af 100644 --- a/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/javaagent/JavaagentTest.java +++ b/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/javaagent/JavaagentTest.java @@ -26,6 +26,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import java.lang.management.ManagementFactory; +import java.util.List; import static org.junit.Assert.fail; @@ -33,16 +34,18 @@ import static org.junit.Assert.fail; public class JavaagentTest { @Deployment public static Archive empty() { - return ShrinkWrap.create(WebArchive.class, "javaagent.war").addAsResource(EmptyAsset.INSTANCE, "foo"); + return ShrinkWrap.create(WebArchive.class, "javaagent.war") + .addAsResource(EmptyAsset.INSTANCE, "foo"); } @Test public void checkAgent() { - for (final String arg : ManagementFactory.getRuntimeMXBean().getInputArguments()) { - if (arg.startsWith("-javaagent") && arg.endsWith("sirona-javaagent-0.2-incubating-shaded.jar")) { + final List inputArguments = ManagementFactory.getRuntimeMXBean().getInputArguments(); + for (final String arg : inputArguments) { + if (arg.startsWith("-javaagent") && arg.endsWith("cfgagent-1.0.0.jar")) { return; } } - fail("didnt find sirona as javaagent"); + fail("didnt find sirona as javaagent: " + inputArguments.toString()); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/d3943483/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml b/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml index dc9fb5b..db472b7 100644 --- a/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml +++ b/arquillian/arquillian-tomee-remote/src/test/resources/arquillian.xml @@ -28,10 +28,11 @@ -1 target/apache-tomee-remote - mvn:org.apache.sirona:sirona-web:0.2-incubating + mvn:org.apache.sirona:sirona-api:0.3-incubating - mvn:org.apache.sirona:sirona-javaagent:0.2-incubating:jar:shaded + # just a javaagent not reading bytecode to not fail cause it doesnt use the wrong asm version + mvn:com.github.testdriven:cfgagent:1.0.0:jar target/arquillian-test-working-dir http://git-wip-us.apache.org/repos/asf/tomee/blob/d3943483/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java index 0235c02..83715dc 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java @@ -199,7 +199,7 @@ public class ServerListener implements LifecycleListener { field.setAccessible(true); final String tomeeVersion = OpenEjbVersion.get().getVersion(); final int modifiers = field.getModifiers(); - if (Modifier.isFinal(modifiers)) { + if (Modifier.isFinal(modifiers)) { // this is a bit fragile, we can surely drop this feature at some point final Field modifiersField = Field.class.getDeclaredField("modifiers"); modifiersField.setAccessible(true); modifiersField.setInt(field, modifiers & ~Modifier.FINAL);