Update some unit test to JUnit5, using BitbucketApiUtils in tests to understand if the serverURL is cloud or server.

Add the bitbucket cloud bad server url to the matches logic.

Author: nfalco79

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/impl/util/BitbucketApiUtils.java

@@ -35,7 +35,7 @@ public static boolean isCloud(BitbucketApi client) {
     }
 
     public static boolean isCloud(@NonNull String serverURL) {
-        return StringUtils.startsWith(serverURL, BitbucketCloudEndpoint.SERVER_URL);
+        return StringUtils.startsWithAny(serverURL, new String[] { BitbucketCloudEndpoint.SERVER_URL, BitbucketCloudEndpoint.BAD_SERVER_URL });
     }
 
     public static ListBoxModel getFromBitbucket(SCMSourceOwner context,

src/test/java/com/cloudbees/jenkins/plugins/bitbucket/client/BitbucketIntegrationClientFactory.java

@@ -25,7 +25,7 @@
 
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketApi;
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketAuthenticator;
-import com.cloudbees.jenkins.plugins.bitbucket.endpoints.BitbucketCloudEndpoint;
+import com.cloudbees.jenkins.plugins.bitbucket.impl.util.BitbucketApiUtils;
 import com.cloudbees.jenkins.plugins.bitbucket.server.client.BitbucketServerAPIClient;
 import java.io.IOException;
 import java.io.InputStream;
@@ -73,8 +73,7 @@ default CloseableHttpResponse loadResponseFromResources(Class<?> resourceBase, S
     }
 
     public static BitbucketApi getClient(String payloadRootPath, String serverURL, String owner, String repositoryName) {
-        if (BitbucketCloudEndpoint.SERVER_URL.equals(serverURL) ||
-                BitbucketCloudEndpoint.BAD_SERVER_URL.equals(serverURL)) {
+        if (BitbucketApiUtils.isCloud(serverURL)) {
             return new BitbucketClouldIntegrationClient(payloadRootPath, owner, repositoryName);
         } else {
             return new BitbucketServerIntegrationClient(payloadRootPath, serverURL, owner, repositoryName);
@@ -169,13 +168,4 @@ public static BitbucketApi getApiMockClient(String serverURL) {
         return BitbucketIntegrationClientFactory.getClient(null, serverURL, "amuniz", "test-repos");
     }
 
-    private static CloseableHttpResponse createRateLimitResponse() {
-        StatusLine statusLine = mock(StatusLine.class);
-        when(statusLine.getStatusCode()).thenReturn(429);
-
-        CloseableHttpResponse response = mock(CloseableHttpResponse.class);
-        when(response.getStatusLine()).thenReturn(statusLine);
-
-        return response;
-    }
 }

src/test/java/com/cloudbees/jenkins/plugins/bitbucket/server/client/BitbucketServerAPIClientTest.java

@@ -5,25 +5,19 @@
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketBuildStatus.Status;
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketRepository;
 import com.cloudbees.jenkins.plugins.bitbucket.client.BitbucketIntegrationClientFactory;
-import com.cloudbees.jenkins.plugins.bitbucket.client.BitbucketIntegrationClientFactory.BitbucketServerIntegrationClient;
 import com.cloudbees.jenkins.plugins.bitbucket.client.BitbucketIntegrationClientFactory.IRequestAudit;
 import io.jenkins.cli.shaded.org.apache.commons.lang.RandomStringUtils;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import java.util.logging.Level;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.client.methods.HttpHead;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.jvnet.hudson.test.JenkinsRule;
-import org.jvnet.hudson.test.LoggerRule;
-import org.jvnet.hudson.test.WithoutJenkins;
+import org.jvnet.hudson.test.junit.jupiter.WithJenkins;
 import org.mockito.ArgumentCaptor;
 import org.mockito.MockedStatic;
 
@@ -37,18 +31,12 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
-public class BitbucketServerAPIClientTest {
-
-    @ClassRule
-    public static JenkinsRule r = new JenkinsRule();
-    @Rule
-    public LoggerRule logger = new LoggerRule().record(BitbucketServerIntegrationClient.class, Level.FINE);
+@WithJenkins
+class BitbucketServerAPIClientTest {
 
     @Test
-    @WithoutJenkins
-    public void verify_status_notitication_name_max_length() throws Exception {
+    void verify_status_notitication_name_max_length(JenkinsRule j) throws Exception {
         BitbucketApi client = BitbucketIntegrationClientFactory.getApiMockClient("https://acme.bitbucket.org");
         BitbucketBuildStatus status = new BitbucketBuildStatus();
         status.setName(RandomStringUtils.randomAlphanumeric(300));
@@ -57,8 +45,7 @@ public void verify_status_notitication_name_max_length() throws Exception {
 
         client.postBuildStatus(status);
 
-        IRequestAudit clientAudit = ((IRequestAudit) client).getAudit();
-        HttpRequestBase request = extractRequest(clientAudit);
+        HttpRequestBase request = extractRequest(client);
         assertThat(request).isNotNull()
             .isInstanceOf(HttpPost.class);
         try (InputStream content = ((HttpPost) request).getEntity().getContent()) {
@@ -67,20 +54,21 @@ public void verify_status_notitication_name_max_length() throws Exception {
         }
     }
 
-    private HttpRequestBase extractRequest(IRequestAudit clientAudit) {
+    private HttpRequestBase extractRequest(BitbucketApi client) {
+        assertThat(client).isInstanceOf(IRequestAudit.class);
+        IRequestAudit clientAudit = ((IRequestAudit) client).getAudit();
+
         ArgumentCaptor<HttpRequestBase> captor = ArgumentCaptor.forClass(HttpRequestBase.class);
         verify(clientAudit).request(captor.capture());
         return captor.getValue();
     }
 
     @Test
-    @WithoutJenkins
-    public void verify_checkPathExists_given_a_path() throws Exception {
+    void verify_checkPathExists_given_a_path(JenkinsRule j) throws Exception {
         BitbucketApi client = BitbucketIntegrationClientFactory.getApiMockClient("https://acme.bitbucket.org");
         assertThat(client.checkPathExists("feature/pipeline", "folder/Jenkinsfile")).isTrue();
 
-        IRequestAudit clientAudit = ((IRequestAudit) client).getAudit();
-        HttpRequestBase request = extractRequest(clientAudit);
+        HttpRequestBase request = extractRequest(client);
         assertThat(request).isNotNull()
             .isInstanceOfSatisfying(HttpHead.class, head -> {
                     assertThat(head.getURI())
@@ -90,20 +78,18 @@ public void verify_checkPathExists_given_a_path() throws Exception {
     }
 
     @Test
-    @WithoutJenkins
-    public void verify_checkPathExists_given_file() throws Exception {
+    void verify_checkPathExists_given_file(JenkinsRule j) throws Exception {
         BitbucketApi client = BitbucketIntegrationClientFactory.getApiMockClient("https://acme.bitbucket.org");
         assertThat(client.checkPathExists("feature/pipeline", "Jenkinsfile")).isTrue();
 
-        IRequestAudit clientAudit = ((IRequestAudit) client).getAudit();
-        HttpRequestBase request = extractRequest(clientAudit);
+        HttpRequestBase request = extractRequest(client);
         assertThat(request).isNotNull()
             .isInstanceOfSatisfying(HttpHead.class, head ->
                 assertThat(head.getURI()).hasPath("/rest/api/1.0/projects/amuniz/repos/test-repos/browse/Jenkinsfile"));
     }
 
     @Test
-    public void filterArchivedRepositories() throws Exception {
+    void filterArchivedRepositories(JenkinsRule j) throws Exception {
         BitbucketApi client = BitbucketIntegrationClientFactory.getClient("localhost", "foo", "test-repos");
         List<? extends BitbucketRepository> repos = client.getRepositories();
         List<String> names = repos.stream().map(BitbucketRepository::getRepositoryName).toList();
@@ -112,22 +98,19 @@ public void filterArchivedRepositories() throws Exception {
     }
 
     @Test
-    public void sortRepositoriesByName() throws Exception {
+    void sortRepositoriesByName(JenkinsRule j) throws Exception {
         BitbucketApi client = BitbucketIntegrationClientFactory.getClient("localhost", "amuniz", "test-repos");
         List<? extends BitbucketRepository> repos = client.getRepositories();
         List<String> names = repos.stream().map(BitbucketRepository::getRepositoryName).toList();
         assertThat(names, is(List.of("another-repo", "dogs-repo", "test-repos")));
     }
 
     @Test
-    public void disableCookieManager() throws Exception {
+    void disableCookieManager(JenkinsRule j) throws Exception {
         try (MockedStatic<HttpClientBuilder> staticHttpClientBuilder = mockStatic(HttpClientBuilder.class)) {
             HttpClientBuilder httpClientBuilder = mock(HttpClientBuilder.class, RETURNS_SELF);
             staticHttpClientBuilder.when(HttpClientBuilder::create).thenReturn(httpClientBuilder);
-            CloseableHttpClient httpClient = mock(CloseableHttpClient.class);
-            when(httpClientBuilder.build()).thenReturn(httpClient);
-            BitbucketApi client = BitbucketIntegrationClientFactory.getClient("localhost", "amuniz", "test-repos");
-            client.getRepositories();
+            BitbucketIntegrationClientFactory.getClient("localhost", "amuniz", "test-repos");
             verify(httpClientBuilder).disableCookieManagement();
         }
     }