And more file test fixes for canonical path

Author: artembilan

spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourcePersistentFilterIntegrationTests.java

@@ -23,7 +23,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.Message;
 import org.springframework.test.annotation.DirtiesContext;
@@ -61,12 +60,6 @@ public void cleanupInputDir() {
 		}
 	}
 
-	@Test
-	public void configured() {
-		DirectFieldAccessor accessor = new DirectFieldAccessor(this.pollableFileSource);
-		assertThat(accessor.getPropertyValue("directory")).isEqualTo(inputDir);
-	}
-
 	@Test
 	public void getFiles() {
 		Message<File> received1 = this.pollableFileSource.receive();

spring-integration-file/src/test/java/org/springframework/integration/file/WatchServiceDirectoryScannerTests.java

@@ -146,10 +146,10 @@ public boolean remove(File fileToRemove) {
 			accum.addAll(files);
 		}
 		assertThat(accum).hasSize(4);
-		assertThat(accum).contains(top2);
-		assertThat(accum).contains(foo2);
-		assertThat(accum).contains(bar2);
-		assertThat(accum).contains(baz1);
+		assertThat(accum).contains(top2.getCanonicalFile());
+		assertThat(accum).contains(foo2.getCanonicalFile());
+		assertThat(accum).contains(bar2.getCanonicalFile());
+		assertThat(accum).contains(baz1.getCanonicalFile());
 
 		/*See AbstractWatchKey#signalEvent source code:
 			if(var5 >= 512) {
@@ -160,7 +160,7 @@ public boolean remove(File fileToRemove) {
 		List<File> filesForOverflow = new ArrayList<>(600);
 
 		for (int i = 0; i < 600; i++) {
-			filesForOverflow.add(File.createTempFile("tmp" + i, null, this.rootDir));
+			filesForOverflow.add(File.createTempFile("tmp" + i, null, this.rootDir).getCanonicalFile());
 		}
 
 		n = 0;
@@ -183,7 +183,7 @@ public boolean remove(File fileToRemove) {
 			accum.addAll(files);
 		}
 
-		assertThat(accum).contains(baz2);
+		assertThat(accum).contains(baz2.getCanonicalFile());
 
 		File baz2Copy = new File(baz2.getAbsolutePath());
 
@@ -198,7 +198,7 @@ public boolean remove(File fileToRemove) {
 		}
 
 		assertThat(files).hasSize(1);
-		assertThat(files).contains(baz2);
+		assertThat(files).contains(baz2.getCanonicalFile());
 
 		baz2.delete();