Merge pull request #273 from strangelookingnerd/migrate_to_junit5

Migrate tests to JUnit5

Author: jimklimov

src/test/java/hudson/plugins/im/IMPublisherTest.java

@@ -1,6 +1,5 @@
 package hudson.plugins.im;
 
-import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Maps;
@@ -14,29 +13,24 @@
 import hudson.model.User;
 import hudson.plugins.im.build_notify.DefaultBuildToChatNotifier;
 import hudson.scm.ChangeLogSet;
-import hudson.scm.NullSCM;
 import hudson.tasks.BuildStepDescriptor;
 import hudson.tasks.Publisher;
+import org.junit.jupiter.api.BeforeEach;
 
-import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 @SuppressWarnings("rawtypes")
-public class IMPublisherTest {
+class IMPublisherTest {
 
     private IMPublisher imPublisher;
 
@@ -53,10 +47,10 @@ public class IMPublisherTest {
     private BuildListener listener;
     private RangeSet rangeset;
 
-    @SuppressWarnings("unchecked")
-    @Before
     // lot of ugly mocking going on here ...
-    public void before() throws IOException {
+    @SuppressWarnings("unchecked")
+    @BeforeEach
+    void setUp() {
 
         this.imPublisher = new IMTestPublisher();
 
@@ -140,18 +134,13 @@ private static void createPreviousNextRelationShip(AbstractBuild... builds) {
      * list.
      */
     @Test
-    public void testIncludeUpstreamCulprits() throws Exception {
+    void testIncludeUpstreamCulprits() {
         /* Anticipating javax.mail.MessagingException and InterruptedException */
         Set<User> recipients = this.imPublisher.getNearestUpstreamCommitters(this.build, listener).keySet();
 
-        assertEquals(recipients.toString(), 2, recipients.size());
+        assertEquals(2, recipients.size(), recipients.toString());
 
-        Iterable<String> userNamesIter = Iterables.transform(recipients, new Function<User, String>() {
-            @Override
-            public String apply(User from) {
-                return from.toString();
-            }
-        });
+        Iterable<String> userNamesIter = Iterables.transform(recipients, User::toString);
 
         Set<String> userNames = Sets.newHashSet(userNamesIter);
 
@@ -162,7 +151,7 @@ public String apply(User from) {
 
     private static class IMTestPublisher extends IMPublisher {
         public IMTestPublisher() {
-            super(Collections.<IMMessageTarget>emptyList(), NotificationStrategy.FAILURE_AND_FIXED.getDisplayName(),
+            super(Collections.emptyList(), NotificationStrategy.FAILURE_AND_FIXED.getDisplayName(),
                     true, true, true, true, true, new DefaultBuildToChatNotifier(), MatrixJobMultiplier.ALL);
         }
 
@@ -172,7 +161,7 @@ protected String getPluginName() {
         }
 
         @Override
-        protected IMConnection getIMConnection() throws IMException {
+        protected IMConnection getIMConnection() {
             return null;
         }
 

src/test/java/hudson/plugins/im/MatrixNotificationTest.java

@@ -1,17 +1,16 @@
 package hudson.plugins.im;
 
-import hudson.Launcher;
 import hudson.matrix.MatrixAggregator;
 import hudson.matrix.MatrixBuild;
 import hudson.matrix.MatrixConfiguration;
 import hudson.model.AbstractBuild;
 import hudson.model.AbstractProject;
 import hudson.model.BuildListener;
+import org.junit.jupiter.api.BeforeEach;
 
 import java.io.IOException;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -26,15 +25,15 @@
  * @author kutzi
  */
 @SuppressWarnings("rawtypes")
-public class MatrixNotificationTest {
+class MatrixNotificationTest {
 
     private IMPublisher publisher;
     private BuildListener listener;
     private AbstractBuild configurationBuild;
     private MatrixBuild parentBuild;
 
-    @Before
-    public void before() throws InterruptedException, IOException {
+    @BeforeEach
+    void setUp() throws InterruptedException, IOException {
         this.publisher = mock(IMPublisher.class);
         when(publisher.prebuild(any(AbstractBuild.class), any(BuildListener.class))).thenCallRealMethod();
         when(publisher.perform(any(AbstractBuild.class), any(), any(BuildListener.class))).thenCallRealMethod();
@@ -55,7 +54,7 @@ public void before() throws InterruptedException, IOException {
     }
 
     @Test
-    public void testOnlyParent() throws InterruptedException, IOException {
+    void testOnlyParent() throws InterruptedException, IOException {
         when(publisher.getMatrixNotifier()).thenReturn(MatrixJobMultiplier.ONLY_PARENT);
 
         publisher.prebuild(configurationBuild, listener);
@@ -71,7 +70,7 @@ public void testOnlyParent() throws InterruptedException, IOException {
     }
 
     @Test
-    public void testOnlyConfigurations() throws InterruptedException, IOException {
+    void testOnlyConfigurations() throws InterruptedException, IOException {
         when(publisher.getMatrixNotifier()).thenReturn(MatrixJobMultiplier.ONLY_CONFIGURATIONS);
 
         MatrixAggregator aggregator = publisher.createAggregator(parentBuild, null, listener);
@@ -87,7 +86,7 @@ public void testOnlyConfigurations() throws InterruptedException, IOException {
     }
 
     @Test
-    public void testOnlyBoth() throws InterruptedException, IOException {
+    void testOnlyBoth() throws InterruptedException, IOException {
         when(publisher.getMatrixNotifier()).thenReturn(MatrixJobMultiplier.ALL);
 
         MatrixAggregator aggregator = publisher.createAggregator(parentBuild, null, listener);