migrate majority of tests to junit5

src/test/java/org/jabref/CodeStyleTests.java

@@ -7,8 +7,9 @@
 
 import org.jabref.model.strings.StringUtil;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class CodeStyleTests {
 
@@ -17,8 +18,8 @@ public void StringUtilClassIsSmall() throws Exception {
         Path path = Paths.get("src", "main", "java", StringUtil.class.getName().replace('.', '/') + ".java");
         int lineCount = Files.readAllLines(path, StandardCharsets.UTF_8).size();
 
-        Assert.assertTrue("StringUtil increased in size. "
+        assertTrue(lineCount <= 722, () -> "StringUtil increased in size. "
                 + "We try to keep this class as small as possible. "
-                + "Thus think twice if you add something to StringUtil.", lineCount <= 722);
+                + "Thus think twice if you add something to StringUtil.");
     }
 }

src/test/java/org/jabref/TestIconsProperties.java

@@ -12,11 +12,11 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-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 TestIconsProperties {
 
@@ -31,15 +31,14 @@ public void testExistenceOfIconImagesReferencedFromIconsProperties() throws IOEx
         try (Reader reader = Files.newBufferedReader(Paths.get(iconsPropertiesPath))) {
             properties.load(reader);
         }
-        assertFalse("There must be loaded properties after loading " + iconsPropertiesPath,
-                properties.entrySet().isEmpty());
+        assertFalse(properties.entrySet().isEmpty(), () -> "There must be loaded properties after loading " + iconsPropertiesPath);
 
         // check that each key references an existing file
         for (Map.Entry<Object, Object> entry : properties.entrySet()) {
             String name = entry.getKey().toString();
             String value = entry.getValue().toString();
 
-            assertTrue("Referenced image (" + name + " --> " + value + " does not exist in folder " + folder, Files.exists(Paths.get(folder, value)));
+            assertTrue(Files.exists(Paths.get(folder, value)), () -> "Referenced image (" + name + " --> " + value + " does not exist in folder " + folder);
         }
 
         // check that each image in the folder is referenced by a key
@@ -51,8 +50,7 @@ public void testExistenceOfIconImagesReferencedFromIconsProperties() throws IOEx
         try (Stream<Path> pathStream = Files.list(Paths.get(folder))) {
             List<String> fileNamesInFolder = pathStream.map(p -> p.getFileName().toString()).collect(Collectors.toList());
             fileNamesInFolder.removeAll(imagesReferencedFromProperties);
-
-            assertEquals("Images are in the folder that are unused", "[red.png]", fileNamesInFolder.toString());
+            assertEquals("[red.png]", fileNamesInFolder.toString(), "Images are in the folder that are unused");
         }
     }
 }

src/test/java/org/jabref/architecture/MainArchitectureTests.java

@@ -37,7 +37,7 @@ public class MainArchitectureTests {
 
     private final String firstPackage;
     private final String secondPackage;
-    private Map<String, List<String>> exceptions;
+    private final Map<String, List<String>> exceptions;
 
     public MainArchitectureTests(String firstPackage, String secondPackage) {
         this.firstPackage = firstPackage;

src/test/java/org/jabref/cleanup/CleanupActionsListModelTest.java

@@ -14,10 +14,10 @@
 import org.jabref.model.cleanup.FieldFormatterCleanup;
 import org.jabref.model.cleanup.FieldFormatterCleanups;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;

src/test/java/org/jabref/cli/AuxCommandLineTest.java

@@ -14,18 +14,19 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
-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 org.mockito.Answers;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.Mockito.mock;
 
 public class AuxCommandLineTest {
 
     private ImportFormatPreferences importFormatPreferences;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
     }
@@ -40,8 +41,8 @@ public void test() throws URISyntaxException, IOException {
 
             AuxCommandLine auxCommandLine = new AuxCommandLine(auxFile.getAbsolutePath(), result.getDatabase());
             BibDatabase newDB = auxCommandLine.perform();
-            Assert.assertNotNull(newDB);
-            Assert.assertEquals(2, newDB.getEntries().size());
+            assertNotNull(newDB);
+            assertEquals(2, newDB.getEntries().size());
         }
     }
 

src/test/java/org/jabref/cli/JabRefCLITest.java

@@ -2,38 +2,40 @@
 
 import java.util.Collections;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class JabRefCLITest {
 
     @Test
     public void testCLIParsingLongOptions() {
         JabRefCLI cli = new JabRefCLI(new String[] {"--nogui", "--import=some/file", "--output=some/export/file"});
 
-        Assert.assertEquals(Collections.emptyList(), cli.getLeftOver());
-        Assert.assertEquals("some/file", cli.getFileImport());
-        Assert.assertTrue(cli.isDisableGui());
-        Assert.assertEquals("some/export/file", cli.getFileExport());
+        assertEquals(Collections.emptyList(), cli.getLeftOver());
+        assertEquals("some/file", cli.getFileImport());
+        assertTrue(cli.isDisableGui());
+        assertEquals("some/export/file", cli.getFileExport());
     }
 
     @Test
     public void testCLIParsingShortOptions() {
         JabRefCLI cli = new JabRefCLI(new String[] {"-n", "-i=some/file", "-o=some/export/file"});
 
-        Assert.assertEquals(Collections.emptyList(), cli.getLeftOver());
-        Assert.assertEquals("some/file", cli.getFileImport());
-        Assert.assertTrue(cli.isDisableGui());
-        Assert.assertEquals("some/export/file", cli.getFileExport());
+        assertEquals(Collections.emptyList(), cli.getLeftOver());
+        assertEquals("some/file", cli.getFileImport());
+        assertTrue(cli.isDisableGui());
+        assertEquals("some/export/file", cli.getFileExport());
     }
 
     @Test
     public void testPreferencesExport() {
         JabRefCLI cli = new JabRefCLI(new String[] {"-n", "-x=some/file"});
 
-        Assert.assertEquals(Collections.emptyList(), cli.getLeftOver());
-        Assert.assertEquals("some/file", cli.getPreferencesExport());
-        Assert.assertTrue(cli.isDisableGui());
+        assertEquals(Collections.emptyList(), cli.getLeftOver());
+        assertEquals("some/file", cli.getPreferencesExport());
+        assertTrue(cli.isDisableGui());
     }
 
 }