diff --git a/batch-processing/pom.xml b/batch-processing/pom.xml index 52bea365d3..a79fcfec8c 100644 --- a/batch-processing/pom.xml +++ b/batch-processing/pom.xml @@ -173,8 +173,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/batch-processing/src/test/java/org/jboss/as/quickstarts/batch/BasicRuntimeIT.java b/batch-processing/src/test/java/org/jboss/as/quickstarts/batch/BasicRuntimeIT.java index 33c83244f9..ffda43fb62 100644 --- a/batch-processing/src/test/java/org/jboss/as/quickstarts/batch/BasicRuntimeIT.java +++ b/batch-processing/src/test/java/org/jboss/as/quickstarts/batch/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.batch; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/bmt/pom.xml b/bmt/pom.xml index ad42bff202..f295774f9c 100644 --- a/bmt/pom.xml +++ b/bmt/pom.xml @@ -114,8 +114,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/bmt/src/test/java/org/jboss/as/quickstarts/bmt/BasicRuntimeIT.java b/bmt/src/test/java/org/jboss/as/quickstarts/bmt/BasicRuntimeIT.java index 64370391c6..9e1f179ad2 100644 --- a/bmt/src/test/java/org/jboss/as/quickstarts/bmt/BasicRuntimeIT.java +++ b/bmt/src/test/java/org/jboss/as/quickstarts/bmt/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.bmt; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/cmt/pom.xml b/cmt/pom.xml index 6c551d9e84..e5e9e1ab3b 100644 --- a/cmt/pom.xml +++ b/cmt/pom.xml @@ -117,8 +117,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/cmt/src/test/java/org/jboss/as/quickstarts/cmt/BasicRuntimeIT.java b/cmt/src/test/java/org/jboss/as/quickstarts/cmt/BasicRuntimeIT.java index c9d2a8b517..92b02d1f49 100644 --- a/cmt/src/test/java/org/jboss/as/quickstarts/cmt/BasicRuntimeIT.java +++ b/cmt/src/test/java/org/jboss/as/quickstarts/cmt/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.cmt; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/cmt/src/test/java/org/jboss/as/quickstarts/cmt/CustomerIT.java b/cmt/src/test/java/org/jboss/as/quickstarts/cmt/CustomerIT.java index 9c07287120..013e6133fa 100644 --- a/cmt/src/test/java/org/jboss/as/quickstarts/cmt/CustomerIT.java +++ b/cmt/src/test/java/org/jboss/as/quickstarts/cmt/CustomerIT.java @@ -31,8 +31,8 @@ import java.net.http.HttpResponse; import java.nio.charset.StandardCharsets; import java.util.Map; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class CustomerIT { @@ -74,8 +74,8 @@ public void addCustomer(String name) throws IOException, InterruptedException { .build(); HttpResponse response = client.send(HttpRequest.newBuilder(getHTTPEndpoint("/addCustomer.jsf")).GET().build(), HttpResponse.BodyHandlers.ofString()); String body = response.body().toString(); - Assert.assertEquals(200, response.statusCode()); - Assert.assertTrue(body, body.contains(" data) { diff --git a/cmt/src/test/java/org/jboss/as/quickstarts/cmt/ejb/CustomerManagerEJBTest.java b/cmt/src/test/java/org/jboss/as/quickstarts/cmt/ejb/CustomerManagerEJBTest.java index 1c16ba6d2f..e32e2f4d35 100644 --- a/cmt/src/test/java/org/jboss/as/quickstarts/cmt/ejb/CustomerManagerEJBTest.java +++ b/cmt/src/test/java/org/jboss/as/quickstarts/cmt/ejb/CustomerManagerEJBTest.java @@ -16,10 +16,10 @@ */ package org.jboss.as.quickstarts.cmt.ejb; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CustomerManagerEJBTest { @Test diff --git a/ee-security/pom.xml b/ee-security/pom.xml index 4c79911be0..48c46089ea 100644 --- a/ee-security/pom.xml +++ b/ee-security/pom.xml @@ -97,8 +97,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/ee-security/src/test/java/org/jboss/as/quickstarts/ee_security/BasicRuntimeIT.java b/ee-security/src/test/java/org/jboss/as/quickstarts/ee_security/BasicRuntimeIT.java index dbb277e7a6..51ce71b2a9 100644 --- a/ee-security/src/test/java/org/jboss/as/quickstarts/ee_security/BasicRuntimeIT.java +++ b/ee-security/src/test/java/org/jboss/as/quickstarts/ee_security/BasicRuntimeIT.java @@ -20,7 +20,7 @@ */ package org.jboss.as.quickstarts.ee_security; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -29,7 +29,7 @@ import java.net.http.HttpRequest; import java.net.http.HttpResponse; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * diff --git a/ejb-multi-server/app-web/pom.xml b/ejb-multi-server/app-web/pom.xml index f14467a1fe..ef72ba5a2f 100644 --- a/ejb-multi-server/app-web/pom.xml +++ b/ejb-multi-server/app-web/pom.xml @@ -66,8 +66,9 @@ provided - junit - junit + org.junit.jupiter + junit-jupiter + test diff --git a/ejb-multi-server/app-web/src/test/java/org/jboss/as/quickstarts/ejb/multi/server/app/BasicRuntimeIT.java b/ejb-multi-server/app-web/src/test/java/org/jboss/as/quickstarts/ejb/multi/server/app/BasicRuntimeIT.java index 81269516bf..b05b3dc65d 100644 --- a/ejb-multi-server/app-web/src/test/java/org/jboss/as/quickstarts/ejb/multi/server/app/BasicRuntimeIT.java +++ b/ejb-multi-server/app-web/src/test/java/org/jboss/as/quickstarts/ejb/multi/server/app/BasicRuntimeIT.java @@ -1,6 +1,6 @@ package org.jboss.as.quickstarts.ejb.multi.server.app; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -10,7 +10,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class BasicRuntimeIT { private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; diff --git a/ejb-remote/pom.xml b/ejb-remote/pom.xml index e3d761c4f5..fa241a2f8d 100644 --- a/ejb-remote/pom.xml +++ b/ejb-remote/pom.xml @@ -87,8 +87,8 @@ test - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/ejb-remote/src/test/java/org/jboss/as/quickstarts/ejb/remote/BasicRuntimeIT.java b/ejb-remote/src/test/java/org/jboss/as/quickstarts/ejb/remote/BasicRuntimeIT.java index a3206e8f88..d344bc0cd2 100644 --- a/ejb-remote/src/test/java/org/jboss/as/quickstarts/ejb/remote/BasicRuntimeIT.java +++ b/ejb-remote/src/test/java/org/jboss/as/quickstarts/ejb/remote/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.ejb.remote; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/ejb-remote/src/test/java/org/jboss/as/quickstarts/ejb/remote/EJBRemoteIT.java b/ejb-remote/src/test/java/org/jboss/as/quickstarts/ejb/remote/EJBRemoteIT.java index 10b1a35702..7547fd0972 100644 --- a/ejb-remote/src/test/java/org/jboss/as/quickstarts/ejb/remote/EJBRemoteIT.java +++ b/ejb-remote/src/test/java/org/jboss/as/quickstarts/ejb/remote/EJBRemoteIT.java @@ -17,8 +17,8 @@ import org.jboss.as.quickstarts.ejb.remote.stateful.RemoteCounter; import org.jboss.as.quickstarts.ejb.remote.stateless.RemoteCalculator; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import javax.naming.Context; import javax.naming.InitialContext; @@ -75,7 +75,7 @@ public void testCalculator() throws NamingException { System.out.println("Adding " + a + " and " + b + " via the remote stateless calculator deployed on the server"); int sum = statelessRemoteCalculator.add(a, b); System.out.println("Remote calculator returned sum = " + sum); - Assert.assertEquals("Unexpected remote stateless calculator sum", (a + b), sum); + Assertions.assertEquals((a + b), sum, "Unexpected remote stateless calculator sum"); // try one more invocation, this time for subtraction int num1 = 3434; int num2 = 2332; @@ -83,7 +83,7 @@ public void testCalculator() throws NamingException { + " via the remote stateless calculator deployed on the server"); int difference = statelessRemoteCalculator.subtract(num1, num2); System.out.println("Remote calculator returned difference = " + difference); - Assert.assertEquals("Unexpected remote stateless calculator difference", (num1 - num2), difference); + Assertions.assertEquals((num1 - num2), difference, "Unexpected remote stateless calculator difference"); context.close(); } @@ -121,7 +121,7 @@ public void testCounter() throws NamingException { statefulRemoteCounter.increment(); System.out.println("Count after increment is " + statefulRemoteCounter.getCount()); } - Assert.assertEquals("Unexpected remote stateful counter value after increments", NUM_TIMES, statefulRemoteCounter.getCount()); + Assertions.assertEquals(NUM_TIMES, statefulRemoteCounter.getCount(), "Unexpected remote stateful counter value after increments"); // now decrementing System.out.println("Counter will now be decremented " + NUM_TIMES + " times"); for (int i = NUM_TIMES; i > 0; i--) { @@ -129,7 +129,7 @@ public void testCounter() throws NamingException { statefulRemoteCounter.decrement(); System.out.println("Count after decrement is " + statefulRemoteCounter.getCount()); } - Assert.assertEquals("Unexpected remote stateful counter value after decrements", 0, statefulRemoteCounter.getCount()); + Assertions.assertEquals(0, statefulRemoteCounter.getCount(), "Unexpected remote stateful counter value after decrements"); context.close(); } } diff --git a/ejb-security-context-propagation/pom.xml b/ejb-security-context-propagation/pom.xml index ab989fb08a..03572cec90 100644 --- a/ejb-security-context-propagation/pom.xml +++ b/ejb-security-context-propagation/pom.xml @@ -101,8 +101,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/ejb-security-context-propagation/src/test/java/org/jboss/as/quickstarts/ejb_security_context_propagation/BasicRuntimeIT.java b/ejb-security-context-propagation/src/test/java/org/jboss/as/quickstarts/ejb_security_context_propagation/BasicRuntimeIT.java index a3f896f551..7e9274ab72 100644 --- a/ejb-security-context-propagation/src/test/java/org/jboss/as/quickstarts/ejb_security_context_propagation/BasicRuntimeIT.java +++ b/ejb-security-context-propagation/src/test/java/org/jboss/as/quickstarts/ejb_security_context_propagation/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.ejb_security_context_propagation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/ejb-security-context-propagation/src/test/java/org/jboss/as/quickstarts/ejb_security_context_propagation/SecurityContextPropagationIT.java b/ejb-security-context-propagation/src/test/java/org/jboss/as/quickstarts/ejb_security_context_propagation/SecurityContextPropagationIT.java index 9f746aa823..287e426c50 100644 --- a/ejb-security-context-propagation/src/test/java/org/jboss/as/quickstarts/ejb_security_context_propagation/SecurityContextPropagationIT.java +++ b/ejb-security-context-propagation/src/test/java/org/jboss/as/quickstarts/ejb_security_context_propagation/SecurityContextPropagationIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.ejb_security_context_propagation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.wildfly.security.auth.client.AuthenticationConfiguration; import org.wildfly.security.auth.client.AuthenticationContext; import org.wildfly.security.auth.client.MatchRule; diff --git a/ejb-security-programmatic-auth/pom.xml b/ejb-security-programmatic-auth/pom.xml index e6daad4e29..e5f3d946ef 100644 --- a/ejb-security-programmatic-auth/pom.xml +++ b/ejb-security-programmatic-auth/pom.xml @@ -49,7 +49,7 @@ 42.0.0.Final ${version.server} - 6.0.3.Final + 6.0.3.Final @@ -99,8 +99,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/ejb-security-programmatic-auth/src/test/java/org/jboss/as/quickstarts/ejb_security_programmatic_auth/BasicRuntimeIT.java b/ejb-security-programmatic-auth/src/test/java/org/jboss/as/quickstarts/ejb_security_programmatic_auth/BasicRuntimeIT.java index 436274e2d2..bb8804a4d3 100644 --- a/ejb-security-programmatic-auth/src/test/java/org/jboss/as/quickstarts/ejb_security_programmatic_auth/BasicRuntimeIT.java +++ b/ejb-security-programmatic-auth/src/test/java/org/jboss/as/quickstarts/ejb_security_programmatic_auth/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.ejb_security_programmatic_auth; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -27,7 +27,7 @@ import java.time.Duration; import java.util.Base64; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/ejb-throws-exception/web/pom.xml b/ejb-throws-exception/web/pom.xml index faea2f42e6..edefd00e62 100644 --- a/ejb-throws-exception/web/pom.xml +++ b/ejb-throws-exception/web/pom.xml @@ -77,8 +77,8 @@ provided - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/ejb-throws-exception/web/src/test/java/org/jboss/as/quickstarts/ear/controller/BasicRuntimeIT.java b/ejb-throws-exception/web/src/test/java/org/jboss/as/quickstarts/ear/controller/BasicRuntimeIT.java index 0706fb3958..2dd5cc6fd6 100644 --- a/ejb-throws-exception/web/src/test/java/org/jboss/as/quickstarts/ear/controller/BasicRuntimeIT.java +++ b/ejb-throws-exception/web/src/test/java/org/jboss/as/quickstarts/ear/controller/BasicRuntimeIT.java @@ -16,7 +16,7 @@ * limitations under the License. */ -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -26,7 +26,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/ejb-timer/pom.xml b/ejb-timer/pom.xml index 6e811345fc..929a8072d8 100644 --- a/ejb-timer/pom.xml +++ b/ejb-timer/pom.xml @@ -99,8 +99,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/ejb-timer/src/test/java/org/jboss/as/quickstarts/ejb/timer/BasicRuntimeIT.java b/ejb-timer/src/test/java/org/jboss/as/quickstarts/ejb/timer/BasicRuntimeIT.java index 0728dbbda1..879bcbe5c0 100644 --- a/ejb-timer/src/test/java/org/jboss/as/quickstarts/ejb/timer/BasicRuntimeIT.java +++ b/ejb-timer/src/test/java/org/jboss/as/quickstarts/ejb/timer/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.ejb.timer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class BasicRuntimeIT { private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; diff --git a/ejb-txn-remote-call/client/pom.xml b/ejb-txn-remote-call/client/pom.xml index 94bbdbda06..f66eeb1fa1 100644 --- a/ejb-txn-remote-call/client/pom.xml +++ b/ejb-txn-remote-call/client/pom.xml @@ -138,8 +138,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/ejb-txn-remote-call/client/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java b/ejb-txn-remote-call/client/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java index f35c427310..22dfa9627a 100644 --- a/ejb-txn-remote-call/client/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java +++ b/ejb-txn-remote-call/client/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.ejb; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/ejb-txn-remote-call/server/pom.xml b/ejb-txn-remote-call/server/pom.xml index 39b829cbe9..72478ad316 100644 --- a/ejb-txn-remote-call/server/pom.xml +++ b/ejb-txn-remote-call/server/pom.xml @@ -122,8 +122,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/ejb-txn-remote-call/server/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java b/ejb-txn-remote-call/server/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java index 616087da18..9035522793 100644 --- a/ejb-txn-remote-call/server/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java +++ b/ejb-txn-remote-call/server/src/test/java/org/jboss/as/quickstarts/ejb/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.ejb; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/ha-singleton-deployment/pom.xml b/ha-singleton-deployment/pom.xml index 18ddc25754..d40c475912 100644 --- a/ha-singleton-deployment/pom.xml +++ b/ha-singleton-deployment/pom.xml @@ -57,8 +57,6 @@ ${version.server} 6.0.3.Final - - 5.9.3 @@ -71,11 +69,6 @@ pom import - - org.junit.jupiter - junit-jupiter-engine - ${version.junit-jupiter} - @@ -94,7 +87,7 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter test diff --git a/ha-singleton-service/pom.xml b/ha-singleton-service/pom.xml index 2e0aaf4bd1..841e0128ad 100644 --- a/ha-singleton-service/pom.xml +++ b/ha-singleton-service/pom.xml @@ -52,8 +52,6 @@ ${version.server} 6.0.3.Final - - 5.9.3 @@ -66,11 +64,6 @@ pom import - - org.junit.jupiter - junit-jupiter-engine - ${version.junit-jupiter} - @@ -94,7 +87,7 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter test diff --git a/helloworld-jms/pom.xml b/helloworld-jms/pom.xml index 6ab67e435a..c23391098e 100644 --- a/helloworld-jms/pom.xml +++ b/helloworld-jms/pom.xml @@ -50,8 +50,6 @@ ${version.server} 6.0.3.Final - - 5.9.3 @@ -64,11 +62,6 @@ pom import - - org.junit.jupiter - junit-jupiter-engine - ${version.junit-jupiter-engine} - @@ -87,7 +80,7 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter test diff --git a/helloworld-mdb/pom.xml b/helloworld-mdb/pom.xml index e0f94c5b0a..a87ab5b580 100644 --- a/helloworld-mdb/pom.xml +++ b/helloworld-mdb/pom.xml @@ -51,8 +51,6 @@ ${version.server} 6.0.3.Final - - 5.9.3 @@ -65,11 +63,6 @@ pom import - - org.junit.jupiter - junit-jupiter-engine - ${version.junit-jupiter-engine} - @@ -103,7 +96,7 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter test diff --git a/helloworld-mutual-ssl-secured/pom.xml b/helloworld-mutual-ssl-secured/pom.xml index f980bdcb5e..d98c48765f 100644 --- a/helloworld-mutual-ssl-secured/pom.xml +++ b/helloworld-mutual-ssl-secured/pom.xml @@ -92,8 +92,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/helloworld-mutual-ssl-secured/src/test/java/org/jboss/as/quickstarts/helloworld_mutual_ssl_secured/BasicRuntimeIT.java b/helloworld-mutual-ssl-secured/src/test/java/org/jboss/as/quickstarts/helloworld_mutual_ssl_secured/BasicRuntimeIT.java index def10b49a3..0f6dbb03d2 100644 --- a/helloworld-mutual-ssl-secured/src/test/java/org/jboss/as/quickstarts/helloworld_mutual_ssl_secured/BasicRuntimeIT.java +++ b/helloworld-mutual-ssl-secured/src/test/java/org/jboss/as/quickstarts/helloworld_mutual_ssl_secured/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.helloworld_mutual_ssl_secured; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.FileInputStream; @@ -43,7 +43,7 @@ import static org.jboss.as.quickstarts.helloworld_mutual_ssl_secured.KeystoreUtil.createTrustStore; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/helloworld-mutual-ssl/pom.xml b/helloworld-mutual-ssl/pom.xml index 41ec984eec..8ee2cad1f3 100644 --- a/helloworld-mutual-ssl/pom.xml +++ b/helloworld-mutual-ssl/pom.xml @@ -92,8 +92,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/helloworld-mutual-ssl/src/test/java/org/jboss/as/quickstarts/helloworld_mutual_ssl/BasicRuntimeIT.java b/helloworld-mutual-ssl/src/test/java/org/jboss/as/quickstarts/helloworld_mutual_ssl/BasicRuntimeIT.java index b61c397d70..5fbb167edc 100644 --- a/helloworld-mutual-ssl/src/test/java/org/jboss/as/quickstarts/helloworld_mutual_ssl/BasicRuntimeIT.java +++ b/helloworld-mutual-ssl/src/test/java/org/jboss/as/quickstarts/helloworld_mutual_ssl/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.helloworld_mutual_ssl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.FileInputStream; @@ -42,7 +42,7 @@ import org.apache.http.HttpResponse; import static org.jboss.as.quickstarts.helloworld_mutual_ssl.KeyStoreUtils.loadKeyPairFromKeyStore; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/helloworld-rs/pom.xml b/helloworld-rs/pom.xml index 5104ae7584..c3134b4d5f 100644 --- a/helloworld-rs/pom.xml +++ b/helloworld-rs/pom.xml @@ -63,8 +63,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/helloworld-rs/src/test/java/org/jboss/as/quickstarts/helloworld/rest/RESTEndPointIT.java b/helloworld-rs/src/test/java/org/jboss/as/quickstarts/helloworld/rest/RESTEndPointIT.java index 91eaffafeb..9e23da4287 100644 --- a/helloworld-rs/src/test/java/org/jboss/as/quickstarts/helloworld/rest/RESTEndPointIT.java +++ b/helloworld-rs/src/test/java/org/jboss/as/quickstarts/helloworld/rest/RESTEndPointIT.java @@ -7,11 +7,11 @@ import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.core.MediaType; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing for a rest endpoint. @@ -33,12 +33,12 @@ private static String getServerHost() { return serverHost; } - @Before + @BeforeEach public void before() { client = ClientBuilder.newClient(); } - @After + @AfterEach public void after() { client.close(); } diff --git a/helloworld-singleton/pom.xml b/helloworld-singleton/pom.xml index fd6a3db37a..e5d6566240 100644 --- a/helloworld-singleton/pom.xml +++ b/helloworld-singleton/pom.xml @@ -51,8 +51,6 @@ ${version.server} 6.0.3.Final - - 5.9.3 @@ -86,8 +84,7 @@ org.junit.jupiter - junit-jupiter-engine - ${version.org.junit.jupiter} + junit-jupiter test diff --git a/helloworld-ws/pom.xml b/helloworld-ws/pom.xml index f7a679ef89..8aa2b9c133 100644 --- a/helloworld-ws/pom.xml +++ b/helloworld-ws/pom.xml @@ -50,7 +50,6 @@ ${version.server} 6.0.3.Final - @@ -77,10 +76,9 @@ - junit - junit + org.junit.jupiter + junit-jupiter test - jar org.wildfly diff --git a/helloworld-ws/src/test/java/org/jboss/as/quickstarts/wshelloworld/ClientIT.java b/helloworld-ws/src/test/java/org/jboss/as/quickstarts/wshelloworld/ClientIT.java index be5674b616..aa77854ccc 100644 --- a/helloworld-ws/src/test/java/org/jboss/as/quickstarts/wshelloworld/ClientIT.java +++ b/helloworld-ws/src/test/java/org/jboss/as/quickstarts/wshelloworld/ClientIT.java @@ -16,7 +16,7 @@ */ package org.jboss.as.quickstarts.wshelloworld; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.net.MalformedURLException; import java.net.URI; @@ -25,9 +25,9 @@ import java.util.ArrayList; import java.util.List; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * Simple set of tests for the HelloWorld Web Service to demonstrate accessing the web service using a client @@ -63,7 +63,7 @@ private static String getServerHost() { private HelloWorldService client; - @BeforeClass + @BeforeAll public static void beforeClass() throws MalformedURLException { URL deploymentUrl = getHTTPEndpoint(); @@ -73,7 +73,7 @@ public static void beforeClass() throws MalformedURLException { ClientIT.deploymentUrl = deploymentUrl; } - @Before + @BeforeEach public void setup() { client = new Client(deploymentUrl); } diff --git a/helloworld/pom.xml b/helloworld/pom.xml index 34601b5169..25f094fb82 100644 --- a/helloworld/pom.xml +++ b/helloworld/pom.xml @@ -75,8 +75,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/helloworld/src/test/java/org/jboss/as/quickstarts/helloworld/BasicRuntimeIT.java b/helloworld/src/test/java/org/jboss/as/quickstarts/helloworld/BasicRuntimeIT.java index 33fe371afe..200b2609a1 100644 --- a/helloworld/src/test/java/org/jboss/as/quickstarts/helloworld/BasicRuntimeIT.java +++ b/helloworld/src/test/java/org/jboss/as/quickstarts/helloworld/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.helloworld; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/hibernate/pom.xml b/hibernate/pom.xml index 7a5882468e..731eafc08b 100644 --- a/hibernate/pom.xml +++ b/hibernate/pom.xml @@ -51,8 +51,6 @@ ${version.server} 6.0.3.Final - - 5.9.3 @@ -139,8 +137,7 @@ org.junit.jupiter - junit-jupiter-engine - ${version.org.junit.jupiter} + junit-jupiter test diff --git a/http-custom-mechanism/webapp/pom.xml b/http-custom-mechanism/webapp/pom.xml index 528bb4f0c1..4b5d030c71 100644 --- a/http-custom-mechanism/webapp/pom.xml +++ b/http-custom-mechanism/webapp/pom.xml @@ -50,8 +50,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/http-custom-mechanism/webapp/src/test/java/org/jboss/as/quickstart/http_custom_mechanism/BasicRuntimeIT.java b/http-custom-mechanism/webapp/src/test/java/org/jboss/as/quickstart/http_custom_mechanism/BasicRuntimeIT.java index aec0272a5d..bd2b47dc5d 100644 --- a/http-custom-mechanism/webapp/src/test/java/org/jboss/as/quickstart/http_custom_mechanism/BasicRuntimeIT.java +++ b/http-custom-mechanism/webapp/src/test/java/org/jboss/as/quickstart/http_custom_mechanism/BasicRuntimeIT.java @@ -15,8 +15,8 @@ */ package org.jboss.as.quickstart.http_custom_mechanism; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -27,7 +27,7 @@ import java.time.Duration; import java.util.logging.Logger; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. @@ -39,7 +39,7 @@ public class BasicRuntimeIT { private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; private String serverHost; - @Before + @BeforeEach public void setUp() { serverHost = System.getenv("SERVER_HOST"); if (serverHost == null) { diff --git a/jaxrs-client/pom.xml b/jaxrs-client/pom.xml index 34ba04ee18..f805460c90 100644 --- a/jaxrs-client/pom.xml +++ b/jaxrs-client/pom.xml @@ -53,7 +53,6 @@ 6.0.3.Final 9.37.1 - 5.10.5 ${project.build.directory}/server @@ -68,13 +67,6 @@ pom import - - org.junit - junit-bom - ${version.org.junit} - pom - import - diff --git a/jaxrs-jwt/pom.xml b/jaxrs-jwt/pom.xml index 53a7172066..62458fad31 100644 --- a/jaxrs-jwt/pom.xml +++ b/jaxrs-jwt/pom.xml @@ -52,7 +52,6 @@ 6.0.3.Final 10.3.1 - 5.10.5 ${project.build.directory}/server @@ -67,13 +66,6 @@ pom import - - org.junit - junit-bom - ${version.org.junit} - pom - import - diff --git a/jaxws-ejb/pom.xml b/jaxws-ejb/pom.xml index 135a50033f..3cc73173e1 100644 --- a/jaxws-ejb/pom.xml +++ b/jaxws-ejb/pom.xml @@ -76,8 +76,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/jaxws-ejb/src/test/java/org/jboss/quickstarts/wsejb/ClientIT.java b/jaxws-ejb/src/test/java/org/jboss/quickstarts/wsejb/ClientIT.java index 8e6b02cd99..7851131511 100644 --- a/jaxws-ejb/src/test/java/org/jboss/quickstarts/wsejb/ClientIT.java +++ b/jaxws-ejb/src/test/java/org/jboss/quickstarts/wsejb/ClientIT.java @@ -22,11 +22,11 @@ import java.net.URL; import javax.xml.namespace.QName; import jakarta.xml.ws.Service; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author rsearls@redhat.com @@ -60,7 +60,7 @@ private static String getServerHost() { private EJB3RemoteInterface client; - @BeforeClass + @BeforeAll public static void beforeClass() throws MalformedURLException { URL deploymentUrl = getHTTPEndpoint(); @@ -70,7 +70,7 @@ public static void beforeClass() throws MalformedURLException { ClientIT.deploymentUrl = deploymentUrl; } - @Before + @BeforeEach public void setup() { QName serviceName = new QName("http://wsejb.quickstarts.jboss.org/", "EJB3BeanService"); Service service = Service.create(deploymentUrl, serviceName); diff --git a/jaxws-retail/pom.xml b/jaxws-retail/pom.xml index 5c057c004a..2bb17e22b5 100644 --- a/jaxws-retail/pom.xml +++ b/jaxws-retail/pom.xml @@ -52,7 +52,6 @@ 6.0.3.Final 1.3.1.Final - @@ -79,10 +78,9 @@ - junit - junit + org.junit.jupiter + junit-jupiter test - jar org.wildfly diff --git a/jaxws-retail/src/test/java/org/jboss/quickstarts/wsretail/ClientIT.java b/jaxws-retail/src/test/java/org/jboss/quickstarts/wsretail/ClientIT.java index 1e891dc230..e3da1b222d 100644 --- a/jaxws-retail/src/test/java/org/jboss/quickstarts/wsretail/ClientIT.java +++ b/jaxws-retail/src/test/java/org/jboss/quickstarts/wsretail/ClientIT.java @@ -11,11 +11,11 @@ import org.jboss.quickstarts.ws.jaxws.samples.retail.profile.DiscountRequest; import org.jboss.quickstarts.ws.jaxws.samples.retail.profile.DiscountResponse; import org.jboss.quickstarts.ws.jaxws.samples.retail.profile.ProfileMgmt; -import org.junit.Test; -import org.junit.Before; -import org.junit.BeforeClass; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ClientIT { /** @@ -46,14 +46,14 @@ private static String getServerHost() { private ProfileMgmt client; - @BeforeClass + @BeforeAll public static void beforeClass() throws MalformedURLException { URL deploymentUrl = getHTTPEndpoint(); // Set the deployment url ClientIT.deploymentUrl = deploymentUrl; } - @Before + @BeforeEach public void setup() { QName serviceName = new QName("http://org.jboss.ws/samples/retail/profile", "ProfileMgmtService"); Service service = Service.create(deploymentUrl, serviceName); diff --git a/jsonp/pom.xml b/jsonp/pom.xml index bb59e1c7cf..e53891ab23 100644 --- a/jsonp/pom.xml +++ b/jsonp/pom.xml @@ -127,8 +127,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/jsonp/src/test/java/org/jboss/as/quickstarts/jsonp/BasicRuntimeIT.java b/jsonp/src/test/java/org/jboss/as/quickstarts/jsonp/BasicRuntimeIT.java index 5af4131fd3..0053f16711 100644 --- a/jsonp/src/test/java/org/jboss/as/quickstarts/jsonp/BasicRuntimeIT.java +++ b/jsonp/src/test/java/org/jboss/as/quickstarts/jsonp/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.jsonp; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/jta-crash-rec/pom.xml b/jta-crash-rec/pom.xml index 8b6882ba25..ceb2a7d3f4 100644 --- a/jta-crash-rec/pom.xml +++ b/jta-crash-rec/pom.xml @@ -119,8 +119,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/jta-crash-rec/src/test/java/org/jboss/as/quickstarts/xa/BasicRuntimeIT.java b/jta-crash-rec/src/test/java/org/jboss/as/quickstarts/xa/BasicRuntimeIT.java index 54d32b9303..eb7621e109 100644 --- a/jta-crash-rec/src/test/java/org/jboss/as/quickstarts/xa/BasicRuntimeIT.java +++ b/jta-crash-rec/src/test/java/org/jboss/as/quickstarts/xa/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.xa; - import org.junit.Test; + import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; - import static org.junit.Assert.assertEquals; + import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/jts/application-component-1/pom.xml b/jts/application-component-1/pom.xml index e4381624b6..9987443e8c 100644 --- a/jts/application-component-1/pom.xml +++ b/jts/application-component-1/pom.xml @@ -93,8 +93,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/jts/application-component-1/src/test/java/org/jboss/as/quickstarts/cmt/jts/BasicRuntimeIT.java b/jts/application-component-1/src/test/java/org/jboss/as/quickstarts/cmt/jts/BasicRuntimeIT.java index e4f1426f78..9de0946764 100644 --- a/jts/application-component-1/src/test/java/org/jboss/as/quickstarts/cmt/jts/BasicRuntimeIT.java +++ b/jts/application-component-1/src/test/java/org/jboss/as/quickstarts/cmt/jts/BasicRuntimeIT.java @@ -15,8 +15,8 @@ */ package org.jboss.as.quickstarts.cmt.jts; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.net.CookieManager; @@ -35,7 +35,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BasicRuntimeIT { @@ -136,7 +136,7 @@ private HttpResponse submitCustomerForm(HttpClient client, String name) String body = getResponse.body(); // JSF requires the ViewState token from the hidden form field to accept a POST submission Matcher viewStateMatcher = Pattern.compile("name=\"jakarta\\.faces\\.ViewState\"[^>]*value=\"([^\"]+)\"").matcher(body); - assertTrue("ViewState not found in response", viewStateMatcher.find()); + assertTrue(viewStateMatcher.find(), "ViewState not found in response"); String viewState = viewStateMatcher.group(1); HttpRequest postRequest = HttpRequest.newBuilder(formUri) @@ -156,8 +156,7 @@ private void waitForMessagesReceived(long expected, long timeoutMs) throws IOExc if (getMessagesReceived() == expected) return; Thread.sleep(500); } - assertEquals("Timed out waiting for messages received to reach " + expected, - expected, getMessagesReceived()); + assertEquals(expected, getMessagesReceived(), "Timed out waiting for messages received to reach " + expected); } private void assertMessagesStayAt(long expected, long durationMs) throws IOException, InterruptedException { @@ -178,8 +177,7 @@ private long getMessagesReceived() throws IOException, InterruptedException { .GET() .build(); HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); - assertEquals("Message count request failed with status " + response.statusCode(), - 200, response.statusCode()); + assertEquals(200, response.statusCode(), "Message count request failed with status " + response.statusCode()); return Long.parseLong(response.body().trim()); } diff --git a/kitchensink/pom.xml b/kitchensink/pom.xml index 3a5a96160e..358bba8e43 100644 --- a/kitchensink/pom.xml +++ b/kitchensink/pom.xml @@ -80,8 +80,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/BasicRuntimeIT.java b/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/BasicRuntimeIT.java index bc264ccfbd..5592ffa0b1 100644 --- a/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/BasicRuntimeIT.java +++ b/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.kitchensink.test; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationIT.java b/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationIT.java index f6cec844c0..8c05765b38 100644 --- a/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationIT.java +++ b/kitchensink/src/test/java/org/jboss/as/quickstarts/kitchensink/test/MemberRegistrationIT.java @@ -19,8 +19,8 @@ import jakarta.json.Json; import jakarta.json.JsonObject; import org.jboss.as.quickstarts.kitchensink.model.Member; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.URI; import java.net.http.HttpClient; @@ -53,7 +53,7 @@ public void testRegister() throws Exception { .POST(HttpRequest.BodyPublishers.ofString(json.toString())) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); - Assert.assertEquals(200, response.statusCode()); - Assert.assertEquals("", response.body().toString() ); + Assertions.assertEquals(200, response.statusCode()); + Assertions.assertEquals("", response.body().toString() ); } } diff --git a/logging/pom.xml b/logging/pom.xml index 976e4551ca..d6fc0ea4e0 100644 --- a/logging/pom.xml +++ b/logging/pom.xml @@ -50,8 +50,6 @@ ${version.server} 6.0.3.Final - - 5.10.5 ${project.build.directory}/server @@ -66,13 +64,6 @@ pom import - - org.junit - junit-bom - ${version.org.junit} - pom - import - diff --git a/mail/pom.xml b/mail/pom.xml index 40804f010a..71772d6e46 100644 --- a/mail/pom.xml +++ b/mail/pom.xml @@ -94,8 +94,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/mail/src/test/java/org/jboss/as/quickstarts/mail/BasicRuntimeIT.java b/mail/src/test/java/org/jboss/as/quickstarts/mail/BasicRuntimeIT.java index fc6fdde77c..09ddb13f1d 100644 --- a/mail/src/test/java/org/jboss/as/quickstarts/mail/BasicRuntimeIT.java +++ b/mail/src/test/java/org/jboss/as/quickstarts/mail/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.mail; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/mail/src/test/java/org/jboss/as/quickstarts/mail/MailTestCaseIT.java b/mail/src/test/java/org/jboss/as/quickstarts/mail/MailTestCaseIT.java index 54ff732aed..9bdfa92cb7 100644 --- a/mail/src/test/java/org/jboss/as/quickstarts/mail/MailTestCaseIT.java +++ b/mail/src/test/java/org/jboss/as/quickstarts/mail/MailTestCaseIT.java @@ -8,9 +8,9 @@ import org.htmlunit.html.HtmlPage; import org.htmlunit.html.HtmlSubmitInput; import org.htmlunit.html.HtmlTextArea; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class MailTestCaseIT { @@ -18,7 +18,7 @@ public class MailTestCaseIT { private String serverHost; - @Before + @BeforeEach public void testSetup() { serverHost = System.getenv("SERVER_HOST"); if (serverHost == null) { @@ -61,7 +61,7 @@ private void sendEmailBySMTP(WebClient webClient, HtmlPage mailHomePage) throws webClient.waitForBackgroundJavaScript(30 * 1000); HtmlElement message = mailHomePage.getFirstByXPath("//ul[@id='smtp_messages']/li"); - Assert.assertEquals("Unexpected result messages after sending an email via SMTP.", "Email sent to user02@mail.local", message.asNormalizedText()); + Assertions.assertEquals("Email sent to user02@mail.local", message.asNormalizedText(), "Unexpected result messages after sending an email via SMTP."); } private void retrieveEmailByPOP3(WebClient webClient, HtmlPage mailHomePage) throws IOException { @@ -76,9 +76,9 @@ private void retrieveEmailByPOP3(WebClient webClient, HtmlPage mailHomePage) thr webClient.waitForBackgroundJavaScript(30 * 1000); HtmlTextArea emails = mailHomePage.getHtmlElementById("pop3_emails"); - Assert.assertTrue("Expected From not found: " + emails.getText(), emails.getText().contains("From : user01@mail.local")); - Assert.assertTrue("Expected Subject not found: " + emails.getText(), emails.getText().contains("Subject : This is a test")); - Assert.assertTrue("Expected Body not found : " + emails.getText(), emails.getText().contains("Body : Hello user02, I've sent an email.")); + Assertions.assertTrue(emails.getText().contains("From : user01@mail.local"), "Expected From not found: " + emails.getText()); + Assertions.assertTrue(emails.getText().contains("Subject : This is a test"), "Expected Subject not found: " + emails.getText()); + Assertions.assertTrue(emails.getText().contains("Body : Hello user02, I've sent an email."), "Expected Body not found : " + emails.getText()); } private void retrieveEmailByIMAP(WebClient webClient, HtmlPage mailHomePage) throws IOException { @@ -88,9 +88,9 @@ private void retrieveEmailByIMAP(WebClient webClient, HtmlPage mailHomePage) thr webClient.waitForBackgroundJavaScript(30 * 1000); HtmlTextArea emails = mailHomePage.getHtmlElementById("imap_emails"); - Assert.assertNotNull("IMAP No messages found.", emails.getText()); - Assert.assertTrue("Expected From not found: " + emails.getText(), emails.getText().contains("From : user01@mail.local")); - Assert.assertTrue("Expected Subject not found: " + emails.getText(), emails.getText().contains("Subject : This is a test")); - Assert.assertTrue("Expected Body not found : " + emails.getText(), emails.getText().contains("Body : Hello user02, I've sent an email.")); + Assertions.assertNotNull(emails.getText(), "IMAP No messages found."); + Assertions.assertTrue(emails.getText().contains("From : user01@mail.local"), "Expected From not found: " + emails.getText()); + Assertions.assertTrue(emails.getText().contains("Subject : This is a test"), "Expected Subject not found: " + emails.getText()); + Assertions.assertTrue(emails.getText().contains("Body : Hello user02, I've sent an email."), "Expected Body not found : " + emails.getText()); } } diff --git a/messaging-clustering-singleton/pom.xml b/messaging-clustering-singleton/pom.xml index b8c9fb3509..5ec03d2248 100644 --- a/messaging-clustering-singleton/pom.xml +++ b/messaging-clustering-singleton/pom.xml @@ -50,8 +50,6 @@ ${version.server} 6.0.3.Final - - 5.9.3 @@ -64,11 +62,6 @@ pom import - - org.junit.jupiter - junit-jupiter-engine - ${version.junit-jupiter-engine} - @@ -102,7 +95,7 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter test diff --git a/micrometer/pom.xml b/micrometer/pom.xml index 2c2ad23a00..4d9bca875b 100644 --- a/micrometer/pom.xml +++ b/micrometer/pom.xml @@ -84,8 +84,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/micrometer/src/test/java/org/wildfly/quickstarts/micrometer/BasicRuntimeIT.java b/micrometer/src/test/java/org/wildfly/quickstarts/micrometer/BasicRuntimeIT.java index 27a18f9c79..08d911a51f 100644 --- a/micrometer/src/test/java/org/wildfly/quickstarts/micrometer/BasicRuntimeIT.java +++ b/micrometer/src/test/java/org/wildfly/quickstarts/micrometer/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.wildfly.quickstarts.micrometer; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BasicRuntimeIT { private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; diff --git a/micrometer/src/test/java/org/wildfly/quickstarts/micrometer/MicrometerIT.java b/micrometer/src/test/java/org/wildfly/quickstarts/micrometer/MicrometerIT.java index 54d5ba845b..01a9f567a6 100644 --- a/micrometer/src/test/java/org/wildfly/quickstarts/micrometer/MicrometerIT.java +++ b/micrometer/src/test/java/org/wildfly/quickstarts/micrometer/MicrometerIT.java @@ -15,7 +15,7 @@ */ package org.wildfly.quickstarts.micrometer; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.net.URI; @@ -24,7 +24,7 @@ import java.net.http.HttpRequest; import java.net.http.HttpResponse; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MicrometerIT { public static final int MAX_NUMBER = 15; diff --git a/microprofile-config/pom.xml b/microprofile-config/pom.xml index 1f72321e50..502ead11df 100644 --- a/microprofile-config/pom.xml +++ b/microprofile-config/pom.xml @@ -72,10 +72,9 @@ - junit - junit + org.junit.jupiter + junit-jupiter test - jar org.jboss.resteasy diff --git a/microprofile-config/src/test/java/org/wildfly/quickstarts/microprofile/config/BasicRuntimeIT.java b/microprofile-config/src/test/java/org/wildfly/quickstarts/microprofile/config/BasicRuntimeIT.java index 052109d568..fca8919e30 100644 --- a/microprofile-config/src/test/java/org/wildfly/quickstarts/microprofile/config/BasicRuntimeIT.java +++ b/microprofile-config/src/test/java/org/wildfly/quickstarts/microprofile/config/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.wildfly.quickstarts.microprofile.config; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/microprofile-fault-tolerance/pom.xml b/microprofile-fault-tolerance/pom.xml index 5bcb01b734..25bd8cbcef 100644 --- a/microprofile-fault-tolerance/pom.xml +++ b/microprofile-fault-tolerance/pom.xml @@ -108,8 +108,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/microprofile-fault-tolerance/src/test/java/org/wildfly/quickstarts/microprofile/faulttolerance/CoffeeResourceIT.java b/microprofile-fault-tolerance/src/test/java/org/wildfly/quickstarts/microprofile/faulttolerance/CoffeeResourceIT.java index 33c1e9559e..6ed8b2eab2 100644 --- a/microprofile-fault-tolerance/src/test/java/org/wildfly/quickstarts/microprofile/faulttolerance/CoffeeResourceIT.java +++ b/microprofile-fault-tolerance/src/test/java/org/wildfly/quickstarts/microprofile/faulttolerance/CoffeeResourceIT.java @@ -28,10 +28,10 @@ import org.jboss.resteasy.plugins.providers.RegisterBuiltin; import org.jboss.resteasy.plugins.providers.jackson.ResteasyJackson2Provider; import org.jboss.resteasy.spi.ResteasyProviderFactory; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Simple integration test for Coffee resource that is guarded by MicroProfile Fault Tolerance annotations. @@ -50,12 +50,12 @@ public class CoffeeResourceIT { instance.registerProvider(ResteasyJackson2Provider.class); } - @Before + @BeforeEach public void before() { client = ClientBuilder.newClient(); } - @After + @AfterEach public void after() { client.close(); } @@ -66,11 +66,11 @@ public void testCoffeeList() { this.resetCounter(); try (Response response = this.getResponse("/coffee")) { - Assert.assertEquals(200, response.getStatus()); + Assertions.assertEquals(200, response.getStatus()); List entity = response.readEntity(new GenericType>() {}); - Assert.assertNotNull(entity); - Assert.assertEquals(3, entity.size()); + Assertions.assertNotNull(entity); + Assertions.assertEquals(3, entity.size()); } } @@ -80,10 +80,10 @@ public void testCoffeeListFailure() { this.resetCounter(); try (Response response = this.getResponse("/coffee")) { - Assert.assertEquals(500, response.getStatus()); + Assertions.assertEquals(500, response.getStatus()); } - Assert.assertEquals(5, this.getCounter()); + Assertions.assertEquals(5, this.getCounter()); } @Test @@ -91,11 +91,11 @@ public void testCoffeeDetail() { this.setFailRatio(0f); try (Response response = this.getResponse("/coffee/1")) { - Assert.assertEquals(200, response.getStatus()); + Assertions.assertEquals(200, response.getStatus()); Coffee entity = response.readEntity(new GenericType() {}); - Assert.assertNotNull(entity); - Assert.assertEquals("Colombia", entity.countryOfOrigin); + Assertions.assertNotNull(entity); + Assertions.assertEquals("Colombia", entity.countryOfOrigin); } } @@ -104,26 +104,26 @@ public void testCoffeeDetailFailure() { this.setFailRatio(1f); try (Response response = this.getResponse("/coffee/1")) { - Assert.assertEquals(500, response.getStatus()); + Assertions.assertEquals(500, response.getStatus()); } } private long getCounter() { try (Response response = this.getResponse("/coffee/getCounter")) { - Assert.assertEquals(200, response.getStatus()); + Assertions.assertEquals(200, response.getStatus()); return response.readEntity(Long.class); } } private void setFailRatio(float failRatio) { try (Response response = this.getResponse("/coffee/setFailRatio/" + failRatio)) { - Assert.assertEquals(204, response.getStatus()); + Assertions.assertEquals(204, response.getStatus()); } } private void resetCounter() { try (Response response = this.getResponse("/coffee/resetCounter")) { - Assert.assertEquals(204, response.getStatus()); + Assertions.assertEquals(204, response.getStatus()); } } @@ -138,12 +138,12 @@ public void testCoffeeRecommendations() { setMaxDelay(250); try (Response response = this.getResponse("/coffee/1/recommendations")) { - Assert.assertEquals(200, response.getStatus()); + Assertions.assertEquals(200, response.getStatus()); ArrayList ordersList = response.readEntity(new GenericType>() {}); - Assert.assertNotNull(ordersList); - Assert.assertEquals(2, ordersList.size()); - Assert.assertNotEquals(1, ordersList.get(0).getId()); - Assert.assertNotEquals(1, ordersList.get(1).getId()); + Assertions.assertNotNull(ordersList); + Assertions.assertEquals(2, ordersList.size()); + Assertions.assertNotEquals(1, ordersList.get(0).getId()); + Assertions.assertNotEquals(1, ordersList.get(1).getId()); } } @@ -158,24 +158,24 @@ public void testCoffeeRecommendationsSafeChoice() { setMaxDelay(500); try (Response response = this.getResponse("/coffee/1/recommendations")) { - Assert.assertEquals(200, response.getStatus()); + Assertions.assertEquals(200, response.getStatus()); ArrayList ordersList = response.readEntity(new GenericType>() {}); - Assert.assertNotNull(ordersList); - Assert.assertEquals(1, ordersList.size()); - Assert.assertEquals(1, ordersList.get(0).getId()); + Assertions.assertNotNull(ordersList); + Assertions.assertEquals(1, ordersList.size()); + Assertions.assertEquals(1, ordersList.get(0).getId()); } } private void setMaxDelay(int maxDelay) { try (Response response = this.getResponse("/coffee/setMaxDelay/" + maxDelay)) { - Assert.assertEquals(204, response.getStatus()); + Assertions.assertEquals(204, response.getStatus()); } } private void setMinDelay(int minDelay) { try (Response response = this.getResponse("/coffee/setMinDelay/" + minDelay)) { - Assert.assertEquals(204, response.getStatus()); + Assertions.assertEquals(204, response.getStatus()); } } diff --git a/microprofile-health/pom.xml b/microprofile-health/pom.xml index cfa673f625..6781cc2929 100644 --- a/microprofile-health/pom.xml +++ b/microprofile-health/pom.xml @@ -71,8 +71,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/microprofile-health/src/test/java/org/wildfly/quickstarts/microprofile/health/BasicRuntimeIT.java b/microprofile-health/src/test/java/org/wildfly/quickstarts/microprofile/health/BasicRuntimeIT.java index 1a4ce6074c..10f7e7881e 100644 --- a/microprofile-health/src/test/java/org/wildfly/quickstarts/microprofile/health/BasicRuntimeIT.java +++ b/microprofile-health/src/test/java/org/wildfly/quickstarts/microprofile/health/BasicRuntimeIT.java @@ -1,6 +1,6 @@ package org.wildfly.quickstarts.microprofile.health; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -10,7 +10,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class BasicRuntimeIT { private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; diff --git a/microprofile-health/src/test/java/org/wildfly/quickstarts/microprofile/health/MicroProfileHealthIT.java b/microprofile-health/src/test/java/org/wildfly/quickstarts/microprofile/health/MicroProfileHealthIT.java index 6eaa3e5eda..f64cb8875c 100644 --- a/microprofile-health/src/test/java/org/wildfly/quickstarts/microprofile/health/MicroProfileHealthIT.java +++ b/microprofile-health/src/test/java/org/wildfly/quickstarts/microprofile/health/MicroProfileHealthIT.java @@ -20,10 +20,10 @@ import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.core.Response; import org.jboss.dmr.ModelNode; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.net.MalformedURLException; import java.net.URI; @@ -42,7 +42,7 @@ public class MicroProfileHealthIT { private URL managementURL; private Client client; - @Before + @BeforeEach public void before() throws MalformedURLException { String managementHost = getConfigValue("server.management.host").orElse("http://localhost:9990"); managementURL = URI.create(managementHost).toURL(); @@ -57,7 +57,7 @@ private Optional getConfigValue(String key) { return Optional.ofNullable(value); } - @After + @AfterEach public void after() { if (client != null) { client.close(); @@ -75,25 +75,25 @@ public void testLivenessContents() { .request() .get(); - Assert.assertEquals(200, response.getStatus()); + Assertions.assertEquals(200, response.getStatus()); ModelNode json = ModelNode.fromJSONString(response.readEntity(String.class)); - Assert.assertEquals("UP", json.get("status").asString()); + Assertions.assertEquals("UP", json.get("status").asString()); List checks = json.get("checks").asList(); - Assert.assertEquals(2, checks.size()); + Assertions.assertEquals(2, checks.size()); for (ModelNode check : checks) { String name = check.get("name").asString(); - Assert.assertTrue(name.equals("Simple health check") || name.equals("Health check with data")); + Assertions.assertTrue(name.equals("Simple health check") || name.equals("Health check with data")); - Assert.assertEquals("UP", check.get("status").asString()); + Assertions.assertEquals("UP", check.get("status").asString()); if (name.equals("Health check with data")) { ModelNode data = check.get("data"); - Assert.assertTrue(data.get("bar") != null && data.get("bar").asString().equals("barValue")); - Assert.assertTrue(data.get("foo") != null && data.get("foo").asString().equals("fooValue")); + Assertions.assertTrue(data.get("bar") != null && data.get("bar").asString().equals("barValue")); + Assertions.assertTrue(data.get("foo") != null && data.get("foo").asString().equals("fooValue")); } } } @@ -110,10 +110,10 @@ public void testReadinessContents() { .request() .get(); - Assert.assertEquals(200, response.getStatus()); + Assertions.assertEquals(200, response.getStatus()); ModelNode json = ModelNode.fromJSONString(response.readEntity(String.class)); - Assert.assertEquals("UP", json.get("status").asString()); + Assertions.assertEquals("UP", json.get("status").asString()); List checks = json.get("checks").asList(); @@ -122,12 +122,12 @@ public void testReadinessContents() { for (int i = 0; i < checks.size(); i++) { ModelNode check = checks.get(i); if (check.get("name").asString().equals("Database connection health check")) { - Assert.assertEquals("UP", check.get("status").asString()); + Assertions.assertEquals("UP", check.get("status").asString()); checkIncluded = true; } } - Assert.assertTrue("The user defined check is not included in the readiness response", checkIncluded); + Assertions.assertTrue(checkIncluded, "The user defined check is not included in the readiness response"); } } diff --git a/microprofile-jwt/pom.xml b/microprofile-jwt/pom.xml index da9c988bbc..6abd8f60b5 100644 --- a/microprofile-jwt/pom.xml +++ b/microprofile-jwt/pom.xml @@ -109,8 +109,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/microprofile-jwt/src/test/java/org/wildfly/quickstarts/mpjwt/BasicRuntimeIT.java b/microprofile-jwt/src/test/java/org/wildfly/quickstarts/mpjwt/BasicRuntimeIT.java index 1260ae330e..d472914cff 100644 --- a/microprofile-jwt/src/test/java/org/wildfly/quickstarts/mpjwt/BasicRuntimeIT.java +++ b/microprofile-jwt/src/test/java/org/wildfly/quickstarts/mpjwt/BasicRuntimeIT.java @@ -4,12 +4,12 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URISyntaxException; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.wildfly.quickstarts.mpjwt.TestUtils.HELLO_WORLD; import static org.wildfly.quickstarts.mpjwt.TestUtils.ROOT_PATH; import static org.wildfly.quickstarts.mpjwt.TestUtils.getServerHost; @@ -22,7 +22,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti HttpGet httpGet = new HttpGet(getServerHost() + ROOT_PATH + HELLO_WORLD); CloseableHttpResponse httpResponse = httpClient.execute(httpGet); - assertEquals("Successful call", 200, httpResponse.getStatusLine().getStatusCode()); + assertEquals(200, httpResponse.getStatusLine().getStatusCode(), "Successful call"); httpResponse.close(); diff --git a/microprofile-jwt/src/test/java/org/wildfly/quickstarts/mpjwt/JWTClientIT.java b/microprofile-jwt/src/test/java/org/wildfly/quickstarts/mpjwt/JWTClientIT.java index 95d412b5cd..27ab6b85a3 100644 --- a/microprofile-jwt/src/test/java/org/wildfly/quickstarts/mpjwt/JWTClientIT.java +++ b/microprofile-jwt/src/test/java/org/wildfly/quickstarts/mpjwt/JWTClientIT.java @@ -18,8 +18,8 @@ package org.wildfly.quickstarts.mpjwt; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.wildfly.quickstarts.mpjwt.TestUtils.HELLO_WORLD; import static org.wildfly.quickstarts.mpjwt.TestUtils.ROOT_PATH; import static org.wildfly.quickstarts.mpjwt.TestUtils.getServerHost; @@ -29,7 +29,7 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** @@ -63,9 +63,9 @@ public void testHelloWorld() throws Exception { HttpGet httpGet = new HttpGet(getServerHost() + ROOT_PATH + HELLO_WORLD); CloseableHttpResponse httpResponse = httpClient.execute(httpGet); - assertEquals("Successful call", 200, httpResponse.getStatusLine().getStatusCode()); + assertEquals(200, httpResponse.getStatusLine().getStatusCode(), "Successful call"); String body = EntityUtils.toString(httpResponse.getEntity()); - assertTrue("Call was anonymous", body.contains(ANONYMOUS)); + assertTrue(body.contains(ANONYMOUS), "Call was anonymous"); httpResponse.close(); } @@ -79,9 +79,9 @@ public void testAuthenticated() throws Exception { CloseableHttpResponse httpResponse = httpClient.execute(httpGet); - assertEquals("Successful call", 200, httpResponse.getStatusLine().getStatusCode()); + assertEquals(200, httpResponse.getStatusLine().getStatusCode(), "Successful call"); String body = EntityUtils.toString(httpResponse.getEntity()); - assertTrue("Call was authenticated", body.contains(PRINCIPAL_NAME)); + assertTrue(body.contains(PRINCIPAL_NAME), "Call was authenticated"); httpResponse.close(); } @@ -91,7 +91,7 @@ public void testAuthorizationRequired() throws Exception { HttpGet httpGet = new HttpGet(getServerHost() + ROOT_PATH + SUBSCRIPTION); CloseableHttpResponse httpResponse = httpClient.execute(httpGet); - assertEquals("Authorization required", 403, httpResponse.getStatusLine().getStatusCode()); + assertEquals(403, httpResponse.getStatusLine().getStatusCode(), "Authorization required"); httpResponse.close(); } @@ -105,9 +105,9 @@ public void testAuthorized() throws Exception { CloseableHttpResponse httpResponse = httpClient.execute(httpGet); - assertEquals("Successful call", 200, httpResponse.getStatusLine().getStatusCode()); + assertEquals(200, httpResponse.getStatusLine().getStatusCode(), "Successful call"); String body = EntityUtils.toString(httpResponse.getEntity()); - assertTrue("Call was authenticated", body.contains(PRINCIPAL_NAME)); + assertTrue(body.contains(PRINCIPAL_NAME), "Call was authenticated"); httpResponse.close(); } @@ -121,7 +121,7 @@ public void testMissingRole() throws Exception { CloseableHttpResponse httpResponse = httpClient.execute(httpGet); - assertEquals("Authorization Required", 403, httpResponse.getStatusLine().getStatusCode()); + assertEquals(403, httpResponse.getStatusLine().getStatusCode(), "Authorization Required"); httpResponse.close(); } @@ -135,10 +135,10 @@ public void testClaimAccess() throws Exception { CloseableHttpResponse httpResponse = httpClient.execute(httpGet); - assertEquals("Successful call", 200, httpResponse.getStatusLine().getStatusCode()); + assertEquals(200, httpResponse.getStatusLine().getStatusCode(), "Successful call"); String body = EntityUtils.toString(httpResponse.getEntity()); - assertTrue("Call was authenticated", body.contains("Happy Birthday") || - body.contains("days until your next birthday")); + assertTrue(body.contains("Happy Birthday") || + body.contains("days until your next birthday"), "Call was authenticated"); httpResponse.close(); } diff --git a/microprofile-lra/pom.xml b/microprofile-lra/pom.xml index 1c8f32e316..92538a0782 100644 --- a/microprofile-lra/pom.xml +++ b/microprofile-lra/pom.xml @@ -71,8 +71,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/microprofile-lra/src/test/java/org/wildfly/quickstarts/microprofile/lra/BasicRuntimeIT.java b/microprofile-lra/src/test/java/org/wildfly/quickstarts/microprofile/lra/BasicRuntimeIT.java index 4c0124cd32..325066c744 100644 --- a/microprofile-lra/src/test/java/org/wildfly/quickstarts/microprofile/lra/BasicRuntimeIT.java +++ b/microprofile-lra/src/test/java/org/wildfly/quickstarts/microprofile/lra/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.wildfly.quickstarts.microprofile.lra; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/microprofile-lra/src/test/java/org/wildfly/quickstarts/microprofile/lra/MicroProfileLRAIT.java b/microprofile-lra/src/test/java/org/wildfly/quickstarts/microprofile/lra/MicroProfileLRAIT.java index e85873aa8d..f82e76d62c 100644 --- a/microprofile-lra/src/test/java/org/wildfly/quickstarts/microprofile/lra/MicroProfileLRAIT.java +++ b/microprofile-lra/src/test/java/org/wildfly/quickstarts/microprofile/lra/MicroProfileLRAIT.java @@ -20,26 +20,26 @@ import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.Response; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.function.Function; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.wildfly.quickstarts.microprofile.lra.TestUtils.getServerHost; public class MicroProfileLRAIT { private Client client; - @Before + @BeforeEach public void before() { client = ClientBuilder.newClient(); } - @After + @AfterEach public void after() { client.close(); } diff --git a/microprofile-openapi/pom.xml b/microprofile-openapi/pom.xml index 8fd86e339f..b8246658fc 100644 --- a/microprofile-openapi/pom.xml +++ b/microprofile-openapi/pom.xml @@ -63,8 +63,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/microprofile-openapi/src/test/java/org/wildfly/quickstart/microprofile/openapi/BasicRuntimeIT.java b/microprofile-openapi/src/test/java/org/wildfly/quickstart/microprofile/openapi/BasicRuntimeIT.java index 2f2e62c4ae..44d570ed67 100644 --- a/microprofile-openapi/src/test/java/org/wildfly/quickstart/microprofile/openapi/BasicRuntimeIT.java +++ b/microprofile-openapi/src/test/java/org/wildfly/quickstart/microprofile/openapi/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.wildfly.quickstart.microprofile.openapi; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/microprofile-openapi/src/test/java/org/wildfly/quickstart/microprofile/openapi/OpenAPIContextIT.java b/microprofile-openapi/src/test/java/org/wildfly/quickstart/microprofile/openapi/OpenAPIContextIT.java index 3f30516417..2d01e72fb5 100644 --- a/microprofile-openapi/src/test/java/org/wildfly/quickstart/microprofile/openapi/OpenAPIContextIT.java +++ b/microprofile-openapi/src/test/java/org/wildfly/quickstart/microprofile/openapi/OpenAPIContextIT.java @@ -4,8 +4,8 @@ */ package org.wildfly.quickstart.microprofile.openapi; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.net.URI; @@ -16,7 +16,7 @@ import java.time.Duration; import java.util.Arrays; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that the /openapi context is available. @@ -46,10 +46,10 @@ public void testOpenAPIContextIsAvailable() throws IOException, InterruptedExcep .connectTimeout(Duration.ofMinutes(1)) .build(); final HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); - assertEquals("/openapi context is not available", 200, response.statusCode()); + assertEquals(200, response.statusCode(), "/openapi context is not available"); String[] bodyLines = response.body().split("\n"); - assertTrue("Document does not contain \"openapi:\" field", Arrays.stream(bodyLines).anyMatch(line -> line.startsWith("openapi:"))); + assertTrue(Arrays.stream(bodyLines).anyMatch(line -> line.startsWith("openapi:")), "Document does not contain \"openapi:\" field"); } } diff --git a/microprofile-reactive-messaging-kafka/pom.xml b/microprofile-reactive-messaging-kafka/pom.xml index 94dbbdd897..5c9dc5d736 100644 --- a/microprofile-reactive-messaging-kafka/pom.xml +++ b/microprofile-reactive-messaging-kafka/pom.xml @@ -139,8 +139,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/microprofile-reactive-messaging-kafka/src/test/java/org/wildfly/quickstarts/microprofile/reactive/messaging/test/BasicRuntimeIT.java b/microprofile-reactive-messaging-kafka/src/test/java/org/wildfly/quickstarts/microprofile/reactive/messaging/test/BasicRuntimeIT.java index 7aff4b1357..15f7ccc9bb 100644 --- a/microprofile-reactive-messaging-kafka/src/test/java/org/wildfly/quickstarts/microprofile/reactive/messaging/test/BasicRuntimeIT.java +++ b/microprofile-reactive-messaging-kafka/src/test/java/org/wildfly/quickstarts/microprofile/reactive/messaging/test/BasicRuntimeIT.java @@ -4,11 +4,11 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.wildfly.quickstarts.microprofile.reactive.messaging.test.TestUtils.getServerHost; public class BasicRuntimeIT { @@ -19,7 +19,7 @@ public void testHTTPEndpointIsAvailable() throws IOException { HttpGet httpGet = new HttpGet(getServerHost()); CloseableHttpResponse httpResponse = httpClient.execute(httpGet); - assertEquals("Successful call", 200, httpResponse.getStatusLine().getStatusCode()); + assertEquals(200, httpResponse.getStatusLine().getStatusCode(), "Successful call"); httpResponse.close(); diff --git a/microprofile-reactive-messaging-kafka/src/test/java/org/wildfly/quickstarts/microprofile/reactive/messaging/test/ReactiveMessagingKafkaIT.java b/microprofile-reactive-messaging-kafka/src/test/java/org/wildfly/quickstarts/microprofile/reactive/messaging/test/ReactiveMessagingKafkaIT.java index 04cc5973f7..8c4c17c68d 100644 --- a/microprofile-reactive-messaging-kafka/src/test/java/org/wildfly/quickstarts/microprofile/reactive/messaging/test/ReactiveMessagingKafkaIT.java +++ b/microprofile-reactive-messaging-kafka/src/test/java/org/wildfly/quickstarts/microprofile/reactive/messaging/test/ReactiveMessagingKafkaIT.java @@ -27,8 +27,8 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.eclipse.microprofile.rest.client.RestClientBuilder; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; @@ -95,9 +95,9 @@ public void testUserApi() throws Throwable { } private void checkAsynchTask(ListSubscriber task, String... values) { - Assert.assertEquals(3, task.lines.size()); + Assertions.assertEquals(3, task.lines.size()); for (int i = 0; i < values.length; i++) { - Assert.assertTrue("Line " + i + ": " + task.lines.get(i), task.lines.get(i).contains(values[i])); + Assertions.assertTrue(task.lines.get(i).contains(values[i]), "Line " + i + ": " + task.lines.get(i)); } } @@ -105,7 +105,7 @@ private boolean checkResponse(CloseableHttpResponse response, boolean fail) thro String s; List lines = new ArrayList<>(); try { - Assert.assertEquals(200, response.getStatusLine().getStatusCode()); + Assertions.assertEquals(200, response.getStatusLine().getStatusCode()); try (BufferedReader reader = new BufferedReader(new InputStreamReader(response.getEntity().getContent()))) { String line = reader.readLine(); while (line != null) { @@ -113,7 +113,7 @@ private boolean checkResponse(CloseableHttpResponse response, boolean fail) thro line = reader.readLine(); } } - Assert.assertTrue("Expected >= 3 lines in:\n" + lines, lines.size() >= 3); + Assertions.assertTrue(lines.size() >= 3, "Expected >= 3 lines in:\n" + lines); } catch (Throwable throwable) { if (fail) { throw throwable; @@ -121,12 +121,12 @@ private boolean checkResponse(CloseableHttpResponse response, boolean fail) thro return false; } - Assert.assertNotEquals("Expected to find 'Hello' on line 0 of:\n" + lines, -1, lines.get(0).indexOf("Hello")); - Assert.assertNotEquals("Expected to find 'Kafka' on line 1 of:\n" + lines, -1, lines.get(1).indexOf("Kafka")); + Assertions.assertNotEquals(-1, lines.get(0).indexOf("Hello"), "Expected to find 'Hello' on line 0 of:\n" + lines); + Assertions.assertNotEquals(-1, lines.get(1).indexOf("Kafka"), "Expected to find 'Kafka' on line 1 of:\n" + lines); for (int i = 2; i < lines.size(); i++) { - Assert.assertNotEquals( - "Expected to find 'Hello' or 'Kafka' on line " + i + - " of:\n" + lines, -2, lines.get(i).indexOf("Hello") + lines.get(i).indexOf("Kafka")); + Assertions.assertNotEquals( + -2, lines.get(i).indexOf("Hello") + lines.get(i).indexOf("Kafka"), + "Expected to find 'Hello' or 'Kafka' on line " + i + " of:\n" + lines); } return true; } diff --git a/microprofile-rest-client/pom.xml b/microprofile-rest-client/pom.xml index 4c5aa9725a..303189d82c 100644 --- a/microprofile-rest-client/pom.xml +++ b/microprofile-rest-client/pom.xml @@ -52,7 +52,6 @@ 2.0.3.Final 6.2.19.Final - 5.10.5 ${project.build.directory}/server http://localhost:8080 @@ -76,13 +75,6 @@ pom import - - org.junit - junit-bom - ${version.org.junit} - pom - import - diff --git a/numberguess/pom.xml b/numberguess/pom.xml index 7a7eb0c384..e583fb41ea 100644 --- a/numberguess/pom.xml +++ b/numberguess/pom.xml @@ -91,8 +91,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/numberguess/src/test/java/org/jboss/as/quickstarts/numberguess/BasicRuntimeIT.java b/numberguess/src/test/java/org/jboss/as/quickstarts/numberguess/BasicRuntimeIT.java index 86933051ee..f38c1cb544 100644 --- a/numberguess/src/test/java/org/jboss/as/quickstarts/numberguess/BasicRuntimeIT.java +++ b/numberguess/src/test/java/org/jboss/as/quickstarts/numberguess/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.numberguess; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/numberguess/src/test/java/org/jboss/as/quickstarts/numberguess/NumberguessIT.java b/numberguess/src/test/java/org/jboss/as/quickstarts/numberguess/NumberguessIT.java index 78fd078fc1..d01f7a8710 100644 --- a/numberguess/src/test/java/org/jboss/as/quickstarts/numberguess/NumberguessIT.java +++ b/numberguess/src/test/java/org/jboss/as/quickstarts/numberguess/NumberguessIT.java @@ -16,7 +16,7 @@ */ package org.jboss.as.quickstarts.numberguess; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.CookieManager; @@ -33,8 +33,8 @@ import java.nio.charset.StandardCharsets; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class NumberguessIT { diff --git a/opentelemetry-tracing/pom.xml b/opentelemetry-tracing/pom.xml index eb9bf74649..634f09b4c6 100644 --- a/opentelemetry-tracing/pom.xml +++ b/opentelemetry-tracing/pom.xml @@ -84,8 +84,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/opentelemetry-tracing/src/test/java/org/wildfly/quickstarts/opentelemetry/BasicRuntimeIT.java b/opentelemetry-tracing/src/test/java/org/wildfly/quickstarts/opentelemetry/BasicRuntimeIT.java index 241de33aef..f83dab91b9 100644 --- a/opentelemetry-tracing/src/test/java/org/wildfly/quickstarts/opentelemetry/BasicRuntimeIT.java +++ b/opentelemetry-tracing/src/test/java/org/wildfly/quickstarts/opentelemetry/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.wildfly.quickstarts.opentelemetry; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BasicRuntimeIT { private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; diff --git a/opentelemetry-tracing/src/test/java/org/wildfly/quickstarts/opentelemetry/OpenTelemetryIT.java b/opentelemetry-tracing/src/test/java/org/wildfly/quickstarts/opentelemetry/OpenTelemetryIT.java index c103dd3c19..e2add679c8 100644 --- a/opentelemetry-tracing/src/test/java/org/wildfly/quickstarts/opentelemetry/OpenTelemetryIT.java +++ b/opentelemetry-tracing/src/test/java/org/wildfly/quickstarts/opentelemetry/OpenTelemetryIT.java @@ -15,7 +15,7 @@ */ package org.wildfly.quickstarts.opentelemetry; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.net.URI; @@ -24,7 +24,7 @@ import java.net.http.HttpRequest; import java.net.http.HttpResponse; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class OpenTelemetryIT { @Test diff --git a/remote-helloworld-mdb/pom.xml b/remote-helloworld-mdb/pom.xml index 7b1923ae98..709ae33f27 100644 --- a/remote-helloworld-mdb/pom.xml +++ b/remote-helloworld-mdb/pom.xml @@ -51,8 +51,6 @@ ${version.server} 6.0.3.Final - - 5.9.3 @@ -65,11 +63,6 @@ pom import - - org.junit.jupiter - junit-jupiter-engine - ${version.junit-jupiter-engine} - @@ -105,7 +98,7 @@ org.junit.jupiter - junit-jupiter-engine + junit-jupiter test diff --git a/security-domain-to-domain/ejb/pom.xml b/security-domain-to-domain/ejb/pom.xml index 5629d8ac83..23b00acce9 100644 --- a/security-domain-to-domain/ejb/pom.xml +++ b/security-domain-to-domain/ejb/pom.xml @@ -68,8 +68,8 @@ jboss-ejb3-ext-api - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/security-domain-to-domain/test/pom.xml b/security-domain-to-domain/test/pom.xml index fcc5810188..2623bd7ecd 100644 --- a/security-domain-to-domain/test/pom.xml +++ b/security-domain-to-domain/test/pom.xml @@ -34,8 +34,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/security-domain-to-domain/test/src/test/java/org/wildfly/quickstarts/security_domain_to_domain_web/BasicRuntimeIT.java b/security-domain-to-domain/test/src/test/java/org/wildfly/quickstarts/security_domain_to_domain_web/BasicRuntimeIT.java index 002d809ce0..3bb8579de6 100644 --- a/security-domain-to-domain/test/src/test/java/org/wildfly/quickstarts/security_domain_to_domain_web/BasicRuntimeIT.java +++ b/security-domain-to-domain/test/src/test/java/org/wildfly/quickstarts/security_domain_to_domain_web/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.wildfly.quickstarts.security_domain_to_domain_web; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -27,7 +27,7 @@ import java.time.Duration; import java.util.Base64; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/servlet-async/pom.xml b/servlet-async/pom.xml index 254127962e..b497dc7152 100644 --- a/servlet-async/pom.xml +++ b/servlet-async/pom.xml @@ -51,8 +51,6 @@ ${version.server} 6.0.3.Final - - 5.9.3 @@ -102,8 +100,7 @@ org.junit.jupiter - junit-jupiter-engine - ${version.org.junit.jupiter} + junit-jupiter test diff --git a/servlet-filterlistener/pom.xml b/servlet-filterlistener/pom.xml index 2b4cb8881c..1eb115c300 100644 --- a/servlet-filterlistener/pom.xml +++ b/servlet-filterlistener/pom.xml @@ -51,8 +51,6 @@ ${version.server} 6.0.3.Final - - 5.9.3 @@ -102,8 +100,7 @@ org.junit.jupiter - junit-jupiter-engine - ${version.org.junit.jupiter} + junit-jupiter test diff --git a/servlet-security/pom.xml b/servlet-security/pom.xml index 9f0a8aeeb1..65fd3a30ba 100644 --- a/servlet-security/pom.xml +++ b/servlet-security/pom.xml @@ -51,8 +51,6 @@ ${version.server} 6.0.3.Final - - 5.9.3 @@ -95,8 +93,7 @@ org.junit.jupiter - junit-jupiter-engine - ${version.org.junit.jupiter} + junit-jupiter test diff --git a/spring-resteasy/pom.xml b/spring-resteasy/pom.xml index 050b241ebf..e167d6ad85 100644 --- a/spring-resteasy/pom.xml +++ b/spring-resteasy/pom.xml @@ -109,8 +109,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/spring-resteasy/src/test/java/org/jboss/as/quickstarts/resteasyspring/test/BasicRuntimeIT.java b/spring-resteasy/src/test/java/org/jboss/as/quickstarts/resteasyspring/test/BasicRuntimeIT.java index d28e5616db..65b735131e 100644 --- a/spring-resteasy/src/test/java/org/jboss/as/quickstarts/resteasyspring/test/BasicRuntimeIT.java +++ b/spring-resteasy/src/test/java/org/jboss/as/quickstarts/resteasyspring/test/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.resteasyspring.test; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,8 +25,8 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * The very basic runtime integration testing. diff --git a/spring-resteasy/src/test/java/org/jboss/as/quickstarts/resteasyspring/test/ResteasySpringIT.java b/spring-resteasy/src/test/java/org/jboss/as/quickstarts/resteasyspring/test/ResteasySpringIT.java index 955bc44f03..da37d021a7 100644 --- a/spring-resteasy/src/test/java/org/jboss/as/quickstarts/resteasyspring/test/ResteasySpringIT.java +++ b/spring-resteasy/src/test/java/org/jboss/as/quickstarts/resteasyspring/test/ResteasySpringIT.java @@ -30,9 +30,9 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; /** * Basic unit tests for resteasy spring integration @@ -44,7 +44,7 @@ public class ResteasySpringIT { private static final String DEFAULT_SERVER_HOST = "http://localhost:8080"; - @BeforeClass + @BeforeAll public static void setupUrl() throws MalformedURLException { String serverHost = System.getenv("SERVER_HOST"); if (serverHost == null) { @@ -69,8 +69,8 @@ public void testHelloSpringResource() throws Exception { .build(); HttpGet method = new HttpGet(uri); try (CloseableHttpResponse response = client.execute(method)) { - Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); - Assert.assertTrue(EntityUtils.toString(response.getEntity()).contains("JBoss Developer")); + Assertions.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); + Assertions.assertTrue(EntityUtils.toString(response.getEntity()).contains("JBoss Developer")); } finally { method.releaseConnection(); } @@ -78,8 +78,8 @@ public void testHelloSpringResource() throws Exception { { HttpGet method = new HttpGet(url.toString() + "/spring-resteasy/basic"); try (CloseableHttpResponse response = client.execute(method)) { - Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); - Assert.assertTrue(EntityUtils.toString(response.getEntity()).contains("basic")); + Assertions.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); + Assertions.assertTrue(EntityUtils.toString(response.getEntity()).contains("basic")); } finally { method.releaseConnection(); } @@ -88,7 +88,7 @@ public void testHelloSpringResource() throws Exception { HttpPut method = new HttpPut(url.toString() + "/spring-resteasy/basic"); method.setEntity(new StringEntity("basic", ContentType.TEXT_PLAIN)); try (CloseableHttpResponse response = client.execute(method)) { - Assert.assertEquals(HttpStatus.SC_NO_CONTENT, response.getStatusLine().getStatusCode()); + Assertions.assertEquals(HttpStatus.SC_NO_CONTENT, response.getStatusLine().getStatusCode()); } finally { method.releaseConnection(); } @@ -103,8 +103,8 @@ public void testHelloSpringResource() throws Exception { .build(); HttpGet method = new HttpGet(uri); try (CloseableHttpResponse response = client.execute(method)) { - Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); - Assert.assertTrue(EntityUtils.toString(response.getEntity()).contains("hello world")); + Assertions.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); + Assertions.assertTrue(EntityUtils.toString(response.getEntity()).contains("hello world")); } finally { method.releaseConnection(); } @@ -112,8 +112,8 @@ public void testHelloSpringResource() throws Exception { { HttpGet method = new HttpGet(url.toString() + "/spring-resteasy/matrixParam;param=matrix"); try (CloseableHttpResponse response = client.execute(method)) { - Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); - Assert.assertEquals("matrix", EntityUtils.toString(response.getEntity())); + Assertions.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); + Assertions.assertEquals("matrix", EntityUtils.toString(response.getEntity())); } finally { method.releaseConnection(); } @@ -121,8 +121,8 @@ public void testHelloSpringResource() throws Exception { { HttpGet method = new HttpGet(url.toString() + "/spring-resteasy/uriParam/1234"); try (CloseableHttpResponse response = client.execute(method)) { - Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); - Assert.assertEquals("1234", EntityUtils.toString(response.getEntity())); + Assertions.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); + Assertions.assertEquals("1234", EntityUtils.toString(response.getEntity())); } finally { method.releaseConnection(); } @@ -143,8 +143,8 @@ public void testLocatingResource() throws Exception { .build(); HttpGet method = new HttpGet(uri); try (CloseableHttpResponse response = client.execute(method)) { - Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); - Assert.assertTrue(EntityUtils.toString(response.getEntity()).contains("JBoss Developer")); + Assertions.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); + Assertions.assertTrue(EntityUtils.toString(response.getEntity()).contains("JBoss Developer")); } finally { method.releaseConnection(); } @@ -152,8 +152,8 @@ public void testLocatingResource() throws Exception { { HttpGet method = new HttpGet(url.toString() + "/spring-resteasy/locating/basic"); try (CloseableHttpResponse response = client.execute(method)) { - Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); - Assert.assertTrue(EntityUtils.toString(response.getEntity()).contains("basic")); + Assertions.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); + Assertions.assertTrue(EntityUtils.toString(response.getEntity()).contains("basic")); } finally { method.releaseConnection(); } @@ -162,7 +162,7 @@ public void testLocatingResource() throws Exception { HttpPut method = new HttpPut(url.toString() + "/spring-resteasy/locating/basic"); method.setEntity(new StringEntity("basic", ContentType.TEXT_PLAIN)); try (CloseableHttpResponse response = client.execute(method)) { - Assert.assertEquals(HttpStatus.SC_NO_CONTENT, response.getStatusLine().getStatusCode()); + Assertions.assertEquals(HttpStatus.SC_NO_CONTENT, response.getStatusLine().getStatusCode()); } finally { method.releaseConnection(); } @@ -177,8 +177,8 @@ public void testLocatingResource() throws Exception { .build(); HttpGet method = new HttpGet(uri); try (CloseableHttpResponse response = client.execute(method)) { - Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); - Assert.assertTrue(EntityUtils.toString(response.getEntity()).contains("hello world")); + Assertions.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); + Assertions.assertTrue(EntityUtils.toString(response.getEntity()).contains("hello world")); } finally { method.releaseConnection(); } @@ -186,8 +186,8 @@ public void testLocatingResource() throws Exception { { HttpGet method = new HttpGet(url.toString() + "/spring-resteasy/locating/matrixParam;param=matrix"); try (CloseableHttpResponse response = client.execute(method)) { - Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); - Assert.assertEquals("matrix", EntityUtils.toString(response.getEntity())); + Assertions.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); + Assertions.assertEquals("matrix", EntityUtils.toString(response.getEntity())); } finally { method.releaseConnection(); } @@ -195,8 +195,8 @@ public void testLocatingResource() throws Exception { { HttpGet method = new HttpGet(url.toString() + "/spring-resteasy/locating/uriParam/1234"); try (CloseableHttpResponse response = client.execute(method)) { - Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); - Assert.assertEquals("1234", EntityUtils.toString(response.getEntity())); + Assertions.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); + Assertions.assertEquals("1234", EntityUtils.toString(response.getEntity())); } finally { method.releaseConnection(); } diff --git a/tasks-jsf/pom.xml b/tasks-jsf/pom.xml index ae526581dd..021bef416a 100644 --- a/tasks-jsf/pom.xml +++ b/tasks-jsf/pom.xml @@ -51,8 +51,6 @@ ${version.server} 6.0.3.Final - - 5.9.3 @@ -104,8 +102,7 @@ org.junit.jupiter - junit-jupiter-engine - ${version.org.junit.jupiter} + junit-jupiter test diff --git a/temperature-converter/pom.xml b/temperature-converter/pom.xml index 1713945cbe..45a93b431d 100644 --- a/temperature-converter/pom.xml +++ b/temperature-converter/pom.xml @@ -98,8 +98,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/temperature-converter/src/test/java/org/jboss/as/quickstarts/temperatureconverter/BasicRuntimeIT.java b/temperature-converter/src/test/java/org/jboss/as/quickstarts/temperatureconverter/BasicRuntimeIT.java index 38d271b550..bdad749e57 100644 --- a/temperature-converter/src/test/java/org/jboss/as/quickstarts/temperatureconverter/BasicRuntimeIT.java +++ b/temperature-converter/src/test/java/org/jboss/as/quickstarts/temperatureconverter/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.temperatureconverter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/temperature-converter/src/test/java/org/jboss/as/quickstarts/temperatureconverter/TemperatureConverterIT.java b/temperature-converter/src/test/java/org/jboss/as/quickstarts/temperatureconverter/TemperatureConverterIT.java index 69512490a6..ecfc720243 100644 --- a/temperature-converter/src/test/java/org/jboss/as/quickstarts/temperatureconverter/TemperatureConverterIT.java +++ b/temperature-converter/src/test/java/org/jboss/as/quickstarts/temperatureconverter/TemperatureConverterIT.java @@ -16,7 +16,7 @@ */ package org.jboss.as.quickstarts.temperatureconverter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.CookieManager; import java.net.CookiePolicy; @@ -30,8 +30,8 @@ import java.nio.charset.StandardCharsets; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TemperatureConverterIT { @@ -46,7 +46,7 @@ public void testConvertTemperature() throws Exception { HttpResponse response = client.send(HttpRequest.newBuilder(new URI(BasicRuntimeIT.getServerHost()+"/temperature-converter/temperatureconvert.jsf")).GET().build(), HttpResponse.BodyHandlers.ofString()); String body = response.body().toString(); assertEquals(200, response.statusCode()); - assertTrue(body, body.contains(" data) { diff --git a/thread-racing/pom.xml b/thread-racing/pom.xml index 616751b4ff..8bdf6e0924 100644 --- a/thread-racing/pom.xml +++ b/thread-racing/pom.xml @@ -157,8 +157,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter test diff --git a/thread-racing/src/test/java/org/jboss/as/quickstarts/threadracing/BasicRuntimeIT.java b/thread-racing/src/test/java/org/jboss/as/quickstarts/threadracing/BasicRuntimeIT.java index 9b43d30e99..3679f9e57d 100644 --- a/thread-racing/src/test/java/org/jboss/as/quickstarts/threadracing/BasicRuntimeIT.java +++ b/thread-racing/src/test/java/org/jboss/as/quickstarts/threadracing/BasicRuntimeIT.java @@ -15,7 +15,7 @@ */ package org.jboss.as.quickstarts.threadracing; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URI; @@ -25,7 +25,7 @@ import java.net.http.HttpResponse; import java.time.Duration; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * The very basic runtime integration testing. diff --git a/thread-racing/src/test/java/org/jboss/as/quickstarts/threadracing/ThreadRacingIT.java b/thread-racing/src/test/java/org/jboss/as/quickstarts/threadracing/ThreadRacingIT.java index 02a32b34fa..05175eb84d 100644 --- a/thread-racing/src/test/java/org/jboss/as/quickstarts/threadracing/ThreadRacingIT.java +++ b/thread-racing/src/test/java/org/jboss/as/quickstarts/threadracing/ThreadRacingIT.java @@ -16,7 +16,7 @@ */ package org.jboss.as.quickstarts.threadracing; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; @@ -27,9 +27,9 @@ import java.util.LinkedHashSet; import java.util.Set; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * The thread racing runtime integration testing. @@ -76,16 +76,16 @@ public void race() throws IOException, InterruptedException { .newWebSocketBuilder() .buildAsync(getWebSocketEndpoint(), listener) .join(); - assertTrue("Connection should be opened", listener.isConnected()); + assertTrue(listener.isConnected(), "Connection should be opened"); while (notFinished) { webSocket.request(1); } webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "Done"); webSocket.request(1); - assertTrue("Connection should be closed", webSocket.isOutputClosed()); - assertFalse("Connection should be closed", listener.isConnected()); + assertTrue(webSocket.isOutputClosed(), "Connection should be closed"); + assertFalse(listener.isConnected(), "Connection should be closed"); webSocket.abort(); - assertTrue("Connection should be closed", webSocket.isInputClosed()); + assertTrue(webSocket.isInputClosed(), "Connection should be closed"); String[] result = messages.toArray(new String[0]); assertEquals("
Please await() the official results ", result[messages.size() - 6]); } diff --git a/todo-backend/pom.xml b/todo-backend/pom.xml index 4871172faf..f8b6ae0a18 100644 --- a/todo-backend/pom.xml +++ b/todo-backend/pom.xml @@ -118,8 +118,7 @@ org.junit.jupiter - junit-jupiter-engine - 5.9.3 + junit-jupiter test diff --git a/websocket-endpoint/pom.xml b/websocket-endpoint/pom.xml index 0b0469dfe2..1d136026b3 100644 --- a/websocket-endpoint/pom.xml +++ b/websocket-endpoint/pom.xml @@ -52,7 +52,6 @@ ${version.server} 6.0.3.Final - 5.9.3 1.1.9 @@ -122,8 +121,7 @@ org.junit.jupiter - junit-jupiter-engine - ${version.org.junit.jupiter} + junit-jupiter test diff --git a/websocket-hello/pom.xml b/websocket-hello/pom.xml index cebacaac76..4f7165091b 100644 --- a/websocket-hello/pom.xml +++ b/websocket-hello/pom.xml @@ -79,8 +79,7 @@ org.junit.jupiter - junit-jupiter-engine - 5.9.3 + junit-jupiter test