Merge branch '2.4.x'

See gh-25985
This commit is contained in:
Andy Wilkinson 2021-04-09 15:05:53 +01:00
commit 048463742d

View File

@ -284,8 +284,7 @@ class FileSystemWatcherTests {
this.watcher.addSourceDirectory(directory);
this.watcher.start();
this.watcher.stopAfter(1);
ChangedFiles changedFiles = getSingleChangedFiles();
Set<ChangedFile> actual = changedFiles.getFiles();
Set<ChangedFile> actual = getAllFileChanges();
Set<ChangedFile> expected = new HashSet<>();
expected.add(new ChangedFile(directory, recreate, Type.ADD));
assertThat(actual).isEqualTo(expected);