Migrate tests to JUnit5 and AssertJ (#1104)

Author: nfalco79

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>5.18</version>
+        <version>5.24</version>
         <relativePath />
     </parent>
 
@@ -29,6 +29,9 @@
         <gitHubRepo>jenkinsci/bitbucket-branch-source-plugin</gitHubRepo>
         <jenkins.baseline>2.504</jenkins.baseline>
         <jenkins.version>${jenkins.baseline}.1</jenkins.version>
+        <!--
+        <ban-junit4-imports.skip>false</ban-junit4-imports.skip>
+        -->
         <hpi.compatibleSinceVersion>936.0.0</hpi.compatibleSinceVersion>
         <tagNameFormat>@{project.version}</tagNameFormat>
     </properties>

src/test/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketGitSCMBuilderTest.java

@@ -32,7 +32,7 @@
 import com.cloudbees.jenkins.plugins.bitbucket.trait.OriginPullRequestDiscoveryTrait;
 import com.cloudbees.jenkins.plugins.bitbucket.trait.TagDiscoveryTrait;
 import hudson.model.TaskListener;
-import java.util.Arrays;
+import java.util.List;
 import java.util.Set;
 import java.util.stream.Stream;
 import jenkins.scm.api.SCMHead;
@@ -52,11 +52,11 @@
 class BitbucketGitSCMRevisionTest {
 
     @SuppressWarnings("unused")
-    private static JenkinsRule j;
+    private static JenkinsRule rule;
 
     @BeforeAll
     static void init(JenkinsRule rule) {
-        j = rule;
+        BitbucketGitSCMRevisionTest.rule = rule;
     }
 
     private static Stream<Arguments> revisionDataProvider() {
@@ -77,7 +77,7 @@ void verify_revision_informations_are_valued(String testName, SCMSourceTrait tra
         BitbucketMockApiFactory.add(serverURL, getApiMockClient(serverURL));
         BitbucketSCMSource source = new BitbucketSCMSource("amuniz", "test-repos");
         source.setServerUrl(serverURL);
-        source.setTraits(Arrays.<SCMSourceTrait> asList(trait));
+        source.setTraits(List.of(trait));
 
         TaskListener listener = BitbucketClientMockUtils.getTaskListenerMock();
         Set<SCMHead> heads = source.fetch(listener);

src/test/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketGitSCMRevisionTest.java

@@ -42,11 +42,12 @@
 @WithJenkins
 class BitbucketSCMNavigatorTest {
 
-    static JenkinsRule j;
+    @SuppressWarnings("unused")
+    private static JenkinsRule rule;
 
     @BeforeAll
     static void init(JenkinsRule rule) {
-        j = rule;
+        BitbucketSCMNavigatorTest.rule = rule;
     }
 
     private String currentTestName;

src/test/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketSCMNavigatorTest.java

@@ -41,11 +41,9 @@
 import hudson.model.Descriptor.FormException;
 import hudson.model.Item;
 import hudson.plugins.git.GitSCM;
-import hudson.plugins.git.UserRemoteConfig;
 import hudson.plugins.git.extensions.impl.BuildChooserSetting;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
 import jenkins.plugins.git.AbstractGitSCMSource;
@@ -65,11 +63,7 @@
 import org.jvnet.hudson.test.junit.jupiter.WithJenkins;
 import org.jvnet.hudson.test.recipes.WithTimeout;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -79,42 +73,44 @@
  */
 @WithJenkins
 @WithGitSampleRepo
-public class BitbucketSCMSourceBuildTest {
+class BitbucketSCMSourceBuildTest {
 
     private static final String CLOUD_REPO_OWNER = "cloudbeers";
     private static final String REPO_NAME = "stunning-adventure";
     private static final String BRANCH_NAME = "master";
     // Test private key from ssh-credentials test case
     // https://github.com/jenkinsci/ssh-credentials-plugin/blob/343.v884f71d78167/src/test/resources/com/cloudbees/jenkins/plugins/sshcredentials/impl/BasicSSHUserPrivateKeyTest/readOldCredentials/credentials.xml
-    private static final String PRIVATE_KEY = "-----BEGIN RSA PRIVATE KEY-----\n" +
-        "MIIEpAIBAAKCAQEAu1r+HHzmpybc4iwoP5+44FjvcaMkNEWeGQZlmPwLx70XW8+8\n" +
-        "3d2BMLjhcw1zLsYG3FWpCyn8cB1OmjKiGjvnP5EBoAolvh3qOcWKyWlVGWGgs10B\n" +
-        "0Cgnd3OBXRPQd1cBdiQZmmeCrrH0OjQefYIF2WYN+F8iuNGraAaRsXLgITanjTb1\n" +
-        "6w1dnk+KLpU2J5G6kG1f/Qxl4pgny80S/3TktqoknbOrYDMOSA1Zdww39cpXJHp6\n" +
-        "feEs8tavC93rOsR2O4ZfVUCjTFAF5FtIdRv3LXY3Q5W/AyY1h45Wk6mMVnEluFjB\n" +
-        "aA+gzVAVaHFQfuhwoj4B7jWCmfHsPG1WmyK0YQIDAQABAoIBADt1qlXiMdV0mP9S\n" +
-        "okdm6maQ8xTugKvyODWa+R1vSFHQqhwiNr927+xFkI9SAm8iu8SrjuWTIqF2O57m\n" +
-        "WNnYjxB2dbyT29yVY+OH1P8M5cwTVsv1xYCJbdUUHEcs5akqPLWAyXteRHQq1+as\n" +
-        "6cxNOov/PonHr55WNH7kLtLRMV54jZ68nrEh5pWdabFa0f7d/ByIvYRJm7lpjtSp\n" +
-        "EBp5AseXzSg2EZP3HDPYYPDHK0tMPginz9+YuQCQFoMYAkVZoKFJGsWICktd5Uk7\n" +
-        "wveOJLOfMng1Iww6CEc871GcLn5LbafLWRxjZssK2Z1fC+pZYLLZPeKDMSxoRXm6\n" +
-        "PShUC1ECgYEA623dmwJNYfVRgAgOYhhcxzH4TAXUmUIpadEUjOkAhe3w/abDawFT\n" +
-        "9ianhqfhTjSZGBtUttcN40Vy+P4bsqfQKZ7p6KzrdR2zWjlYcICWhZDZPGmMxpMZ\n" +
-        "mUFhZXsLRVhn8qed8w1t6eju7S+t9satKIMC/KrhNsFzjrgbU9eC+m0CgYEAy7nN\n" +
-        "gMwQeGxAQSJr9H7eKkthnjMe77rLIAZEbDJhcwYVz+Iie/E4hjESQ+IuvXa1VawD\n" +
-        "O6cD0wWdOhH2McNdMNIbM4IOaO/TOaR5jfQwBWmb4iG2BZQWQQE/HUBnoJQWUhqm\n" +
-        "b+D+s4bHh4J+bs+ptgg9Sd9V+VxJBcu2QDmI6UUCgYBTb1pMJyK5hrFdiH1gcnXe\n" +
-        "+myetKpFrlby83AvCBxxWoQ/wKwc7hmNcOGKLVEB4E4pZvY83jZDx0cZyySRyjtR\n" +
-        "pMoM9ct0dBQt84jORiQSLeVvLZEAhv1ZfPxBdLvn1Y7xRkoJ60Z60Vxrnqwueva/\n" +
-        "Fr8mQIEUYLbNa53ztrrqeQKBgQCqOY4k2F3KwWjPA9wAZyFrZaEjdsOavBGNqK7z\n" +
-        "WQVj/umq0eDOfzgjqE0Cu7MiTFYoR5pL9bmUUVSWePuliQANEwH3f+xackmkGHIY\n" +
-        "0rhtTVkbEd/tuVb+6fO6lV4BJrufzvTS9sTbbPq7l6XdIVdE6o2LdDl6Kko5tYWL\n" +
-        "FIf5oQKBgQDLHK/9NTb3VHp+Qriu2Vp8Pnaw6YF6pETfgjyrH2ULSW/R07v+AECC\n" +
-        "sPr+d/hx2MQWp54HglY8lv98rOrRjMiRw1GVoXs+Ut9vkupmrpvzNE7ITl0tzBqD\n" +
-        "sroT/IHW2jKMD0v8kKLUnKCZYzlw0By7+RvJ8lgzHB0D71f6EC1UWg==\n" +
-        "-----END RSA PRIVATE KEY-----\n";
-
-    public static JenkinsRule rule = new JenkinsRule();
+    private static final String PRIVATE_KEY = """
+        -----BEGIN RSA PRIVATE KEY-----
+        MIIEpAIBAAKCAQEAu1r+HHzmpybc4iwoP5+44FjvcaMkNEWeGQZlmPwLx70XW8+8
+        3d2BMLjhcw1zLsYG3FWpCyn8cB1OmjKiGjvnP5EBoAolvh3qOcWKyWlVGWGgs10B
+        0Cgnd3OBXRPQd1cBdiQZmmeCrrH0OjQefYIF2WYN+F8iuNGraAaRsXLgITanjTb1
+        6w1dnk+KLpU2J5G6kG1f/Qxl4pgny80S/3TktqoknbOrYDMOSA1Zdww39cpXJHp6
+        feEs8tavC93rOsR2O4ZfVUCjTFAF5FtIdRv3LXY3Q5W/AyY1h45Wk6mMVnEluFjB
+        aA+gzVAVaHFQfuhwoj4B7jWCmfHsPG1WmyK0YQIDAQABAoIBADt1qlXiMdV0mP9S
+        okdm6maQ8xTugKvyODWa+R1vSFHQqhwiNr927+xFkI9SAm8iu8SrjuWTIqF2O57m
+        WNnYjxB2dbyT29yVY+OH1P8M5cwTVsv1xYCJbdUUHEcs5akqPLWAyXteRHQq1+as
+        6cxNOov/PonHr55WNH7kLtLRMV54jZ68nrEh5pWdabFa0f7d/ByIvYRJm7lpjtSp
+        EBp5AseXzSg2EZP3HDPYYPDHK0tMPginz9+YuQCQFoMYAkVZoKFJGsWICktd5Uk7
+        wveOJLOfMng1Iww6CEc871GcLn5LbafLWRxjZssK2Z1fC+pZYLLZPeKDMSxoRXm6
+        PShUC1ECgYEA623dmwJNYfVRgAgOYhhcxzH4TAXUmUIpadEUjOkAhe3w/abDawFT
+        9ianhqfhTjSZGBtUttcN40Vy+P4bsqfQKZ7p6KzrdR2zWjlYcICWhZDZPGmMxpMZ
+        mUFhZXsLRVhn8qed8w1t6eju7S+t9satKIMC/KrhNsFzjrgbU9eC+m0CgYEAy7nN
+        gMwQeGxAQSJr9H7eKkthnjMe77rLIAZEbDJhcwYVz+Iie/E4hjESQ+IuvXa1VawD
+        O6cD0wWdOhH2McNdMNIbM4IOaO/TOaR5jfQwBWmb4iG2BZQWQQE/HUBnoJQWUhqm
+        b+D+s4bHh4J+bs+ptgg9Sd9V+VxJBcu2QDmI6UUCgYBTb1pMJyK5hrFdiH1gcnXe
+        +myetKpFrlby83AvCBxxWoQ/wKwc7hmNcOGKLVEB4E4pZvY83jZDx0cZyySRyjtR
+        pMoM9ct0dBQt84jORiQSLeVvLZEAhv1ZfPxBdLvn1Y7xRkoJ60Z60Vxrnqwueva/
+        Fr8mQIEUYLbNa53ztrrqeQKBgQCqOY4k2F3KwWjPA9wAZyFrZaEjdsOavBGNqK7z
+        WQVj/umq0eDOfzgjqE0Cu7MiTFYoR5pL9bmUUVSWePuliQANEwH3f+xackmkGHIY
+        0rhtTVkbEd/tuVb+6fO6lV4BJrufzvTS9sTbbPq7l6XdIVdE6o2LdDl6Kko5tYWL
+        FIf5oQKBgQDLHK/9NTb3VHp+Qriu2Vp8Pnaw6YF6pETfgjyrH2ULSW/R07v+AECC
+        sPr+d/hx2MQWp54HglY8lv98rOrRjMiRw1GVoXs+Ut9vkupmrpvzNE7ITl0tzBqD
+        sroT/IHW2jKMD0v8kKLUnKCZYzlw0By7+RvJ8lgzHB0D71f6EC1UWg==
+        -----END RSA PRIVATE KEY-----
+        """;
+
+    private static JenkinsRule rule;
 
     @BeforeAll
     static void init(JenkinsRule r) {
@@ -171,17 +167,19 @@ void buildWhenSetSSHCheckoutTraitThenEmptyAuthenticatorExtension() throws Except
             new AbstractGitSCMSource.SCMRevisionImpl(head, sampleRepo.head());
         GitSCM build = (GitSCM) scmSource.build(head, revision);
 
-        assertThat(build.getUserRemoteConfigs().size(), is(1));
-        UserRemoteConfig remoteConfig = build.getUserRemoteConfigs().get(0);
-        assertThat(remoteConfig.getUrl(), is(String.format("ssh://user@localhost/%s", sampleRepo)));
-        assertThat(remoteConfig.getRefspec(), is(String.format("+refs/heads/%s:refs/remotes/origin/%s", BRANCH_NAME, BRANCH_NAME)));
-        assertThat(remoteConfig.getCredentialsId(), is(sshCredentials.getId()));
-        assertThat(build.getExtensions(), containsInAnyOrder(
-            instanceOf(BuildChooserSetting.class),
-            instanceOf(GitSCMSourceDefaults.class),
-            instanceOf(GitClientAuthenticatorExtension.class),
-            instanceOf(BitbucketEnvVarExtension.class))
-        );
+        assertThat(build.getUserRemoteConfigs())
+            .hasSize(1)
+            .element(0).satisfies(remoteConfig -> {
+                assertThat(remoteConfig.getUrl()).isEqualTo(String.format("ssh://user@localhost/%s", sampleRepo));
+                assertThat(remoteConfig.getRefspec()).isEqualTo(String.format("+refs/heads/%s:refs/remotes/origin/%s", BRANCH_NAME, BRANCH_NAME));
+                assertThat(remoteConfig.getCredentialsId()).isEqualTo(sshCredentials.getId());
+                assertThat(build.getExtensions()).hasOnlyElementsOfTypes(
+                    BuildChooserSetting.class,
+                    GitSCMSourceDefaults.class,
+                    GitClientAuthenticatorExtension.class,
+                    BitbucketEnvVarExtension.class
+                );
+            });
 
         // Create a Pipeline with CpsScmFlowDefinition based of the GitSCM produced
         // Then check that the checkout uses GIT_SSH from the git-client logs
@@ -191,7 +189,7 @@ void buildWhenSetSSHCheckoutTraitThenEmptyAuthenticatorExtension() throws Except
 
         ByteArrayOutputStream byteArrayOutStr = new ByteArrayOutputStream();
         run.writeWholeLogTo(byteArrayOutStr);
-        assertThat(byteArrayOutStr.toString(StandardCharsets.UTF_8), containsString("using GIT_SSH to set credentials"));
+        assertThat(byteArrayOutStr).asString().contains("using GIT_SSH to set credentials");
     }
 
     @Test
@@ -226,17 +224,19 @@ void buildBasicAuthThenAuthenticatorExtension() throws Exception {
             new AbstractGitSCMSource.SCMRevisionImpl(head, sampleRepo.head());
         GitSCM build = (GitSCM) scmSource.build(head, revision);
 
-        assertThat(build.getUserRemoteConfigs().size(), is(1));
-        UserRemoteConfig remoteConfig = build.getUserRemoteConfigs().get(0);
-        assertThat(remoteConfig.getUrl(), is(sampleRepo.toString()));
-        assertThat(remoteConfig.getRefspec(), is(String.format("+refs/heads/%s:refs/remotes/origin/%s", BRANCH_NAME, BRANCH_NAME)));
-        assertThat(remoteConfig.getCredentialsId(), is(userPassCredentials.getId()));
-        assertThat(build.getExtensions(), containsInAnyOrder(
-            instanceOf(BuildChooserSetting.class),
-            instanceOf(GitSCMSourceDefaults.class),
-            instanceOf(GitClientAuthenticatorExtension.class),
-            instanceOf(BitbucketEnvVarExtension.class)
-        ));
+        assertThat(build.getUserRemoteConfigs())
+            .hasSize(1)
+            .element(0).satisfies(remoteConfig -> {
+                assertThat(remoteConfig.getUrl()).isEqualTo(sampleRepo.toString());
+                assertThat(remoteConfig.getRefspec()).isEqualTo(String.format("+refs/heads/%s:refs/remotes/origin/%s", BRANCH_NAME, BRANCH_NAME));
+                assertThat(remoteConfig.getCredentialsId()).isEqualTo(userPassCredentials.getId());
+                assertThat(build.getExtensions()).hasOnlyElementsOfTypes(
+                    BuildChooserSetting.class,
+                    GitSCMSourceDefaults.class,
+                    GitClientAuthenticatorExtension.class,
+                    BitbucketEnvVarExtension.class
+                );
+            });
 
         // Create a Pipeline with CpsScmFlowDefinition based of the GitSCM produced
         // Then check that the checkout scm uses GIT_ASKPASS from the git-client logs
@@ -246,7 +246,7 @@ void buildBasicAuthThenAuthenticatorExtension() throws Exception {
 
         ByteArrayOutputStream byteArrayOutStr = new ByteArrayOutputStream();
         run.writeWholeLogTo(byteArrayOutStr);
-        assertThat(byteArrayOutStr.toString(StandardCharsets.UTF_8), containsString("using GIT_ASKPASS to set credentials"));
+        assertThat(byteArrayOutStr).asString().contains("using GIT_ASKPASS to set credentials");
     }
 
     @Test
@@ -279,17 +279,19 @@ void verify_ssh_trait_on_data_center_with_disabled_https_protocol() throws Excep
         AbstractGitSCMSource.SCMRevisionImpl revision = new AbstractGitSCMSource.SCMRevisionImpl(head, "1dbb02d4c1b99f1e84459c6947e3caa53cadfad1");
         GitSCM build = (GitSCM) scmSource.build(head, revision);
 
-        assertThat(build.getUserRemoteConfigs().size(), is(1));
-        UserRemoteConfig remoteConfig = build.getUserRemoteConfigs().get(0);
-        assertThat(remoteConfig.getUrl(), is(sshCloneURL));
-        assertThat(remoteConfig.getRefspec(), is(String.format("+refs/heads/%s:refs/remotes/origin/%s", BRANCH_NAME, BRANCH_NAME)));
-        assertThat(remoteConfig.getCredentialsId(), is(sshCredentials.getId()));
-        assertThat(build.getExtensions(), containsInAnyOrder(
-            instanceOf(BuildChooserSetting.class),
-            instanceOf(GitSCMSourceDefaults.class),
-            instanceOf(GitClientAuthenticatorExtension.class),
-            instanceOf(BitbucketEnvVarExtension.class))
-        );
+        assertThat(build.getUserRemoteConfigs())
+            .hasSize(1)
+            .element(0).satisfies(remoteConfig -> {
+                assertThat(remoteConfig.getUrl()).isEqualTo(sshCloneURL);
+                assertThat(remoteConfig.getRefspec()).isEqualTo(String.format("+refs/heads/%s:refs/remotes/origin/%s", BRANCH_NAME, BRANCH_NAME));
+                assertThat(remoteConfig.getCredentialsId()).isEqualTo(sshCredentials.getId());
+                assertThat(build.getExtensions()).hasOnlyElementsOfTypes(
+                    BuildChooserSetting.class,
+                    GitSCMSourceDefaults.class,
+                    GitClientAuthenticatorExtension.class,
+                    BitbucketEnvVarExtension.class
+                );
+            });
     }
 
     private StandardUsernameCredentials registerSSHCredentials() throws IOException {

src/test/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketSCMSourceBuildTest.java

@@ -97,7 +97,8 @@ class BitbucketSCMSourceRetrieveTest {
     private static final String COMMIT_HASH = "e851558f77c098d21af6bb8cc54a423f7cf12147";
     private static final Integer PR_ID = 1;
 
-    public static JenkinsRule jenkinsRule = new JenkinsRule();
+    @SuppressWarnings("unused")
+    private static JenkinsRule jenkinsRule;
 
     @Mock
     private BitbucketRepository repository;

src/test/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketSCMSourceRetrieveTest.java

@@ -74,11 +74,11 @@
 
 @WithJenkins
 class BitbucketSCMSourceTest {
-    private static JenkinsRule j;
+    private static JenkinsRule rule;
 
     @BeforeAll
     static void init(JenkinsRule rule) {
-        j = rule;
+        BitbucketSCMSourceTest.rule = rule;
         BitbucketPlugin.aliases();
     }
 
@@ -225,7 +225,7 @@ void test_show_bitbucket_avatar_trait() throws Exception {
     void verify_built_scm_with_username_password_authenticator() throws Exception {
         UsernamePasswordCredentialsImpl userCredentials = new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, "username-password", "desc", "user", "password");
 
-        CredentialsStore store = CredentialsProvider.lookupStores(j.getInstance()).iterator().next();
+        CredentialsStore store = CredentialsProvider.lookupStores(rule.getInstance()).iterator().next();
         store.addCredentials(Domain.global(), userCredentials);
 
         BitbucketSCMSource instance = new BitbucketSCMSource("testing", "test-repo");
@@ -251,7 +251,7 @@ void verify_built_scm_with_username_password_authenticator() throws Exception {
     void verify_built_scm_with_token_authenticator() throws Exception {
         StringCredentials tokenCredentials = new StringCredentialsImpl(CredentialsScope.GLOBAL, "token-id", "desc", Secret.fromString("password"));
 
-        CredentialsStore store = CredentialsProvider.lookupStores(j.getInstance()).iterator().next();
+        CredentialsStore store = CredentialsProvider.lookupStores(rule.getInstance()).iterator().next();
         store.addCredentials(Domain.global(), tokenCredentials);
 
         BitbucketSCMSource instance = new BitbucketSCMSource("testing", "test-repo");