diff --git a/extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/Http2FormAuthRedirectTestCase.java b/extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/Http2FormAuthRedirectTestCase.java index a3d9df4cda142..f30dd62a871d3 100644 --- a/extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/Http2FormAuthRedirectTestCase.java +++ b/extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/Http2FormAuthRedirectTestCase.java @@ -28,7 +28,7 @@ public class Http2FormAuthRedirectTestCase { - @TestHTTPResource(value = "/j_security_check", ssl = true) + @TestHTTPResource(value = "/j_security_check", tls = true) URL sslUrl; @RegisterExtension diff --git a/extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/MtlsBasicAnnotationBasedAuthMechSelectionTest.java b/extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/MtlsBasicAnnotationBasedAuthMechSelectionTest.java index aba63d4868ead..9765e24d9fa35 100644 --- a/extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/MtlsBasicAnnotationBasedAuthMechSelectionTest.java +++ b/extensions/resteasy-reactive/rest/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/security/MtlsBasicAnnotationBasedAuthMechSelectionTest.java @@ -24,10 +24,10 @@ public class MtlsBasicAnnotationBasedAuthMechSelectionTest { - @TestHTTPResource(value = "/mtls", ssl = true) + @TestHTTPResource(value = "/mtls", tls = true) URL mtlsUrl; - @TestHTTPResource(value = "/basic", ssl = true) + @TestHTTPResource(value = "/basic", tls = true) URL basicUrl; @RegisterExtension diff --git a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/Http2ServerPushTestCase.java b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/Http2ServerPushTestCase.java index 49bd64923513e..0ee35d7240d4a 100644 --- a/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/Http2ServerPushTestCase.java +++ b/extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/push/Http2ServerPushTestCase.java @@ -28,7 +28,7 @@ public class Http2ServerPushTestCase { - @TestHTTPResource(value = "/push", ssl = true) + @TestHTTPResource(value = "/push", tls = true) URL sslUrl; @RegisterExtension diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerMtlsPKCS12CertificateReloadTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerMtlsPKCS12CertificateReloadTest.java index 520ffec23b8b1..91dff07e0e1be 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerMtlsPKCS12CertificateReloadTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerMtlsPKCS12CertificateReloadTest.java @@ -46,7 +46,7 @@ @DisabledOnOs(OS.WINDOWS) public class MainHttpServerMtlsPKCS12CertificateReloadTest { - @TestHTTPResource(value = "/hello", ssl = true) + @TestHTTPResource(value = "/hello", tls = true) URL url; public static final File temp = new File("target/test-certificates-" + UUID.randomUUID()); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerTlsCertificateReloadTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerTlsCertificateReloadTest.java index 6a594f79ab916..c62b3640f27f3 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerTlsCertificateReloadTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerTlsCertificateReloadTest.java @@ -46,7 +46,7 @@ @DisabledOnOs(OS.WINDOWS) public class MainHttpServerTlsCertificateReloadTest { - @TestHTTPResource(value = "/hello", ssl = true) + @TestHTTPResource(value = "/hello", tls = true) URL url; public static final File temp = new File("target/test-certificates-" + UUID.randomUUID()); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerTlsPKCS12CertificateReloadTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerTlsPKCS12CertificateReloadTest.java index 72e09ec1bd56e..6dec8504b0bd7 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerTlsPKCS12CertificateReloadTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerTlsPKCS12CertificateReloadTest.java @@ -46,7 +46,7 @@ @DisabledOnOs(OS.WINDOWS) public class MainHttpServerTlsPKCS12CertificateReloadTest { - @TestHTTPResource(value = "/hello", ssl = true) + @TestHTTPResource(value = "/hello", tls = true) URL url; public static final File temp = new File("target/test-certificates-" + UUID.randomUUID()); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerTlsPKCS12CertificateReloadWithTlsRegistryAndUpdateEventTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerTlsPKCS12CertificateReloadWithTlsRegistryAndUpdateEventTest.java index 989bf7867ec0f..3cef77d8c09ae 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerTlsPKCS12CertificateReloadWithTlsRegistryAndUpdateEventTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerTlsPKCS12CertificateReloadWithTlsRegistryAndUpdateEventTest.java @@ -47,7 +47,7 @@ @DisabledOnOs(OS.WINDOWS) public class MainHttpServerTlsPKCS12CertificateReloadWithTlsRegistryAndUpdateEventTest { - @TestHTTPResource(value = "/hello", ssl = true) + @TestHTTPResource(value = "/hello", tls = true) URL url; public static final File temp = new File("target/test-certificates-" + UUID.randomUUID()); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerTlsPKCS12CertificateReloadWithTlsRegistryTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerTlsPKCS12CertificateReloadWithTlsRegistryTest.java index be735274a21f4..4057fb193edcf 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerTlsPKCS12CertificateReloadWithTlsRegistryTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/certReload/MainHttpServerTlsPKCS12CertificateReloadWithTlsRegistryTest.java @@ -46,7 +46,7 @@ @DisabledOnOs(OS.WINDOWS) public class MainHttpServerTlsPKCS12CertificateReloadWithTlsRegistryTest { - @TestHTTPResource(value = "/hello", ssl = true) + @TestHTTPResource(value = "/hello", tls = true) URL url; public static final File temp = new File("target/test-certificates-" + UUID.randomUUID()); diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/http2/Http2RSTFloodProtectionConfigTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/http2/Http2RSTFloodProtectionConfigTest.java index 31ded4d0f0406..f4f8fd0428fd4 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/http2/Http2RSTFloodProtectionConfigTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/http2/Http2RSTFloodProtectionConfigTest.java @@ -47,7 +47,7 @@ public class Http2RSTFloodProtectionConfigTest { quarkus.http.limits.rst-flood-window-duration=10s """; - @TestHTTPResource(value = "/ping", ssl = true) + @TestHTTPResource(value = "/ping", tls = true) URL sslUrl; @TestHTTPResource(value = "/ping") diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/http2/Http2RSTFloodProtectionTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/http2/Http2RSTFloodProtectionTest.java index efdde1794f432..9ec997f5178cf 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/http2/Http2RSTFloodProtectionTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/http2/Http2RSTFloodProtectionTest.java @@ -44,7 +44,7 @@ public class Http2RSTFloodProtectionTest { quarkus.http.ssl.certificate.key-store-password=secret """; - @TestHTTPResource(value = "/ping", ssl = true) + @TestHTTPResource(value = "/ping", tls = true) URL sslUrl; @TestHTTPResource(value = "/ping") diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsRequestBasicAuthTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsRequestBasicAuthTest.java index 872aaaad9f9f9..321a2f704b6a5 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsRequestBasicAuthTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsRequestBasicAuthTest.java @@ -39,7 +39,7 @@ public class MtlsRequestBasicAuthTest { quarkus.http.auth.proactive=true """; - @TestHTTPResource(value = "/mtls", ssl = true) + @TestHTTPResource(value = "/mtls", tls = true) URL url; @RegisterExtension diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsRequestTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsRequestTest.java index a966229fac7f2..b5ed0a38d054a 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsRequestTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsRequestTest.java @@ -35,7 +35,7 @@ public class MtlsRequestTest { quarkus.http.auth.permission.all.policy=authenticated """; - @TestHTTPResource(value = "/mtls", ssl = true) + @TestHTTPResource(value = "/mtls", tls = true) URL url; @RegisterExtension diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsRequiredTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsRequiredTest.java index 06ea879e0d139..dd9b7d68aa813 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsRequiredTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsRequiredTest.java @@ -37,10 +37,10 @@ public class MtlsRequiredTest { quarkus.http.auth.permission.default.policy=authenticated """; - @TestHTTPResource(value = "/mtls", ssl = true) + @TestHTTPResource(value = "/mtls", tls = true) URL url; - @TestHTTPResource(value = "/mtls", ssl = false) + @TestHTTPResource(value = "/mtls") URL urlNoTls; @RegisterExtension diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsWithP12Test.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsWithP12Test.java index 606827a0144de..28c664dd14d91 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsWithP12Test.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsWithP12Test.java @@ -37,10 +37,10 @@ public class MtlsWithP12Test { quarkus.http.auth.permission.default.policy=authenticated """; - @TestHTTPResource(value = "/mtls", ssl = true) + @TestHTTPResource(value = "/mtls", tls = true) URL url; - @TestHTTPResource(value = "/mtls", ssl = false) + @TestHTTPResource(value = "/mtls") URL urlNoTls; @RegisterExtension diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsWithPemTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsWithPemTest.java index 6eed8921fc9ab..dce36fb0bab82 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsWithPemTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/mtls/MtlsWithPemTest.java @@ -37,10 +37,10 @@ public class MtlsWithPemTest { quarkus.http.auth.permission.default.policy=authenticated """; - @TestHTTPResource(value = "/mtls", ssl = true) + @TestHTTPResource(value = "/mtls", tls = true) URL url; - @TestHTTPResource(value = "/mtls", ssl = false) + @TestHTTPResource(value = "/mtls") URL urlNoTls; @RegisterExtension diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJKSWithSniMatchingSanDNSTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJKSWithSniMatchingSanDNSTest.java index ac79b60ec18d3..57c3cc6f9474b 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJKSWithSniMatchingSanDNSTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJKSWithSniMatchingSanDNSTest.java @@ -32,7 +32,7 @@ })) public class SslServerWithJKSWithSniMatchingSanDNSTest { - @TestHTTPResource(value = "/ssl", ssl = true) + @TestHTTPResource(value = "/ssl", tls = true) URL url; @RegisterExtension diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJksTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJksTest.java index e0d1976ab0ccc..ee0e085b47374 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJksTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJksTest.java @@ -24,7 +24,7 @@ Format.JKS, Format.PKCS12, Format.PEM })) public class SslServerWithJksTest { - @TestHTTPResource(value = "/ssl", ssl = true) + @TestHTTPResource(value = "/ssl", tls = true) URL url; @RegisterExtension diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJksWithAliasTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJksWithAliasTest.java index 26184e02f5564..b1f3f63bdae0f 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJksWithAliasTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithJksWithAliasTest.java @@ -26,7 +26,7 @@ Format.PEM }, aliases = @Alias(name = "alias", password = "alias-password", subjectAlternativeNames = "DNS:localhost"))) public class SslServerWithJksWithAliasTest { - @TestHTTPResource(value = "/ssl", ssl = true) + @TestHTTPResource(value = "/ssl", tls = true) URL url; @RegisterExtension diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12Test.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12Test.java index 47e0d0f502257..06c99ddb588f6 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12Test.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12Test.java @@ -24,7 +24,7 @@ Format.JKS, Format.PKCS12, Format.PEM })) public class SslServerWithP12Test { - @TestHTTPResource(value = "/ssl", ssl = true) + @TestHTTPResource(value = "/ssl", tls = true) URL url; @RegisterExtension diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12WithAliasTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12WithAliasTest.java index c741df1cbe289..02dcb3997bbc9 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12WithAliasTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12WithAliasTest.java @@ -26,7 +26,7 @@ Format.PEM }, aliases = @Alias(name = "alias", password = "alias-password", subjectAlternativeNames = "DNS:localhost"))) public class SslServerWithP12WithAliasTest { - @TestHTTPResource(value = "/ssl", ssl = true) + @TestHTTPResource(value = "/ssl", tls = true) URL url; @RegisterExtension diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12WithSniMatchingSanDNSTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12WithSniMatchingSanDNSTest.java index 316a927b716e9..fddef9beeb441 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12WithSniMatchingSanDNSTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithP12WithSniMatchingSanDNSTest.java @@ -32,7 +32,7 @@ })) public class SslServerWithP12WithSniMatchingSanDNSTest { - @TestHTTPResource(value = "/ssl", ssl = true) + @TestHTTPResource(value = "/ssl", tls = true) URL url; @RegisterExtension diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithPemTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithPemTest.java index 08d94c88c4d0f..e602bf3e96cc6 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithPemTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithPemTest.java @@ -38,7 +38,7 @@ public class SslServerWithPemTest { quarkus.http.insecure-requests=disabled """; - @TestHTTPResource(value = "/ssl", ssl = true) + @TestHTTPResource(value = "/ssl", tls = true) URL url; @RegisterExtension diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithPemWithSniMatchingSanDNSTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithPemWithSniMatchingSanDNSTest.java index 7a2622f53848a..ecbfaec6e0c22 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithPemWithSniMatchingSanDNSTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/ssl/SslServerWithPemWithSniMatchingSanDNSTest.java @@ -33,7 +33,7 @@ })) public class SslServerWithPemWithSniMatchingSanDNSTest { - @TestHTTPResource(value = "/ssl", ssl = true) + @TestHTTPResource(value = "/ssl", tls = true) URL url; private static final String configuration = """ diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/tls/TlsServerWithPemWithSniMatchingSanDNSTest.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/tls/TlsServerWithPemWithSniMatchingSanDNSTest.java index 2a41551e9c02d..d9710e9015989 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/tls/TlsServerWithPemWithSniMatchingSanDNSTest.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/tls/TlsServerWithPemWithSniMatchingSanDNSTest.java @@ -33,7 +33,7 @@ })) public class TlsServerWithPemWithSniMatchingSanDNSTest { - @TestHTTPResource(value = "/ssl", ssl = true) + @TestHTTPResource(value = "/ssl", tls = true) URL url; private static final String configuration = """ diff --git a/integration-tests/bouncycastle-fips-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseTestCase.java b/integration-tests/bouncycastle-fips-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseTestCase.java index 522d49eb11519..2d7cb486433b0 100644 --- a/integration-tests/bouncycastle-fips-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseTestCase.java +++ b/integration-tests/bouncycastle-fips-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleFipsJsseTestCase.java @@ -36,7 +36,7 @@ public class BouncyCastleFipsJsseTestCase { static final Logger LOG = Logger.getLogger(BouncyCastleFipsJsseTestCase.class); - @TestHTTPResource(ssl = true) + @TestHTTPResource(tls = true) URL url; @Test diff --git a/integration-tests/bouncycastle-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleJsseTestCase.java b/integration-tests/bouncycastle-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleJsseTestCase.java index 5f0d8a1e2f415..72e86c3b699ef 100644 --- a/integration-tests/bouncycastle-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleJsseTestCase.java +++ b/integration-tests/bouncycastle-jsse/src/test/java/io/quarkus/it/bouncycastle/BouncyCastleJsseTestCase.java @@ -31,7 +31,7 @@ public class BouncyCastleJsseTestCase { static final Logger LOG = Logger.getLogger(BouncyCastleJsseTestCase.class); - @TestHTTPResource(ssl = true) + @TestHTTPResource(tls = true) URL url; @Test diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/DDLGenerationPMT.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/DDLGenerationPMT.java index 86bbeef1b4dda..5f8d44c76cb77 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/DDLGenerationPMT.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/DDLGenerationPMT.java @@ -24,7 +24,6 @@ public class DDLGenerationPMT { .setApplicationName("ddl-generation") .setApplicationVersion(Version.getVersion()) .setRun(true) - .setLogFileName("ddl-generation-test.log") .withConfigurationResource("ddlgeneration.properties"); @ProdBuildResults diff --git a/integration-tests/mtls-certificates/src/test/java/io/quarkus/it/vertx/AbstractCertificateRoleMappingTest.java b/integration-tests/mtls-certificates/src/test/java/io/quarkus/it/vertx/AbstractCertificateRoleMappingTest.java index 14a03fb700018..f2edcf0bb38be 100644 --- a/integration-tests/mtls-certificates/src/test/java/io/quarkus/it/vertx/AbstractCertificateRoleMappingTest.java +++ b/integration-tests/mtls-certificates/src/test/java/io/quarkus/it/vertx/AbstractCertificateRoleMappingTest.java @@ -16,7 +16,7 @@ public abstract class AbstractCertificateRoleMappingTest { - @TestHTTPResource(ssl = true) + @TestHTTPResource(tls = true) URL url; @Test diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/AsyncConsoleHandlerTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/AsyncConsoleHandlerTest.java index f8746777d18b2..a7f56c2f714da 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/AsyncConsoleHandlerTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/AsyncConsoleHandlerTest.java @@ -20,9 +20,7 @@ public class AsyncConsoleHandlerTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-async-console-log.properties") .withApplicationRoot((jar) -> jar - .addClass(LoggingTestsHelper.class) - .addAsManifestResource("application.properties", "microprofile-config.properties")) - .setLogFileName("AsyncConsoleHandlerTest.log"); + .addClass(LoggingTestsHelper.class)); @Test public void asyncConsoleHandlerConfigurationTest() { diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/AsyncFileHandlerTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/AsyncFileHandlerTest.java index df8cabf08c668..96ee7ab778180 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/AsyncFileHandlerTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/AsyncFileHandlerTest.java @@ -20,9 +20,7 @@ public class AsyncFileHandlerTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-async-file-log.properties") .withApplicationRoot((jar) -> jar - .addClass(LoggingTestsHelper.class) - .addAsManifestResource("application.properties", "microprofile-config.properties")) - .setLogFileName("AsyncFileHandlerTest.log"); + .addClass(LoggingTestsHelper.class)); @Test public void asyncFileHandlerConfigurationTest() { diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/AsyncSyslogHandlerTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/AsyncSyslogHandlerTest.java index eb64369be26f1..a105174da88ce 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/AsyncSyslogHandlerTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/AsyncSyslogHandlerTest.java @@ -20,9 +20,7 @@ public class AsyncSyslogHandlerTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-async-syslog.properties") .withApplicationRoot((jar) -> jar - .addClass(LoggingTestsHelper.class) - .addAsManifestResource("application.properties", "microprofile-config.properties")) - .setLogFileName("AsyncSyslogHandlerTest.log"); + .addClass(LoggingTestsHelper.class)); @Test public void asyncSyslogHandlerConfigurationTest() throws NullPointerException { diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/NoRotationLoggingTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/NoRotationLoggingTest.java index 84333fe6b8b0d..5f5540449e3c7 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/NoRotationLoggingTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/NoRotationLoggingTest.java @@ -20,9 +20,7 @@ public class NoRotationLoggingTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-no-log-rotation.properties") .withApplicationRoot((jar) -> jar - .addClass(LoggingTestsHelper.class) - .addAsManifestResource("application.properties", "microprofile-config.properties")) - .setLogFileName("NoRotationLoggingTest.log"); + .addClass(LoggingTestsHelper.class)); @Test public void sizeRotatingConfigurationTest() { diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/PeriodicRotatingLoggingTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/PeriodicRotatingLoggingTest.java index 201b2d7bb724f..2ba617163f9a2 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/PeriodicRotatingLoggingTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/PeriodicRotatingLoggingTest.java @@ -20,9 +20,7 @@ public class PeriodicRotatingLoggingTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-periodic-file-log-rotating.properties") .withApplicationRoot((jar) -> jar - .addClass(LoggingTestsHelper.class) - .addAsManifestResource("application.properties", "microprofile-config.properties")) - .setLogFileName("PeriodicRotatingLoggingTest.log"); + .addClass(LoggingTestsHelper.class)); @Test public void periodicRotatingConfigurationTest() { diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/PeriodicSizeRotatingLoggingRotateOnBootTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/PeriodicSizeRotatingLoggingRotateOnBootTest.java index fcfb8591dac4a..15ee6b5805415 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/PeriodicSizeRotatingLoggingRotateOnBootTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/PeriodicSizeRotatingLoggingRotateOnBootTest.java @@ -16,15 +16,11 @@ public class PeriodicSizeRotatingLoggingRotateOnBootTest { - private static final String FILE_NAME = PeriodicSizeRotatingLoggingRotateOnBootTest.class.getSimpleName() + ".log"; - @RegisterExtension static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-periodic-size-file-log-rotating-rotate-on-boot.properties") .withApplicationRoot((jar) -> jar - .addClass(LoggingTestsHelper.class) - .addAsManifestResource("application.properties", "microprofile-config.properties")) - .setLogFileName(FILE_NAME); + .addClass(LoggingTestsHelper.class)); @Test public void periodicSizeRotatingConfigurationTest() { diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/PeriodicSizeRotatingLoggingTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/PeriodicSizeRotatingLoggingTest.java index 6bda2458eed9f..f9f79ed7d86d7 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/PeriodicSizeRotatingLoggingTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/PeriodicSizeRotatingLoggingTest.java @@ -20,9 +20,7 @@ public class PeriodicSizeRotatingLoggingTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-periodic-size-file-log-rotating.properties") .withApplicationRoot((jar) -> jar - .addClass(LoggingTestsHelper.class) - .addAsManifestResource("application.properties", "microprofile-config.properties")) - .setLogFileName("PeriodicSizeRotatingLoggingTest.log"); + .addClass(LoggingTestsHelper.class)); @Test public void periodicSizeRotatingConfigurationTest() { diff --git a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/SizeRotatingLoggingTest.java b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/SizeRotatingLoggingTest.java index 896d08790b07e..75ea31c10b198 100644 --- a/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/SizeRotatingLoggingTest.java +++ b/integration-tests/test-extension/extension/deployment/src/test/java/io/quarkus/logging/SizeRotatingLoggingTest.java @@ -20,9 +20,7 @@ public class SizeRotatingLoggingTest { static final QuarkusUnitTest config = new QuarkusUnitTest() .withConfigurationResource("application-size-file-log-rotating.properties") .withApplicationRoot((jar) -> jar - .addClass(LoggingTestsHelper.class) - .addAsManifestResource("application.properties", "microprofile-config.properties")) - .setLogFileName("SizeRotatingLoggingTest.log"); + .addClass(LoggingTestsHelper.class)); @Test public void sizeRotatingConfigurationTest() { diff --git a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/Http2TestCase.java b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/Http2TestCase.java index 5d4d2973de190..60ce57ec0ead0 100644 --- a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/Http2TestCase.java +++ b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/Http2TestCase.java @@ -29,10 +29,10 @@ public class Http2TestCase { protected static final String PING_DATA = "12345678"; - @TestHTTPResource(value = "/ping", ssl = true) + @TestHTTPResource(value = "/ping", tls = true) URL sslUrl; - @TestHTTPResource(value = "/ping", ssl = false) + @TestHTTPResource(value = "/ping") URL url; @Test diff --git a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/RandomTestPortTestCase.java b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/RandomTestPortTestCase.java index b8275f241d538..bfad72e2e8f19 100644 --- a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/RandomTestPortTestCase.java +++ b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/RandomTestPortTestCase.java @@ -36,7 +36,7 @@ public class RandomTestPortTestCase { @ConfigProperty(name = "quarkus.http.test-ssl-port") int httpsTestPort; - @TestHTTPResource(value = "/some-path", ssl = true) + @TestHTTPResource(value = "/some-path", tls = true) URL httpsTestUrl; @Test diff --git a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/TlsProtocolVersionDefaultTestCase.java b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/TlsProtocolVersionDefaultTestCase.java index 645369fad5a94..bfd548df6a5ea 100644 --- a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/TlsProtocolVersionDefaultTestCase.java +++ b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/TlsProtocolVersionDefaultTestCase.java @@ -20,7 +20,7 @@ @QuarkusTest public class TlsProtocolVersionDefaultTestCase { - @TestHTTPResource(value = "/hello", ssl = true) + @TestHTTPResource(value = "/hello", tls = true) String url; @Inject diff --git a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/TlsProtocolVersionSelectionTestCase.java b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/TlsProtocolVersionSelectionTestCase.java index 9fa967bade361..22cc3bd8fa614 100644 --- a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/TlsProtocolVersionSelectionTestCase.java +++ b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/TlsProtocolVersionSelectionTestCase.java @@ -22,7 +22,7 @@ @TestProfile(ServerWithTLS13Only.class) public class TlsProtocolVersionSelectionTestCase { - @TestHTTPResource(value = "/hello", ssl = true) + @TestHTTPResource(value = "/hello", tls = true) String url; @Inject diff --git a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/VertxProducerResourceTest.java b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/VertxProducerResourceTest.java index 676a8569f680f..df40f1f425b1c 100644 --- a/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/VertxProducerResourceTest.java +++ b/integration-tests/vertx-http/src/test/java/io/quarkus/it/vertx/VertxProducerResourceTest.java @@ -17,7 +17,7 @@ @QuarkusTest public class VertxProducerResourceTest { - @TestHTTPResource(ssl = true) + @TestHTTPResource(tls = true) URL url; @Test diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/LauncherUtil.java b/test-framework/common/src/main/java/io/quarkus/test/common/LauncherUtil.java index 68067456adab6..c4802f1096f8c 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/common/LauncherUtil.java +++ b/test-framework/common/src/main/java/io/quarkus/test/common/LauncherUtil.java @@ -20,9 +20,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.eclipse.microprofile.config.Config; -import org.eclipse.microprofile.config.ConfigProvider; - import io.quarkus.test.common.http.TestHTTPResourceManager; import io.smallrye.common.os.OS; @@ -33,11 +30,6 @@ public final class LauncherUtil { private LauncherUtil() { } - @Deprecated(forRemoval = true, since = "3.17") - public static Config installAndGetSomeConfig() { - return ConfigProvider.getConfig(); - } - /** * Launches a process using the supplied arguments and makes sure the process's output is drained to standard out *

diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/PropertyTestUtil.java b/test-framework/common/src/main/java/io/quarkus/test/common/PropertyTestUtil.java deleted file mode 100644 index e736d46ef3c58..0000000000000 --- a/test-framework/common/src/main/java/io/quarkus/test/common/PropertyTestUtil.java +++ /dev/null @@ -1,49 +0,0 @@ -package io.quarkus.test.common; - -import static io.quarkus.runtime.logging.LogRuntimeConfig.FileConfig; - -import java.io.File; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Arrays; -import java.util.List; - -@Deprecated(forRemoval = true) -public class PropertyTestUtil { - - private static final String LOG_FILE_PATH_PROPERTY = "quarkus.log.file.path"; - - public static void setLogFileProperty() { - System.setProperty(LOG_FILE_PATH_PROPERTY, getLogFileLocation()); - } - - public static void setLogFileProperty(String logFileName) { - System.setProperty(LOG_FILE_PATH_PROPERTY, getLogFileLocation(logFileName)); - } - - public static String getLogFileLocation() { - String logFilePath = System.getProperty(LOG_FILE_PATH_PROPERTY); - - if (logFilePath != null) { - return logFilePath; - } - - return getLogFileLocation(FileConfig.DEFAULT_LOG_FILE_NAME); - } - - public static Path getLogFilePath() { - return Paths.get(getLogFileLocation()); - } - - private static String getLogFileLocation(String logFileName) { - return String.join(File.separator, getLogFileLocationParts(logFileName)); - } - - private static List getLogFileLocationParts(String logFileName) { - if (Files.isDirectory(Paths.get("build"))) { - return Arrays.asList("build", logFileName); - } - return Arrays.asList("target", logFileName); - } -} diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPResource.java b/test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPResource.java index c551c362e5651..bfd4a10066d4c 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPResource.java +++ b/test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPResource.java @@ -22,13 +22,6 @@ */ String value() default ""; - /** - * @return If the URL should use the HTTPS protocol and SSL port - * @deprecated use #tls instead - */ - @Deprecated(since = "3.10", forRemoval = true) - boolean ssl() default false; - /** * @return if the url should use the management interface */ diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPResourceManager.java b/test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPResourceManager.java index 06e963a902d57..2ace990d4de50 100644 --- a/test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPResourceManager.java +++ b/test-framework/common/src/main/java/io/quarkus/test/common/http/TestHTTPResourceManager.java @@ -90,7 +90,7 @@ public static void inject(Object testCase, List, String>> endp path = endpointPath; } String val; - if (resource.ssl() || resource.tls() || ConfigProvider.getConfig() + if (resource.tls() || ConfigProvider.getConfig() .getOptionalValue("quarkus.http.test-ssl-enabled", Boolean.class).orElse(false)) { if (management) { if (path.startsWith("/")) { diff --git a/test-framework/devmode-test-utils/src/main/java/io/quarkus/test/devmode/util/DevModeTestUtils.java b/test-framework/devmode-test-utils/src/main/java/io/quarkus/test/devmode/util/DevModeTestUtils.java deleted file mode 100644 index 8d2050fa26e34..0000000000000 --- a/test-framework/devmode-test-utils/src/main/java/io/quarkus/test/devmode/util/DevModeTestUtils.java +++ /dev/null @@ -1,91 +0,0 @@ -package io.quarkus.test.devmode.util; - -import java.io.File; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; - -/** - * @deprecated Use {@link DevModeClient} instead (the methods on that class are non-static to allow ports to be specified). - */ -@Deprecated(since = "3.3", forRemoval = true) -public class DevModeTestUtils { - - private static final DevModeClient devModeClient = new DevModeClient(); - - public static List killDescendingProcesses() { - return DevModeClient.killDescendingProcesses(); - } - - public static void filter(File input, Map variables) throws IOException { - DevModeClient.filter(input, variables); - } - - public static void awaitUntilServerDown() { - devModeClient.awaitUntilServerDown(); - } - - public static String getHttpResponse() { - return devModeClient.getHttpResponse(); - } - - public static String getHttpResponse(Supplier brokenReason) { - return devModeClient.getHttpResponse(brokenReason); - } - - public static String getHttpErrorResponse() { - return devModeClient.getHttpErrorResponse(); - } - - public static String getHttpErrorResponse(Supplier brokenReason) { - return devModeClient.getHttpErrorResponse(brokenReason); - } - - public static String getHttpResponse(String path) { - return devModeClient.getHttpResponse(path); - } - - public static String getHttpResponse(String path, Supplier brokenReason) { - return devModeClient.getHttpResponse(path, brokenReason); - } - - public static String getHttpResponse(String path, boolean allowError) { - return devModeClient.getHttpResponse(path, allowError); - } - - public static String getHttpResponse(String path, boolean allowError, Supplier brokenReason) { - return devModeClient.getHttpResponse(path, allowError, brokenReason); - } - - public static String getHttpResponse(String path, boolean allowError, Supplier brokenReason, long timeout, - TimeUnit tu) { - return devModeClient.getHttpResponse(path, allowError, brokenReason, timeout, tu); - } - - public static boolean getHttpResponse(String path, int expectedStatus) { - return devModeClient.getHttpResponse(path, expectedStatus); - } - - public static boolean getHttpResponse(String path, int expectedStatus, long timeout, TimeUnit tu) { - return devModeClient.getHttpResponse(path, expectedStatus, timeout, tu); - } - - // will fail if it receives any http response except the expected one - public static boolean getStrictHttpResponse(String path, int expectedStatus) { - return devModeClient.getStrictHttpResponse(path, expectedStatus); - } - - public static String get() throws IOException { - return devModeClient.get(); - } - - public static String get(String urlStr) throws IOException { - return devModeClient.get(urlStr); - } - - public static boolean isCode(String path, int code) { - return devModeClient.isCode(path, code); - } -} diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java index b60c30bac6539..cd8a72e5cbc73 100644 --- a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java +++ b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java @@ -60,7 +60,6 @@ import io.quarkus.runtime.LaunchMode; import io.quarkus.test.common.GroovyClassValue; import io.quarkus.test.common.PathTestHelper; -import io.quarkus.test.common.PropertyTestUtil; import io.quarkus.test.common.TestConfigUtil; import io.quarkus.test.common.TestResourceManager; import io.quarkus.test.common.http.TestHTTPResourceManager; @@ -200,12 +199,6 @@ public QuarkusDevModeTest setCodeGenSources(String... codeGenSources) { return this; } - @Deprecated(forRemoval = true) - public QuarkusDevModeTest setLogFileName(String logFileName) { - PropertyTestUtil.setLogFileProperty(logFileName); - return this; - } - public QuarkusDevModeTest setLogRecordPredicate(Predicate predicate) { this.inMemoryLogHandler = new InMemoryLogHandler(predicate); return this; 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 e47bd720d881e..e67b1fe87c5fd 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 @@ -69,7 +69,6 @@ import io.quarkus.runtime.LaunchMode; import io.quarkus.test.common.GroovyClassValue; import io.quarkus.test.common.PathTestHelper; -import io.quarkus.test.common.PropertyTestUtil; import io.quarkus.test.common.RestAssuredStateManager; import io.quarkus.test.common.TestConfigUtil; import io.quarkus.test.common.TestResourceManager; @@ -261,12 +260,6 @@ public QuarkusUnitTest addClassLoaderEventListener(ClassLoaderEventListener list return this; } - @Deprecated(forRemoval = true) - public QuarkusUnitTest setLogFileName(String logFileName) { - PropertyTestUtil.setLogFileProperty(logFileName); - return this; - } - public QuarkusUnitTest setLogRecordPredicate(Predicate predicate) { this.inMemoryLogHandler = new InMemoryLogHandler(predicate); return this; diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTest.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTest.java index 4996ed3168b5f..22136c7d700bf 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTest.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTest.java @@ -7,8 +7,6 @@ import org.junit.jupiter.api.extension.ExtendWith; -import io.quarkus.test.common.DevServicesContext; - /** * Annotation that indicates that this test should run the result of the Quarkus build. * If a jar was created, it is launched using {@code java -jar ...} @@ -33,16 +31,4 @@ @ExtendWith({ DisabledOnIntegrationTestCondition.class, QuarkusIntegrationTestExtension.class }) @Retention(RetentionPolicy.RUNTIME) public @interface QuarkusIntegrationTest { - - /** - * If used as a field of class annotated with {@link QuarkusIntegrationTest}, the field is populated - * with an implementation that allows accessing contextual test information - * - * @deprecated Use {@link DevServicesContext} instead. - */ - @Deprecated - interface Context extends DevServicesContext { - - } - } diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/nativeimage/NativeBuildOutputExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/nativeimage/NativeBuildOutputExtension.java deleted file mode 100644 index 668cde1d27153..0000000000000 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/nativeimage/NativeBuildOutputExtension.java +++ /dev/null @@ -1,150 +0,0 @@ -package io.quarkus.test.junit.nativeimage; - -import static io.quarkus.test.junit.IntegrationTestUtil.readQuarkusArtifactProperties; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Locale; -import java.util.Properties; - -import jakarta.json.Json; -import jakarta.json.JsonObject; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Assumptions; -import org.junit.jupiter.api.extension.BeforeAllCallback; -import org.junit.jupiter.api.extension.ExtensionContext; - -import io.quarkus.deployment.pkg.steps.GraalVM; - -/** - * This is a general utility to assert via - * unit testing how many classes, methods, objects etc. have been included in a native-image. - *

- * For detailed information and explanations on the build output, visit - * the upstream GraalVM - * documentation. - * - * @deprecated This extension is no longer used by core Quarkus and will eventually be removed. - */ -@Deprecated -public class NativeBuildOutputExtension implements BeforeAllCallback { - - private static final String IMAGE_METRICS_TEST_PROPERTIES = "image-metrics.properties"; - private static final String IMAGE_METRICS_DIR = "image-metrics"; - private final JsonObject buildOutput; - private static GraalVM.Version mandrelVersion; - - public NativeBuildOutputExtension() { - this.buildOutput = getBuildOutput(); - } - - public void verifyImageMetrics() { - String version = mandrelVersion.getMajorMinorAsString(); - String propertiesFileName = IMAGE_METRICS_DIR + "/" + version + "/" + IMAGE_METRICS_TEST_PROPERTIES; - verifyImageMetrics(propertiesFileName); - } - - public void verifyImageMetrics(String propertiesFileName) { - /* - * Allow users to skip this kind of tests by setting env variable QUARKUS_NATIVE_IT_SKIP_VERIFY_IMAGE_METRICS to true - */ - boolean skipVerifyImageMetrics = Boolean.parseBoolean(System.getenv("QUARKUS_NATIVE_IT_SKIP_VERIFY_IMAGE_METRICS")); - Assumptions.assumeFalse(skipVerifyImageMetrics, - "Environment variable QUARKUS_NATIVE_IT_SKIP_VERIFY_IMAGE_METRICS is set. Skipping image metrics verification."); - - Properties properties = getProperties(propertiesFileName); - - Assertions.assertAll(properties.entrySet().stream().map(entry -> () -> { - var key = (String) entry.getKey(); - var value = (String) entry.getValue(); - if (key.endsWith(".tolerance")) { - return; - } - String[] keyParts = key.split("\\."); - String tolerance = properties.getProperty(key + ".tolerance"); - assert tolerance != null : "tolerance not defined for " + key; - assertValueWithinRange(Integer.parseInt(value), Integer.parseInt(tolerance), keyParts); - })); - } - - private Properties getProperties(String propertiesFileName) { - Properties properties = new Properties(); - try { - InputStream resourceAsStream = getClass().getClassLoader().getResourceAsStream(propertiesFileName); - Assumptions.assumeTrue(resourceAsStream != null, - "Could not find properties file matching the Mandrel version being used: " + propertiesFileName); - properties.load(resourceAsStream); - } catch (IOException e) { - Assertions.fail("Could not load properties from " + propertiesFileName, e); - } - return properties; - } - - private void assertValueWithinRange(int expectedValue, int tolerancePercentage, String... key) { - JsonObject currentObject = buildOutput; - for (int i = 0; i < key.length - 1; i++) { - currentObject = currentObject.getJsonObject(key[i]); - } - String lastKey = key[key.length - 1]; - int actualValue = currentObject.getInt(lastKey); - Assertions.assertTrue(isNumberWithinRange(expectedValue, actualValue, tolerancePercentage), - "Expected " + String.join(".", key) + " to be within range [" + expectedValue + " +- " + tolerancePercentage - + "%] but was " + actualValue); - } - - private boolean isNumberWithinRange(int expectedNumberOfClasses, int actualNumberOfClasses, int tolerancePercentage) { - final int lowerBound = expectedNumberOfClasses - (expectedNumberOfClasses * tolerancePercentage / 100); - final int upperBound = expectedNumberOfClasses + (expectedNumberOfClasses * tolerancePercentage / 100); - return actualNumberOfClasses >= lowerBound && actualNumberOfClasses <= upperBound; - } - - private static JsonObject getBuildOutput() { - final Path buildOutputPath = getBuildOutputPath(); - try (InputStream inputStream = Files.newInputStream(buildOutputPath)) { - return Json.createReader(inputStream).readObject(); - } catch (Exception e) { - throw new RuntimeException("Could not load build output", e); - } - } - - private static Path getBuildOutputPath() { - final Path buildDirectory = locateNativeImageBuildDirectory(); - final File[] buildOutput = buildDirectory.toFile().listFiles((dir, name) -> name.toLowerCase(Locale.ROOT) - .endsWith("-build-output-stats.json")); - Assertions.assertNotNull(buildOutput, "Could not identify the native image build output"); - Assertions.assertEquals(1, buildOutput.length, "Could not identify the native image build output"); - return buildOutput[0].toPath(); - } - - private static Path locateNativeImageBuildDirectory() { - Path buildPath = Paths.get("target"); - final File[] files = buildPath.toFile().listFiles((dir, name) -> name.toLowerCase(Locale.ROOT) - .endsWith("-native-image-source-jar")); - Assertions.assertNotNull(files, "Could not identify the native image build directory"); - Assertions.assertEquals(1, files.length, "Could not identify the native image build directory"); - return files[0].toPath(); - } - - @Override - public void beforeAll(ExtensionContext extensionContext) throws Exception { - mandrelVersion = getMandrelVersion(extensionContext); - } - - private GraalVM.Version getMandrelVersion(ExtensionContext context) { - Properties quarkusArtifactProperties = readQuarkusArtifactProperties(context); - String fullVersion = quarkusArtifactProperties.getProperty("metadata.graalvm.version.full"); - try { - return GraalVM.Version.of(fullVersion.lines()); - } catch (NumberFormatException e) { - System.out.println( - "WARNING: Unable to determine the GraalVM version with which the native binary was built. metadata.graalvm.version.full = " - + fullVersion); - return GraalVM.Version.CURRENT; - } - } -} diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/util/QuarkusTestProfileAwareClassOrderer.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/util/QuarkusTestProfileAwareClassOrderer.java index 810aa49740a64..ba7d4ccd0f23a 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/util/QuarkusTestProfileAwareClassOrderer.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/util/QuarkusTestProfileAwareClassOrderer.java @@ -47,9 +47,6 @@ * {@link org.junit.jupiter.api.ClassOrderer.Random org.junit.jupiter.api.ClassOrderer$Random} will order the test classes * within one group randomly instead by class name. *

- * {@link #getCustomOrderKey(ClassDescriptor, ClassOrdererContext)} can be overridden to provide a custom order number for a - * given test class, e.g. based on {@link org.junit.jupiter.api.Tag} or something else. - *

* Limitations: *