From 2c4e155a63c05afa6add866970775c248be2d03f Mon Sep 17 00:00:00 2001 From: Adrien Lecharpentier Date: Thu, 6 Nov 2025 10:59:34 +0100 Subject: [PATCH 1/4] Empty commit to show the issue in CI From a53a9ca51a15a256db7f1409943acad4e1198b97 Mon Sep 17 00:00:00 2001 From: Adrien Lecharpentier Date: Thu, 6 Nov 2025 11:04:29 +0100 Subject: [PATCH 2/4] Adds exception message prefix in test --- .../gitlabjenkins/connection/GitLabConnectionConfigSSLTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/dabsquared/gitlabjenkins/connection/GitLabConnectionConfigSSLTest.java b/src/test/java/com/dabsquared/gitlabjenkins/connection/GitLabConnectionConfigSSLTest.java index b6186c970..eaebb6894 100644 --- a/src/test/java/com/dabsquared/gitlabjenkins/connection/GitLabConnectionConfigSSLTest.java +++ b/src/test/java/com/dabsquared/gitlabjenkins/connection/GitLabConnectionConfigSSLTest.java @@ -164,6 +164,6 @@ void doCheckConnection_certificateError() { FormValidation formValidation = descriptor.doTestConnection("https://localhost:" + port + "/gitlab", API_TOKEN_ID, "v3", false, 10, 10); - assertThat(formValidation.getMessage(), containsString(Messages.connection_error("PKIX path building failed"))); + assertThat(formValidation.getMessage(), containsString(Messages.connection_error("(certificate_unknown) PKIX path building failed"))); } } From 7e572b73a3f1f627f774416627ee49d950bb9156 Mon Sep 17 00:00:00 2001 From: Adrien Lecharpentier Date: Thu, 6 Nov 2025 11:24:37 +0100 Subject: [PATCH 3/4] Comply with spotless --- .../connection/GitLabConnectionConfigSSLTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/dabsquared/gitlabjenkins/connection/GitLabConnectionConfigSSLTest.java b/src/test/java/com/dabsquared/gitlabjenkins/connection/GitLabConnectionConfigSSLTest.java index eaebb6894..58e72c8d9 100644 --- a/src/test/java/com/dabsquared/gitlabjenkins/connection/GitLabConnectionConfigSSLTest.java +++ b/src/test/java/com/dabsquared/gitlabjenkins/connection/GitLabConnectionConfigSSLTest.java @@ -164,6 +164,8 @@ void doCheckConnection_certificateError() { FormValidation formValidation = descriptor.doTestConnection("https://localhost:" + port + "/gitlab", API_TOKEN_ID, "v3", false, 10, 10); - assertThat(formValidation.getMessage(), containsString(Messages.connection_error("(certificate_unknown) PKIX path building failed"))); + assertThat( + formValidation.getMessage(), + containsString(Messages.connection_error("(certificate_unknown) PKIX path building failed"))); } } From fb5933feff33cc21724a357457d2a9b0592e795d Mon Sep 17 00:00:00 2001 From: Adrien Lecharpentier Date: Thu, 6 Nov 2025 15:09:29 +0100 Subject: [PATCH 4/4] Fixing string detection for java 17 up to 25 --- .../connection/GitLabConnectionConfigSSLTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/dabsquared/gitlabjenkins/connection/GitLabConnectionConfigSSLTest.java b/src/test/java/com/dabsquared/gitlabjenkins/connection/GitLabConnectionConfigSSLTest.java index 58e72c8d9..d934c5e7e 100644 --- a/src/test/java/com/dabsquared/gitlabjenkins/connection/GitLabConnectionConfigSSLTest.java +++ b/src/test/java/com/dabsquared/gitlabjenkins/connection/GitLabConnectionConfigSSLTest.java @@ -1,6 +1,8 @@ package com.dabsquared.gitlabjenkins.connection; +import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; import com.cloudbees.plugins.credentials.CredentialsProvider; @@ -166,6 +168,6 @@ void doCheckConnection_certificateError() { descriptor.doTestConnection("https://localhost:" + port + "/gitlab", API_TOKEN_ID, "v3", false, 10, 10); assertThat( formValidation.getMessage(), - containsString(Messages.connection_error("(certificate_unknown) PKIX path building failed"))); + allOf(startsWith(Messages.connection_error("")), containsString("PKIX path building failed"))); } }