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

INT-4243: Upgrade to sshd 1.4

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

Remove newline char from key exchange.

Fix CR and Add Windows Delete Diagnostics

Fix For Windows

More diagnostics.

It appears the new server doesn't close the file when the session is closed.

In the streaming test, consume the stream before closing the session.

Polishing - PR Comments

* More polishing according PR comments

Conflicts:
	spring-integration-sftp/src/test/java/org/springframework/integration/sftp/SftpTestSupport.java
	spring-integration-sftp/src/test/java/org/springframework/integration/sftp/dsl/SftpTests.java
	spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpRemoteFileTemplateTests.java
	spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpServerTests.java
	spring-integration-sftp/src/test/java/org/springframework/integration/sftp/session/SftpSessionFactoryTests.java
This commit is contained in:
Gary Russell
2017-03-10 15:45:02 -05:00
committed by Artem Bilan
parent f47b4bf222
commit 96331d5415
8 changed files with 83 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
spring-integration-file/src/test/java/org/springframework/integration/file/remote/RemoteFileTestSupport.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016 the original author or authors.
* Copyright 2016-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,10 +19,15 @@ package org.springframework.integration.file.remote;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Arrays;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestName;
/**
* Abstract base class for tests requiring remote file servers, e.g. (S)FTP.
@@ -33,6 +38,8 @@ import org.junit.rules.TemporaryFolder;
*/
public abstract class RemoteFileTestSupport {
protected final Log logger = LogFactory.getLog(getClass());
protected static int port;
@ClassRule
@@ -41,6 +48,9 @@ public abstract class RemoteFileTestSupport {
@ClassRule
public static final TemporaryFolder localTemporaryFolder = new TemporaryFolder();
@Rule
public final TestName testName = new TestName();
protected volatile File sourceRemoteDirectory;
protected volatile File targetRemoteDirectory;
@@ -57,6 +67,10 @@ public abstract class RemoteFileTestSupport {
return targetRemoteDirectory;
}
public String getTargetRemoteDirectoryName() {
return targetRemoteDirectory.getAbsolutePath() + File.separator;
}
public File getSourceLocalDirectory() {
return sourceLocalDirectory;
}
@@ -65,6 +79,10 @@ public abstract class RemoteFileTestSupport {
return targetLocalDirectory;
}
public String getTargetLocalDirectoryName() {
return targetLocalDirectory.getAbsolutePath() + File.separator;
}
/**
* Default implementation creates the following folder structures:
*
@@ -154,15 +172,24 @@ public abstract class RemoteFileTestSupport {
File[] files = file.listFiles();
if (files != null) {
for (File fyle : files) {
logger.info("Deleting: " + fyle + " in " + testName.getMethodName());
if (fyle.isDirectory()) {
recursiveDelete(fyle);
}
else {
fyle.delete();
if (!fyle.delete()) {
logger.error("Couldn't delete: " + fyle + " in " + testName.getMethodName());
}
}
}
}
file.delete();
logger.info("Deleting: " + file + " in " + testName.getMethodName());
if (!file.delete()) {
logger.error("Couldn't delete: " + file + " in " + testName.getMethodName());
if (file.isDirectory()) {
logger.error("Contents: " + Arrays.toString(file.listFiles()));
}
}
}
}