You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2020/04/02 12:40:04 UTC
[tomee] 04/05: Add test
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit abdde00ae91bd6ec2537946d4854ce7c593fcdec
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Thu Apr 2 13:29:32 2020 +0100
Add test
---
.../arquillian/tests/jaxws/TestService.java} | 27 +++++++++-------------
.../jaxws}/WebAppClassLoaderSkipClassesTest.java | 10 ++++----
.../src/test/resources/arquillian.xml | 4 ++++
arquillian/arquillian-tomee-tests/pom.xml | 2 +-
4 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/classloader/webapp/TestServlet.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/TestService.java
similarity index 51%
rename from arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/classloader/webapp/TestServlet.java
rename to arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/TestService.java
index 7ba1fee..53bcded 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/classloader/webapp/TestServlet.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/TestService.java
@@ -14,25 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.arquillian.tests.classloader.webapp;
+package org.apache.openejb.arquillian.tests.jaxws;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import org.apache.commons.logging.Log;
-@WebServlet(urlPatterns = "/test")
-public class TestServlet extends HttpServlet {
- @Override
- protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
+import javax.ejb.Singleton;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
- final ClassLoader tccl = Thread.currentThread().getContextClassLoader();
- ClassLoader parent = tccl.getParent();
+@Path("test")
+@Singleton
+public class TestService {
- System.out.println(parent.getClass().getName());
-
- // org/apache/commons/logging/Log.
+ @GET
+ public String get() {
+ return Log.class.getProtectionDomain().getCodeSource().getLocation().toExternalForm();
}
}
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/classloader/webapp/WebAppClassLoaderSkipClassesTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/WebAppClassLoaderSkipClassesTest.java
similarity index 87%
rename from arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/classloader/webapp/WebAppClassLoaderSkipClassesTest.java
rename to arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/WebAppClassLoaderSkipClassesTest.java
index a11a212..710e862 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/classloader/webapp/WebAppClassLoaderSkipClassesTest.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/WebAppClassLoaderSkipClassesTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.arquillian.tests.classloader.webapp;
+package org.apache.openejb.arquillian.tests.jaxws;
import org.apache.openejb.loader.IO;
import org.jboss.arquillian.container.test.api.Deployment;
@@ -26,6 +26,7 @@ import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.resolver.api.maven.Maven;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -33,8 +34,6 @@ import java.io.File;
import java.io.IOException;
import java.net.URL;
-import static org.junit.Assert.assertEquals;
-
@RunWith(Arquillian.class)
@RunAsClient
public class WebAppClassLoaderSkipClassesTest {
@@ -52,13 +51,14 @@ public class WebAppClassLoaderSkipClassesTest {
return ShrinkWrap.create(WebArchive.class, "WebAppClassLoaderTest.war")
- .addClasses(TestServlet.class)
+ .addClasses(TestService.class)
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
.addAsLibraries(libs);
}
@Test
public void valid() throws IOException {
- assertEquals("true", IO.slurp(new URL(url.toExternalForm() + "test")));
+ final String output = IO.slurp(new URL(url.toExternalForm() + "test"));
+ Assert.assertFalse(output.contains("WEB-INF")); // shouldn't be loaded from the webapp
}
}
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
index bac5665..d24f983 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/src/test/resources/arquillian.xml
@@ -29,6 +29,7 @@
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.
+ tomee.webapp.classloader.forced-skip=org.apache.commons.logging.
</property>
</configuration>
</container>
@@ -43,6 +44,7 @@
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests
+ tomee.webapp.classloader.forced-skip=org.apache.commons.logging.
</property>
</configuration>
</container>
@@ -58,6 +60,7 @@
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests
javax.security.jacc.policy.provider=sun.security.provider.PolicyFile
+ tomee.webapp.classloader.forced-skip=org.apache.commons.logging.
</property>
</configuration>
</container>
@@ -72,6 +75,7 @@
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.
+ tomee.webapp.classloader.forced-skip=org.apache.commons.logging.
</property>
</configuration>
</container>
diff --git a/arquillian/arquillian-tomee-tests/pom.xml b/arquillian/arquillian-tomee-tests/pom.xml
index b7831f8..ee714b4 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -603,7 +603,7 @@
<goal>test</goal>
</goals>
<configuration>
- <skip>${maven.test.skip}</skip>
+ <skip>false</skip>
<systemPropertyVariables>
<openejb.arquillian.debug>true</openejb.arquillian.debug>
<tomee.version>${project.version}</tomee.version>