Merge remote-tracking branch 'upstream/detectCharset' into detectCharset

# Conflicts: # src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java
JabRef · Jul 4, 2022 · ded49cd · ded49cd
2 parents f93cfb8 + 59f3ffc
commit ded49cd
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java
@@ -184,7 +184,9 @@ public void testParsingOfUtf16EncodedFileReadsUmlautCharacterCorrectly(String fi
         MetaData metaData = new MetaData();
         metaData.setMode(BibDatabaseMode.BIBTEX);
         metaData.setEncoding(StandardCharsets.UTF_16BE);
-        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(new BibDatabase(List.of(new BibEntry(StandardEntryType.Article).withField(StandardField.TITLE, "Ü ist ein Umlaut"))), metaData);
+        BibDatabase database = new BibDatabase(List.of(new BibEntry(StandardEntryType.Article).withField(StandardField.TITLE, "Ü ist ein Umlaut")));;
+        database.setNewLineSeparator("\n");
+        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(database, metaData);
 
         assertEquals(
                      bibDatabaseContext.getDatabase().getEntries(),