Switch to junit 5

jline · Oct 3, 2023 · 8e8540d · 8e8540d
1 parent a2ab047
commit 8e8540d
Show file tree

Hide file tree

Showing 74 changed files with 301 additions and 297 deletions.
diff --git a/builtins/pom.xml b/builtins/pom.xml
@@ -43,8 +43,8 @@
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/builtins/src/test/java/org/jline/builtins/CommandsTest.java b/builtins/src/test/java/org/jline/builtins/CommandsTest.java
@@ -19,9 +19,9 @@
 import org.jline.terminal.Size;
 import org.jline.terminal.Terminal;
 import org.jline.terminal.TerminalBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class CommandsTest {
     @Test

diff --git a/builtins/src/test/java/org/jline/builtins/CompletersTest.java b/builtins/src/test/java/org/jline/builtins/CompletersTest.java
@@ -16,10 +16,10 @@
 import org.jline.reader.LineReader;
 import org.jline.reader.ParsedLine;
 import org.jline.reader.impl.DefaultParser;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.jline.builtins.Completers.TreeCompleter.node;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class CompletersTest {
 

diff --git a/builtins/src/test/java/org/jline/builtins/InputRCTest.java b/builtins/src/test/java/org/jline/builtins/InputRCTest.java
@@ -17,11 +17,11 @@
 import org.jline.reader.Macro;
 import org.jline.reader.Reference;
 import org.jline.terminal.TerminalBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class InputRCTest {
 

diff --git a/builtins/src/test/java/org/jline/builtins/NanoTest.java b/builtins/src/test/java/org/jline/builtins/NanoTest.java
@@ -15,11 +15,13 @@
 import org.jline.keymap.KeyMap;
 import org.jline.terminal.Size;
 import org.jline.terminal.impl.LineDisciplineTerminal;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 public class NanoTest {
 
-    @Test(timeout = 1000)
+    @Test
+    @Timeout(1)
     public void nanoBufferLineOverflow() throws Exception {
         ByteArrayOutputStream output = new ByteArrayOutputStream();
         LineDisciplineTerminal terminal = new LineDisciplineTerminal("nano", "xterm", output, StandardCharsets.UTF_8);

diff --git a/builtins/src/test/java/org/jline/builtins/NfaMatcherTest.java b/builtins/src/test/java/org/jline/builtins/NfaMatcherTest.java
@@ -12,11 +12,11 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class NfaMatcherTest {
 

diff --git a/builtins/src/test/java/org/jline/builtins/OptionCompleterTest.java b/builtins/src/test/java/org/jline/builtins/OptionCompleterTest.java
@@ -17,7 +17,7 @@
 import org.jline.reader.impl.completer.ArgumentCompleter;
 import org.jline.reader.impl.completer.NullCompleter;
 import org.jline.reader.impl.completer.StringsCompleter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class OptionCompleterTest extends ReaderTestSupport {
 

diff --git a/builtins/src/test/java/org/jline/builtins/OptionsTest.java b/builtins/src/test/java/org/jline/builtins/OptionsTest.java
@@ -36,11 +36,11 @@
 import org.jline.terminal.Terminal;
 import org.jline.terminal.TerminalBuilder;
 import org.jline.utils.AttributedString;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class OptionsTest {
 

diff --git a/builtins/src/test/java/org/jline/builtins/ReaderTestSupport.java b/builtins/src/test/java/org/jline/builtins/ReaderTestSupport.java
@@ -31,7 +31,7 @@
 import org.jline.terminal.impl.DumbTerminal;
 import org.jline.utils.Curses;
 import org.jline.utils.InfoCmp.Capability;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 
 import static org.jline.reader.LineReader.ACCEPT_LINE;
 import static org.jline.reader.LineReader.BACKWARD_CHAR;
@@ -47,8 +47,8 @@
 import static org.jline.reader.LineReader.UP_HISTORY;
 import static org.jline.reader.LineReader.YANK;
 import static org.jline.reader.LineReader.YANK_POP;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Provides support for reader tests.
@@ -60,7 +60,7 @@ public abstract class ReaderTestSupport {
     protected ByteArrayOutputStream out;
     protected Character mask;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         Handler ch = new ConsoleHandler();
         ch.setLevel(Level.FINEST);

diff --git a/builtins/src/test/java/org/jline/builtins/StylesTest.java b/builtins/src/test/java/org/jline/builtins/StylesTest.java
@@ -8,13 +8,14 @@
  */
 package org.jline.builtins;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class StylesTest {
-    private static final int TIMEOUT = 1000;
+    private static final int TIMEOUT = 1;
 
     private static final String STANDARD_COLORS = "di=1;91:ex=1;92:ln=1;96:fi=";
 
@@ -33,7 +34,8 @@ public void testIsStylePatternStandardColors() {
         assertTrue(stylePattern);
     }
 
-    @Test(timeout = TIMEOUT)
+    @Test
+    @Timeout(TIMEOUT)
     public void testIsStylePatternRepeatedDirectory() {
         final StringBuilder builder = getRepeatedStyleBuilder();
 
@@ -43,7 +45,8 @@ public void testIsStylePatternRepeatedDirectory() {
         assertTrue(stylePattern);
     }
 
-    @Test(timeout = TIMEOUT)
+    @Test
+    @Timeout(TIMEOUT)
     public void testIsStylePatternAsteriskTilde() {
         final StringBuilder builder = getRepeatedStyleBuilder();
         builder.append(ASTERISK_TILDE_STYLE_ELEMENT);

diff --git a/builtins/src/test/java/org/jline/builtins/TmuxTest.java b/builtins/src/test/java/org/jline/builtins/TmuxTest.java
@@ -8,10 +8,10 @@
  */
 package org.jline.builtins;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class TmuxTest {
 

diff --git a/builtins/src/test/java/org/jline/builtins/TreeCompleterTest.java b/builtins/src/test/java/org/jline/builtins/TreeCompleterTest.java
@@ -10,7 +10,7 @@
 
 import org.jline.builtins.Completers.TreeCompleter;
 import org.jline.reader.LineReader;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.jline.builtins.Completers.TreeCompleter.node;
 

diff --git a/console/pom.xml b/console/pom.xml
@@ -43,8 +43,8 @@
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/groovy/pom.xml b/groovy/pom.xml
@@ -48,8 +48,8 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/native/pom.xml b/native/pom.xml
@@ -30,14 +30,12 @@
     <dependencies>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <version>5.7.0</version>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.7.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -104,7 +104,7 @@
         <juniversalchardet.version>1.0.3</juniversalchardet.version>
         <sshd.version>2.9.2</sshd.version>
         <easymock.version>5.1.0</easymock.version>
-        <junit.version>4.13.2</junit.version>
+        <junit.version>5.10.0</junit.version>
         <gogo.runtime.version>1.1.6</gogo.runtime.version>
         <gogo.jline.version>1.1.8</gogo.jline.version>
         <slf4j.version>2.0.6</slf4j.version>
@@ -294,10 +294,16 @@
             </dependency>
 
             <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-api</artifactId>
                 <version>${junit.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-params</artifactId>
+                <version>${junit.version}</version>
+                <scope>test</scope>
+            </dependency>
 
             <dependency>
                 <groupId>com.google.code.findbugs</groupId>

diff --git a/reader/pom.xml b/reader/pom.xml
@@ -33,8 +33,8 @@
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/reader/src/test/java/org/jline/keymap/BindingReaderTest.java b/reader/src/test/java/org/jline/keymap/BindingReaderTest.java
@@ -22,19 +22,19 @@
 import org.jline.terminal.Size;
 import org.jline.terminal.Terminal;
 import org.jline.terminal.impl.DumbTerminal;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class BindingReaderTest {
 
     protected Terminal terminal;
     protected EofPipedInputStream in;
     protected ByteArrayOutputStream out;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         Handler ch = new ConsoleHandler();
         ch.setLevel(Level.FINEST);

diff --git a/reader/src/test/java/org/jline/keymap/KeyMapTest.java b/reader/src/test/java/org/jline/keymap/KeyMapTest.java
@@ -26,9 +26,8 @@
 import org.jline.terminal.Size;
 import org.jline.terminal.Terminal;
 import org.jline.terminal.impl.DumbTerminal;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.jline.keymap.KeyMap.alt;
 import static org.jline.keymap.KeyMap.display;
@@ -41,16 +40,16 @@
 import static org.jline.reader.LineReader.KILL_WHOLE_LINE;
 import static org.jline.reader.LineReader.SEND_BREAK;
 import static org.jline.reader.LineReader.UP_HISTORY;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class KeyMapTest {
 
     protected Terminal terminal;
     protected EofPipedInputStream in;
     protected ByteArrayOutputStream out;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         Handler ch = new ConsoleHandler();
         ch.setLevel(Level.FINEST);
@@ -69,7 +68,7 @@ public void setUp() throws Exception {
     public void testBound() throws Exception {
         KeyMap<Binding> map = new LineReaderImpl(terminal).emacs();
 
-        Assert.assertEquals(new Reference(COMPLETE_WORD), map.getBound("\u001B\u001B"));
+        assertEquals(new Reference(COMPLETE_WORD), map.getBound("\u001B\u001B"));
         assertEquals(new Reference(BACKWARD_WORD), map.getBound(alt("b")));
 
         map.bindIfNotBound(new Reference(UP_HISTORY), "\033[0A");

diff --git a/reader/src/test/java/org/jline/reader/LineReaderBuilderTest.java b/reader/src/test/java/org/jline/reader/LineReaderBuilderTest.java
@@ -12,9 +12,9 @@
 
 import org.jline.terminal.Terminal;
 import org.jline.terminal.TerminalBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class LineReaderBuilderTest {
 
@@ -26,7 +26,7 @@ public void testInheritAppNameFromTerminal() throws IOException {
         final LineReader lineReader =
                 LineReaderBuilder.builder().terminal(terminal).build();
 
-        assertEquals("Did not inherit appName from terminal", expectedAppName, lineReader.getAppName());
+        assertEquals(expectedAppName, lineReader.getAppName(), "Did not inherit appName from terminal");
     }
 
     @Test
@@ -39,6 +39,6 @@ public void testPreferAppNameFromBuilder() throws IOException {
                 .terminal(terminal)
                 .build();
 
-        assertEquals("Did not prefer appName from builder", expectedAppName, lineReader.getAppName());
+        assertEquals(expectedAppName, lineReader.getAppName(), "Did not prefer appName from builder");
     }
 }
diff --git a/reader/src/test/java/org/jline/reader/completer/ArgumentCompleterTest.java b/reader/src/test/java/org/jline/reader/completer/ArgumentCompleterTest.java
@@ -11,7 +11,7 @@
 import org.jline.reader.impl.ReaderTestSupport;
 import org.jline.reader.impl.completer.ArgumentCompleter;
 import org.jline.reader.impl.completer.StringsCompleter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for {@link ArgumentCompleter}.