Use the new unit test API

It's slightly nicer, and we really want new tests to use it rather than just copying existing tests that use the old API.
quarkusio · Nov 4, 2021 · 01bee69 · 01bee69
1 parent 442f14e
commit 01bee69
Show file tree

Hide file tree

Showing 1,281 changed files with 1,400 additions and 3,822 deletions.
diff --git a/.../deployment/src/test/java/io/quarkus/commandmode/DefaultProfileInjectingMainTestCase.java b/.../deployment/src/test/java/io/quarkus/commandmode/DefaultProfileInjectingMainTestCase.java
@@ -1,8 +1,6 @@
 package io.quarkus.commandmode;
 
 import org.assertj.core.api.Assertions;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -12,7 +10,7 @@ public class DefaultProfileInjectingMainTestCase {
 
     @RegisterExtension
     static final QuarkusProdModeTest config = new QuarkusProdModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addClasses(PropertyInjectingMain.class))
             .setApplicationName("property-injecting")
             .setApplicationVersion("0.1-SNAPSHOT")

diff --git a/...deployment/src/test/java/io/quarkus/commandmode/ExceptionHandlingCommandModeTestCase.java b/...deployment/src/test/java/io/quarkus/commandmode/ExceptionHandlingCommandModeTestCase.java
@@ -1,8 +1,6 @@
 package io.quarkus.commandmode;
 
 import org.assertj.core.api.Assertions;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -12,7 +10,7 @@ public class ExceptionHandlingCommandModeTestCase {
 
     @RegisterExtension
     static final QuarkusProdModeTest config = new QuarkusProdModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addAsManifestResource("application.properties", "microprofile-config.properties")
                     .addClasses(ThrowExceptionApplicationMain.class, ThrowExceptionApplication.class))
             .setApplicationName("exception-handling")

diff --git a/...deployment/src/test/java/io/quarkus/commandmode/ExceptionThrowingCommandModeTestCase.java b/...deployment/src/test/java/io/quarkus/commandmode/ExceptionThrowingCommandModeTestCase.java
@@ -1,8 +1,6 @@
 package io.quarkus.commandmode;
 
 import org.assertj.core.api.Assertions;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -11,7 +9,7 @@
 public class ExceptionThrowingCommandModeTestCase {
     @RegisterExtension
     static final QuarkusProdModeTest config = new QuarkusProdModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addAsManifestResource("application.properties", "microprofile-config.properties")
                     .addClasses(ExceptionThrowingMain.class))
             .setApplicationName("exception-throwing")

diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExitCodeTestCase.java b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/ExitCodeTestCase.java
@@ -4,8 +4,6 @@
 import java.util.concurrent.ExecutionException;
 import java.util.function.BiConsumer;
 
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -20,7 +18,7 @@ public class ExitCodeTestCase {
 
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+            .withEmptyApplication();
 
     @Test
     public void testReturnedExitCode() throws ExecutionException, InterruptedException {

diff --git a/...t-extension/deployment/src/test/java/io/quarkus/commandmode/InvalidNamedMainTestCase.java b/...t-extension/deployment/src/test/java/io/quarkus/commandmode/InvalidNamedMainTestCase.java
@@ -2,8 +2,6 @@
 
 import static org.junit.jupiter.api.Assertions.fail;
 
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -12,7 +10,7 @@
 public class InvalidNamedMainTestCase {
     @RegisterExtension
     static final QuarkusProdModeTest config = new QuarkusProdModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addAsManifestResource("application.properties", "microprofile-config.properties")
                     .addClasses(JavaMain.class, HelloWorldNonDefault.class, NamedMain.class))
             .setApplicationName("run-exit")

diff --git a/...nsion/deployment/src/test/java/io/quarkus/commandmode/JavaMainFullyQualifiedTestCase.java b/...nsion/deployment/src/test/java/io/quarkus/commandmode/JavaMainFullyQualifiedTestCase.java
@@ -1,8 +1,6 @@
 package io.quarkus.commandmode;
 
 import org.assertj.core.api.Assertions;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -11,7 +9,7 @@
 public class JavaMainFullyQualifiedTestCase {
     @RegisterExtension
     static final QuarkusProdModeTest config = new QuarkusProdModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addAsManifestResource("application.properties", "microprofile-config.properties")
                     .addClasses(JavaMain.class, HelloWorldNonDefault.class))
             .setApplicationName("run-exit")

diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/JavaMainTestCase.java b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/JavaMainTestCase.java
@@ -1,8 +1,6 @@
 package io.quarkus.commandmode;
 
 import org.assertj.core.api.Assertions;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -11,7 +9,7 @@
 public class JavaMainTestCase {
     @RegisterExtension
     static final QuarkusProdModeTest config = new QuarkusProdModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addAsManifestResource("application.properties", "microprofile-config.properties")
                     .addClasses(JavaMain.class, HelloWorldNonDefault.class))
             .setApplicationName("run-exit")

diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/NamedMainTestCase.java b/core/test-extension/deployment/src/test/java/io/quarkus/commandmode/NamedMainTestCase.java
@@ -1,8 +1,6 @@
 package io.quarkus.commandmode;
 
 import org.assertj.core.api.Assertions;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -11,7 +9,7 @@
 public class NamedMainTestCase {
     @RegisterExtension
     static final QuarkusProdModeTest config = new QuarkusProdModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addAsManifestResource("application.properties", "microprofile-config.properties")
                     .addClasses(JavaMain.class, HelloWorldNonDefault.class, NamedMain.class))
             .setApplicationName("run-exit")

diff --git a/...ployment/src/test/java/io/quarkus/commandmode/OverriddenProfileInjectingMainTestCase.java b/...ployment/src/test/java/io/quarkus/commandmode/OverriddenProfileInjectingMainTestCase.java
@@ -3,8 +3,6 @@
 import java.util.Collections;
 
 import org.assertj.core.api.Assertions;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -14,7 +12,7 @@ public class OverriddenProfileInjectingMainTestCase {
 
     @RegisterExtension
     static final QuarkusProdModeTest config = new QuarkusProdModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addClasses(PropertyInjectingMain.class))
             .setApplicationName("property-injecting")
             .setApplicationVersion("0.1-SNAPSHOT")

diff --git a/...n/deployment/src/test/java/io/quarkus/commandmode/SimpleCommandModeBothMainsTestCase.java b/...n/deployment/src/test/java/io/quarkus/commandmode/SimpleCommandModeBothMainsTestCase.java
@@ -1,8 +1,6 @@
 package io.quarkus.commandmode;
 
 import org.assertj.core.api.Assertions;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -11,7 +9,7 @@
 public class SimpleCommandModeBothMainsTestCase {
     @RegisterExtension
     static final QuarkusProdModeTest config = new QuarkusProdModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addAsManifestResource("application.properties", "microprofile-config.properties")
                     .addClasses(BothTypesMain.class))
             .setApplicationName("run-exit")

diff --git a/...-extension/deployment/src/test/java/io/quarkus/commandmode/SimpleCommandModeTestCase.java b/...-extension/deployment/src/test/java/io/quarkus/commandmode/SimpleCommandModeTestCase.java
@@ -1,8 +1,6 @@
 package io.quarkus.commandmode;
 
 import org.assertj.core.api.Assertions;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -11,7 +9,7 @@
 public class SimpleCommandModeTestCase {
     @RegisterExtension
     static final QuarkusProdModeTest config = new QuarkusProdModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addAsManifestResource("application.properties", "microprofile-config.properties")
                     .addClasses(HelloWorldMain.class, NamedMain.class))
             .setApplicationName("run-exit")

diff --git a/...ension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingInvalidTest.java b/...ension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingInvalidTest.java
@@ -2,8 +2,6 @@
 
 import javax.inject.Inject;
 
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -15,7 +13,7 @@
 public class StaticInitConfigMappingInvalidTest {
     @RegisterExtension
     static final QuarkusUnitTest TEST = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addClass(RuntimeInitConfigSource.class)
                     .addAsServiceProvider("org.eclipse.microprofile.config.spi.ConfigSource",
                             RuntimeInitConfigSource.class.getName()))

diff --git a/...est-extension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingTest.java b/...est-extension/deployment/src/test/java/io/quarkus/config/StaticInitConfigMappingTest.java
@@ -4,8 +4,6 @@
 
 import javax.inject.Inject;
 
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -15,7 +13,7 @@
 public class StaticInitConfigMappingTest {
     @RegisterExtension
     static final QuarkusUnitTest TEST = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addClass(StaticInitConfigSource.class)
                     .addAsServiceProvider("org.eclipse.microprofile.config.spi.ConfigSource",
                             StaticInitConfigSource.class.getName()));

diff --git a/...ent/src/test/java/io/quarkus/deployment/pkg/builditem/GeneratedResourceBuildItemTest.java b/...ent/src/test/java/io/quarkus/deployment/pkg/builditem/GeneratedResourceBuildItemTest.java
@@ -12,8 +12,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -25,7 +23,7 @@ class GeneratedResourceBuildItemTest {
 
     @RegisterExtension
     static final QuarkusProdModeTest runner = new QuarkusProdModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addAsManifestResource("application.properties", "microprofile-config.properties")
                     .addClass(UberJarMain.class))
             .setApplicationName("generated-resource")

diff --git a/...rc/test/java/io/quarkus/deployment/pkg/builditem/UberJarIgnoredResourceBuildItemTest.java b/...rc/test/java/io/quarkus/deployment/pkg/builditem/UberJarIgnoredResourceBuildItemTest.java
@@ -7,8 +7,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -20,7 +18,7 @@ class UberJarIgnoredResourceBuildItemTest {
 
     @RegisterExtension
     static final QuarkusProdModeTest runner = new QuarkusProdModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addAsManifestResource("application.properties", "microprofile-config.properties")
                     .addClass(UberJarMain.class))
             .setApplicationName("uber-jar-ignored")

diff --git a/...src/test/java/io/quarkus/deployment/pkg/builditem/UberJarMergedResourceBuildItemTest.java b/...src/test/java/io/quarkus/deployment/pkg/builditem/UberJarMergedResourceBuildItemTest.java
@@ -11,8 +11,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -24,7 +22,7 @@ class UberJarMergedResourceBuildItemTest {
 
     @RegisterExtension
     static final QuarkusProdModeTest runner = new QuarkusProdModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addAsManifestResource("application.properties", "microprofile-config.properties")
                     .addClass(UberJarMain.class))
             .setApplicationName("uber-jar-merged")

diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/extest/ConfiguredBeanTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/extest/ConfiguredBeanTest.java
@@ -25,8 +25,6 @@
 import javax.inject.Inject;
 
 import org.eclipse.microprofile.config.spi.ConfigSource;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -52,7 +50,7 @@
 public class ConfiguredBeanTest {
     @RegisterExtension
     static final QuarkusUnitTest TEST = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addClasses(ConfiguredBean.class)
                     // Don't change this to types, because of classloader class cast exception.
                     .addAsServiceProvider("org.eclipse.microprofile.config.spi.ConfigSource",

diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/extest/RuntimeDefaultsTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/extest/RuntimeDefaultsTest.java
@@ -9,8 +9,6 @@
 import javax.inject.Inject;
 
 import org.eclipse.microprofile.config.spi.ConfigSource;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -20,7 +18,7 @@
 public class RuntimeDefaultsTest {
     @RegisterExtension
     static final QuarkusUnitTest TEST = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     // Don't change this to types, because of classloader class cast exception.
                     .addAsServiceProvider("org.eclipse.microprofile.config.spi.ConfigSource",
                             "io.quarkus.extest.runtime.config.EnvBuildTimeConfigSource")

diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/extest/StaticInitSourcesTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/extest/StaticInitSourcesTest.java
@@ -2,8 +2,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -15,7 +13,7 @@
 public class StaticInitSourcesTest {
     @RegisterExtension
     static final QuarkusUnitTest TEST = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addClasses(ConfiguredBean.class)
                     // Don't change this to types, because of classloader class cast exception.
                     .addAsServiceProvider("org.eclipse.microprofile.config.spi.ConfigSource",

diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/extest/UnknownConfigTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/extest/UnknownConfigTest.java
@@ -11,8 +11,6 @@
 import javax.inject.Inject;
 
 import org.eclipse.microprofile.config.Config;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -23,7 +21,7 @@
 public class UnknownConfigTest {
     @RegisterExtension
     static final QuarkusUnitTest TEST = new QuarkusUnitTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addAsResource("application.properties"))
             .setLogRecordPredicate(record -> record.getLevel().intValue() >= Level.WARNING.intValue())
             .assertLogRecords(logRecords -> {

diff --git a/...test-extension/deployment/src/test/java/io/quarkus/forkjoin/ForkJoinProdModeTestCase.java b/...test-extension/deployment/src/test/java/io/quarkus/forkjoin/ForkJoinProdModeTestCase.java
@@ -1,8 +1,6 @@
 package io.quarkus.forkjoin;
 
-import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -13,7 +11,7 @@ public class ForkJoinProdModeTestCase {
 
     @RegisterExtension
     static final QuarkusProdModeTest config = new QuarkusProdModeTest()
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addClasses(ProductionModeTestsEndpoint.class, ForkJoinPoolAssertions.class)
                     .addAsResource(new StringAsset("quarkus.banner.enabled=false\nquarkus.log.level=ERROR"),
                             "application.properties"))

diff --git a/core/test-extension/deployment/src/test/java/io/quarkus/logging/AdditionalHandlersTest.java b/core/test-extension/deployment/src/test/java/io/quarkus/logging/AdditionalHandlersTest.java
@@ -6,8 +6,6 @@
 import java.util.logging.Handler;
 import java.util.logging.Level;
 
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -19,7 +17,7 @@ public class AdditionalHandlersTest {
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .withConfigurationResource("application-additional-handlers.properties")
-            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+            .withApplicationRoot((jar) -> jar
                     .addClass(LoggingTestsHelper.class)
                     .addAsManifestResource("application.properties", "microprofile-config.properties"));