[2/4] mina-sshd git commit: [SSHD-621] ClientSession.createSftpClient() doesn't return when server doesn't support SFTP

[lg...@apache.org]

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/cfb006c6/sshd-core/src/test/java/org/apache/sshd/common/compression/CompressionTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/common/compression/CompressionTest.java b/sshd-core/src/test/java/org/apache/sshd/common/compression/CompressionTest.java
index 67c1987..e3e56b8 100644
--- a/sshd-core/src/test/java/org/apache/sshd/common/compression/CompressionTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/common/compression/CompressionTest.java
@@ -25,6 +25,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.sshd.common.NamedFactory;
+import org.apache.sshd.common.channel.Channel;
 import org.apache.sshd.server.SshServer;
 import org.apache.sshd.util.test.BaseTestSupport;
 import org.apache.sshd.util.test.JSchLogger;
@@ -99,7 +100,7 @@ public class CompressionTest extends BaseTestSupport {
 
         s.connect();
         try {
-            com.jcraft.jsch.Channel c = s.openChannel("shell");
+            com.jcraft.jsch.Channel c = s.openChannel(Channel.CHANNEL_SHELL);
             c.connect();
             try (OutputStream os = c.getOutputStream();
                  InputStream is = c.getInputStream()) {

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/cfb006c6/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java b/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java
index 68b0d79..987beb2 100644
--- a/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java
@@ -31,6 +31,7 @@ import java.util.TreeSet;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.sshd.common.NamedFactory;
+import org.apache.sshd.common.channel.Channel;
 import org.apache.sshd.common.util.GenericUtils;
 import org.apache.sshd.server.SshServer;
 import org.apache.sshd.util.test.BaseTestSupport;
@@ -156,7 +157,7 @@ public class MacTest extends BaseTestSupport {
             session.setUserInfo(new SimpleUserInfo(getCurrentTestName()));
             session.connect();
 
-            com.jcraft.jsch.Channel channel = session.openChannel("shell");
+            com.jcraft.jsch.Channel channel = session.openChannel(Channel.CHANNEL_SHELL);
             channel.connect();
 
             try (OutputStream stdin = channel.getOutputStream();

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/cfb006c6/sshd-core/src/test/java/org/apache/sshd/spring/SpringConfigTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/spring/SpringConfigTest.java b/sshd-core/src/test/java/org/apache/sshd/spring/SpringConfigTest.java
index 7ff81cc..3501208 100644
--- a/sshd-core/src/test/java/org/apache/sshd/spring/SpringConfigTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/spring/SpringConfigTest.java
@@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit;
 
 import com.jcraft.jsch.Channel;
 import com.jcraft.jsch.JSch;
+
 import org.apache.sshd.common.util.OsUtils;
 import org.apache.sshd.server.SshServer;
 import org.apache.sshd.util.test.BaseTestSupport;
@@ -81,7 +82,7 @@ public class SpringConfigTest extends BaseTestSupport {
         s.connect();
 
         try {
-            Channel c = s.openChannel("shell");
+            Channel c = s.openChannel(org.apache.sshd.common.channel.Channel.CHANNEL_SHELL);
             c.connect();
 
             String command = OsUtils.isWin32() ? "dir" : "ls";