Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-3478 SftpPAOnceFileListFilter use getFilename

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3478

INT-3478: add test case

Polishing
This commit is contained in:
David Liu
2014-08-06 13:40:36 +03:00
committed by Artem Bilan
parent 4382a5796e
commit 0aec26ad4f
2 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-integration-sftp/src/main/java/org/springframework/integration/sftp/filters/SftpPersistentAcceptOnceFileListFilter.java
View File

@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.sftp.filters;
import org.springframework.integration.file.filters.AbstractPersistentAcceptOnceFileListFilter;
import org.springframework.integration.metadata.ConcurrentMetadataStore;
@@ -27,6 +26,7 @@ import com.jcraft.jsch.ChannelSftp.LsEntry;
* 'seen' this file.
*
* @author Gary Russell
* @author David Liu
* @since 3.0
*
*/
@@ -43,8 +43,7 @@ public class SftpPersistentAcceptOnceFileListFilter extends AbstractPersistentAc
@Override
protected String fileName(LsEntry file) {
return file.getLongname();
return file.getFilename();
}
}

32
spring-integration-sftp/src/test/java/org/springframework/integration/sftp/filters/SftpPersistentAcceptOnceFileListFilterTests.java
View File

@@ -13,24 +13,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.sftp.filters;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import java.lang.reflect.Constructor;
import java.util.Arrays;
import java.util.List;
import com.jcraft.jsch.ChannelSftp;
import com.jcraft.jsch.ChannelSftp.LsEntry;
import com.jcraft.jsch.SftpATTRS;
import org.junit.Test;
import org.springframework.integration.metadata.SimpleMetadataStore;
import com.jcraft.jsch.ChannelSftp;
import com.jcraft.jsch.ChannelSftp.LsEntry;
import com.jcraft.jsch.SftpATTRS;
/**
* @author Gary Russell
* @author David Liu
* @since 4.0.4
*
*/
@@ -62,4 +66,22 @@ public class SftpPersistentAcceptOnceFileListFilterTests {
assertEquals(0, now.size());
}
@Test
public void testKeyUsingFileName() throws Exception {
SftpPersistentAcceptOnceFileListFilter filter = new SftpPersistentAcceptOnceFileListFilter(
new SimpleMetadataStore(), "rollback:");
ChannelSftp channel = new ChannelSftp();
SftpATTRS attrs = mock(SftpATTRS.class);
@SuppressWarnings("unchecked")
Constructor<LsEntry> ctor = (Constructor<LsEntry>) LsEntry.class.getDeclaredConstructors()[0];
ctor.setAccessible(true);
LsEntry sftpFile1 = ctor.newInstance(channel, "foo", "same", attrs);
LsEntry sftpFile2 = ctor.newInstance(channel, "bar", "same", attrs);
LsEntry[] files = new LsEntry[] {sftpFile1, sftpFile2};
List<LsEntry> now = filter.filterFiles(files);
assertEquals(2, now.size());
assertEquals("foo", now.get(0).getFilename());
assertEquals("bar", now.get(1).getFilename());
}
}