Refactoring and addition of unit tests

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

@@ -9,50 +9,103 @@
 
 class JabRefCLITest {
 
+    private final String bibtex = "@article{test, title=\"test title\"}";
+
     @Test
-    void parsingLongOptions() throws Exception {
+    void emptyCLILeftOversLongOptions() throws Exception {
         JabRefCLI cli = new JabRefCLI(new String[]{"--nogui", "--import=some/file", "--output=some/export/file"});
 
         assertEquals(Collections.emptyList(), cli.getLeftOver());
-        assertEquals("some/file", cli.getFileImport());
+    }
+
+    @Test
+    void guiIsDisabledLongOptions() throws Exception {
+        JabRefCLI cli = new JabRefCLI(new String[]{"--nogui", "--import=some/file", "--output=some/export/file"});
+
         assertTrue(cli.isDisableGui());
+    }
+
+    @Test
+    void successfulParsingOfFileImportCLILongOptions() throws Exception {
+        JabRefCLI cli = new JabRefCLI(new String[]{"--nogui", "--import=some/file", "--output=some/export/file"});
+
+        assertEquals("some/file", cli.getFileImport());
+    }
+
+    @Test
+    void successfulParsingOfFileExportCLILongOptions() throws Exception {
+        JabRefCLI cli = new JabRefCLI(new String[]{"--nogui", "--import=some/file", "--output=some/export/file"});
+
         assertEquals("some/export/file", cli.getFileExport());
     }
 
     @Test
-    void parsingShortOptions() throws Exception {
+    void emptyCLILeftOversShortOptions() throws Exception {
         JabRefCLI cli = new JabRefCLI(new String[]{"-n", "-i=some/file", "-o=some/export/file"});
 
         assertEquals(Collections.emptyList(), cli.getLeftOver());
-        assertEquals("some/file", cli.getFileImport());
+    }
+
+    @Test
+    void guiIsDisabledShortOptions() throws Exception {
+        JabRefCLI cli = new JabRefCLI(new String[]{"-n", "-i=some/file", "-o=some/export/file"});
+
         assertTrue(cli.isDisableGui());
+    }
+
+    @Test
+    void successfulParsingOfFileImportShortOptions() throws Exception {
+        JabRefCLI cli = new JabRefCLI(new String[]{"-n", "-i=some/file", "-o=some/export/file"});
+
+        assertEquals("some/file", cli.getFileImport());
+    }
+
+    @Test
+    void successfulParsingOfFileExportShortOptions() throws Exception {
+        JabRefCLI cli = new JabRefCLI(new String[]{"-n", "-i=some/file", "-o=some/export/file"});
+
         assertEquals("some/export/file", cli.getFileExport());
     }
 
     @Test
-    void preferencesExport() throws Exception {
-        JabRefCLI cli = new JabRefCLI(new String[]{"-n", "-x=some/file"});
+    void emptyLeftOversCLIShortImportingBibtex() throws Exception {
+        JabRefCLI cli = new JabRefCLI(new String[]{"-ib", bibtex});
 
         assertEquals(Collections.emptyList(), cli.getLeftOver());
-        assertEquals("some/file", cli.getPreferencesExport());
-        assertTrue(cli.isDisableGui());
     }
 
     @Test
-    void recognizesImportBibtex() throws Exception {
-        String bibtex = "@article{test, title=\"test title\"}";
+    void recognizesImportBibtexShort() throws Exception {
         JabRefCLI cli = new JabRefCLI(new String[]{"-ib", bibtex});
-        assertEquals(Collections.emptyList(), cli.getLeftOver());
+
         assertTrue(cli.isBibtexImport());
+    }
+
+    @Test
+    void successfulParsingOfBibtexImportShort() throws Exception {
+        JabRefCLI cli = new JabRefCLI(new String[]{"-ib", bibtex});
+
         assertEquals(bibtex, cli.getBibtexImport());
     }
 
     @Test
-    void recognizesImportBibtexLong() throws Exception {
-        String bibtex = "@article{test, title=\"test title\"}";
+    void emptyLeftOversCLILongImportingBibtex() throws Exception {
         JabRefCLI cli = new JabRefCLI(new String[]{"-importBibtex", bibtex});
+
         assertEquals(Collections.emptyList(), cli.getLeftOver());
+    }
+
+    @Test
+    void recognizesImportBibtexLong() throws Exception {
+        JabRefCLI cli = new JabRefCLI(new String[]{"-importBibtex", bibtex});
+
         assertTrue(cli.isBibtexImport());
+    }
+
+    @Test
+    void successfulParsingOfBibtexImportLong() throws Exception {
+        JabRefCLI cli = new JabRefCLI(new String[]{"-importBibtex", bibtex});
+
         assertEquals(bibtex, cli.getBibtexImport());
     }
 }

src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java

@@ -6,14 +6,17 @@
 import org.jabref.model.pdf.FileAnnotation;
 import org.jabref.model.pdf.FileAnnotationType;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class FileAnnotationViewModelTest {
 
-    @Test
-    public void removeOnlyLineBreaksNotPrecededByPeriodOrColon() {
+    private FileAnnotationViewModel annotationViewModel;
+
+    @BeforeEach
+    void setup() {
         String content = "This is content";
         String marking = String.format("This is paragraph 1.%n" +
                 "This is paragr-%naph 2, and it crosses%nseveral lines,%nnow you can see next paragraph:%n"
@@ -22,16 +25,39 @@ public void removeOnlyLineBreaksNotPrecededByPeriodOrColon() {
         FileAnnotation linkedFileAnnotation = new FileAnnotation("John", LocalDateTime.now(), 3, content, FileAnnotationType.FREETEXT, Optional.empty());
         FileAnnotation annotation = new FileAnnotation("Jaroslav Kucha ˇr", LocalDateTime.parse("2017-07-20T10:11:30"), 1, marking, FileAnnotationType.HIGHLIGHT, Optional.of(linkedFileAnnotation));
 
-        FileAnnotationViewModel annotationViewModel = new FileAnnotationViewModel(annotation);
+        annotationViewModel = new FileAnnotationViewModel(annotation);
+    }
+
+    @Test
+    public void sameAuthor() {
+        String expectedAuthor = "Jaroslav Kucha ˇr";
+        assertTrue(annotationViewModel.getAuthor().equals(expectedAuthor));
+    }
+
+    @Test
+    public void retrieveCorrectPageNumberAsString() {
+        String expectedPage = "1";
+        assertTrue(annotationViewModel.getPage().equals(expectedPage));
+    }
+
+    @Test
+    public void retrieveCorrectDateAsString() {
+        String expectedDate = "2017-07-20 10:11:30";
+        assertTrue(annotationViewModel.getDate().equals(expectedDate));
+    }
 
-        assertEquals("Jaroslav Kucha ˇr", annotationViewModel.getAuthor());
-        assertEquals(1, annotation.getPage());
-        assertEquals("2017-07-20 10:11:30", annotationViewModel.getDate());
-        assertEquals("This is content", annotationViewModel.getContent());
+    @Test
+    public void retrieveCorrectContent() {
+        String expectedContent = "This is content";
+        assertTrue(annotationViewModel.getContent().equals(expectedContent));
+    }
+
+    @Test
+    public void removeOnlyLineBreaksNotPrecededByPeriodOrColon() {
+        String expectedMarking = String.format("This is paragraph 1.%n" +
+                "This is paragraph 2, and it crosses several lines, now you can see next paragraph:%n"
+                + "This is paragraph 3.");
 
-        assertEquals(String.format("This is paragraph 1.%n" +
-                        "This is paragraph 2, and it crosses several lines, now you can see next paragraph:%n"
-                        + "This is paragraph 3."),
-                annotationViewModel.getMarking());
+        assertTrue(annotationViewModel.getMarking().equals(expectedMarking));
     }
 }

src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java

@@ -14,26 +14,44 @@ public class MainTableColumnModelTest {
     private static MainTableColumnModel.Type testTypeOnlyType = MainTableColumnModel.Type.LINKED_IDENTIFIER;
 
     @Test
-    public void testMainTableColumnModelParser() {
+    public void mainTableColumnModelParserRetrievesCorrectType() {
         MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testQualifier);
 
         assertEquals(testColumnModel.getType(), testType);
+    }
+
+    @Test
+    public void mainTableColumnModelParserRetrievesCorrectQualifier() {
+        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testQualifier);
+
         assertEquals(testColumnModel.getQualifier(), testQualifier);
     }
 
     @Test
-    public void testMainTableColumnModelParserFull() {
+    public void fullMainTableColumnModelParserRetrievesCorrectType() {
         MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testName);
 
         assertEquals(testColumnModel.getType(), testType);
+    }
+
+    @Test
+    public void fullMainTableColumnModelParserRetrievesCorrectQualifier() {
+        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testName);
+
         assertEquals(testColumnModel.getQualifier(), testQualifier);
     }
 
     @Test
-    public void testMainTableColumnModelParserTypeOnly() {
+    public void typeOnlyMainTableColumnModelParserRetrievesCorrectType() {
         MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testTypeOnlyName);
 
         assertEquals(testColumnModel.getType(), testTypeOnlyType);
+    }
+
+    @Test
+    public void typeOnlyMainTableColumnModelParserRetrievesCorrectQualifier() {
+        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testTypeOnlyName);
+
         assertEquals(testColumnModel.getQualifier(), "");
     }
 }