Replace commons-lang from Jenkins core with commons-lang4 api plugin (#1093)

Move some unit test to JUnit 5

Author: nfalco79

pom.xml

@@ -83,6 +83,10 @@
             <groupId>io.jenkins.plugins</groupId>
             <artifactId>commons-lang3-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.jenkins.plugins</groupId>
+            <artifactId>commons-collections4-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>jackson2-api</artifactId>

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/api/BitbucketRepository.java

@@ -27,7 +27,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 
 /**
  * Represents a Bitbucket repository.

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/endpoints/BitbucketEndpointConfiguration.java

@@ -51,7 +51,7 @@
 import jenkins.model.GlobalConfiguration;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/BitbucketSCMSourcePushHookReceiver.java

@@ -49,14 +49,16 @@
 import org.apache.commons.codec.digest.HmacAlgorithms;
 import org.apache.commons.codec.digest.HmacUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.jenkinsci.plugins.plaincredentials.StringCredentials;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses.HttpResponseException;
 import org.kohsuke.stapler.StaplerRequest2;
 
-import static org.apache.commons.lang.StringUtils.trimToNull;
+import static org.apache.commons.lang3.StringUtils.lowerCase;
+import static org.apache.commons.lang3.StringUtils.substringAfter;
+import static org.apache.commons.lang3.StringUtils.substringBefore;
+import static org.apache.commons.lang3.StringUtils.trimToNull;
 
 /**
  * Process Bitbucket push and pull requests creations/updates hooks.
@@ -160,8 +162,8 @@ private HttpResponseException checkSignature(@NonNull StaplerRequest2 req, @NonN
         StringCredentials signatureCredentials = endpoint.hookSignatureCredentials();
         if (signatureCredentials != null) {
             String signatureHeader = req.getHeader("X-Hub-Signature");
-            String bitbucketAlgorithm = trimToNull(StringUtils.substringBefore(signatureHeader, "="));
-            String bitbucketSignature = trimToNull(StringUtils.substringAfter(signatureHeader, "="));
+            String bitbucketAlgorithm = trimToNull(substringBefore(signatureHeader, "="));
+            String bitbucketSignature = trimToNull(substringAfter(signatureHeader, "="));
             HmacAlgorithms algorithm = getAlgorithm(bitbucketAlgorithm);
             if (algorithm == null) {
                 return HttpResponses.error(HttpServletResponse.SC_FORBIDDEN, "Signature " + bitbucketAlgorithm + " not supported");
@@ -191,7 +193,7 @@ private HttpResponseException checkSignature(@NonNull StaplerRequest2 req, @NonN
 
     @CheckForNull
     private HmacAlgorithms getAlgorithm(String algorithm) {
-        switch (StringUtils.lowerCase(algorithm)) {
+        switch (lowerCase(algorithm)) {
         case "sha1":
             return HmacAlgorithms.HMAC_SHA_1;
         case "sha256":

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/WebhookConfiguration.java

@@ -47,7 +47,7 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.logging.Logger;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.jenkinsci.plugins.plaincredentials.StringCredentials;
 
 /**

src/test/java/com/cloudbees/jenkins/plugins/bitbucket/trait/TagDiscoveryTraitTest.java

@@ -24,41 +24,22 @@
 package com.cloudbees.jenkins.plugins.bitbucket.trait;
 
 import com.cloudbees.jenkins.plugins.bitbucket.BitbucketSCMSourceContext;
-import com.cloudbees.jenkins.plugins.bitbucket.trait.TagDiscoveryTrait;
 import com.cloudbees.jenkins.plugins.bitbucket.trait.TagDiscoveryTrait.TagSCMHeadAuthority;
-import java.util.Collections;
 import jenkins.scm.api.SCMHeadObserver;
-import jenkins.scm.api.trait.SCMHeadFilter;
-import jenkins.scm.api.trait.SCMHeadPrefilter;
-import org.hamcrest.Matcher;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.jvnet.hudson.test.JenkinsRule;
+import org.junit.jupiter.api.Test;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assume.assumeThat;
-
-public class TagDiscoveryTraitTest {
-    @ClassRule
-    public static JenkinsRule j = new JenkinsRule();
+import static org.assertj.core.api.Assertions.assertThat;
 
+class TagDiscoveryTraitTest {
     @Test
-    public void given__discoverAll__when__appliedToContext__then__noFilter() throws Exception {
+    void given__discoverAll__when__appliedToContext__then__noFilter() throws Exception {
         BitbucketSCMSourceContext ctx = new BitbucketSCMSourceContext(null, SCMHeadObserver.none());
-        assumeThat(ctx.wantTags(), is(false));
-        assumeThat(ctx.prefilters(), is(Collections.<SCMHeadPrefilter>emptyList()));
-        assumeThat(ctx.filters(), is(Collections.<SCMHeadFilter>emptyList()));
-        assumeThat(ctx.authorities(), not((Matcher) hasItem(instanceOf(TagSCMHeadAuthority.class))));
 
         TagDiscoveryTrait instance = new TagDiscoveryTrait();
         instance.decorateContext(ctx);
-        assertThat(ctx.wantTags(), is(true));
-        assertThat(ctx.prefilters(), is(Collections.<SCMHeadPrefilter>emptyList()));
-        assertThat(ctx.filters(), is(Collections.<SCMHeadFilter>emptyList()));
-        assertThat(ctx.authorities(), (Matcher) hasItem(instanceOf(TagSCMHeadAuthority.class)));
+        assertThat(ctx.wantTags()).isTrue();
+        assertThat(ctx.prefilters()).isEmpty();
+        assertThat(ctx.filters()).isEmpty();
+        assertThat(ctx.authorities()).hasAtLeastOneElementOfType(TagSCMHeadAuthority.class);
     }
 }

src/test/java/com/cloudbees/jenkins/plugins/bitbucket/trait/WebhookConfigurationTraitTest.java

@@ -24,35 +24,30 @@
 package com.cloudbees.jenkins.plugins.bitbucket.trait;
 
 import com.cloudbees.jenkins.plugins.bitbucket.BitbucketSCMSourceContext;
-import com.cloudbees.jenkins.plugins.bitbucket.trait.WebhookConfigurationTrait;
 import jenkins.scm.api.SCMHeadObserver;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.jvnet.hudson.test.JenkinsRule;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-
-public class WebhookConfigurationTraitTest {
-    @ClassRule
-    public static JenkinsRule j = new JenkinsRule();
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assumptions.assumeThat;
 
+class WebhookConfigurationTraitTest {
     @Test
-    public void ignoredCommittersDefault()
-            throws Exception {
+    void ignoredCommittersDefault() {
         BitbucketSCMSourceContext ctx = new BitbucketSCMSourceContext(null, SCMHeadObserver.none());
-        assertEquals(ctx.webhookConfiguration().getCommittersToIgnore(), null);
+        assumeThat(ctx.webhookConfiguration().getCommittersToIgnore()).isNull();
+
         WebhookConfigurationTrait instance = new WebhookConfigurationTrait("");
         instance.decorateContext(ctx);
-        assertEquals(ctx.webhookConfiguration().getCommittersToIgnore(), "");
+        assertThat(ctx.webhookConfiguration().getCommittersToIgnore()).isEmpty();
     }
 
     @Test
-    public void ignoredCommittersWithValue()
-            throws Exception {
+    void ignoredCommittersWithValue() {
         BitbucketSCMSourceContext ctx = new BitbucketSCMSourceContext(null, SCMHeadObserver.none());
-        assertEquals(ctx.webhookConfiguration().getCommittersToIgnore(), null);
+        assumeThat(ctx.webhookConfiguration().getCommittersToIgnore()).isNull();
+
         WebhookConfigurationTrait instance = new WebhookConfigurationTrait("jenkins");
         instance.decorateContext(ctx);
-        assertEquals(ctx.webhookConfiguration().getCommittersToIgnore(), "jenkins");
+        assertThat(ctx.webhookConfiguration().getCommittersToIgnore()).isEqualTo("jenkins");
     }
 }

src/test/java/com/cloudbees/jenkins/plugins/bitbucket/trait/WebhookRegistrationTraitTest.java

@@ -25,49 +25,40 @@
 
 import com.cloudbees.jenkins.plugins.bitbucket.BitbucketSCMSourceContext;
 import com.cloudbees.jenkins.plugins.bitbucket.WebhookRegistration;
-import com.cloudbees.jenkins.plugins.bitbucket.trait.WebhookRegistrationTrait;
 import hudson.util.ListBoxModel;
 import jenkins.scm.api.SCMHeadObserver;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.jvnet.hudson.test.JenkinsRule;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.jupiter.api.Test;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assume.assumeThat;
-
-public class WebhookRegistrationTraitTest {
-    @ClassRule
-    public static JenkinsRule j = new JenkinsRule();
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assumptions.assumeThat;
 
+class WebhookRegistrationTraitTest {
     @Test
-    public void given__webhookRegistrationDisabled__when__appliedToContext__then__webhookRegistrationDisabled()
-            throws Exception {
+    void given__webhookRegistrationDisabled__when__appliedToContext__then__webhookRegistrationDisabled() {
         BitbucketSCMSourceContext ctx = new BitbucketSCMSourceContext(null, SCMHeadObserver.none());
-        assumeThat(ctx.webhookRegistration(), is(WebhookRegistration.SYSTEM));
+        assumeThat(ctx.webhookRegistration()).isEqualTo(WebhookRegistration.SYSTEM);
+
         WebhookRegistrationTrait instance = new WebhookRegistrationTrait(WebhookRegistration.DISABLE.toString());
         instance.decorateContext(ctx);
-        assertThat(ctx.webhookRegistration(), is(WebhookRegistration.DISABLE));
+        assertThat(ctx.webhookRegistration()).isEqualTo(WebhookRegistration.DISABLE);
     }
 
     @Test
-    public void given__webhookRegistrationFromItem__when__appliedToContext__then__webhookRegistrationFromItem()
-            throws Exception {
+    void given__webhookRegistrationFromItem__when__appliedToContext__then__webhookRegistrationFromItem() {
         BitbucketSCMSourceContext ctx = new BitbucketSCMSourceContext(null, SCMHeadObserver.none());
-        assumeThat(ctx.webhookRegistration(), is(WebhookRegistration.SYSTEM));
+        assumeThat(ctx.webhookRegistration()).isEqualTo(WebhookRegistration.SYSTEM);
+
         WebhookRegistrationTrait instance = new WebhookRegistrationTrait(WebhookRegistration.ITEM.toString());
         instance.decorateContext(ctx);
-        assertThat(ctx.webhookRegistration(), is(WebhookRegistration.ITEM));
+        assertThat(ctx.webhookRegistration()).isEqualTo(WebhookRegistration.ITEM);
     }
 
     @Test
-    public void given__descriptor__when__displayingOptions__then__SYSTEM_not_present() {
-        ListBoxModel options =
-                j.jenkins.getDescriptorByType(WebhookRegistrationTrait.DescriptorImpl.class).doFillModeItems();
-        for (ListBoxModel.Option o : options) {
-            assertThat(o.value, not(is(WebhookRegistration.SYSTEM.name())));
-        }
+    void given__descriptor__when__displayingOptions__then__SYSTEM_not_present() {
+        ListBoxModel items = new WebhookRegistrationTrait.DescriptorImpl().doFillModeItems();
+        assertThat(items).isNotEmpty()
+            .noneMatch(el -> StringUtils.equals(el.value, WebhookRegistration.SYSTEM.name()));
     }
 
 }