Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

public class Http2FormAuthRedirectTestCase {

@TestHTTPResource(value = "/j_security_check", ssl = true)
@TestHTTPResource(value = "/j_security_check", tls = true)
URL sslUrl;

@RegisterExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

public class Http2ServerPushTestCase {

@TestHTTPResource(value = "/push", ssl = true)
@TestHTTPResource(value = "/push", tls = true)
URL sslUrl;

@RegisterExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
}))
public class SslServerWithJKSWithSniMatchingSanDNSTest {

@TestHTTPResource(value = "/ssl", ssl = true)
@TestHTTPResource(value = "/ssl", tls = true)
URL url;

@RegisterExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
}))
public class SslServerWithP12WithSniMatchingSanDNSTest {

@TestHTTPResource(value = "/ssl", ssl = true)
@TestHTTPResource(value = "/ssl", tls = true)
URL url;

@RegisterExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}))
public class SslServerWithPemWithSniMatchingSanDNSTest {

@TestHTTPResource(value = "/ssl", ssl = true)
@TestHTTPResource(value = "/ssl", tls = true)
URL url;

private static final String configuration = """
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}))
public class TlsServerWithPemWithSniMatchingSanDNSTest {

@TestHTTPResource(value = "/ssl", ssl = true)
@TestHTTPResource(value = "/ssl", tls = true)
URL url;

private static final String configuration = """
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class BouncyCastleFipsJsseTestCase {

static final Logger LOG = Logger.getLogger(BouncyCastleFipsJsseTestCase.class);

@TestHTTPResource(ssl = true)
@TestHTTPResource(tls = true)
URL url;

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class BouncyCastleJsseTestCase {

static final Logger LOG = Logger.getLogger(BouncyCastleJsseTestCase.class);

@TestHTTPResource(ssl = true)
@TestHTTPResource(tls = true)
URL url;

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ public class DDLGenerationPMT {
.setApplicationName("ddl-generation")
.setApplicationVersion(Version.getVersion())
.setRun(true)
.setLogFileName("ddl-generation-test.log")
.withConfigurationResource("ddlgeneration.properties");

@ProdBuildResults
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

public abstract class AbstractCertificateRoleMappingTest {

@TestHTTPResource(ssl = true)
@TestHTTPResource(tls = true)
URL url;

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
@QuarkusTest
public class TlsProtocolVersionDefaultTestCase {

@TestHTTPResource(value = "/hello", ssl = true)
@TestHTTPResource(value = "/hello", tls = true)
String url;

@Inject
Expand Down
Loading
Loading