Migrate tests to JUnit5 (cli) (#10559)

Co-authored-by: Mark Waite <mark.earl.waite@gmail.com>

Author: strangelookingnerd

cli/src/test/java/hudson/cli/CLIConnectionFactoryTest.java

@@ -1,12 +1,13 @@
 package hudson.cli;
 
-import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 class CLIConnectionFactoryTest {
 
-    CLIConnectionFactory cliFactory;
+    private CLIConnectionFactory cliFactory;
 
     @BeforeEach
     void setUp() {
@@ -15,11 +16,11 @@ void setUp() {
 
     @Test
     void testBearerFromToken() {
-        Assertions.assertEquals("Bearer some-token", cliFactory.bearerAuth("some-token").authorization);
+        assertEquals("Bearer some-token", cliFactory.bearerAuth("some-token").authorization);
     }
 
     @Test
     void testBasicFromUserAndPass() {
-        Assertions.assertEquals("Basic c29tZTpwYXNz", cliFactory.basicAuth("some:pass").authorization);
+        assertEquals("Basic c29tZTpwYXNz", cliFactory.basicAuth("some:pass").authorization);
     }
 }

cli/src/test/java/hudson/cli/HexDumpTest.java

@@ -12,40 +12,40 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 @Execution(ExecutionMode.CONCURRENT)
-public class HexDumpTest {
+class HexDumpTest {
 
-  @DisplayName("Test HexDump.toHex(byte[] buf)")
-  @ParameterizedTest(name = "{index} => expected: {0}, buf: {1}")
-  @MethodSource("testToHex1Sources")
-  public void testToHex1(String expected, byte[] buf) {
-    assertEquals(expected, HexDump.toHex(buf));
-  }
+    @DisplayName("Test HexDump.toHex(byte[] buf)")
+    @ParameterizedTest(name = "{index} => expected: {0}, buf: {1}")
+    @MethodSource("testToHex1Sources")
+    void testToHex1(String expected, byte[] buf) {
+        assertEquals(expected, HexDump.toHex(buf));
+    }
 
-  static Stream<Arguments> testToHex1Sources() {
-    return Stream.of(
+    static Stream<Arguments> testToHex1Sources() {
+        return Stream.of(
             arguments("'fooBar'", new byte[] {'f', 'o', 'o', 'B', 'a', 'r'}),
             arguments("0xc3", new byte[] {(byte) 'Ã'}),
             arguments("0xac '100'", new byte[] {(byte) '€', '1', '0', '0'}),
             arguments("'1' 0xf7 '2'", new byte[] {'1', (byte) '÷', '2'}),
             arguments("'foo' 0x0a\n'Bar'", new byte[] {'f', 'o', 'o', '\n', 'B', 'a', 'r'})
-    );
-  }
+        );
+    }
 
-  @DisplayName("Test HexDump.toHex(byte[] buf, int start, int len)")
-  @ParameterizedTest(name = "{index} => expected: {0}, buf: {1}, start: {2}, len: {3}")
-  @MethodSource("testToHex2Sources")
-  public void testToHex2(String expected, byte[] buf, int start, int len) {
-    assertEquals(expected, HexDump.toHex(buf, start, len));
-  }
+    @DisplayName("Test HexDump.toHex(byte[] buf, int start, int len)")
+    @ParameterizedTest(name = "{index} => expected: {0}, buf: {1}, start: {2}, len: {3}")
+    @MethodSource("testToHex2Sources")
+    void testToHex2(String expected, byte[] buf, int start, int len) {
+        assertEquals(expected, HexDump.toHex(buf, start, len));
+    }
 
-  static Stream<Arguments> testToHex2Sources() {
-    return Stream.of(
+    static Stream<Arguments> testToHex2Sources() {
+        return Stream.of(
             arguments("'ooBa'", new byte[] {'f', 'o', 'o', 'B', 'a', 'r'}, 1, 4),
             arguments("0xc3", new byte[] {(byte) 'Ã'}, 0, 1),
             arguments("0xac '10'", new byte[] {(byte) '€', '1', '0', '0'}, 0, 3),
             arguments("0xf7 '2'", new byte[] {'1', (byte) '÷', '2'}, 1, 2),
             arguments("'Bar'", new byte[] {'f', 'o', 'o', '\n', 'B', 'a', 'r'}, 4, 3),
             arguments("", new byte[] {'f', 'o', 'o', 'B', 'a', 'r'}, 0, 0)
-    );
-  }
+        );
+    }
 }

cli/src/test/java/hudson/cli/PlainCLIProtocolTest.java

@@ -34,17 +34,17 @@
 import java.nio.charset.Charset;
 import org.junit.jupiter.api.Test;
 
-public class PlainCLIProtocolTest {
+class PlainCLIProtocolTest {
 
     @Test
-    public void ignoreUnknownOperations() throws Exception {
+    void ignoreUnknownOperations() throws Exception {
         final PipedOutputStream upload = new PipedOutputStream();
         final PipedOutputStream download = new PipedOutputStream();
         class Client extends PlainCLIProtocol.ClientSide {
             int code = -1;
             final ByteArrayOutputStream stdout = new ByteArrayOutputStream();
 
-            Client() throws IOException {
+            Client() {
                 super(new PlainCLIProtocol.FramedOutput(upload));
             }
 

cli/src/test/java/hudson/cli/PrivateKeyProviderTest.java

@@ -18,13 +18,13 @@
 keys were generated with ssh-keygen from OpenSSH_7.9p1, LibreSSL 2.7.3
 */
 @Execution(ExecutionMode.CONCURRENT)
-public class PrivateKeyProviderTest {
+class PrivateKeyProviderTest {
 
     /**
     key command: ssh-keygen -f dsa -t dsa -b 1024 -m PEM
     */
     @Test
-    public void loadKeyDSA() throws IOException, GeneralSecurityException {
+    void loadKeyDSA() throws IOException, GeneralSecurityException {
         File file = new File(this.getClass().getResource("dsa").getFile());
         assertKeyPairNotNull(file, null);
     }
@@ -45,7 +45,7 @@ private void assertKeyPairNotNull(File file, String password) throws IOException
     key command: ssh-keygen -f dsa-password -t dsa -b 1024 -m PEM -P password
     */
     @Test
-    public void loadKeyDSAPassword() throws IOException, GeneralSecurityException {
+    void loadKeyDSAPassword() throws IOException, GeneralSecurityException {
         File file = new File(this.getClass().getResource("dsa-password").getFile());
         String password = "password";
         assertKeyPairNotNull(file, password);
@@ -55,7 +55,7 @@ public void loadKeyDSAPassword() throws IOException, GeneralSecurityException {
     key command: ssh-keygen -f rsa -t rsa -b 1024 -m PEM
     */
     @Test
-    public void loadKeyRSA() throws IOException, GeneralSecurityException {
+    void loadKeyRSA() throws IOException, GeneralSecurityException {
         File file = new File(this.getClass().getResource("rsa").getFile());
         assertKeyPairNotNull(file, null);
     }
@@ -64,7 +64,7 @@ public void loadKeyRSA() throws IOException, GeneralSecurityException {
     key command: ssh-keygen -f rsa-password -t rsa -b 1024 -m PEM -P password
     */
     @Test
-    public void loadKeyRSAPassword() throws IOException, GeneralSecurityException {
+    void loadKeyRSAPassword() throws IOException, GeneralSecurityException {
         File file = new File(this.getClass().getResource("rsa-password").getFile());
         String password = "password";
         assertKeyPairNotNull(file, password);
@@ -74,7 +74,7 @@ public void loadKeyRSAPassword() throws IOException, GeneralSecurityException {
     key command: ssh-keygen -f openssh -t rsa -b 1024
     */
     @Test
-    public void loadKeyOpenSSH() throws IOException, GeneralSecurityException {
+    void loadKeyOpenSSH() throws IOException, GeneralSecurityException {
         File file = new File(this.getClass().getResource("openssh").getFile());
         assertKeyPairNotNull(file, null);
     }
@@ -83,7 +83,7 @@ public void loadKeyOpenSSH() throws IOException, GeneralSecurityException {
      key command: ssh-keygen -f openssh-unsupported -t rsa -b 1024 -m PKCS8 -P password
      */
     @Test
-    public void loadKeyOpenSSHPKCS8() throws IOException, GeneralSecurityException {
+    void loadKeyOpenSSHPKCS8() throws IOException, GeneralSecurityException {
         File file = new File(this.getClass().getResource("openssh-pkcs8").getFile());
         String password = "password";
         assertKeyPairNotNull(file, password);
@@ -93,7 +93,7 @@ public void loadKeyOpenSSHPKCS8() throws IOException, GeneralSecurityException {
      key command: ssh-keygen -f openssh-unsupported -t rsa -b 1024 -m RFC4716 -p password
      */
     @Test
-    public void loadKeyOpenSSHRFC4716() throws IOException, GeneralSecurityException {
+    void loadKeyOpenSSHRFC4716() throws IOException, GeneralSecurityException {
         File file = new File(this.getClass().getResource("openssh-rfc4716").getFile());
         String password = "password";
         assertKeyPairNotNull(file, password);
@@ -104,7 +104,7 @@ public void loadKeyOpenSSHRFC4716() throws IOException, GeneralSecurityException
      Copy pasted the same key twice
      */
     @Test
-    public void loadKeyOpenSSHMultipleKeys() throws IOException, GeneralSecurityException {
+    void loadKeyOpenSSHMultipleKeys() {
         File file = new File(this.getClass().getResource("openssh-multiple-keys").getFile());
         String password = "password";
         assertThrows(InvalidKeySpecException.class, () -> PrivateKeyProvider.loadKey(file, password));
@@ -114,7 +114,7 @@ public void loadKeyOpenSSHMultipleKeys() throws IOException, GeneralSecurityExce
      * Uses a blank file
      */
     @Test
-    public void loadBlankKey() throws IOException, GeneralSecurityException {
+    void loadBlankKey() {
         File file = new File(this.getClass().getResource("blank").getFile());
         String password = "password";
         assertThrows(InvalidKeyException.class, () -> PrivateKeyProvider.loadKey(file, password));
@@ -125,7 +125,7 @@ public void loadBlankKey() throws IOException, GeneralSecurityException {
     in this key we remove some lines to break the key.
     */
     @Test
-    public void loadKeyBroken() throws IOException, GeneralSecurityException {
+    void loadKeyBroken() {
         File file = new File(this.getClass().getResource("openssh-broken").getFile());
         String password = "password";
         assertThrows(IllegalArgumentException.class, () -> PrivateKeyProvider.loadKey(file, password));

cli/src/test/java/hudson/util/QuotedStringTokenizerTest.java

@@ -34,53 +34,53 @@
 /**
  * @author Kohsuke Kawaguchi
  */
-public class QuotedStringTokenizerTest {
+class QuotedStringTokenizerTest {
 
     @Test
-    public void test1() {
+    void test1() {
         check("foo bar",
               "foo", "bar");
     }
 
     @Test
-    public void test2() {
+    void test2() {
         check("foo \"bar zot\"",
               "foo", "bar zot");
     }
 
     @Test
-    public void test3() {
+    void test3() {
         check("foo bar=\"quote zot\"",
               "foo", "bar=quote zot");
     }
 
     @Test
-    public void test4() {
+    void test4() {
         check("foo\\\"",
               "foo\"");
     }
 
     @Test
-    public void test5() {
+    void test5() {
         check("foo\\ bar",
               "foo bar");
     }
 
     @Test
-    public void test6() {
+    void test6() {
         check("foo\\\\ bar",
               "foo\\", "bar");
     }
 
     // see http://www.nabble.com/Error-parsing-%22-in-msbuild-task-to20535754.html
     @Test
-    public void test7() {
+    void test7() {
         check("foo=\"bar\\zot\"",
               "foo=bar\\zot");
     }
 
     @Test
-    public void testHasMoreToken() {
+    void testHasMoreToken() {
         QuotedStringTokenizer tokenizer = new QuotedStringTokenizer("");
         assertFalse(tokenizer.hasMoreTokens());
         tokenizer = new QuotedStringTokenizer("one");