You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by jl...@apache.org on 2023/05/22 09:06:49 UTC
[johnzon] 07/11: fix: classloading issues because the test jar has too much in it
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch johnzon-1.2.x
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 33b59817dea27053ca3d5cff5e2bd3d970775314
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Mon May 22 11:04:47 2023 +0200
fix: classloading issues because the test jar has too much in it
Signed-off-by: Jean-Louis Monteiro <jl...@tomitribe.com>
---
.../org/apache/johnzon/websocket/JsrCodecTest.java | 9 +++------
.../apache/johnzon/websocket/MapperCodecTest.java | 22 +++++++++-------------
2 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java
index 11d77902..567e5abb 100644
--- a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java
+++ b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/JsrCodecTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.johnzon.websocket;
-import org.apache.johnzon.core.JsonProviderImpl;
import org.apache.johnzon.websocket.endpoint.JsrClientEndpointImpl;
import org.apache.johnzon.websocket.endpoint.JsrServerEndpointImpl;
import org.apache.johnzon.websocket.endpoint.Message;
@@ -37,16 +36,15 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import java.net.URI;
-import java.net.URL;
import javax.json.Json;
import javax.json.JsonObject;
import javax.websocket.CloseReason;
import javax.websocket.ContainerProvider;
import javax.websocket.Session;
import javax.websocket.WebSocketContainer;
+import java.net.URI;
+import java.net.URL;
-import static org.apache.openejb.loader.JarLocation.jarLocation;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -59,8 +57,7 @@ public class JsrCodecTest {
.addAsLibraries(
ShrinkWrap.create(JavaArchive.class, "johnzon-websocket.jar")
.addClasses(FactoryLocator.class, JsrDecoder.class, JsrEncoder.class, JsrObjectDecoder.class, JsrObjectEncoder.class)
- .addPackages(true, JsonProviderImpl.class.getPackage()))
- .addAsLibrary(jarLocation(Json.class));
+ );
}
@ArquillianResource
diff --git a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java
index 2dcc2090..e042cc81 100644
--- a/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java
+++ b/johnzon-websocket/src/test/java/org/apache/johnzon/websocket/MapperCodecTest.java
@@ -18,8 +18,6 @@
*/
package org.apache.johnzon.websocket;
-import org.apache.johnzon.core.JsonProviderImpl;
-import org.apache.johnzon.mapper.Mapper;
import org.apache.johnzon.mapper.MapperBuilder;
import org.apache.johnzon.websocket.endpoint.ClientEndpointImpl;
import org.apache.johnzon.websocket.endpoint.Message;
@@ -40,15 +38,13 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
-import java.net.URI;
-import java.net.URL;
-import javax.json.Json;
import javax.websocket.CloseReason;
import javax.websocket.ContainerProvider;
import javax.websocket.Session;
import javax.websocket.WebSocketContainer;
+import java.net.URI;
+import java.net.URL;
-import static org.apache.openejb.loader.JarLocation.jarLocation;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -57,13 +53,13 @@ public class MapperCodecTest {
@Deployment(testable = false)
public static WebArchive war() {
return ShrinkWrap.create(WebArchive.class, "codec.war")
- .addClasses(ServerEndpointImpl.class, ServerReport.class, Message.class)
- .addAsLibrary(
- ShrinkWrap.create(JavaArchive.class, "johnzon-websocket.jar")
- .addClasses(MapperLocator.class, MapperLocatorDelegate.class, IgnoreIfMissing.class, JohnzonTextDecoder.class, JohnzonTextEncoder.class)
- .addPackages(true, JsonProviderImpl.class.getPackage())
- .addPackages(true, Mapper.class.getPackage()))
- .addAsLibrary(jarLocation(Json.class));
+ .addClasses(ServerEndpointImpl.class, ServerReport.class, Message.class)
+ .addAsLibrary(
+ ShrinkWrap.create(JavaArchive.class, "johnzon-websocket.jar")
+ .addClasses(MapperLocator.class, MapperLocatorDelegate.class,
+ IgnoreIfMissing.class, JohnzonTextDecoder.class,
+ JohnzonTextEncoder.class)
+ );
}
@ArquillianResource