Skip to content

Commit 39d2db6

Browse files
committed
More canonical file fixes in tests
**Auto-cherry-pick to `7.0.x` & `6.5.x`**
1 parent a10ec58 commit 39d2db6

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

spring-integration-file/src/test/java/org/springframework/integration/file/inbound/FileInboundTransactionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public void testNoTx() throws Exception {
113113
assertThat(result.getPayload()).isEqualTo("foo");
114114
assertThat(transactionManager.getCommitted()).isFalse();
115115
assertThat(transactionManager.getRolledBack()).isFalse();
116-
verify(fileListFilter).remove(new File(tmpDir, "si-test1/foo"));
116+
verify(fileListFilter).remove(new File(tmpDir, "si-test1/foo").getCanonicalFile());
117117

118118
pseudoTx.stop();
119119
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ public boolean remove(File fileToRemove) {
203203

204204
assertThat(removeFileLatch.await(10, TimeUnit.SECONDS)).isTrue();
205205

206-
File baz3 = File.createTempFile("baz3", ".txt", baz);
206+
File baz3 = File.createTempFile("baz3", ".txt", baz).getCanonicalFile();
207207

208208
n = 0;
209209
Message<File> fileMessage = null;

spring-integration-file/src/test/java/org/springframework/integration/file/locking/FileLockingWithMultipleSourcesIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void cleanoutWorkDir() {
6464

6565
@Test
6666
public void filePickedUpOnceWithDistinctFilters() throws IOException {
67-
File testFile = new File(workdir, "test");
67+
File testFile = new File(workdir, "test").getCanonicalFile();
6868
testFile.createNewFile();
6969
assertThat(this.fileSource1.receive())
7070
.isNotNull()
@@ -76,7 +76,7 @@ public void filePickedUpOnceWithDistinctFilters() throws IOException {
7676

7777
@Test
7878
public void filePickedUpTwiceWithSharedFilter() throws Exception {
79-
File testFile = new File(workdir, "test");
79+
File testFile = new File(workdir, "test").getCanonicalFile();
8080
testFile.createNewFile();
8181
assertThat(this.fileSource1.receive())
8282
.isNotNull()

spring-integration-file/src/test/java/org/springframework/integration/file/locking/NioFileLockerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class NioFileLockerTests {
4545
@Test
4646
public void fileListedByFirstFilter() throws Exception {
4747
NioFileLocker filter = new NioFileLocker();
48-
File testFile = new File(workdir, "test0");
48+
File testFile = new File(workdir, "test0").getCanonicalFile();
4949
testFile.createNewFile();
5050
assertThat(filter.filterFiles(workdir.listFiles()).get(0)).isEqualTo(testFile);
5151
filter.lock(testFile);

0 commit comments

Comments
 (0)