diff --git a/extensions/amazon-dynamodb/deployment/src/test/java/io/quarkus/dynamodb/deployment/DynamodbMissingInterceptorConfigTest.java b/extensions/amazon-dynamodb/deployment/src/test/java/io/quarkus/dynamodb/deployment/DynamodbMissingInterceptorConfigTest.java index f1cc73137..14d44c91b 100644 --- a/extensions/amazon-dynamodb/deployment/src/test/java/io/quarkus/dynamodb/deployment/DynamodbMissingInterceptorConfigTest.java +++ b/extensions/amazon-dynamodb/deployment/src/test/java/io/quarkus/dynamodb/deployment/DynamodbMissingInterceptorConfigTest.java @@ -21,6 +21,7 @@ public class DynamodbMissingInterceptorConfigTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .setExpectedException(ConfigurationError.class) .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) + .addClass(BadInterceptor.class) .addAsResource("missing-interceptor-config.properties", "application.properties")); @Test diff --git a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/BcryptPasswordMapperTest.java b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/BcryptPasswordMapperTest.java index eb1eed6e8..e75a7500b 100644 --- a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/BcryptPasswordMapperTest.java +++ b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/BcryptPasswordMapperTest.java @@ -12,6 +12,7 @@ public class BcryptPasswordMapperTest extends JdbcSecurityRealmTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClasses) + .addAsResource("bcrypt-password-mapper/import.sql") .addAsResource("bcrypt-password-mapper/application.properties", "application.properties")); } diff --git a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoderTest.java b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoderTest.java index 5b28f8d4f..d0026e45e 100644 --- a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoderTest.java +++ b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoderTest.java @@ -19,6 +19,7 @@ public class CustomRoleDecoderTest extends JdbcSecurityRealmTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClassesWithCustomRoleDecoder) + .addAsResource("custom-role-decoder/import.sql") .addAsResource("custom-role-decoder/application.properties", "application.properties")); } diff --git a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MinimalConfigurationTest.java b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MinimalConfigurationTest.java index 36dd96b5a..3f51926a5 100644 --- a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MinimalConfigurationTest.java +++ b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MinimalConfigurationTest.java @@ -12,6 +12,7 @@ public class MinimalConfigurationTest extends JdbcSecurityRealmTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClasses) + .addAsResource("minimal-config/import.sql") .addAsResource("minimal-config/application.properties", "application.properties")); } diff --git a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MultipleDataSourcesTest.java b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MultipleDataSourcesTest.java index 7645e5b56..39aedb75b 100644 --- a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MultipleDataSourcesTest.java +++ b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MultipleDataSourcesTest.java @@ -12,6 +12,8 @@ public class MultipleDataSourcesTest extends JdbcSecurityRealmTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClasses) + .addAsResource("multiple-data-sources/users.sql") + .addAsResource("multiple-data-sources/permissions.sql") .addAsResource("multiple-data-sources/application.properties", "application.properties")); } diff --git a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MultipleQueriesConfigurationTest.java b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MultipleQueriesConfigurationTest.java index 070d8571f..5e9065ef9 100644 --- a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MultipleQueriesConfigurationTest.java +++ b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/MultipleQueriesConfigurationTest.java @@ -12,6 +12,7 @@ public class MultipleQueriesConfigurationTest extends JdbcSecurityRealmTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClasses) + .addAsResource("multiple-queries/import.sql") .addAsResource("multiple-queries/application.properties", "application.properties")); } diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPAValidationTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPAValidationTestCase.java index 1eed2461c..530eddd3e 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPAValidationTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/validation/JPAValidationTestCase.java @@ -19,6 +19,7 @@ public class JPAValidationTestCase { static QuarkusUnitTest runner = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(MyEntity.class, JPATestValidationResource.class) + .addAsResource("application.properties") .addAsResource(new StringAsset(""), "import.sql")); // define an empty import.sql file @Test diff --git a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ConstraintValidatorLocalesTest.java b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ConstraintValidatorLocalesTest.java index 65d62b5c8..8b6572169 100644 --- a/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ConstraintValidatorLocalesTest.java +++ b/extensions/hibernate-validator/deployment/src/test/java/io/quarkus/hibernate/validator/test/ConstraintValidatorLocalesTest.java @@ -20,7 +20,10 @@ public class ConstraintValidatorLocalesTest { @RegisterExtension static final QuarkusUnitTest test = new QuarkusUnitTest().setArchiveProducer(() -> ShrinkWrap - .create(JavaArchive.class).addClasses(MyBean.class)); + .create(JavaArchive.class).addClasses(MyBean.class) + .addAsResource("application.properties") + .addAsResource("ValidationMessages.properties") + .addAsResource("ValidationMessages_fr_FR.properties")); @Test public void testConstraintLocale() { diff --git a/extensions/logging-json/deployment/src/test/java/io/quarkus/logging/json/JsonFormatterCustomConfigTest.java b/extensions/logging-json/deployment/src/test/java/io/quarkus/logging/json/JsonFormatterCustomConfigTest.java index d99145d12..7ffa69f7a 100644 --- a/extensions/logging-json/deployment/src/test/java/io/quarkus/logging/json/JsonFormatterCustomConfigTest.java +++ b/extensions/logging-json/deployment/src/test/java/io/quarkus/logging/json/JsonFormatterCustomConfigTest.java @@ -7,6 +7,8 @@ import java.time.ZoneId; import org.jboss.logmanager.formatters.JsonFormatter; import org.jboss.logmanager.formatters.StructuredFormatter; +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; @@ -16,6 +18,7 @@ public class JsonFormatterCustomConfigTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() + .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(JsonFormatterDefaultConfigTest.class)) .withConfigurationResource("application-json-formatter-custom.properties"); @Test diff --git a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerCustomTest.java b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerCustomTest.java index 753cace2f..4f16e368f 100644 --- a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerCustomTest.java +++ b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerCustomTest.java @@ -16,6 +16,7 @@ public class SentryLoggerCustomTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() + .setAllowTestClassOutsideDeployment(true) .withConfigurationResource("application-sentry-logger-custom.properties"); @Test diff --git a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerDisabledTest.java b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerDisabledTest.java index 1164b779a..ee8461965 100644 --- a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerDisabledTest.java +++ b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerDisabledTest.java @@ -15,6 +15,7 @@ public class SentryLoggerDisabledTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() + .setAllowTestClassOutsideDeployment(true) .withConfigurationResource("application-sentry-logger-disabled.properties"); @Test diff --git a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerTest.java b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerTest.java index 4b35fcb5e..8a2702272 100644 --- a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerTest.java +++ b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerTest.java @@ -23,6 +23,7 @@ public class SentryLoggerTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() + .setAllowTestClassOutsideDeployment(true) .withConfigurationResource("application-sentry-logger-default.properties"); @Test diff --git a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerWrongTest.java b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerWrongTest.java index 7eaca71ae..79587d2f2 100644 --- a/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerWrongTest.java +++ b/extensions/logging-sentry/deployment/src/test/java/io/quarkus/logging/sentry/SentryLoggerWrongTest.java @@ -13,6 +13,7 @@ public class SentryLoggerWrongTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() + .setAllowTestClassOutsideDeployment(true) .withConfigurationResource("application-sentry-logger-wrong.properties") .setExpectedException(ConfigurationException.class); diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsUnitTest.java index 9717679b5..f5109a72f 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/DefaultGroupsUnitTest.java @@ -14,7 +14,8 @@ import io.restassured.RestAssured; public class DefaultGroupsUnitTest { private static Class[] testClasses = { - DefaultGroupsEndpoint.class + DefaultGroupsEndpoint.class, + TokenUtils.class }; /** * The test generated JWT token string @@ -26,6 +27,8 @@ public class DefaultGroupsUnitTest { .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClasses) .addAsResource("publicKey.pem") + .addAsResource("privateKey.pem") + .addAsResource("TokenNoGroups.json") .addAsResource("applicationDefaultGroups.properties", "application.properties")); @BeforeEach diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtAuthUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtAuthUnitTest.java index a2a11630f..8348e7192 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtAuthUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtAuthUnitTest.java @@ -22,7 +22,8 @@ import io.restassured.response.Response; public class JwtAuthUnitTest { private static Class[] testClasses = { - JsonValuejectionEndpoint.class + JsonValuejectionEndpoint.class, + TokenUtils.class }; /** * The test generated JWT token string @@ -38,6 +39,8 @@ public class JwtAuthUnitTest { .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClasses) .addAsResource("publicKey.pem") + .addAsResource("privateKey.pem") + .addAsResource("Token1.json") .addAsResource("application.properties")); @BeforeEach diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieUnitTest.java index 80356e2f0..d47db3c25 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/JwtCookieUnitTest.java @@ -14,7 +14,8 @@ import io.restassured.RestAssured; public class JwtCookieUnitTest { private static Class[] testClasses = { - DefaultGroupsEndpoint.class + DefaultGroupsEndpoint.class, + TokenUtils.class }; /** * The test generated JWT token string @@ -26,6 +27,8 @@ public class JwtCookieUnitTest { .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClasses) .addAsResource("publicKey.pem") + .addAsResource("privateKey.pem") + .addAsResource("TokenNoGroups.json") .addAsResource("applicationJwtCookie.properties", "application.properties")); @BeforeEach diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrimitiveInjectionUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrimitiveInjectionUnitTest.java index e5b246793..633e6a30b 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrimitiveInjectionUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrimitiveInjectionUnitTest.java @@ -24,7 +24,8 @@ import io.restassured.RestAssured; */ public class PrimitiveInjectionUnitTest { private static Class[] testClasses = { - PrimitiveInjectionEndpoint.class + PrimitiveInjectionEndpoint.class, + TokenUtils.class }; /** @@ -44,6 +45,8 @@ public class PrimitiveInjectionUnitTest { .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClasses) .addAsResource("publicKey.pem") + .addAsResource("privateKey.pem") + .addAsResource("Token1.json") .addAsResource("application.properties")); @BeforeEach diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionUnitTest.java index 624ace641..1515bc497 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/PrincipalInjectionUnitTest.java @@ -21,7 +21,8 @@ import io.restassured.RestAssured; public class PrincipalInjectionUnitTest { private static Class[] testClasses = { - PrincipalInjectionEndpoint.class + PrincipalInjectionEndpoint.class, + TokenUtils.class }; /** * The test generated JWT token string @@ -37,6 +38,8 @@ public class PrincipalInjectionUnitTest { .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClasses) .addAsResource("publicKey.pem") + .addAsResource("privateKey.pem") + .addAsResource("Token1.json") .addAsResource("application.properties")); @BeforeEach diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequiredClaimsUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequiredClaimsUnitTest.java index a62e137fe..de6d7efe4 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequiredClaimsUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RequiredClaimsUnitTest.java @@ -21,7 +21,8 @@ import io.restassured.RestAssured; public class RequiredClaimsUnitTest { private static Class[] testClasses = { - RequiredClaimsEndpoint.class + RequiredClaimsEndpoint.class, + TokenUtils.class }; /** @@ -41,6 +42,8 @@ public class RequiredClaimsUnitTest { .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClasses) .addAsResource("publicKey.pem") + .addAsResource("privateKey.pem") + .addAsResource("RequiredClaims.json") .addAsResource("application.properties")); @BeforeEach diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RolesAllowedUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RolesAllowedUnitTest.java index d33cbc3b8..30cb67485 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RolesAllowedUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/RolesAllowedUnitTest.java @@ -17,7 +17,8 @@ import io.restassured.response.Response; public class RolesAllowedUnitTest { private static Class[] testClasses = { - RolesEndpoint.class + RolesEndpoint.class, + TokenUtils.class }; /** * The test generated JWT token string @@ -33,6 +34,9 @@ public class RolesAllowedUnitTest { .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClasses) .addAsResource("publicKey.pem") + .addAsResource("privateKey.pem") + .addAsResource("Token1.json") + .addAsResource("Token2.json") .addAsResource("application.properties")); @BeforeEach diff --git a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/ScopingUnitTest.java b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/ScopingUnitTest.java index d375994b9..b1bc6c728 100644 --- a/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/ScopingUnitTest.java +++ b/extensions/smallrye-jwt/deployment/src/test/java/io/quarkus/jwt/test/ScopingUnitTest.java @@ -20,7 +20,8 @@ import io.restassured.response.Response; public class ScopingUnitTest { private static Class[] testClasses = { DefaultScopedEndpoint.class, - RequestScopedEndpoint.class + RequestScopedEndpoint.class, + TokenUtils.class }; @RegisterExtension @@ -28,6 +29,9 @@ public class ScopingUnitTest { .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(testClasses) .addAsResource("publicKey.pem") + .addAsResource("privateKey.pem") + .addAsResource("Token1.json") + .addAsResource("Token2.json") .addAsResource("application.properties")); @Test diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletDestroyTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletDestroyTestCase.java index 09a35f86e..e9d6afb61 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletDestroyTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/ServletDestroyTestCase.java @@ -19,6 +19,7 @@ public class ServletDestroyTestCase { static QuarkusUnitTest runner = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses(PreDestroyServlet.class)) + .setAllowTestClassOutsideDeployment(true) .setAfterUndeployListener(() -> { try { Assertions.assertEquals("Servlet Destroyed", Messages.MESSAGES.poll(2, TimeUnit.SECONDS)); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CoresSecurityTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CoresSecurityTestCase.java index bd0ad2807..04cd3bdfc 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CoresSecurityTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/cors/CoresSecurityTestCase.java @@ -32,7 +32,8 @@ public class CoresSecurityTestCase { static QuarkusUnitTest test = new QuarkusUnitTest().setArchiveProducer(new Supplier() { @Override public JavaArchive get() { - return ShrinkWrap.create(JavaArchive.class).addClasses(TestIdentityProvider.class, PathHandler.class) + return ShrinkWrap.create(JavaArchive.class) + .addClasses(TestIdentityProvider.class, TestIdentityController.class, PathHandler.class) .addAsResource(new StringAsset(APP_PROPS), "application.properties"); } }); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/DefaultDenyTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/DefaultDenyTestCase.java index b5aeb2e5d..baab598c6 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/DefaultDenyTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/DefaultDenyTestCase.java @@ -32,7 +32,8 @@ public class DefaultDenyTestCase { static QuarkusUnitTest test = new QuarkusUnitTest().setArchiveProducer(new Supplier() { @Override public JavaArchive get() { - return ShrinkWrap.create(JavaArchive.class).addClasses(TestIdentityProvider.class, PathHandler.class) + return ShrinkWrap.create(JavaArchive.class) + .addClasses(TestIdentityProvider.class, TestIdentityController.class, PathHandler.class) .addAsResource(new StringAsset(APP_PROPS), "application.properties"); } }); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FormAuthCookiesTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FormAuthCookiesTestCase.java index 7a5ae632b..6623d50a1 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FormAuthCookiesTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FormAuthCookiesTestCase.java @@ -35,7 +35,8 @@ public class FormAuthCookiesTestCase { @Override public JavaArchive get() { return ShrinkWrap.create(JavaArchive.class) - .addClasses(TestIdentityProvider.class, TestTrustedIdentityProvider.class, PathHandler.class) + .addClasses(TestIdentityProvider.class, TestIdentityController.class, TestTrustedIdentityProvider.class, + PathHandler.class) .addAsResource(new StringAsset(APP_PROPS), "application.properties"); } }); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FormAuthNoRedirectTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FormAuthNoRedirectTestCase.java index d3c6407b7..6466ae6d2 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FormAuthNoRedirectTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FormAuthNoRedirectTestCase.java @@ -32,7 +32,8 @@ public class FormAuthNoRedirectTestCase { @Override public JavaArchive get() { return ShrinkWrap.create(JavaArchive.class) - .addClasses(TestIdentityProvider.class, TestTrustedIdentityProvider.class, PathHandler.class) + .addClasses(TestIdentityProvider.class, TestIdentityController.class, TestTrustedIdentityProvider.class, + PathHandler.class) .addAsResource(new StringAsset(APP_PROPS), "application.properties"); } }); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FormAuthTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FormAuthTestCase.java index a44b5a3ff..63e2f5adc 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FormAuthTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/FormAuthTestCase.java @@ -33,7 +33,8 @@ public class FormAuthTestCase { @Override public JavaArchive get() { return ShrinkWrap.create(JavaArchive.class) - .addClasses(TestIdentityProvider.class, TestTrustedIdentityProvider.class, PathHandler.class) + .addClasses(TestIdentityProvider.class, TestTrustedIdentityProvider.class, TestIdentityController.class, + PathHandler.class) .addAsResource(new StringAsset(APP_PROPS), "application.properties"); } }); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/PermitDenyAllTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/PermitDenyAllTestCase.java index b10deb680..8ee0848d6 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/PermitDenyAllTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/PermitDenyAllTestCase.java @@ -30,7 +30,8 @@ public class PermitDenyAllTestCase { static QuarkusUnitTest test = new QuarkusUnitTest().setArchiveProducer(new Supplier() { @Override public JavaArchive get() { - return ShrinkWrap.create(JavaArchive.class).addClasses(TestIdentityProvider.class, PathHandler.class) + return ShrinkWrap.create(JavaArchive.class) + .addClasses(TestIdentityController.class, TestIdentityProvider.class, PathHandler.class) .addAsResource(new StringAsset(APP_PROPS), "application.properties"); } }); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/RolesAllowedTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/RolesAllowedTestCase.java index 614fe67f4..cf711d116 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/RolesAllowedTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/RolesAllowedTestCase.java @@ -33,7 +33,8 @@ public class RolesAllowedTestCase { static QuarkusUnitTest test = new QuarkusUnitTest().setArchiveProducer(new Supplier() { @Override public JavaArchive get() { - return ShrinkWrap.create(JavaArchive.class).addClasses(TestIdentityProvider.class, PathHandler.class) + return ShrinkWrap.create(JavaArchive.class) + .addClasses(TestIdentityController.class, TestIdentityProvider.class, PathHandler.class) .addAsResource(new StringAsset(APP_PROPS), "application.properties"); } }); diff --git a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/CodecTest.java b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/CodecTest.java index f5d83fc8e..32f0f2904 100644 --- a/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/CodecTest.java +++ b/extensions/vertx/deployment/src/test/java/io/quarkus/vertx/CodecTest.java @@ -21,7 +21,7 @@ public class CodecTest { @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap - .create(JavaArchive.class).addClasses(MyBean.class, MyPetCodec.class)); + .create(JavaArchive.class).addClasses(MyBean.class, MyPetCodec.class, Person.class, Pet.class)); @Inject MyBean bean; diff --git a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultAppRoleITCase.java b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultAppRoleITCase.java index 443665e25..e9a060857 100644 --- a/integration-tests/vault/src/test/java/io/quarkus/vault/VaultAppRoleITCase.java +++ b/integration-tests/vault/src/test/java/io/quarkus/vault/VaultAppRoleITCase.java @@ -9,7 +9,6 @@ import java.util.Map; import javax.inject.Inject; -import org.jboss.logging.Logger; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; @@ -25,8 +24,6 @@ import io.quarkus.vault.test.VaultTestLifecycleManager; @QuarkusTestResource(VaultTestLifecycleManager.class) public class VaultAppRoleITCase { - private static final Logger log = Logger.getLogger(VaultITCase.class); - @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java index 05d45ae4e..cd06e4cbc 100644 --- a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java +++ b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java @@ -50,6 +50,8 @@ import org.junit.jupiter.api.extension.TestInstantiationException; import io.quarkus.bootstrap.app.CuratedApplication; import io.quarkus.bootstrap.app.QuarkusBootstrap; import io.quarkus.bootstrap.app.RunningQuarkusApplication; +import io.quarkus.bootstrap.classloading.ClassPathElement; +import io.quarkus.bootstrap.classloading.QuarkusClassLoader; import io.quarkus.builder.BuildChainBuilder; import io.quarkus.builder.BuildContext; import io.quarkus.builder.BuildException; @@ -96,6 +98,8 @@ public class QuarkusUnitTest private Class actualTestClass; private Object actualTestInstance; + private boolean allowTestClassOutsideDeployment; + public QuarkusUnitTest setExpectedException(Class expectedException) { return assertException(t -> { Throwable i = t; @@ -161,6 +165,16 @@ public class QuarkusUnitTest return this; } + /** + * Normally access to any test classes that are not packaged in the deployment will result + * in a ClassNotFoundException. If this is true then access is allowed, which can be useful + * when testing shutdown behaviour. + */ + public QuarkusUnitTest setAllowTestClassOutsideDeployment(boolean allowTestClassOutsideDeployment) { + this.allowTestClassOutsideDeployment = allowTestClassOutsideDeployment; + return this; + } + private void exportArchive(Path deploymentDir, Class testClass) { try { JavaArchive archive = getArchiveProducerOrDefault(); @@ -362,11 +376,18 @@ public class QuarkusUnitTest final Path testLocation = PathTestHelper.getTestClassesLocation(testClass); try { - curatedApplication = QuarkusBootstrap.builder(deploymentDir) + QuarkusBootstrap.Builder builder = QuarkusBootstrap.builder(deploymentDir) .setMode(QuarkusBootstrap.Mode.TEST) .addExcludedPath(testLocation) - .setProjectRoot(testLocation) - .build().bootstrap(); + .setProjectRoot(testLocation); + if (!allowTestClassOutsideDeployment) { + builder + .setBaseClassLoader( + QuarkusClassLoader + .builder("QuarkusUnitTest ClassLoader", getClass().getClassLoader(), false) + .addBannedElement(ClassPathElement.fromPath(testLocation)).build()); + } + curatedApplication = builder.build().bootstrap(); runningQuarkusApplication = new AugmentActionImpl(curatedApplication, customizers) .createInitialRuntimeApplication()