From 8a7293c6807f64d98a05d2f52e3e3638bbc07605 Mon Sep 17 00:00:00 2001 From: abilan Date: Thu, 22 Jun 2023 10:19:46 -0400 Subject: [PATCH] An attempt to fix Sftp tests to new `sshd-sftp` --- .../session/SftpRemoteFileTemplateTests.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpRemoteFileTemplateTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpRemoteFileTemplateTests.java index 82e711399f..b6855d6825 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpRemoteFileTemplateTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpRemoteFileTemplateTests.java @@ -69,14 +69,14 @@ public class SftpRemoteFileTemplateTests extends SftpTestSupport { fileNameGenerator.setExpression("'foobar.txt'"); fileNameGenerator.setBeanFactory(mock(BeanFactory.class)); template.setFileNameGenerator(fileNameGenerator); - template.setRemoteDirectoryExpression(new LiteralExpression("foo/")); + template.setRemoteDirectoryExpression(new LiteralExpression("/foo/")); template.setUseTemporaryFileName(false); template.setBeanFactory(mock(BeanFactory.class)); template.afterPropertiesSet(); template.execute(session -> { - session.mkdir("foo/"); - return session.mkdir("foo/bar/"); + session.mkdir("/foo/"); + return session.mkdir("/foo/bar/"); }); template.append(new GenericMessage<>("foo")); template.append(new GenericMessage<>("bar")); @@ -91,17 +91,17 @@ public class SftpRemoteFileTemplateTests extends SftpTestSupport { } }); template.execute((SessionCallbackWithoutResult) session -> { - SftpClient.DirEntry[] files = session.list("foo/"); + SftpClient.DirEntry[] files = session.list("/foo/"); assertThat(files.length).isEqualTo(4); - assertThat(session.remove("foo/foobar.txt")).isTrue(); - assertThat(session.rmdir("foo/bar/")).isTrue(); - files = session.list("foo/"); + assertThat(session.remove("/foo/foobar.txt")).isTrue(); + assertThat(session.rmdir("/foo/bar/")).isTrue(); + files = session.list("/foo"); assertThat(files.length).isEqualTo(2); List fileNames = Arrays.stream(files).map(SftpClient.DirEntry::getFilename).toList(); assertThat(fileNames).contains(".", ".."); - assertThat(session.rmdir("foo/")).isTrue(); + assertThat(session.rmdir("/foo")).isTrue(); }); - assertThat(template.exists("foo")).isFalse(); + assertThat(template.exists("/foo")).isFalse(); } @Test