You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2014/02/06 15:10:16 UTC
[2/7] git commit: Optimize test imports
Optimize test imports
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/5f55ec14
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/5f55ec14
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/5f55ec14
Branch: refs/heads/master
Commit: 5f55ec1461e94d695421d9dc6e616b819ca284c6
Parents: 52d3da9
Author: Guillaume Nodet <gn...@apache.org>
Authored: Mon Feb 3 22:14:36 2014 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Mon Feb 3 22:14:36 2014 +0100
----------------------------------------------------------------------
.../org/apache/sshd/AbstractSessionTest.java | 7 +++---
.../test/java/org/apache/sshd/AgentTest.java | 10 +++++----
.../org/apache/sshd/AuthenticationTest.java | 1 -
.../test/java/org/apache/sshd/ClientTest.java | 14 +++++++-----
.../java/org/apache/sshd/CompressionTest.java | 5 +----
.../java/org/apache/sshd/KeepAliveTest.java | 9 ++++----
.../src/test/java/org/apache/sshd/LoadTest.java | 12 ++--------
.../org/apache/sshd/PortForwardingLoadTest.java | 3 ---
.../src/test/java/org/apache/sshd/ScpTest.java | 3 ---
.../test/java/org/apache/sshd/ServerTest.java | 1 -
.../src/test/java/org/apache/sshd/SftpTest.java | 2 --
.../java/org/apache/sshd/SpringConfigTest.java | 2 --
.../java/org/apache/sshd/SshServerTest.java | 6 ++---
.../java/org/apache/sshd/WelcomeBannerTest.java | 5 ++---
.../file/virtualfs/VirtualFileSystemTest.java | 2 +-
.../org/apache/sshd/common/util/BufferTest.java | 4 ++--
.../sshd/common/util/SttySupportTest.java | 8 +++----
.../jaas/JaasPasswordAuthenticatorTest.java | 23 +++++++++++---------
.../PEMGeneratorHostKeyProviderTest.java | 8 +++----
.../SimpleGeneratorHostKeyProviderTest.java | 8 +++----
.../server/shell/InvertedShellWrapperTest.java | 6 ++---
.../java/org/apache/sshd/util/BogusChannel.java | 4 ++--
.../apache/sshd/util/BogusForwardingFilter.java | 4 ++--
.../test/java/org/apache/sshd/util/Utils.java | 8 +++----
24 files changed, 69 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/AbstractSessionTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/AbstractSessionTest.java b/sshd-core/src/test/java/org/apache/sshd/AbstractSessionTest.java
index 230dcc5..5a919ea 100644
--- a/sshd-core/src/test/java/org/apache/sshd/AbstractSessionTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/AbstractSessionTest.java
@@ -20,16 +20,15 @@ package org.apache.sshd;
import java.io.IOException;
-import org.apache.mina.core.buffer.IoBuffer;
import org.apache.sshd.common.session.AbstractSession;
import org.apache.sshd.common.util.Buffer;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
import org.apache.sshd.util.BaseTest;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
/**
* Test basic stuff on AbstractSession.
*
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/AgentTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/AgentTest.java b/sshd-core/src/test/java/org/apache/sshd/AgentTest.java
index bcdb5fc..6aa0ded 100644
--- a/sshd-core/src/test/java/org/apache/sshd/AgentTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/AgentTest.java
@@ -21,15 +21,13 @@ package org.apache.sshd;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
import java.security.KeyPair;
import java.security.PublicKey;
import java.util.List;
import org.apache.sshd.agent.SshAgent;
-import org.apache.sshd.agent.local.ProxyAgentFactory;
import org.apache.sshd.agent.local.LocalAgentFactory;
+import org.apache.sshd.agent.local.ProxyAgentFactory;
import org.apache.sshd.agent.unix.AgentClient;
import org.apache.sshd.agent.unix.AgentServer;
import org.apache.sshd.client.channel.ChannelShell;
@@ -37,7 +35,11 @@ import org.apache.sshd.common.KeyPairProvider;
import org.apache.sshd.common.util.SecurityUtils;
import org.apache.sshd.server.Command;
import org.apache.sshd.server.Environment;
-import org.apache.sshd.util.*;
+import org.apache.sshd.util.BaseTest;
+import org.apache.sshd.util.BogusPasswordAuthenticator;
+import org.apache.sshd.util.BogusPublickeyAuthenticator;
+import org.apache.sshd.util.EchoShellFactory;
+import org.apache.sshd.util.Utils;
import org.junit.Test;
import static org.apache.sshd.util.Utils.createTestKeyPairProvider;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/AuthenticationTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/AuthenticationTest.java b/sshd-core/src/test/java/org/apache/sshd/AuthenticationTest.java
index 85ecb10..09d06b7 100644
--- a/sshd-core/src/test/java/org/apache/sshd/AuthenticationTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/AuthenticationTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.sshd;
-import java.net.ServerSocket;
import java.security.KeyPair;
import org.apache.sshd.common.KeyPairProvider;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/ClientTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/ClientTest.java b/sshd-core/src/test/java/org/apache/sshd/ClientTest.java
index 290115b..8c3604f 100644
--- a/sshd-core/src/test/java/org/apache/sshd/ClientTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/ClientTest.java
@@ -23,11 +23,9 @@ import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
-import java.net.ServerSocket;
import java.security.KeyPair;
import java.util.concurrent.CountDownLatch;
-import org.apache.mina.core.future.WriteFuture;
import org.apache.sshd.client.channel.ChannelExec;
import org.apache.sshd.client.future.AuthFuture;
import org.apache.sshd.client.future.OpenFuture;
@@ -46,16 +44,20 @@ import org.apache.sshd.common.util.NoCloseOutputStream;
import org.apache.sshd.server.Command;
import org.apache.sshd.server.CommandFactory;
import org.apache.sshd.server.command.UnknownCommand;
-import org.apache.sshd.util.*;
+import org.apache.sshd.util.BaseTest;
+import org.apache.sshd.util.BogusPasswordAuthenticator;
+import org.apache.sshd.util.BogusPublickeyAuthenticator;
+import org.apache.sshd.util.EchoShellFactory;
+import org.apache.sshd.util.TeeOutputStream;
+import org.apache.sshd.util.Utils;
import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
/**
* TODO Add javadoc
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/CompressionTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/CompressionTest.java b/sshd-core/src/test/java/org/apache/sshd/CompressionTest.java
index 6fc8c5f..ed9270c 100644
--- a/sshd-core/src/test/java/org/apache/sshd/CompressionTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/CompressionTest.java
@@ -20,12 +20,9 @@ package org.apache.sshd;
import java.io.InputStream;
import java.io.OutputStream;
-import java.net.ServerSocket;
import java.util.Arrays;
import com.jcraft.jsch.JSch;
-import com.jcraft.jsch.Logger;
-import com.jcraft.jsch.UserInfo;
import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.common.compression.CompressionDelayedZlib;
import org.apache.sshd.common.compression.CompressionNone;
@@ -37,9 +34,9 @@ import org.apache.sshd.util.JSchLogger;
import org.apache.sshd.util.SimpleUserInfo;
import org.apache.sshd.util.Utils;
import org.junit.After;
+import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import org.junit.Test;
/**
* Test compression algorithms.
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/KeepAliveTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/KeepAliveTest.java b/sshd-core/src/test/java/org/apache/sshd/KeepAliveTest.java
index 1e11901..5b8ffcf 100644
--- a/sshd-core/src/test/java/org/apache/sshd/KeepAliveTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/KeepAliveTest.java
@@ -19,15 +19,16 @@
package org.apache.sshd;
import java.io.ByteArrayOutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.net.ServerSocket;
import java.util.concurrent.CountDownLatch;
import org.apache.sshd.client.ClientFactoryManager;
import org.apache.sshd.server.Command;
import org.apache.sshd.server.ServerFactoryManager;
-import org.apache.sshd.util.*;
+import org.apache.sshd.util.BaseTest;
+import org.apache.sshd.util.BogusPasswordAuthenticator;
+import org.apache.sshd.util.BogusPublickeyAuthenticator;
+import org.apache.sshd.util.EchoShellFactory;
+import org.apache.sshd.util.Utils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/LoadTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/LoadTest.java b/sshd-core/src/test/java/org/apache/sshd/LoadTest.java
index 3a0886a..4b62d4c 100644
--- a/sshd-core/src/test/java/org/apache/sshd/LoadTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/LoadTest.java
@@ -20,18 +20,11 @@ package org.apache.sshd;
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.net.ServerSocket;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CountDownLatch;
-import org.apache.sshd.ClientChannel;
-import org.apache.sshd.ClientSession;
-import org.apache.sshd.SshClient;
-import org.apache.sshd.SshServer;
import org.apache.sshd.client.kex.DHG1;
import org.apache.sshd.common.Cipher;
import org.apache.sshd.common.KeyExchange;
@@ -40,14 +33,13 @@ import org.apache.sshd.common.cipher.BlowfishCBC;
import org.apache.sshd.util.BaseTest;
import org.apache.sshd.util.BogusPasswordAuthenticator;
import org.apache.sshd.util.EchoShellFactory;
-import org.apache.sshd.util.TeeOutputStream;
import org.apache.sshd.util.Utils;
import org.junit.After;
-
-import static org.junit.Assert.assertArrayEquals;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertArrayEquals;
+
public class LoadTest extends BaseTest {
private SshServer sshd;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/PortForwardingLoadTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/PortForwardingLoadTest.java b/sshd-core/src/test/java/org/apache/sshd/PortForwardingLoadTest.java
index f27b3ad..d739857 100644
--- a/sshd-core/src/test/java/org/apache/sshd/PortForwardingLoadTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/PortForwardingLoadTest.java
@@ -34,9 +34,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.Logger;
import com.jcraft.jsch.Session;
-import com.jcraft.jsch.UserInfo;
import org.apache.commons.httpclient.HostConfiguration;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpVersion;
@@ -47,7 +45,6 @@ import org.apache.mina.core.service.IoAcceptor;
import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
-import org.apache.sshd.SshServer;
import org.apache.sshd.util.BaseTest;
import org.apache.sshd.util.BogusForwardingFilter;
import org.apache.sshd.util.BogusPasswordAuthenticator;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/ScpTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/ScpTest.java b/sshd-core/src/test/java/org/apache/sshd/ScpTest.java
index 9202c9d..a280f3d 100644
--- a/sshd-core/src/test/java/org/apache/sshd/ScpTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/ScpTest.java
@@ -24,7 +24,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.net.ServerSocket;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
@@ -33,8 +32,6 @@ import ch.ethz.ssh2.SCPClient;
import com.jcraft.jsch.ChannelExec;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.Logger;
-import com.jcraft.jsch.UserInfo;
import org.apache.sshd.client.ScpClient;
import org.apache.sshd.server.command.ScpCommandFactory;
import org.apache.sshd.util.BaseTest;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/ServerTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/ServerTest.java b/sshd-core/src/test/java/org/apache/sshd/ServerTest.java
index 2489537..b878326 100644
--- a/sshd-core/src/test/java/org/apache/sshd/ServerTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/ServerTest.java
@@ -19,7 +19,6 @@
package org.apache.sshd;
import java.io.ByteArrayOutputStream;
-import java.net.ServerSocket;
import java.util.Arrays;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/SftpTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/SftpTest.java b/sshd-core/src/test/java/org/apache/sshd/SftpTest.java
index 01744f8..f4fba4c 100644
--- a/sshd-core/src/test/java/org/apache/sshd/SftpTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/SftpTest.java
@@ -24,14 +24,12 @@ import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URI;
-import java.net.URL;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.Vector;
import com.jcraft.jsch.ChannelSftp;
import com.jcraft.jsch.JSch;
-import com.jcraft.jsch.Logger;
import org.apache.sshd.client.SftpClient;
import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.server.Command;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/SpringConfigTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/SpringConfigTest.java b/sshd-core/src/test/java/org/apache/sshd/SpringConfigTest.java
index 84cf547..f5b493b 100644
--- a/sshd-core/src/test/java/org/apache/sshd/SpringConfigTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/SpringConfigTest.java
@@ -22,8 +22,6 @@ import java.io.OutputStream;
import com.jcraft.jsch.Channel;
import com.jcraft.jsch.JSch;
-import com.jcraft.jsch.Logger;
-import com.jcraft.jsch.UserInfo;
import org.apache.sshd.util.BaseTest;
import org.apache.sshd.util.JSchLogger;
import org.apache.sshd.util.SimpleUserInfo;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/SshServerTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/SshServerTest.java b/sshd-core/src/test/java/org/apache/sshd/SshServerTest.java
index 3b730f8..247d9dc 100644
--- a/sshd-core/src/test/java/org/apache/sshd/SshServerTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/SshServerTest.java
@@ -18,15 +18,15 @@
*/
package org.apache.sshd;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+
import org.apache.sshd.util.BaseTest;
import org.apache.sshd.util.BogusPasswordAuthenticator;
import org.apache.sshd.util.EchoShellFactory;
import org.apache.sshd.util.Utils;
import org.junit.Test;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/WelcomeBannerTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/WelcomeBannerTest.java b/sshd-core/src/test/java/org/apache/sshd/WelcomeBannerTest.java
index 788bced..09a778e 100644
--- a/sshd-core/src/test/java/org/apache/sshd/WelcomeBannerTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/WelcomeBannerTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.sshd;
+import java.util.concurrent.atomic.AtomicReference;
+
import org.apache.sshd.client.UserInteraction;
import org.apache.sshd.util.BaseTest;
import org.apache.sshd.util.BogusPasswordAuthenticator;
@@ -27,9 +29,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import java.net.ServerSocket;
-import java.util.concurrent.atomic.AtomicReference;
-
import static junit.framework.Assert.assertEquals;
public class WelcomeBannerTest extends BaseTest {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/common/file/virtualfs/VirtualFileSystemTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/common/file/virtualfs/VirtualFileSystemTest.java b/sshd-core/src/test/java/org/apache/sshd/common/file/virtualfs/VirtualFileSystemTest.java
index 9b806b4..8c37ddf 100644
--- a/sshd-core/src/test/java/org/apache/sshd/common/file/virtualfs/VirtualFileSystemTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/common/file/virtualfs/VirtualFileSystemTest.java
@@ -21,7 +21,6 @@ package org.apache.sshd.common.file.virtualfs;
import java.io.File;
import java.io.IOException;
-import org.apache.sshd.util.BaseTest;
import org.apache.sshd.SshServer;
import org.apache.sshd.common.AbstractFactoryManager;
import org.apache.sshd.common.file.FileSystemView;
@@ -30,6 +29,7 @@ import org.apache.sshd.common.file.nativefs.NativeFileSystemFactory;
import org.apache.sshd.common.file.nativefs.NativeSshFile;
import org.apache.sshd.common.session.AbstractSession;
import org.apache.sshd.common.util.Buffer;
+import org.apache.sshd.util.BaseTest;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/common/util/BufferTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/BufferTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/BufferTest.java
index 355e0cc..d939ed3 100644
--- a/sshd-core/src/test/java/org/apache/sshd/common/util/BufferTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/common/util/BufferTest.java
@@ -18,14 +18,14 @@
*/
package org.apache.sshd.common.util;
-import static org.junit.Assert.assertEquals;
-
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import org.apache.sshd.util.BaseTest;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class BufferTest extends BaseTest {
@Test
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/common/util/SttySupportTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/SttySupportTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/SttySupportTest.java
index 97857f2..31d4811 100644
--- a/sshd-core/src/test/java/org/apache/sshd/common/util/SttySupportTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/common/util/SttySupportTest.java
@@ -18,14 +18,14 @@
*/
package org.apache.sshd.common.util;
-import org.apache.sshd.util.BaseTest;
-import org.apache.sshd.common.PtyMode;
-import org.junit.Test;
-
import java.io.InputStreamReader;
import java.io.Reader;
import java.util.Map;
+import org.apache.sshd.common.PtyMode;
+import org.apache.sshd.util.BaseTest;
+import org.junit.Test;
+
/**
* TODO Add javadoc
*
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/server/jaas/JaasPasswordAuthenticatorTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/server/jaas/JaasPasswordAuthenticatorTest.java b/sshd-core/src/test/java/org/apache/sshd/server/jaas/JaasPasswordAuthenticatorTest.java
index 43e98b5..69691d4 100644
--- a/sshd-core/src/test/java/org/apache/sshd/server/jaas/JaasPasswordAuthenticatorTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/server/jaas/JaasPasswordAuthenticatorTest.java
@@ -18,27 +18,30 @@
*/
package org.apache.sshd.server.jaas;
-import java.util.Map;
-import java.util.HashMap;
import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
-import javax.security.auth.login.Configuration;
-import javax.security.auth.login.AppConfigurationEntry;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.spi.LoginModule;
import javax.security.auth.Subject;
-import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.NameCallback;
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.login.AppConfigurationEntry;
+import javax.security.auth.login.Configuration;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
import org.apache.sshd.util.BaseTest;
-import org.junit.Test;
-import org.junit.Before;
import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
/**
* TODO Add javadoc
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProviderTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProviderTest.java b/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProviderTest.java
index a6355c7..2ff1752 100644
--- a/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProviderTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProviderTest.java
@@ -18,18 +18,18 @@
*/
package org.apache.sshd.server.keyprovider;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
import java.io.File;
import java.security.KeyPair;
import java.security.spec.ECGenParameterSpec;
-import org.apache.sshd.util.BaseTest;
import org.apache.sshd.common.KeyPairProvider;
import org.apache.sshd.common.util.SecurityUtils;
+import org.apache.sshd.util.BaseTest;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* TODO Add javadoc
*
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProviderTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProviderTest.java b/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProviderTest.java
index f3d7d94..fd3b7f7 100644
--- a/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProviderTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProviderTest.java
@@ -18,17 +18,17 @@
*/
package org.apache.sshd.server.keyprovider;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
import java.io.File;
import java.security.spec.ECGenParameterSpec;
-import org.apache.sshd.util.BaseTest;
import org.apache.sshd.common.KeyPairProvider;
import org.apache.sshd.common.util.SecurityUtils;
+import org.apache.sshd.util.BaseTest;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* TODO Add javadoc
*
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/server/shell/InvertedShellWrapperTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/server/shell/InvertedShellWrapperTest.java b/sshd-core/src/test/java/org/apache/sshd/server/shell/InvertedShellWrapperTest.java
index 6deb7b8..b153ff1 100644
--- a/sshd-core/src/test/java/org/apache/sshd/server/shell/InvertedShellWrapperTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/server/shell/InvertedShellWrapperTest.java
@@ -18,15 +18,15 @@
*/
package org.apache.sshd.server.shell;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+
import org.apache.sshd.util.BaseTest;
import org.apache.sshd.util.BogusEnvironment;
import org.apache.sshd.util.BogusExitCallback;
import org.apache.sshd.util.BogusInvertedShell;
import org.junit.Test;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
import static junit.framework.Assert.assertEquals;
public class InvertedShellWrapperTest extends BaseTest {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/util/BogusChannel.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/util/BogusChannel.java b/sshd-core/src/test/java/org/apache/sshd/util/BogusChannel.java
index 17065a7..f4a9d18 100644
--- a/sshd-core/src/test/java/org/apache/sshd/util/BogusChannel.java
+++ b/sshd-core/src/test/java/org/apache/sshd/util/BogusChannel.java
@@ -18,13 +18,13 @@
*/
package org.apache.sshd.util;
+import java.io.IOException;
+
import org.apache.sshd.client.future.DefaultOpenFuture;
import org.apache.sshd.client.future.OpenFuture;
import org.apache.sshd.common.channel.AbstractChannel;
import org.apache.sshd.common.util.Buffer;
-import java.io.IOException;
-
public class BogusChannel extends AbstractChannel {
@Override
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/util/BogusForwardingFilter.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/util/BogusForwardingFilter.java b/sshd-core/src/test/java/org/apache/sshd/util/BogusForwardingFilter.java
index 1ebd620..6e25706 100644
--- a/sshd-core/src/test/java/org/apache/sshd/util/BogusForwardingFilter.java
+++ b/sshd-core/src/test/java/org/apache/sshd/util/BogusForwardingFilter.java
@@ -18,9 +18,9 @@
*/
package org.apache.sshd.util;
-import org.apache.sshd.common.SshdSocketAddress;
-import org.apache.sshd.common.Session;
import org.apache.sshd.common.ForwardingFilter;
+import org.apache.sshd.common.Session;
+import org.apache.sshd.common.SshdSocketAddress;
/**
* TODO Add javadoc
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5f55ec14/sshd-core/src/test/java/org/apache/sshd/util/Utils.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/util/Utils.java b/sshd-core/src/test/java/org/apache/sshd/util/Utils.java
index 0291bd6..ae91d64 100644
--- a/sshd-core/src/test/java/org/apache/sshd/util/Utils.java
+++ b/sshd-core/src/test/java/org/apache/sshd/util/Utils.java
@@ -18,15 +18,15 @@
*/
package org.apache.sshd.util;
-import org.apache.sshd.common.KeyPairProvider;
-import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
-import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
-
import java.io.File;
import java.net.ServerSocket;
import java.net.URISyntaxException;
import java.net.URL;
+import org.apache.sshd.common.KeyPairProvider;
+import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
+import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
+
public class Utils {
public static KeyPairProvider createTestHostKeyProvider() {