Migrate tests to JUnit5 (core / hudson / 2) (#10577)

Author: krisstern

core/src/test/java/hudson/BulkChangeTest.java

@@ -24,18 +24,18 @@
 
 package hudson;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import hudson.model.Saveable;
 import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests {@link BulkChange}.
  *
  * @author Kohsuke Kawaguchi
  */
-public class BulkChangeTest {
+class BulkChangeTest {
 
     private static class Point implements Saveable {
         /**
@@ -72,7 +72,7 @@ public void save() {
      * If there is no BulkChange, we should see two saves.
      */
     @Test
-    public void noBulkChange() throws Exception {
+    void noBulkChange() throws Exception {
         Point pt = new Point();
         pt.set(0, 0);
         assertEquals(2, pt.saveCount);
@@ -82,7 +82,7 @@ public void noBulkChange() throws Exception {
      * With a {@link BulkChange}, this will become just one save.
      */
     @Test
-    public void bulkChange() throws Exception {
+    void bulkChange() throws Exception {
         Point pt = new Point();
         BulkChange bc = new BulkChange(pt);
         try {
@@ -97,7 +97,7 @@ public void bulkChange() throws Exception {
      * {@link BulkChange}s can be nested.
      */
     @Test
-    public void nestedBulkChange() throws Exception {
+    void nestedBulkChange() throws Exception {
         Point pt = new Point();
         Point pt2 = new Point();
         BulkChange bc1 = new BulkChange(pt);

core/src/test/java/hudson/ChannelRule.java

@@ -37,10 +37,10 @@
 /**
  * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a>
  */
-public class ClassicPluginStrategyTest {
+class ClassicPluginStrategyTest {
 
     @Test
-    public void test_getDetachedPlugins() {
+    void test_getDetachedPlugins() {
         List<DetachedPlugin> list = DetachedPluginsUtil.getDetachedPlugins(new VersionNumber("1.296"));
 
         assertTrue(list.size() >= 14); // There were 14 at the time of writing this test

core/src/test/java/hudson/ClassicPluginStrategyTest.java

@@ -41,17 +41,17 @@
 /**
  * @author Kohsuke Kawaguchi
  */
-public class EnvVarsTest {
+class EnvVarsTest {
 
     @Test
-    public void caseInsensitive() {
+    void caseInsensitive() {
         EnvVars ev = new EnvVars(Map.of("Path", "A:B:C"));
         assertTrue(ev.containsKey("PATH"));
         assertEquals("A:B:C", ev.get("PATH"));
     }
 
     @Test
-    public void overrideExpandingAll() {
+    void overrideExpandingAll() {
         EnvVars env = new EnvVars();
         env.put("PATH", "orig");
         env.put("A", "Value1");
@@ -71,7 +71,7 @@ public void overrideExpandingAll() {
     }
 
     @Test
-    public void overrideOrderCalculatorSimple() {
+    void overrideOrderCalculatorSimple() {
         EnvVars env = new EnvVars();
         EnvVars overrides = new EnvVars();
         overrides.put("A", "NoReference");
@@ -87,7 +87,7 @@ public void overrideOrderCalculatorSimple() {
     }
 
     @Test
-    public void overrideOrderCalculatorInOrder() {
+    void overrideOrderCalculatorInOrder() {
         EnvVars env = new EnvVars();
         EnvVars overrides = new EnvVars();
         overrides.put("A", "NoReference");
@@ -102,7 +102,7 @@ public void overrideOrderCalculatorInOrder() {
     }
 
     @Test
-    public void overrideOrderCalculatorMultiple() {
+    void overrideOrderCalculatorMultiple() {
         EnvVars env = new EnvVars();
         EnvVars overrides = new EnvVars();
         overrides.put("A", "Noreference");
@@ -115,7 +115,7 @@ public void overrideOrderCalculatorMultiple() {
     }
 
     @Test
-    public void overrideOrderCalculatorSelfReference() {
+    void overrideOrderCalculatorSelfReference() {
         EnvVars env = new EnvVars();
         EnvVars overrides = new EnvVars();
         overrides.put("PATH", "some;${PATH}");
@@ -126,7 +126,7 @@ public void overrideOrderCalculatorSelfReference() {
     }
 
     @Test
-    public void overrideOrderCalculatorCyclic() {
+    void overrideOrderCalculatorCyclic() {
         EnvVars env = new EnvVars();
         env.put("C", "Existing");
         EnvVars overrides = new EnvVars();
@@ -144,7 +144,7 @@ public void overrideOrderCalculatorCyclic() {
     }
 
     @Test
-    public void putIfNotNull() {
+    void putIfNotNull() {
         EnvVars env = new EnvVars();
         env.putIfNotNull("foo", null);
         assertTrue(env.isEmpty());
@@ -153,7 +153,7 @@ public void putIfNotNull() {
     }
 
     @Test
-    public void putAllNonNull() {
+    void putAllNonNull() {
         EnvVars env = new EnvVars();
         TreeMap<String, String> map = new TreeMap<>();
         map.put("A", "a");