Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/fix-for-koppor-issue-9798' into …
Browse files Browse the repository at this point in the history
…fix-for-koppor-issue-9798

# Conflicts:
#	src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
  • Loading branch information
Kingfisher12312 committed Oct 27, 2024
2 parents 354cd6d + 9bb0185 commit 87306c3
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ void noRelinkCopyFileFromSubfolderToRootFolder(@TempDir Path folder) throws Exce
Files.copy(fileA, folder.resolve("A.pdf"), StandardCopyOption.REPLACE_EXISTING);
util.linkAssociatedFiles(entries, onLinkedFile);
List<LinkedFile> actual = entryA.getFiles();
List<LinkedFile> expect = List.of(new LinkedFile("", Path.of("A/A.pdf"), "PDF"),new LinkedFile("", Path.of("A.pdf"), "PDF"));
List<LinkedFile> expect = List.of(new LinkedFile("", Path.of("A/A.pdf"), "PDF"), new LinkedFile("", Path.of("A.pdf"), "PDF"));
assertEquals(actual, expect);
}

Expand Down

0 comments on commit 87306c3

Please sign in to comment.