From 7363b5d22692308c688336e62fe48a6721284569 Mon Sep 17 00:00:00 2001 From: davidtrafela Date: Wed, 29 Nov 2023 10:54:34 +0100 Subject: [PATCH] Updated project to Java 21, migrated to Jakarta namespace, updated dependencies to latest versions. --- kumuluzee-arquillian-container/pom.xml | 26 +++--------- .../arquillian/KumuluzEEContainer.java | 16 ++++---- .../arquillian/assets/MainWrapper.java | 8 ++-- .../arquillian/assets/ServletWebListener.java | 11 ++--- .../deployment/AbstractDeployment.java | 10 ++--- .../arquillian/utils/ArchiveUtils.java | 9 ++-- .../arquillian/utils/RequiredLibraries.java | 30 +++++++------- .../arquillian/AddressAlreadyInUseTest.java | 8 ++-- .../arquillian/ArquillianResourceTest.java | 14 +++---- .../arquillian/AutoDiscoveredServletTest.java | 8 ++-- .../ee/testing/arquillian/ConfigTest.java | 16 ++++---- .../arquillian/ConfigWebArchiveTest.java | 16 ++++---- .../arquillian/DescriptorServletTest.java | 10 ++--- .../ee/testing/arquillian/InjectTest.java | 28 ++++++------- .../arquillian/InjectWebArchiveTest.java | 28 ++++++------- .../arquillian/ShouldThrowExceptionTest.java | 15 ++++--- .../assets/AutoDiscoveredServlet.java | 9 ++-- .../testing/arquillian/assets/ConfigBean.java | 2 +- .../arquillian/assets/DescriptorServlet.java | 7 ++-- .../arquillian/assets/InvalidBean.java | 4 +- .../testing/arquillian/assets/SimpleBean.java | 2 +- .../testing/arquillian/jaxrs/JaxRsTest.java | 21 +++++----- .../testing/arquillian/jaxrs/SimpleApp.java | 4 +- .../arquillian/jaxrs/SimpleResource.java | 6 +-- .../src/test/resources/arquillian.xml | 8 ++-- pom.xml | 41 ++++++++++++------- 26 files changed, 177 insertions(+), 180 deletions(-) diff --git a/kumuluzee-arquillian-container/pom.xml b/kumuluzee-arquillian-container/pom.xml index 33c4a1d..2d33c15 100644 --- a/kumuluzee-arquillian-container/pom.xml +++ b/kumuluzee-arquillian-container/pom.xml @@ -5,7 +5,7 @@ kumuluzee-testing com.kumuluz.ee.testing - 1.2.0-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 @@ -14,7 +14,6 @@ kumuluzee-arquillian-container - com.kumuluz.ee @@ -27,25 +26,17 @@ true - - org.jboss.arquillian.container - arquillian-container-spi - - - org.jboss.arquillian.container - arquillian-container-test-spi - org.jboss.arquillian.protocol - arquillian-protocol-servlet + arquillian-protocol-servlet-jakarta org.jboss.arquillian.testenricher - arquillian-testenricher-cdi + arquillian-testenricher-cdi-jakarta org.jboss.arquillian.testenricher - arquillian-testenricher-resource + arquillian-testenricher-resource-jakarta org.jboss.arquillian.testenricher @@ -69,13 +60,8 @@ test - org.jboss.arquillian.junit - arquillian-junit-container - test - - - junit - junit + org.jboss.arquillian.junit5 + arquillian-junit5-container test diff --git a/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/KumuluzEEContainer.java b/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/KumuluzEEContainer.java index adb0334..c949889 100644 --- a/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/KumuluzEEContainer.java +++ b/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/KumuluzEEContainer.java @@ -35,6 +35,7 @@ import java.util.HashMap; import java.util.Map; +import java.util.logging.Level; import java.util.logging.Logger; /** @@ -45,7 +46,7 @@ */ public class KumuluzEEContainer implements DeployableContainer { - private final Logger LOG; // initialized in constructor after logging init + private final Logger log; // initialized in constructor after logging init private static boolean loggingInitialized = false; @@ -57,11 +58,11 @@ private static synchronized void initLogging() { } } - private Map deployments; + private final Map deployments; public KumuluzEEContainer() { initLogging(); - this.LOG = Logger.getLogger(KumuluzEEContainer.class.getName()); + this.log = Logger.getLogger(KumuluzEEContainer.class.getName()); this.deployments = new HashMap<>(); } @@ -95,7 +96,7 @@ public void stop() { @Override public ProtocolDescription getDefaultProtocol() { - return new ProtocolDescription("Servlet 3.0"); + return new ProtocolDescription("Servlet 5.0"); } @Override @@ -122,7 +123,7 @@ public void undeploy(Archive archive) throws DeploymentException { @Override public ProtocolMetaData deploy(Archive archive) throws DeploymentException { - LOG.info("Deploying " + archive.getName()); + log.info("Deploying " + archive.getName()); KumuluzEEContainerConfig containerConfig = KumuluzEEContainerConfig.getInstance(); @@ -131,12 +132,12 @@ public ProtocolMetaData deploy(Archive archive) throws DeploymentException { switch (containerConfig.getPackaging()) { case KumuluzEEContainerConfig.PACKAGING_UBER_JAR: Archive uberJar = ArchiveUtils.generateUberJar(archive); - LOG.fine("UberJar: " + uberJar.toString(true)); + log.log(Level.FINE, "UberJar: {0}", uberJar.toString(true)); deployment = new UberJarDeployment(uberJar); break; case KumuluzEEContainerConfig.PACKAGING_EXPLODED: Archive exploded = ArchiveUtils.generateExploded(archive); - LOG.fine("Exploded structure: " + exploded.toString(true)); + log.log(Level.FINE, "Exploded structure: {0}", exploded.toString(true)); deployment = new ExplodedDeployment(exploded); break; default: @@ -153,5 +154,4 @@ public ProtocolMetaData deploy(Archive archive) throws DeploymentException { metaData.addContext(context); return metaData; } - } diff --git a/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/assets/MainWrapper.java b/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/assets/MainWrapper.java index 0b87196..d92c26d 100644 --- a/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/assets/MainWrapper.java +++ b/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/assets/MainWrapper.java @@ -51,8 +51,8 @@ public static void main(String[] args) { EeApplication app = new EeApplication(); - KumuluzServer server = app.getServer(); - if (server instanceof ServletServer) { + KumuluzServer ser = app.getServer(); + if (ser instanceof ServletServer server) { // print metadata (gets intercepted by parent process) // print port Integer port = EeConfig.getInstance().getServer().getHttp().getPort(); @@ -61,11 +61,11 @@ public static void main(String[] args) { metadataSb.append(MSG_METADATA_PREFIX).append(port).append('\t'); // print information about the servlets - List servlets = ((ServletServer) server).getRegisteredServlets(); + List servlets = server.getRegisteredServlets(); for (ServletWrapper s : servlets) { metadataSb.append(s.getName()).append(':').append(s.getContextPath()).append('\t'); } - System.out.println(metadataSb.toString()); + System.out.println(metadataSb); } System.out.println(MSG_SERVER_STARTED); diff --git a/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/assets/ServletWebListener.java b/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/assets/ServletWebListener.java index 4956ea9..a39b81c 100644 --- a/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/assets/ServletWebListener.java +++ b/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/assets/ServletWebListener.java @@ -20,11 +20,11 @@ */ package com.kumuluz.ee.testing.arquillian.assets; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletRegistration; -import javax.servlet.annotation.WebListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.ServletRegistration; +import jakarta.servlet.annotation.WebListener; /** * Adds Arquillian Servlet mapping to the web container. @@ -57,6 +57,7 @@ public void contextDestroyed(ServletContextEvent servletContextEvent) { private boolean isClassPresent(String classname) { try { + System.out.println("Checking for class: " + classname); Class.forName(classname); return true; } catch (ClassNotFoundException e) { diff --git a/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/deployment/AbstractDeployment.java b/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/deployment/AbstractDeployment.java index 61a4fbc..e721d68 100644 --- a/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/deployment/AbstractDeployment.java +++ b/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/deployment/AbstractDeployment.java @@ -60,7 +60,7 @@ public abstract class AbstractDeployment { private Process process; - public AbstractDeployment(Archive archive) { + protected AbstractDeployment(Archive archive) { this.archive = archive; this.containerConfig = KumuluzEEContainerConfig.getInstance(); this.shouldDelete = this.containerConfig.shouldDeleteTemporaryFiles(); @@ -96,7 +96,7 @@ public HTTPContext start() throws DeploymentException { Path javaPath; - if (!this.containerConfig.getJavaPath().equals("")) { + if (!this.containerConfig.getJavaPath().isEmpty()) { // java binary is specified in container configuration javaPath = Paths.get(this.containerConfig.getJavaPath()); @@ -171,10 +171,8 @@ public void stop() { } // clean up tmp files - if (shouldDelete) { - if (tmpDir.toFile().exists()) { - deleteDirectory(tmpDir.toFile()); - } + if (shouldDelete && tmpDir.toFile().exists()) { + deleteDirectory(tmpDir.toFile()); } } diff --git a/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/utils/ArchiveUtils.java b/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/utils/ArchiveUtils.java index bc7cb33..86b605a 100644 --- a/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/utils/ArchiveUtils.java +++ b/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/utils/ArchiveUtils.java @@ -45,6 +45,10 @@ public class ArchiveUtils { private static final Logger LOG = Logger.getLogger(ArchiveUtils.class.getName()); + private ArchiveUtils() { + throw new IllegalStateException("Utility class"); + } + /** * These classes are added to the root of the archive */ @@ -192,10 +196,9 @@ private static void fixArchiveAssets(Archive a, String parentDir) { Archive tmp = ShrinkWrap.create(JavaArchive.class); List pathsToDelete = new ArrayList<>(); for (Node child : n.getChildren()) { - Asset childAsset = child.getAsset(); - if (childAsset instanceof ArchiveAsset && child.getPath().get().endsWith(".jar")) { + Asset asset = child.getAsset(); + if (asset instanceof ArchiveAsset archiveAsset && child.getPath().get().endsWith(".jar")) { LOG.fine("Converting archive " + child.getPath().get() + " to ByteArrayAsset"); - ArchiveAsset archiveAsset = (ArchiveAsset) childAsset; ByteArrayAsset bas = new ByteArrayAsset(archiveAsset.openStream()); pathsToDelete.add(child.getPath()); tmp.add(bas, child.getPath()); diff --git a/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/utils/RequiredLibraries.java b/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/utils/RequiredLibraries.java index f50bd76..f378f6d 100644 --- a/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/utils/RequiredLibraries.java +++ b/kumuluzee-arquillian-container/src/main/java/com/kumuluz/ee/testing/arquillian/utils/RequiredLibraries.java @@ -47,6 +47,10 @@ public class RequiredLibraries { private static final Logger LOG = Logger.getLogger(RequiredLibraries.class.getName()); + private RequiredLibraries() { + throw new IllegalStateException("Utility class"); + } + private static final String[] LIBS_DEFAULT = { "com.kumuluz.ee:kumuluzee-core:", "com.kumuluz.ee:kumuluzee-servlet-jetty:", @@ -125,21 +129,15 @@ public static Archive[] getRequiredLibraries(List deploymentLibs) { * @return A list of dependencies. */ private static List getIncludedLibraries(String includeRequiredLibraries) { - switch (includeRequiredLibraries) { - case KumuluzEEContainerConfig.INCLUDE_LIBS_FALSE: - case KumuluzEEContainerConfig.INCLUDE_LIBS_FROM_POM: - return Collections.emptyList(); - case KumuluzEEContainerConfig.INCLUDE_LIBS_DEFAULT: - return Arrays.asList(LIBS_DEFAULT); - case KumuluzEEContainerConfig.INCLUDE_LIBS_MP1_0: - return Arrays.asList(LIBS_MP1_0); - case KumuluzEEContainerConfig.INCLUDE_LIBS_MP1_1: - return Arrays.asList(LIBS_MP1_1); - case KumuluzEEContainerConfig.INCLUDE_LIBS_MP1_2: - return Arrays.asList(LIBS_MP1_2); - default: - throw new RuntimeException("Could not determine includeRequiredLibraries parameter: " + - includeRequiredLibraries); - } + return switch (includeRequiredLibraries) { + case KumuluzEEContainerConfig.INCLUDE_LIBS_FALSE, KumuluzEEContainerConfig.INCLUDE_LIBS_FROM_POM -> + Collections.emptyList(); + case KumuluzEEContainerConfig.INCLUDE_LIBS_DEFAULT -> Arrays.asList(LIBS_DEFAULT); + case KumuluzEEContainerConfig.INCLUDE_LIBS_MP1_0 -> Arrays.asList(LIBS_MP1_0); + case KumuluzEEContainerConfig.INCLUDE_LIBS_MP1_1 -> Arrays.asList(LIBS_MP1_1); + case KumuluzEEContainerConfig.INCLUDE_LIBS_MP1_2 -> Arrays.asList(LIBS_MP1_2); + default -> throw new RuntimeException("Could not determine includeRequiredLibraries parameter: " + + includeRequiredLibraries); + }; } } diff --git a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/AddressAlreadyInUseTest.java b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/AddressAlreadyInUseTest.java index 37a751f..96492a8 100644 --- a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/AddressAlreadyInUseTest.java +++ b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/AddressAlreadyInUseTest.java @@ -23,12 +23,12 @@ import com.kumuluz.ee.common.exceptions.KumuluzServerException; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; /** * Starts two deployments and tests for "Address is already in use" exception. @@ -36,7 +36,7 @@ * @author Urban Malc * @since 1.1.0 */ -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AddressAlreadyInUseTest { @Deployment(name = "deployment1", order = 1) diff --git a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/ArquillianResourceTest.java b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/ArquillianResourceTest.java index 9741d09..4cbad93 100644 --- a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/ArquillianResourceTest.java +++ b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/ArquillianResourceTest.java @@ -22,11 +22,11 @@ import com.kumuluz.ee.testing.arquillian.provider.SimplePojo; import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; /** * Tests injection of {@link ArquillianResource}. @@ -35,7 +35,7 @@ * @since 1.0.0 */ @SuppressWarnings("ArquillianDeploymentAbsent") -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) @RunAsClient public class ArquillianResourceTest { @@ -44,7 +44,7 @@ public class ArquillianResourceTest { @Test public void arquillianResourceTest() { - Assert.assertNotNull(simplePojo); - Assert.assertEquals(42, simplePojo.getNumber()); + Assertions.assertNotNull(simplePojo); + Assertions.assertEquals(42, simplePojo.getNumber()); } } diff --git a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/AutoDiscoveredServletTest.java b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/AutoDiscoveredServletTest.java index 66e1162..7161fc2 100644 --- a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/AutoDiscoveredServletTest.java +++ b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/AutoDiscoveredServletTest.java @@ -23,11 +23,11 @@ import com.kumuluz.ee.testing.arquillian.assets.AutoDiscoveredServlet; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import static io.restassured.RestAssured.when; import static org.hamcrest.Matchers.is; @@ -38,7 +38,7 @@ * @author Urban Malc * @since 1.0.0 */ -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AutoDiscoveredServletTest { @Deployment(testable = false) diff --git a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/ConfigTest.java b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/ConfigTest.java index 0525ec8..a9ec2e0 100644 --- a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/ConfigTest.java +++ b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/ConfigTest.java @@ -21,16 +21,16 @@ package com.kumuluz.ee.testing.arquillian; import com.kumuluz.ee.testing.arquillian.assets.ConfigBean; +import jakarta.inject.Inject; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -import javax.inject.Inject; import java.util.Optional; /** @@ -39,7 +39,7 @@ * @author Urban Malc * @since 1.0.0 */ -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class ConfigTest { @Deployment @@ -57,7 +57,7 @@ public static JavaArchive createDeployment() { public void configTest() { Optional configValue = configBean.getConfigValue(); - Assert.assertTrue(configValue.isPresent()); - Assert.assertEquals("config-hello", configValue.get()); + Assertions.assertTrue(configValue.isPresent()); + Assertions.assertEquals("config-hello", configValue.get()); } } diff --git a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/ConfigWebArchiveTest.java b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/ConfigWebArchiveTest.java index 6872508..762d2ea 100644 --- a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/ConfigWebArchiveTest.java +++ b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/ConfigWebArchiveTest.java @@ -21,17 +21,17 @@ package com.kumuluz.ee.testing.arquillian; import com.kumuluz.ee.testing.arquillian.assets.ConfigBean; +import jakarta.inject.Inject; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -import javax.inject.Inject; import java.util.Optional; /** @@ -40,7 +40,7 @@ * @author Urban Malc * @since 1.0.0 */ -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class ConfigWebArchiveTest { @Deployment @@ -59,7 +59,7 @@ public static WebArchive createDeployment() { public void configTest() { Optional configValue = configBean.getConfigValue(); - Assert.assertTrue(configValue.isPresent()); - Assert.assertEquals("config-hello", configValue.get()); + Assertions.assertTrue(configValue.isPresent()); + Assertions.assertEquals("config-hello", configValue.get()); } } diff --git a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/DescriptorServletTest.java b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/DescriptorServletTest.java index caaf608..8fe3a74 100644 --- a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/DescriptorServletTest.java +++ b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/DescriptorServletTest.java @@ -23,11 +23,11 @@ import com.kumuluz.ee.testing.arquillian.assets.DescriptorServlet; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import static io.restassured.RestAssured.when; import static org.hamcrest.Matchers.is; @@ -38,7 +38,7 @@ * @author Urban Malc * @since 1.0.0 */ -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class DescriptorServletTest { @Deployment(testable = false) @@ -50,7 +50,7 @@ public static JavaArchive createDeployment() { @Test @RunAsClient - public void responseTest() { + void responseTest() { when().get("/test").then().statusCode(200).and().body(is("descriptor-hello")); } } diff --git a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/InjectTest.java b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/InjectTest.java index 27f0867..bbd27ea 100644 --- a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/InjectTest.java +++ b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/InjectTest.java @@ -24,18 +24,18 @@ import com.kumuluz.ee.testing.arquillian.provider.SimplePojo; import com.kumuluz.ee.testing.arquillian.provider.SimpleResourceProvider; import com.kumuluz.ee.testing.arquillian.provider.SimpleResourceProviderRemoteExtension; +import jakarta.inject.Inject; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.spi.RemoteLoadableExtension; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -import javax.inject.Inject; import javax.naming.InitialContext; /** @@ -44,7 +44,7 @@ * @author Urban Malc * @since 1.0.0 */ -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class InjectTest { @Deployment @@ -68,19 +68,19 @@ public static JavaArchive createDeployment() { private InitialContext initialContext; @Test - public void injectTest() { - Assert.assertNotNull(bean); - Assert.assertEquals("bean-hello", bean.sayHello()); + void injectTest() { + Assertions.assertNotNull(bean); + Assertions.assertEquals("bean-hello", bean.sayHello()); } @Test - public void arquillianResourceTest() { - Assert.assertNotNull(arquillianProvidedPojo); - Assert.assertEquals(42, arquillianProvidedPojo.getNumber()); + void arquillianResourceTest() { + Assertions.assertNotNull(arquillianProvidedPojo); + Assertions.assertEquals(42, arquillianProvidedPojo.getNumber()); } @Test - public void initialContextTest() { - Assert.assertNotNull(initialContext); + void initialContextTest() { + Assertions.assertNotNull(initialContext); } } diff --git a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/InjectWebArchiveTest.java b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/InjectWebArchiveTest.java index dce8757..4f12d28 100644 --- a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/InjectWebArchiveTest.java +++ b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/InjectWebArchiveTest.java @@ -24,19 +24,19 @@ import com.kumuluz.ee.testing.arquillian.provider.SimplePojo; import com.kumuluz.ee.testing.arquillian.provider.SimpleResourceProvider; import com.kumuluz.ee.testing.arquillian.provider.SimpleResourceProviderRemoteExtension; +import jakarta.inject.Inject; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.spi.RemoteLoadableExtension; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; -import javax.inject.Inject; import javax.naming.InitialContext; /** @@ -45,7 +45,7 @@ * @author Urban Malc * @since 1.0.0 */ -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class InjectWebArchiveTest { @Deployment @@ -70,19 +70,19 @@ public static WebArchive createDeployment() { private InitialContext initialContext; @Test - public void injectTest() { - Assert.assertNotNull(bean); - Assert.assertEquals("bean-hello", bean.sayHello()); + void injectTest() { + Assertions.assertNotNull(bean); + Assertions.assertEquals("bean-hello", bean.sayHello()); } @Test - public void arquillianResourceTest() { - Assert.assertNotNull(arquillianProvidedPojo); - Assert.assertEquals(42, arquillianProvidedPojo.getNumber()); + void arquillianResourceTest() { + Assertions.assertNotNull(arquillianProvidedPojo); + Assertions.assertEquals(42, arquillianProvidedPojo.getNumber()); } @Test - public void initialContextTest() { - Assert.assertNotNull(initialContext); + void initialContextTest() { + Assertions.assertNotNull(initialContext); } } diff --git a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/ShouldThrowExceptionTest.java b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/ShouldThrowExceptionTest.java index 522c8a6..1158b99 100644 --- a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/ShouldThrowExceptionTest.java +++ b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/ShouldThrowExceptionTest.java @@ -21,16 +21,15 @@ package com.kumuluz.ee.testing.arquillian; import com.kumuluz.ee.testing.arquillian.assets.InvalidBean; +import jakarta.enterprise.inject.spi.DeploymentException; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.Test; -import org.junit.runner.RunWith; - -import javax.enterprise.inject.spi.DeploymentException; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; /** * Tests the {@link ShouldThrowException} annotation. @@ -38,11 +37,10 @@ * @author Urban Malc * @since 1.1.0 */ -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class ShouldThrowExceptionTest { @Deployment - @ShouldThrowException(DeploymentException.class) public static JavaArchive createDeployment() { return ShrinkWrap.create(JavaArchive.class) .addClass(InvalidBean.class) @@ -50,7 +48,8 @@ public static JavaArchive createDeployment() { } @Test - public void ignored() { + @ShouldThrowException(DeploymentException.class) + void ignored() { // NO-OP, see @ShouldThrowException above } } diff --git a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/AutoDiscoveredServlet.java b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/AutoDiscoveredServlet.java index 5729ca9..875912f 100644 --- a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/AutoDiscoveredServlet.java +++ b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/AutoDiscoveredServlet.java @@ -20,10 +20,11 @@ */ package com.kumuluz.ee.testing.arquillian.assets; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; /** diff --git a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/ConfigBean.java b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/ConfigBean.java index 3afb4fd..8f9cf7f 100644 --- a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/ConfigBean.java +++ b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/ConfigBean.java @@ -21,8 +21,8 @@ package com.kumuluz.ee.testing.arquillian.assets; import com.kumuluz.ee.configuration.utils.ConfigurationUtil; +import jakarta.enterprise.context.Dependent; -import javax.enterprise.context.Dependent; import java.util.Optional; /** diff --git a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/DescriptorServlet.java b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/DescriptorServlet.java index 7924f0a..5818e89 100644 --- a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/DescriptorServlet.java +++ b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/DescriptorServlet.java @@ -20,9 +20,10 @@ */ package com.kumuluz.ee.testing.arquillian.assets; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import java.io.IOException; /** diff --git a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/InvalidBean.java b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/InvalidBean.java index 0f3180d..b99e567 100644 --- a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/InvalidBean.java +++ b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/InvalidBean.java @@ -20,8 +20,8 @@ */ package com.kumuluz.ee.testing.arquillian.assets; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; /** * Bean that tries to inject a String but fails because there is no producer for String type. diff --git a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/SimpleBean.java b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/SimpleBean.java index ffdfb25..fd3e3ee 100644 --- a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/SimpleBean.java +++ b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/assets/SimpleBean.java @@ -20,7 +20,7 @@ */ package com.kumuluz.ee.testing.arquillian.assets; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; /** * Bean with a simple response method. diff --git a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/jaxrs/JaxRsTest.java b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/jaxrs/JaxRsTest.java index c6094fa..e4c0a18 100644 --- a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/jaxrs/JaxRsTest.java +++ b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/jaxrs/JaxRsTest.java @@ -22,14 +22,13 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.junit.InSequence; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.*; +import org.junit.jupiter.api.extension.ExtendWith; import static io.restassured.RestAssured.when; import static org.hamcrest.Matchers.is; @@ -40,7 +39,8 @@ * @author Urban Malc * @since 1.0.0 */ -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) +@TestMethodOrder(MethodOrderer.MethodName.class) public class JaxRsTest { @Deployment public static JavaArchive createDeployment() { @@ -51,14 +51,15 @@ public static JavaArchive createDeployment() { } @Test - @InSequence(-1) // run first - public void dependencyAppenderTest() throws ClassNotFoundException { - Assert.assertNotNull(Class.forName("javax.ws.rs.core.Application")); + @Order(1) // run first + void dependencyAppenderTest() throws ClassNotFoundException { + Assertions.assertNotNull(Class.forName("jakarta.ws.rs.core.Application")); } @Test @RunAsClient - public void resourceTest() { + @Order(2) + void resourceTest() { when().get("/test").then().statusCode(200).and().body(is("hello")); } } diff --git a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/jaxrs/SimpleApp.java b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/jaxrs/SimpleApp.java index 7ce142e..3933908 100644 --- a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/jaxrs/SimpleApp.java +++ b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/jaxrs/SimpleApp.java @@ -20,8 +20,8 @@ */ package com.kumuluz.ee.testing.arquillian.jaxrs; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; /** * Simple JAX-RS application. diff --git a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/jaxrs/SimpleResource.java b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/jaxrs/SimpleResource.java index 9d00fa4..2dcb347 100644 --- a/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/jaxrs/SimpleResource.java +++ b/kumuluzee-arquillian-container/src/test/java/com/kumuluz/ee/testing/arquillian/jaxrs/SimpleResource.java @@ -20,9 +20,9 @@ */ package com.kumuluz.ee.testing.arquillian.jaxrs; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; /** * Simple JAX-RS resource. diff --git a/kumuluzee-arquillian-container/src/test/resources/arquillian.xml b/kumuluzee-arquillian-container/src/test/resources/arquillian.xml index e1cf465..1c26295 100644 --- a/kumuluzee-arquillian-container/src/test/resources/arquillian.xml +++ b/kumuluzee-arquillian-container/src/test/resources/arquillian.xml @@ -1,8 +1,7 @@ - - + @@ -11,5 +10,4 @@ - \ No newline at end of file diff --git a/pom.xml b/pom.xml index b50402b..5386511 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.kumuluz.ee.testing kumuluzee-testing pom - 1.2.0-SNAPSHOT + 2.0.0-SNAPSHOT kumuluzee-arquillian-container @@ -22,22 +22,22 @@ https://ee.kumuluz.com - 1.8 - 1.8 + 21 + 21 UTF-8 - 3.12.0 + 5.0.0-SNAPSHOT - 1.6.0.Final + 1.8.0.Final 1.2.6 - 3.1.4 + 3.2.1 - 4.13.1 - 4.3.3 + 5.10.1 + 5.3.2 - 3.8.1 - 1.6.8 - 1.6 + 3.11.0 + 1.6.13 + 3.1.0 @@ -98,12 +98,13 @@ import - org.jboss.arquillian - arquillian-bom + org.jboss.arquillian.jakarta + arquillian-parent-jakarta ${arquillian.version} pom import + org.jboss.shrinkwrap.resolver shrinkwrap-resolver-depchain @@ -124,9 +125,11 @@ - junit - junit + org.junit + junit-bom ${junit.version} + pom + import io.rest-assured @@ -136,6 +139,14 @@ + + + org.junit.jupiter + junit-jupiter + test + + +