diff --git a/build.gradle b/build.gradle index 1f6253aa9b8..3f47d9ac3d9 100644 --- a/build.gradle +++ b/build.gradle @@ -215,6 +215,7 @@ dependencies { implementation group: 'org.jooq', name: 'jool', version: '0.9.15' compileOnly 'org.jspecify:jspecify:0.3.0' + testCompileOnly 'org.jspecify:jspecify:0.3.0' testImplementation 'io.github.classgraph:classgraph:4.8.162' testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0' diff --git a/src/test/java/org/jabref/logic/crawler/CrawlerTest.java b/src/test/java/org/jabref/logic/crawler/CrawlerTest.java index fe63cc22dba..3bb915cf568 100644 --- a/src/test/java/org/jabref/logic/crawler/CrawlerTest.java +++ b/src/test/java/org/jabref/logic/crawler/CrawlerTest.java @@ -72,7 +72,6 @@ public void setUp() throws Exception { importerPreferences = mock(ImporterPreferences.class); saveConfiguration = mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS); when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder()); - when(saveConfiguration.useMetadataSaveOrder()).thenReturn(true); when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet()); when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(','); diff --git a/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java b/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java index 9b73a8ad2d9..e3bee090ebf 100644 --- a/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java +++ b/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java @@ -40,7 +40,6 @@ void setUpMocks() { preferencesService = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS); saveConfiguration = mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS); when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder()); - when(saveConfiguration.useMetadataSaveOrder()).thenReturn(true); when(preferencesService.getBibEntryPreferences().getKeywordSeparator()).thenReturn(','); when(preferencesService.getImporterPreferences().getApiKeys()).thenReturn(FXCollections.emptyObservableSet()); diff --git a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java index f551cdec9b0..aaae4763f15 100644 --- a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java +++ b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java @@ -29,9 +29,6 @@ public class CsvExportFormatTest { @BeforeEach public void setUp() { - SaveConfiguration saveConfiguration = mock(SaveConfiguration.class); - when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder()); - exportFormat = new TemplateExporter( "OpenOffice/LibreOffice CSV", "oocsv", @@ -39,7 +36,7 @@ public void setUp() { "openoffice", StandardFileType.CSV, mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS), - saveConfiguration); + SaveOrder.getDefaultSaveOrder()); databaseContext = new BibDatabaseContext(); } @@ -101,8 +98,8 @@ public void testPerformExportForSingleEditor(@TempDir Path testFolder) throws Ex public void testPerformExportForMultipleEditors(@TempDir Path testFolder) throws Exception { Path path = testFolder.resolve("ThisIsARandomlyNamedFile"); File tmpFile = path.toFile(); - BibEntry entry = new BibEntry(); - entry.setField(StandardField.EDITOR, "von Neumann, John and Smith, John and Black Brown, Peter"); + BibEntry entry = new BibEntry() + .withField(StandardField.EDITOR, "von Neumann, John and Smith, John and Black Brown, Peter"); List entries = List.of(entry); exportFormat.export(databaseContext, tmpFile.toPath(), entries); diff --git a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java index b46b12c7fdf..da3308f2a96 100644 --- a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java +++ b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java @@ -29,7 +29,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; public class DocBook5ExporterTest { @@ -42,9 +41,6 @@ public class DocBook5ExporterTest { @BeforeEach void setUp() throws URISyntaxException { - SaveConfiguration saveConfiguration = mock(SaveConfiguration.class); - when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder()); - exporter = new TemplateExporter( "DocBook 5.1", "docbook5", @@ -52,19 +48,19 @@ void setUp() throws URISyntaxException { null, StandardFileType.XML, mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS), - saveConfiguration); + SaveOrder.getDefaultSaveOrder()); LocalDate myDate = LocalDate.of(2018, 1, 1); xmlFile = Path.of(DocBook5ExporterTest.class.getResource("Docbook5ExportFormat.xml").toURI()); databaseContext = new BibDatabaseContext(); charset = StandardCharsets.UTF_8; - BibEntry entry = new BibEntry(StandardEntryType.Book); - entry.setField(StandardField.TITLE, "my paper title"); - entry.setField(StandardField.AUTHOR, "Stefan Kolb and Tobias Diez"); - entry.setField(StandardField.ISBN, "1-2-34"); - entry.setCitationKey("mykey"); - entry.setDate(new org.jabref.model.entry.Date(myDate)); + BibEntry entry = new BibEntry(StandardEntryType.Book) + .withField(StandardField.TITLE, "my paper title") + .withField(StandardField.AUTHOR, "Stefan Kolb and Tobias Diez") + .withField(StandardField.ISBN, "1-2-34") + .withCitationKey("mykey") + .withDate(new org.jabref.model.entry.Date(myDate)); entries = Collections.singletonList(entry); } diff --git a/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java b/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java index e3b38e8918f..9b6c0cb74f0 100644 --- a/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java +++ b/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java @@ -32,9 +32,6 @@ public class DocbookExporterTest { @BeforeEach public void setUp() { - SaveConfiguration saveConfiguration = mock(SaveConfiguration.class); - when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder()); - exportFormat = new TemplateExporter( "DocBook 4", "docbook4", @@ -42,7 +39,7 @@ public void setUp() { null, StandardFileType.XML, mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS), - saveConfiguration); + SaveOrder.getDefaultSaveOrder()); } @Test diff --git a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java index 3f18d4704b1..4b36efedee7 100644 --- a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java +++ b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java @@ -31,16 +31,13 @@ public class HtmlExportFormatTest { @BeforeEach public void setUp() { - SaveConfiguration saveConfiguration = mock(SaveConfiguration.class); - when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder()); - exportFormat = new TemplateExporter("HTML", "html", "html", null, StandardFileType.HTML, mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS), - saveConfiguration); + SaveOrder.getDefaultSaveOrder()); databaseContext = new BibDatabaseContext(); charset = StandardCharsets.UTF_8; diff --git a/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java b/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java index 36f9665b094..ccd648cf840 100644 --- a/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java +++ b/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java @@ -29,9 +29,6 @@ public class YamlExporterTest { @BeforeAll static void setUp() { - SaveConfiguration saveConfiguration = mock(SaveConfiguration.class); - when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder()); - yamlExporter = new TemplateExporter( "CSL YAML", "yaml", @@ -39,7 +36,7 @@ static void setUp() { null, StandardFileType.YAML, mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS), - saveConfiguration, + SaveOrder.getDefaultSaveOrder(), BlankLineBehaviour.DELETE_BLANKS); databaseContext = new BibDatabaseContext();