diff --git a/extensions/keycloak-admin-client/runtime/pom.xml b/extensions/keycloak-admin-client/runtime/pom.xml index 2c24dbb098b83..9d4195d3bd266 100644 --- a/extensions/keycloak-admin-client/runtime/pom.xml +++ b/extensions/keycloak-admin-client/runtime/pom.xml @@ -58,11 +58,6 @@ org.jboss.logging commons-logging-jboss-logging - - junit - junit - test - diff --git a/extensions/keycloak-authorization/runtime/pom.xml b/extensions/keycloak-authorization/runtime/pom.xml index 8053bbf07182b..1e0a125c44d15 100644 --- a/extensions/keycloak-authorization/runtime/pom.xml +++ b/extensions/keycloak-authorization/runtime/pom.xml @@ -44,11 +44,6 @@ org.jboss.logging commons-logging-jboss-logging - - junit - junit - test - diff --git a/integration-tests/maven/pom.xml b/integration-tests/maven/pom.xml index 9dc2fcebfd612..bcfaede377a50 100644 --- a/integration-tests/maven/pom.xml +++ b/integration-tests/maven/pom.xml @@ -50,10 +50,6 @@ ${project.version} test - - junit - junit - io.quarkus quarkus-junit5-internal diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectCodestartMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectCodestartMojoIT.java index 686e4144b7178..0dd71949149a0 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectCodestartMojoIT.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectCodestartMojoIT.java @@ -27,7 +27,7 @@ import org.apache.maven.shared.invoker.InvokerLogger; import org.apache.maven.shared.invoker.MavenInvocationException; import org.apache.maven.shared.invoker.PrintStreamLogger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; @@ -93,7 +93,7 @@ public void generateCustomRESTEasyJavaProject() throws Exception { "\"/bonjour\""); checkContent(generatedProjectPath.resolve("src/test/java/com/andy/NativeBonjourResourceIT.java"), - "package comandy;", + "package com.andy;", "class NativeBonjourResourceIT extends BonjourResourceTest"); } diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java index bc820a6d20c3c..e81f48f70ed3e 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java @@ -3,8 +3,8 @@ import static io.quarkus.maven.it.ApplicationNameAndVersionTestUtil.assertApplicationPropertiesSetCorrectly; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; -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.BufferedReader; import java.io.File; diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/JarRunnerIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/JarRunnerIT.java index d131a9289209c..322260a164d8d 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/JarRunnerIT.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/JarRunnerIT.java @@ -31,7 +31,6 @@ import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.exporter.ZipExporter; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.Assert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledForJreRange; @@ -138,7 +137,7 @@ public void testPlatformPropertiesOverridenInApplicationProperties() throws Exce Process process = doLaunch(new File(testDir, "app/target"), Paths.get("acme-app-1.0-SNAPSHOT-runner.jar"), output, Collections.emptyList()).start(); try { - Assert.assertEquals("builder-image is customized", DevModeTestUtils.getHttpResponse("/hello")); + Assertions.assertEquals("builder-image is customized", DevModeTestUtils.getHttpResponse("/hello")); } finally { process.destroy(); } @@ -163,7 +162,7 @@ public void testPlatformPropertiesOverridenOnCommandLine() throws Exception { Process process = doLaunch(new File(testDir, "app/target"), Paths.get("acme-app-1.0-SNAPSHOT-runner.jar"), output, Collections.emptyList()).start(); try { - Assert.assertEquals("builder-image is commandline", DevModeTestUtils.getHttpResponse("/hello")); + Assertions.assertEquals("builder-image is commandline", DevModeTestUtils.getHttpResponse("/hello")); } finally { process.destroy(); } diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/PackageIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/PackageIT.java index 3e9e52a7679e4..e6fc632ee1574 100644 --- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/PackageIT.java +++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/PackageIT.java @@ -22,7 +22,7 @@ import java.util.zip.ZipInputStream; import org.apache.maven.shared.invoker.MavenInvocationException; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import io.quarkus.maven.it.verifier.MavenProcessInvocationResult; @@ -203,7 +203,7 @@ public void testRunnerUberJarHasValidCRC() throws Exception { assertThat(getNumberOfFilesEndingWith(targetDir, ".original")).isEqualTo(1); final Path runnerJar = targetDir.toPath().resolve("acme-1.0-SNAPSHOT-runner.jar"); - Assert.assertTrue("Runner jar " + runnerJar + " is missing", Files.exists(runnerJar)); + Assertions.assertTrue(Files.exists(runnerJar), "Runner jar " + runnerJar + " is missing"); assertZipEntriesCanBeOpenedAndClosed(runnerJar); } @@ -229,7 +229,7 @@ public void testRunnerJarHasValidCRC() throws Exception { assertThat(getNumberOfFilesEndingWith(targetDir, ".jar")).isEqualTo(2); final Path runnerJar = targetDir.toPath().resolve("acme-1.0-SNAPSHOT-runner.jar"); - Assert.assertTrue("Runner jar " + runnerJar + " is missing", Files.exists(runnerJar)); + Assertions.assertTrue(Files.exists(runnerJar), "Runner jar " + runnerJar + " is missing"); assertZipEntriesCanBeOpenedAndClosed(runnerJar); } @@ -250,7 +250,7 @@ public void testQuarkusIndexDependencyOnLocalModule() throws Exception { assertThat(getNumberOfFilesEndingWith(targetDir, ".jar")).isEqualTo(2); final Path runnerJar = targetDir.toPath().resolve("quarkus-quickstart-multimodule-main-1.0-SNAPSHOT-runner.jar"); - Assert.assertTrue("Runner jar " + runnerJar + " is missing", Files.exists(runnerJar)); + Assertions.assertTrue(Files.exists(runnerJar), "Runner jar " + runnerJar + " is missing"); assertZipEntriesCanBeOpenedAndClosed(runnerJar); } diff --git a/integration-tests/packaging/pom.xml b/integration-tests/packaging/pom.xml index 07a6adf437d7d..17a579a8575bc 100644 --- a/integration-tests/packaging/pom.xml +++ b/integration-tests/packaging/pom.xml @@ -20,11 +20,6 @@ assertj-core test - - junit - junit - test - io.quarkus quarkus-junit5-internal diff --git a/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsThinJarTest.java b/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsThinJarTest.java index eb78fd39970a6..53cc5d185dbba 100644 --- a/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsThinJarTest.java +++ b/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsThinJarTest.java @@ -11,7 +11,7 @@ import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -44,12 +44,11 @@ public void testManifestEntries() throws Exception { Attributes testAttributes = manifest.getEntries().get("Test-Information"); assertThat(testAttributes).isNotNull(); Attributes.Name testKey1 = new Attributes.Name("Test-Key-1"); - Assert.assertTrue("Custom Manifest Entry for Test-Key-1 is missing", - testAttributes.containsKey(testKey1)); - Assert.assertEquals("Custom Manifest Entry for Test-Key-1 value is not correct", - "Test Value 1", testAttributes.getValue(testKey1)); - Assert.assertTrue("Custom Manifest Entry for Test-Key-2 is missing", - testAttributes.containsKey(new Attributes.Name("Test-Key-2"))); + Assertions.assertTrue(testAttributes.containsKey(testKey1), "Custom Manifest Entry for Test-Key-1 is missing"); + Assertions.assertEquals("Test Value 1", testAttributes.getValue(testKey1), + "Custom Manifest Entry for Test-Key-1 value is not correct"); + Assertions.assertTrue(testAttributes.containsKey(new Attributes.Name("Test-Key-2")), + "Custom Manifest Entry for Test-Key-2 is missing"); } } } diff --git a/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsUberJarTest.java b/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsUberJarTest.java index ae421e21c82ed..3e3944081e6b5 100644 --- a/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsUberJarTest.java +++ b/integration-tests/packaging/src/test/java/io/quarkus/maven/CustomManifestSectionsUberJarTest.java @@ -11,7 +11,7 @@ import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -44,12 +44,11 @@ public void testManifestEntries() throws Exception { Attributes testAttributes = manifest.getEntries().get("Test-Information"); assertThat(testAttributes).isNotNull(); Attributes.Name testKey1 = new Attributes.Name("Test-Key-1"); - Assert.assertTrue("Custom Manifest Entry for Test-Key-1 is missing", - testAttributes.containsKey(testKey1)); - Assert.assertEquals("Custom Manifest Entry for Test-Key-1 value is not correct", - "Test Value 1", testAttributes.getValue(testKey1)); - Assert.assertTrue("Custom Manifest Entry for Test-Key-2 is missing", - testAttributes.containsKey(new Attributes.Name("Test-Key-2"))); + Assertions.assertTrue(testAttributes.containsKey(testKey1), "Custom Manifest Entry for Test-Key-1 is missing"); + Assertions.assertEquals("Test Value 1", testAttributes.getValue(testKey1), + "Custom Manifest Entry for Test-Key-1 value is not correct"); + Assertions.assertTrue(testAttributes.containsKey(new Attributes.Name("Test-Key-2")), + "Custom Manifest Emntry for Test-Key-2 is missing"); } } }