Repository: mina-sshd Updated Branches: refs/heads/master e12434d0d -> 4ea340e71
SSHD-484] Add @FixMethodOrder(NAME_ASCENDING) to all unit test classes Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/4ea340e7 Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/4ea340e7 Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/4ea340e7 Branch: refs/heads/master Commit: 4ea340e71db17b4bec27233f2c8343479d8e99b3 Parents: e12434d Author: Lyor Goldstein <[email protected]> Authored: Wed Jun 3 16:18:38 2015 +0300 Committer: Lyor Goldstein <[email protected]> Committed: Wed Jun 3 16:18:38 2015 +0300 ---------------------------------------------------------------------- .../src/test/java/org/apache/sshd/AbstractSessionTest.java | 3 +++ sshd-core/src/test/java/org/apache/sshd/AgentTest.java | 6 +++++- .../src/test/java/org/apache/sshd/AuthenticationTest.java | 3 +++ sshd-core/src/test/java/org/apache/sshd/CipherTest.java | 6 +++++- sshd-core/src/test/java/org/apache/sshd/ClientTest.java | 3 +++ sshd-core/src/test/java/org/apache/sshd/EcdsaTest.java | 3 +++ sshd-core/src/test/java/org/apache/sshd/KeepAliveTest.java | 3 +++ .../src/test/java/org/apache/sshd/KeyReExchangeTest.java | 7 +++++-- sshd-core/src/test/java/org/apache/sshd/LoadTest.java | 3 +++ sshd-core/src/test/java/org/apache/sshd/MacTest.java | 6 +++++- .../test/java/org/apache/sshd/PortForwardingLoadTest.java | 3 +++ .../src/test/java/org/apache/sshd/PortForwardingTest.java | 3 +++ sshd-core/src/test/java/org/apache/sshd/ProxyTest.java | 3 +++ sshd-core/src/test/java/org/apache/sshd/RandomTest.java | 3 +++ sshd-core/src/test/java/org/apache/sshd/ServerTest.java | 3 +++ .../test/java/org/apache/sshd/SinglePublicKeyAuthTest.java | 3 +++ .../src/test/java/org/apache/sshd/SpringConfigTest.java | 8 ++++++-- sshd-core/src/test/java/org/apache/sshd/SshBuilderTest.java | 3 +++ sshd-core/src/test/java/org/apache/sshd/SshServerTest.java | 3 +++ .../src/test/java/org/apache/sshd/WelcomeBannerTest.java | 3 +++ .../src/test/java/org/apache/sshd/WindowAdjustTest.java | 3 +++ sshd-core/src/test/java/org/apache/sshd/WindowTest.java | 3 +++ .../src/test/java/org/apache/sshd/client/kex/KexTest.java | 3 +++ .../client/keyverifier/StaticServerKeyVerifierTest.java | 3 +++ .../src/test/java/org/apache/sshd/client/scp/ScpTest.java | 4 +++- .../apache/sshd/client/sftp/DefaultCloseableHandleTest.java | 3 +++ .../org/apache/sshd/client/sftp/SftpFileSystemTest.java | 3 +++ .../src/test/java/org/apache/sshd/client/sftp/SftpTest.java | 3 +++ .../org/apache/sshd/common/FactoryManagerUtilsTest.java | 3 +++ .../sshd/common/channel/ChannelPipedInputStreamTest.java | 3 +++ .../sshd/common/channel/ChannelPipedOutputStreamTest.java | 3 +++ .../java/org/apache/sshd/common/cipher/AES192CTRTest.java | 3 +++ .../java/org/apache/sshd/common/cipher/AES256CBCTest.java | 3 +++ .../java/org/apache/sshd/common/cipher/ARCFOUR128Test.java | 3 +++ .../java/org/apache/sshd/common/cipher/ARCFOUR256Test.java | 3 +++ .../org/apache/sshd/common/cipher/BuiltinCiphersTest.java | 3 +++ .../sshd/common/compression/BuiltinCompressionsTest.java | 3 +++ .../org/apache/sshd/common/compression/CompressionTest.java | 3 +++ .../apache/sshd/common/config/SshConfigFileReaderTest.java | 3 +++ .../org/apache/sshd/common/config/TimeValueConfigTest.java | 3 +++ .../java/org/apache/sshd/common/file/util/BasePathTest.java | 3 +++ .../test/java/org/apache/sshd/common/future/FutureTest.java | 3 +++ .../common/io/BuiltinIoServiceFactoryFactoriesTest.java | 3 +++ .../sshd/common/io/DefaultIoServiceFactoryFactoryTest.java | 3 +++ .../org/apache/sshd/common/kex/BuiltinDHFactoriesTest.java | 3 +++ .../apache/sshd/common/keyprovider/KeyPairProviderTest.java | 5 +++-- .../java/org/apache/sshd/common/mac/BuiltinMacsTest.java | 3 +++ .../apache/sshd/common/signature/BuiltinSignaturesTest.java | 3 +++ .../test/java/org/apache/sshd/common/util/BufferTest.java | 3 +++ .../org/apache/sshd/common/util/CloseableUtilsTest.java | 3 +++ .../org/apache/sshd/common/util/EventListenerUtilsTest.java | 3 +++ .../java/org/apache/sshd/common/util/GenericUtilsTest.java | 3 +++ .../java/org/apache/sshd/common/util/SttySupportTest.java | 3 +++ .../java/org/apache/sshd/common/util/ThreadUtilsTest.java | 3 +++ .../java/org/apache/sshd/common/util/ValidateUtilsTest.java | 9 +++++++++ .../apache/sshd/common/util/io/LimitInputStreamTest.java | 3 +++ .../org/apache/sshd/server/PasswordAuthenticatorTest.java | 3 +++ .../org/apache/sshd/server/PublickeyAuthenticatorTest.java | 3 +++ .../org/apache/sshd/server/channel/ChannelSessionTest.java | 3 +++ .../apache/sshd/server/command/ScpCommandFactoryTest.java | 3 +++ .../sshd/server/config/keys/AuthorizedKeyEntryTest.java | 3 +++ .../server/config/keys/AuthorizedKeysAuthenticatorTest.java | 3 +++ .../config/keys/DefaultAuthorizedKeysAuthenticatorTest.java | 3 +++ .../sshd/server/jaas/JaasPasswordAuthenticatorTest.java | 3 +++ .../keyprovider/AbstractGeneratorHostKeyProviderTest.java | 3 +++ .../server/keyprovider/PEMGeneratorHostKeyProviderTest.java | 3 +++ .../keyprovider/SimpleGeneratorHostKeyProviderTest.java | 3 +++ .../apache/sshd/server/sftp/SftpSubsystemFactoryTest.java | 3 +++ .../apache/sshd/server/shell/InvertedShellWrapperTest.java | 3 +++ .../src/test/java/org/apache/sshd/util/JSchLogger.java | 3 ++- .../java/org/apache/sshd/git/pack/GitPackCommandTest.java | 3 +++ .../java/org/apache/sshd/git/pgm/GitPgmCommandTest.java | 3 +++ 72 files changed, 232 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/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 15ff2a3..8180e1e 100644 --- a/sshd-core/src/test/java/org/apache/sshd/AbstractSessionTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/AbstractSessionTest.java @@ -25,13 +25,16 @@ import org.apache.sshd.common.util.buffer.Buffer; import org.apache.sshd.common.util.buffer.ByteArrayBuffer; import org.apache.sshd.util.BaseTestSupport; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * Test basic stuff on AbstractSession. * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class AbstractSessionTest extends BaseTestSupport { private MySession session; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/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 0c6ad20..ea17be1 100644 --- a/sshd-core/src/test/java/org/apache/sshd/AgentTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/AgentTest.java @@ -44,8 +44,11 @@ import org.apache.sshd.util.BogusPasswordAuthenticator; import org.apache.sshd.util.EchoShellFactory; import org.apache.sshd.util.Utils; import org.junit.Assume; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class AgentTest extends BaseTestSupport { public AgentTest() { super(); @@ -188,7 +191,8 @@ public class AgentTest extends BaseTestSupport { return shell; } - public class TestEchoShell extends EchoShell { + @FixMethodOrder(MethodSorters.NAME_ASCENDING) +public class TestEchoShell extends EchoShell { boolean started; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/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 b249bbe..f8ae660 100644 --- a/sshd-core/src/test/java/org/apache/sshd/AuthenticationTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/AuthenticationTest.java @@ -42,8 +42,11 @@ import org.apache.sshd.util.BogusPasswordAuthenticator; import org.apache.sshd.util.Utils; import org.junit.After; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class AuthenticationTest extends BaseTestSupport { private static final String WELCOME = "Welcome to SSHD"; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/CipherTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/CipherTest.java b/sshd-core/src/test/java/org/apache/sshd/CipherTest.java index 9eb5d84..2e62a65 100644 --- a/sshd-core/src/test/java/org/apache/sshd/CipherTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/CipherTest.java @@ -22,7 +22,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Arrays; -import com.jcraft.jsch.JSch; import org.apache.sshd.common.Cipher; import org.apache.sshd.common.NamedFactory; import org.apache.sshd.common.Random; @@ -35,13 +34,18 @@ 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.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; + +import com.jcraft.jsch.JSch; /** * Test Cipher algorithms. * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class CipherTest extends BaseTestSupport { private SshServer sshd; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/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 4906f2e..bdd039a 100644 --- a/sshd-core/src/test/java/org/apache/sshd/ClientTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/ClientTest.java @@ -89,13 +89,16 @@ import org.apache.sshd.util.TeeOutputStream; import org.apache.sshd.util.Utils; import org.junit.After; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * TODO Add javadoc * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class ClientTest extends BaseTestSupport { private SshServer sshd; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/EcdsaTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/EcdsaTest.java b/sshd-core/src/test/java/org/apache/sshd/EcdsaTest.java index c3864db..fb89f19 100644 --- a/sshd-core/src/test/java/org/apache/sshd/EcdsaTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/EcdsaTest.java @@ -39,13 +39,16 @@ import org.apache.sshd.util.Utils; import org.junit.After; import org.junit.Assume; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * TODO Add javadoc * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class EcdsaTest extends BaseTestSupport { private SshServer sshd; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/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 0bcb7f5..83f042d 100644 --- a/sshd-core/src/test/java/org/apache/sshd/KeepAliveTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/KeepAliveTest.java @@ -33,13 +33,16 @@ import org.apache.sshd.util.EchoShellFactory; import org.apache.sshd.util.Utils; import org.junit.After; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * TODO Add javadoc * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class KeepAliveTest extends BaseTestSupport { private SshServer sshd; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/KeyReExchangeTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/KeyReExchangeTest.java b/sshd-core/src/test/java/org/apache/sshd/KeyReExchangeTest.java index f99c3d2..e03d219 100644 --- a/sshd-core/src/test/java/org/apache/sshd/KeyReExchangeTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/KeyReExchangeTest.java @@ -26,8 +26,6 @@ import java.io.PipedOutputStream; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import com.jcraft.jsch.JSch; - import org.apache.sshd.client.channel.ChannelShell; import org.apache.sshd.common.Session; import org.apache.sshd.common.SessionListener; @@ -40,13 +38,18 @@ import org.apache.sshd.util.SimpleUserInfo; import org.apache.sshd.util.TeeOutputStream; import org.apache.sshd.util.Utils; import org.junit.After; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; + +import com.jcraft.jsch.JSch; /** * Test key exchange algorithms. * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class KeyReExchangeTest extends BaseTestSupport { private SshServer sshd; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/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 e4c7db6..0345d15 100644 --- a/sshd-core/src/test/java/org/apache/sshd/LoadTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/LoadTest.java @@ -39,8 +39,11 @@ import org.apache.sshd.util.EchoShellFactory; import org.apache.sshd.util.Utils; import org.junit.After; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class LoadTest extends BaseTestSupport { private SshServer sshd; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/MacTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/MacTest.java b/sshd-core/src/test/java/org/apache/sshd/MacTest.java index cbf86a1..602685b 100644 --- a/sshd-core/src/test/java/org/apache/sshd/MacTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/MacTest.java @@ -22,7 +22,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Arrays; -import com.jcraft.jsch.JSch; import org.apache.sshd.common.Cipher; import org.apache.sshd.common.Mac; import org.apache.sshd.common.NamedFactory; @@ -37,14 +36,19 @@ 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.FixMethodOrder; import org.junit.Ignore; import org.junit.Test; +import org.junit.runners.MethodSorters; + +import com.jcraft.jsch.JSch; /** * Test Cipher algorithms. * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class MacTest extends BaseTestSupport { private SshServer sshd; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/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 72169e6..7426965 100644 --- a/sshd-core/src/test/java/org/apache/sshd/PortForwardingLoadTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/PortForwardingLoadTest.java @@ -55,7 +55,9 @@ import org.apache.sshd.util.SimpleUserInfo; import org.apache.sshd.util.Utils; import org.junit.After; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,6 +68,7 @@ import com.jcraft.jsch.Session; /** * Port forwarding tests */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class PortForwardingLoadTest extends BaseTestSupport { private final Logger log = LoggerFactory.getLogger(getClass()); private SshServer sshd; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/PortForwardingTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/PortForwardingTest.java b/sshd-core/src/test/java/org/apache/sshd/PortForwardingTest.java index 95c05c2..cafa924 100644 --- a/sshd-core/src/test/java/org/apache/sshd/PortForwardingTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/PortForwardingTest.java @@ -45,7 +45,9 @@ import org.apache.sshd.util.SimpleUserInfo; import org.apache.sshd.util.Utils; import org.junit.After; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.slf4j.LoggerFactory; import com.jcraft.jsch.JSch; @@ -55,6 +57,7 @@ import com.jcraft.jsch.Session; /** * Port forwarding tests */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class PortForwardingTest extends BaseTestSupport { private final org.slf4j.Logger log = LoggerFactory.getLogger(getClass()); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/ProxyTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/ProxyTest.java b/sshd-core/src/test/java/org/apache/sshd/ProxyTest.java index b7c185b..9892a8e 100644 --- a/sshd-core/src/test/java/org/apache/sshd/ProxyTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/ProxyTest.java @@ -40,11 +40,14 @@ import org.apache.sshd.util.EchoShellFactory; import org.apache.sshd.util.Utils; import org.junit.After; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * Port forwarding tests */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class ProxyTest extends BaseTestSupport { private SshServer sshd; private int sshPort; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/RandomTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/RandomTest.java b/sshd-core/src/test/java/org/apache/sshd/RandomTest.java index 77d5190..ea5d248 100644 --- a/sshd-core/src/test/java/org/apache/sshd/RandomTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/RandomTest.java @@ -22,13 +22,16 @@ import org.apache.sshd.common.Random; import org.apache.sshd.common.random.BouncyCastleRandom; import org.apache.sshd.common.random.JceRandom; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * TODO Add javadoc * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class RandomTest extends BaseTestSupport { @Test http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/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 718ef09..8d91cf7 100644 --- a/sshd-core/src/test/java/org/apache/sshd/ServerTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/ServerTest.java @@ -65,7 +65,9 @@ import org.apache.sshd.util.EchoShellFactory; import org.apache.sshd.util.Utils; import org.junit.After; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,6 +76,7 @@ import org.slf4j.LoggerFactory; * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class ServerTest extends BaseTestSupport { private SshServer sshd; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/SinglePublicKeyAuthTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/SinglePublicKeyAuthTest.java b/sshd-core/src/test/java/org/apache/sshd/SinglePublicKeyAuthTest.java index 61fa2c1..9fd0db6 100644 --- a/sshd-core/src/test/java/org/apache/sshd/SinglePublicKeyAuthTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/SinglePublicKeyAuthTest.java @@ -38,13 +38,16 @@ import org.apache.sshd.util.BaseTestSupport; import org.apache.sshd.util.Utils; import org.junit.After; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * TODO Add javadoc * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class SinglePublicKeyAuthTest extends BaseTestSupport { private SshServer sshd; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/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 dad0482..a86163a 100644 --- a/sshd-core/src/test/java/org/apache/sshd/SpringConfigTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/SpringConfigTest.java @@ -20,21 +20,25 @@ package org.apache.sshd; import java.io.OutputStream; -import com.jcraft.jsch.Channel; -import com.jcraft.jsch.JSch; import org.apache.sshd.util.BaseTestSupport; import org.apache.sshd.util.JSchLogger; import org.apache.sshd.util.SimpleUserInfo; import org.junit.After; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.springframework.context.support.ClassPathXmlApplicationContext; +import com.jcraft.jsch.Channel; +import com.jcraft.jsch.JSch; + /** * Test for spring based configuration. * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class SpringConfigTest extends BaseTestSupport { private ClassPathXmlApplicationContext context; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/SshBuilderTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/SshBuilderTest.java b/sshd-core/src/test/java/org/apache/sshd/SshBuilderTest.java index 9307def..bdee19b 100644 --- a/sshd-core/src/test/java/org/apache/sshd/SshBuilderTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/SshBuilderTest.java @@ -34,11 +34,14 @@ import org.apache.sshd.common.mac.BuiltinMacs; import org.apache.sshd.common.signature.BuiltinSignatures; import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class SshBuilderTest extends BaseTestSupport { public SshBuilderTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/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 4e9356f..f6c6951 100644 --- a/sshd-core/src/test/java/org/apache/sshd/SshServerTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/SshServerTest.java @@ -25,12 +25,15 @@ import org.apache.sshd.util.BaseTestSupport; import org.apache.sshd.util.BogusPasswordAuthenticator; import org.apache.sshd.util.EchoShellFactory; import org.apache.sshd.util.Utils; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author Kohsuke Kawaguchi * @author Michael Heemskerk */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class SshServerTest extends BaseTestSupport { @Test http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/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 1fa1475..5c2a584 100644 --- a/sshd-core/src/test/java/org/apache/sshd/WelcomeBannerTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/WelcomeBannerTest.java @@ -29,8 +29,11 @@ import org.apache.sshd.util.BogusPasswordAuthenticator; import org.apache.sshd.util.Utils; import org.junit.After; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class WelcomeBannerTest extends BaseTestSupport { private static final String WELCOME = "Welcome to SSHD"; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/WindowAdjustTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/WindowAdjustTest.java b/sshd-core/src/test/java/org/apache/sshd/WindowAdjustTest.java index 6c89165..5086d24 100644 --- a/sshd-core/src/test/java/org/apache/sshd/WindowAdjustTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/WindowAdjustTest.java @@ -43,7 +43,9 @@ import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider; import org.apache.sshd.util.BogusPasswordAuthenticator; import org.junit.After; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * This test simulates heavy traffic coming from the server towards the client making sure the traffic does not get stuck. @@ -51,6 +53,7 @@ import org.junit.Test; * * AsyncInPendingWrapper in this test serves as a handler for WritePendingException, which can occur when sending too many messages one after another. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class WindowAdjustTest { public static final String END_FILE = "#"; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/WindowTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/WindowTest.java b/sshd-core/src/test/java/org/apache/sshd/WindowTest.java index 1fe5493..2946156 100644 --- a/sshd-core/src/test/java/org/apache/sshd/WindowTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/WindowTest.java @@ -57,13 +57,16 @@ import org.apache.sshd.util.EchoShellFactory; import org.apache.sshd.util.Utils; import org.junit.After; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * TODO Add javadoc * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class WindowTest extends BaseTestSupport { private SshServer sshd; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/client/kex/KexTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/client/kex/KexTest.java b/sshd-core/src/test/java/org/apache/sshd/client/kex/KexTest.java index 588cca1..a044d4f 100644 --- a/sshd-core/src/test/java/org/apache/sshd/client/kex/KexTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/client/kex/KexTest.java @@ -42,12 +42,15 @@ import org.apache.sshd.util.TeeOutputStream; import org.apache.sshd.util.Utils; import org.junit.After; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * Test client key exchange algorithms. * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class KexTest extends BaseTestSupport { private SshServer sshd; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/client/keyverifier/StaticServerKeyVerifierTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/client/keyverifier/StaticServerKeyVerifierTest.java b/sshd-core/src/test/java/org/apache/sshd/client/keyverifier/StaticServerKeyVerifierTest.java index aadd33b..bcd99b3 100644 --- a/sshd-core/src/test/java/org/apache/sshd/client/keyverifier/StaticServerKeyVerifierTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/client/keyverifier/StaticServerKeyVerifierTest.java @@ -30,12 +30,15 @@ import org.apache.sshd.ClientSession; import org.apache.sshd.client.ServerKeyVerifier; import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.mockito.Mockito; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class StaticServerKeyVerifierTest extends BaseTestSupport { public StaticServerKeyVerifierTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/client/scp/ScpTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/client/scp/ScpTest.java b/sshd-core/src/test/java/org/apache/sshd/client/scp/ScpTest.java index fedc1ed..c0ba491 100644 --- a/sshd-core/src/test/java/org/apache/sshd/client/scp/ScpTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/client/scp/ScpTest.java @@ -39,7 +39,6 @@ import java.util.concurrent.TimeUnit; import org.apache.sshd.ClientSession; import org.apache.sshd.SshClient; import org.apache.sshd.SshServer; -import org.apache.sshd.client.scp.ScpClient; import org.apache.sshd.common.Session; import org.apache.sshd.common.file.FileSystemFactory; import org.apache.sshd.common.file.root.RootedFileSystemProvider; @@ -55,8 +54,10 @@ import org.apache.sshd.util.SimpleUserInfo; import org.apache.sshd.util.Utils; import org.junit.After; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Ignore; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,6 +73,7 @@ import com.jcraft.jsch.JSchException; * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class ScpTest extends BaseTestSupport { private SshServer sshd; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/client/sftp/DefaultCloseableHandleTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/client/sftp/DefaultCloseableHandleTest.java b/sshd-core/src/test/java/org/apache/sshd/client/sftp/DefaultCloseableHandleTest.java index 43f6913..22f1a70 100644 --- a/sshd-core/src/test/java/org/apache/sshd/client/sftp/DefaultCloseableHandleTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/client/sftp/DefaultCloseableHandleTest.java @@ -25,7 +25,9 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.sshd.client.sftp.SftpClient.CloseableHandle; import org.apache.sshd.client.sftp.SftpClient.Handle; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.mockito.Matchers; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; @@ -34,6 +36,7 @@ import org.mockito.stubbing.Answer; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class DefaultCloseableHandleTest extends BaseTestSupport { public DefaultCloseableHandleTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/client/sftp/SftpFileSystemTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/client/sftp/SftpFileSystemTest.java b/sshd-core/src/test/java/org/apache/sshd/client/sftp/SftpFileSystemTest.java index 5d5ca94..237e3b4 100644 --- a/sshd-core/src/test/java/org/apache/sshd/client/sftp/SftpFileSystemTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/client/sftp/SftpFileSystemTest.java @@ -59,8 +59,11 @@ import org.apache.sshd.util.EchoShellFactory; import org.apache.sshd.util.Utils; import org.junit.After; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class SftpFileSystemTest extends BaseTestSupport { private SshServer sshd; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/client/sftp/SftpTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/client/sftp/SftpTest.java b/sshd-core/src/test/java/org/apache/sshd/client/sftp/SftpTest.java index c125bf2..95b130d 100644 --- a/sshd-core/src/test/java/org/apache/sshd/client/sftp/SftpTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/client/sftp/SftpTest.java @@ -63,13 +63,16 @@ import org.apache.sshd.util.Utils; import org.junit.After; import org.junit.Assume; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Ignore; import org.junit.Test; +import org.junit.runners.MethodSorters; import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.JSch; import com.jcraft.jsch.SftpException; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class SftpTest extends BaseTestSupport { private SshServer sshd; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/FactoryManagerUtilsTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/FactoryManagerUtilsTest.java b/sshd-core/src/test/java/org/apache/sshd/common/FactoryManagerUtilsTest.java index fa5aae0..5e687ed 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/FactoryManagerUtilsTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/FactoryManagerUtilsTest.java @@ -23,12 +23,15 @@ import java.util.Map; import java.util.TreeMap; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.mockito.Mockito; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class FactoryManagerUtilsTest extends BaseTestSupport { public FactoryManagerUtilsTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/channel/ChannelPipedInputStreamTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/channel/ChannelPipedInputStreamTest.java b/sshd-core/src/test/java/org/apache/sshd/common/channel/ChannelPipedInputStreamTest.java index 0b5b3e2..3f20256 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/channel/ChannelPipedInputStreamTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/channel/ChannelPipedInputStreamTest.java @@ -23,8 +23,11 @@ import java.util.Arrays; import org.apache.sshd.util.BaseTestSupport; import org.apache.sshd.util.BogusChannel; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class ChannelPipedInputStreamTest extends BaseTestSupport { public ChannelPipedInputStreamTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/channel/ChannelPipedOutputStreamTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/channel/ChannelPipedOutputStreamTest.java b/sshd-core/src/test/java/org/apache/sshd/common/channel/ChannelPipedOutputStreamTest.java index 670d52f..1c7fced 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/channel/ChannelPipedOutputStreamTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/channel/ChannelPipedOutputStreamTest.java @@ -24,7 +24,9 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.mockito.Matchers; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; @@ -33,6 +35,7 @@ import org.mockito.stubbing.Answer; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class ChannelPipedOutputStreamTest extends BaseTestSupport { public ChannelPipedOutputStreamTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/cipher/AES192CTRTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/cipher/AES192CTRTest.java b/sshd-core/src/test/java/org/apache/sshd/common/cipher/AES192CTRTest.java index 138163e..1074ef0 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/cipher/AES192CTRTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/cipher/AES192CTRTest.java @@ -19,11 +19,14 @@ package org.apache.sshd.common.cipher; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class AES192CTRTest extends BaseCipherTest { public AES192CTRTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/cipher/AES256CBCTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/cipher/AES256CBCTest.java b/sshd-core/src/test/java/org/apache/sshd/common/cipher/AES256CBCTest.java index fd1ab48..fea7d34 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/cipher/AES256CBCTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/cipher/AES256CBCTest.java @@ -19,11 +19,14 @@ package org.apache.sshd.common.cipher; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class AES256CBCTest extends BaseCipherTest { public AES256CBCTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/cipher/ARCFOUR128Test.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/cipher/ARCFOUR128Test.java b/sshd-core/src/test/java/org/apache/sshd/common/cipher/ARCFOUR128Test.java index d7672bd..cc08799 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/cipher/ARCFOUR128Test.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/cipher/ARCFOUR128Test.java @@ -19,11 +19,14 @@ package org.apache.sshd.common.cipher; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class ARCFOUR128Test extends BaseCipherTest { public ARCFOUR128Test() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/cipher/ARCFOUR256Test.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/cipher/ARCFOUR256Test.java b/sshd-core/src/test/java/org/apache/sshd/common/cipher/ARCFOUR256Test.java index 9026362..6a3ccef 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/cipher/ARCFOUR256Test.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/cipher/ARCFOUR256Test.java @@ -19,11 +19,14 @@ package org.apache.sshd.common.cipher; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class ARCFOUR256Test extends BaseCipherTest { public ARCFOUR256Test() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/cipher/BuiltinCiphersTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/cipher/BuiltinCiphersTest.java b/sshd-core/src/test/java/org/apache/sshd/common/cipher/BuiltinCiphersTest.java index feef53e..60b7980 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/cipher/BuiltinCiphersTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/cipher/BuiltinCiphersTest.java @@ -34,12 +34,15 @@ import org.apache.sshd.common.NamedResource; import org.apache.sshd.common.cipher.BuiltinCiphers.ParseResult; import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.mockito.Mockito; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class BuiltinCiphersTest extends BaseTestSupport { public BuiltinCiphersTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/compression/BuiltinCompressionsTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/compression/BuiltinCompressionsTest.java b/sshd-core/src/test/java/org/apache/sshd/common/compression/BuiltinCompressionsTest.java index 83e46f2..88cbcc8 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/compression/BuiltinCompressionsTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/compression/BuiltinCompressionsTest.java @@ -33,12 +33,15 @@ import org.apache.sshd.common.NamedResource; import org.apache.sshd.common.compression.BuiltinCompressions.ParseResult; import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.mockito.Mockito; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class BuiltinCompressionsTest extends BaseTestSupport { public BuiltinCompressionsTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/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 5289fb1..cf3bfad 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 @@ -32,7 +32,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.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import com.jcraft.jsch.JSch; @@ -41,6 +43,7 @@ import com.jcraft.jsch.JSch; * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class CompressionTest extends BaseTestSupport { private SshServer sshd; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/config/SshConfigFileReaderTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/config/SshConfigFileReaderTest.java b/sshd-core/src/test/java/org/apache/sshd/common/config/SshConfigFileReaderTest.java index 375023b..038ff6f 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/config/SshConfigFileReaderTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/config/SshConfigFileReaderTest.java @@ -45,11 +45,14 @@ import org.apache.sshd.common.mac.BuiltinMacs; import org.apache.sshd.common.signature.BuiltinSignatures; import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class SshConfigFileReaderTest extends BaseTestSupport { public SshConfigFileReaderTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/config/TimeValueConfigTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/config/TimeValueConfigTest.java b/sshd-core/src/test/java/org/apache/sshd/common/config/TimeValueConfigTest.java index c702d6b..795e15c 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/config/TimeValueConfigTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/config/TimeValueConfigTest.java @@ -22,11 +22,14 @@ package org.apache.sshd.common.config; import java.util.concurrent.TimeUnit; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TimeValueConfigTest extends BaseTestSupport { public TimeValueConfigTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/file/util/BasePathTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/file/util/BasePathTest.java b/sshd-core/src/test/java/org/apache/sshd/common/file/util/BasePathTest.java index 262b91e..c609927 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/file/util/BasePathTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/file/util/BasePathTest.java @@ -33,8 +33,11 @@ import java.util.Set; import org.apache.sshd.util.BaseTestSupport; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class BasePathTest extends BaseTestSupport { private TestFileSystem fileSystem; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/future/FutureTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/future/FutureTest.java b/sshd-core/src/test/java/org/apache/sshd/common/future/FutureTest.java index 047b70a..6e8367d 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/future/FutureTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/future/FutureTest.java @@ -19,10 +19,13 @@ package org.apache.sshd.common.future; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class FutureTest extends BaseTestSupport { @Test http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/io/BuiltinIoServiceFactoryFactoriesTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/io/BuiltinIoServiceFactoryFactoriesTest.java b/sshd-core/src/test/java/org/apache/sshd/common/io/BuiltinIoServiceFactoryFactoriesTest.java index 05d8449..f715362 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/io/BuiltinIoServiceFactoryFactoriesTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/io/BuiltinIoServiceFactoryFactoriesTest.java @@ -20,11 +20,14 @@ package org.apache.sshd.common.io; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class BuiltinIoServiceFactoryFactoriesTest extends BaseTestSupport { public BuiltinIoServiceFactoryFactoriesTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/io/DefaultIoServiceFactoryFactoryTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/io/DefaultIoServiceFactoryFactoryTest.java b/sshd-core/src/test/java/org/apache/sshd/common/io/DefaultIoServiceFactoryFactoryTest.java index eedea5f..d2ead6b 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/io/DefaultIoServiceFactoryFactoryTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/io/DefaultIoServiceFactoryFactoryTest.java @@ -26,12 +26,15 @@ import java.util.concurrent.ExecutorService; import org.apache.sshd.common.FactoryManager; import org.apache.sshd.common.util.threads.ExecutorServiceCarrier; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.mockito.Mockito; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class DefaultIoServiceFactoryFactoryTest extends BaseTestSupport { public DefaultIoServiceFactoryFactoryTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/kex/BuiltinDHFactoriesTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/kex/BuiltinDHFactoriesTest.java b/sshd-core/src/test/java/org/apache/sshd/common/kex/BuiltinDHFactoriesTest.java index c921e03..ba112fb 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/kex/BuiltinDHFactoriesTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/kex/BuiltinDHFactoriesTest.java @@ -32,12 +32,15 @@ import org.apache.sshd.common.NamedResource; import org.apache.sshd.common.kex.BuiltinDHFactories.ParseResult; import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.mockito.Mockito; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class BuiltinDHFactoriesTest extends BaseTestSupport { public BuiltinDHFactoriesTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/keyprovider/KeyPairProviderTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/keyprovider/KeyPairProviderTest.java b/sshd-core/src/test/java/org/apache/sshd/common/keyprovider/KeyPairProviderTest.java index 2efd225..01378fd 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/keyprovider/KeyPairProviderTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/keyprovider/KeyPairProviderTest.java @@ -25,16 +25,17 @@ import java.security.PublicKey; import java.util.Map; import java.util.TreeMap; -import org.apache.sshd.common.keyprovider.KeyPairProvider; -import org.apache.sshd.common.keyprovider.MappedKeyPairProvider; import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.mockito.Mockito; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class KeyPairProviderTest extends BaseTestSupport { public KeyPairProviderTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/mac/BuiltinMacsTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/mac/BuiltinMacsTest.java b/sshd-core/src/test/java/org/apache/sshd/common/mac/BuiltinMacsTest.java index 6fd7d58..22066d9 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/mac/BuiltinMacsTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/mac/BuiltinMacsTest.java @@ -34,12 +34,15 @@ import org.apache.sshd.common.NamedResource; import org.apache.sshd.common.mac.BuiltinMacs.ParseResult; import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.mockito.Mockito; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class BuiltinMacsTest extends BaseTestSupport { public BuiltinMacsTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/signature/BuiltinSignaturesTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/signature/BuiltinSignaturesTest.java b/sshd-core/src/test/java/org/apache/sshd/common/signature/BuiltinSignaturesTest.java index 5f1d35d..40ae120 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/signature/BuiltinSignaturesTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/signature/BuiltinSignaturesTest.java @@ -31,12 +31,15 @@ import org.apache.sshd.common.Signature; import org.apache.sshd.common.signature.BuiltinSignatures.ParseResult; import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.mockito.Mockito; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class BuiltinSignaturesTest extends BaseTestSupport { public BuiltinSignaturesTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/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 a8dc3c6..470b1c3 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 @@ -24,8 +24,11 @@ import java.io.DataOutputStream; import org.apache.sshd.common.util.buffer.Buffer; import org.apache.sshd.common.util.buffer.ByteArrayBuffer; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class BufferTest extends BaseTestSupport { @Test http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/util/CloseableUtilsTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/CloseableUtilsTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/CloseableUtilsTest.java index 17723eb..4e1bb9a 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/CloseableUtilsTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/CloseableUtilsTest.java @@ -30,11 +30,14 @@ import org.apache.sshd.common.future.CloseFuture; import org.apache.sshd.common.future.DefaultCloseFuture; import org.apache.sshd.common.util.threads.ThreadUtils; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class CloseableUtilsTest extends BaseTestSupport { public CloseableUtilsTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/util/EventListenerUtilsTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/EventListenerUtilsTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/EventListenerUtilsTest.java index 09dd42c..674b4ed 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/EventListenerUtilsTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/EventListenerUtilsTest.java @@ -24,11 +24,14 @@ import java.util.EventListener; import java.util.List; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class EventListenerUtilsTest extends BaseTestSupport { public EventListenerUtilsTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/util/GenericUtilsTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/GenericUtilsTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/GenericUtilsTest.java index 1983f9b..7d3628a 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/GenericUtilsTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/GenericUtilsTest.java @@ -24,11 +24,14 @@ import java.util.Collections; import java.util.List; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class GenericUtilsTest extends BaseTestSupport { public GenericUtilsTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/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 18fe689..5854b2c 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 @@ -24,13 +24,16 @@ import java.util.Map; import org.apache.sshd.common.PtyMode; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * TODO Add javadoc * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class SttySupportTest extends BaseTestSupport { @Test http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/util/ThreadUtilsTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/ThreadUtilsTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/ThreadUtilsTest.java index d1c291c..1359253 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/ThreadUtilsTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/ThreadUtilsTest.java @@ -25,11 +25,14 @@ import java.util.concurrent.Executors; import org.apache.sshd.common.util.threads.ThreadUtils; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class ThreadUtilsTest extends BaseTestSupport { public ThreadUtilsTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/util/ValidateUtilsTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/ValidateUtilsTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/ValidateUtilsTest.java index af9d7ee..d141a0c 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/ValidateUtilsTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/ValidateUtilsTest.java @@ -20,13 +20,22 @@ package org.apache.sshd.common.util; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class ValidateUtilsTest extends BaseTestSupport { public ValidateUtilsTest() { super(); } + @Test(expected=IllegalArgumentException.class) + public void checkNotNull() { + ValidateUtils.checkNotNull(getClass(), getCurrentTestName(), GenericUtils.EMPTY_OBJECT_ARRAY); + ValidateUtils.checkNotNull(null, getCurrentTestName(), GenericUtils.EMPTY_OBJECT_ARRAY); + } } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/common/util/io/LimitInputStreamTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/io/LimitInputStreamTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/io/LimitInputStreamTest.java index c873611..23690f5 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/io/LimitInputStreamTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/io/LimitInputStreamTest.java @@ -25,11 +25,14 @@ import java.nio.file.Files; import java.nio.file.Path; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class LimitInputStreamTest extends BaseTestSupport { public LimitInputStreamTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/server/PasswordAuthenticatorTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/PasswordAuthenticatorTest.java b/sshd-core/src/test/java/org/apache/sshd/server/PasswordAuthenticatorTest.java index 053d8d1..010e42c 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/PasswordAuthenticatorTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/PasswordAuthenticatorTest.java @@ -26,11 +26,14 @@ import java.util.Random; import org.apache.sshd.server.PasswordAuthenticator.StaticPasswordAuthenticator; import org.apache.sshd.server.session.ServerSession; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class PasswordAuthenticatorTest extends BaseTestSupport { public PasswordAuthenticatorTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/server/PublickeyAuthenticatorTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/PublickeyAuthenticatorTest.java b/sshd-core/src/test/java/org/apache/sshd/server/PublickeyAuthenticatorTest.java index 71eddb0..2e67160 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/PublickeyAuthenticatorTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/PublickeyAuthenticatorTest.java @@ -28,12 +28,15 @@ import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.server.PublickeyAuthenticator.StaticPublickeyAuthenticator; import org.apache.sshd.server.session.ServerSession; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.mockito.Mockito; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class PublickeyAuthenticatorTest extends BaseTestSupport { public PublickeyAuthenticatorTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/server/channel/ChannelSessionTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/channel/ChannelSessionTest.java b/sshd-core/src/test/java/org/apache/sshd/server/channel/ChannelSessionTest.java index 447413e..00f4fb9 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/channel/ChannelSessionTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/channel/ChannelSessionTest.java @@ -28,8 +28,11 @@ import org.apache.sshd.server.Signal; import org.apache.sshd.server.SignalListener; import org.apache.sshd.util.BaseTestSupport; import org.apache.sshd.util.BogusChannel; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class ChannelSessionTest extends BaseTestSupport { private boolean expanded = false; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/server/command/ScpCommandFactoryTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/command/ScpCommandFactoryTest.java b/sshd-core/src/test/java/org/apache/sshd/server/command/ScpCommandFactoryTest.java index 0bba1d4..f66cdc5 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/command/ScpCommandFactoryTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/command/ScpCommandFactoryTest.java @@ -24,12 +24,15 @@ import java.util.concurrent.ExecutorService; import org.apache.sshd.common.scp.ScpHelper; import org.apache.sshd.server.CommandFactory; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.mockito.Mockito; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class ScpCommandFactoryTest extends BaseTestSupport { public ScpCommandFactoryTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/server/config/keys/AuthorizedKeyEntryTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/config/keys/AuthorizedKeyEntryTest.java b/sshd-core/src/test/java/org/apache/sshd/server/config/keys/AuthorizedKeyEntryTest.java index 008e682..1fd66c9 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/config/keys/AuthorizedKeyEntryTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/config/keys/AuthorizedKeyEntryTest.java @@ -32,12 +32,15 @@ import org.apache.sshd.common.util.IoUtils; import org.apache.sshd.common.util.ValidateUtils; import org.apache.sshd.server.PublickeyAuthenticator; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Ignore; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class AuthorizedKeyEntryTest extends BaseTestSupport { public AuthorizedKeyEntryTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/server/config/keys/AuthorizedKeysAuthenticatorTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/config/keys/AuthorizedKeysAuthenticatorTest.java b/sshd-core/src/test/java/org/apache/sshd/server/config/keys/AuthorizedKeysAuthenticatorTest.java index 262d013..cf57dc9 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/config/keys/AuthorizedKeysAuthenticatorTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/config/keys/AuthorizedKeysAuthenticatorTest.java @@ -40,12 +40,15 @@ import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.server.PublickeyAuthenticator; import org.apache.sshd.server.session.ServerSession; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.mockito.Mockito; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class AuthorizedKeysAuthenticatorTest extends BaseTestSupport { public AuthorizedKeysAuthenticatorTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/server/config/keys/DefaultAuthorizedKeysAuthenticatorTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/config/keys/DefaultAuthorizedKeysAuthenticatorTest.java b/sshd-core/src/test/java/org/apache/sshd/server/config/keys/DefaultAuthorizedKeysAuthenticatorTest.java index ca700d7..a1101f7 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/config/keys/DefaultAuthorizedKeysAuthenticatorTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/config/keys/DefaultAuthorizedKeysAuthenticatorTest.java @@ -31,11 +31,14 @@ import java.util.Collection; import org.apache.sshd.common.util.IoUtils; import org.apache.sshd.server.PublickeyAuthenticator; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class DefaultAuthorizedKeysAuthenticatorTest extends BaseTestSupport { public DefaultAuthorizedKeysAuthenticatorTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/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 e700b52..0062688 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 @@ -36,13 +36,16 @@ import javax.security.auth.spi.LoginModule; import org.apache.sshd.util.BaseTestSupport; import org.junit.After; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * TODO Add javadoc * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class JaasPasswordAuthenticatorTest extends BaseTestSupport { @Before http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProviderTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProviderTest.java b/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProviderTest.java index 84427c7..7d5d01f 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProviderTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProviderTest.java @@ -25,10 +25,13 @@ import java.security.KeyPair; import java.util.concurrent.atomic.AtomicInteger; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class AbstractGeneratorHostKeyProviderTest extends BaseTestSupport { @Rule http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/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 0c4fec8..56f3194 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 @@ -29,13 +29,16 @@ import org.apache.sshd.common.keyprovider.KeyPairProvider; import org.apache.sshd.common.util.SecurityUtils; import org.apache.sshd.util.BaseTestSupport; import org.junit.Assume; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * TODO Add javadoc * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class PEMGeneratorHostKeyProviderTest extends BaseTestSupport { @Test http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/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 9d5117a..63d5b65 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 @@ -27,13 +27,16 @@ import org.apache.sshd.common.keyprovider.KeyPairProvider; import org.apache.sshd.common.util.SecurityUtils; import org.apache.sshd.util.BaseTestSupport; import org.junit.Assume; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * TODO Add javadoc * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class SimpleGeneratorHostKeyProviderTest extends BaseTestSupport { @Test http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/server/sftp/SftpSubsystemFactoryTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/sftp/SftpSubsystemFactoryTest.java b/sshd-core/src/test/java/org/apache/sshd/server/sftp/SftpSubsystemFactoryTest.java index 157b3fa..8807fae 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/sftp/SftpSubsystemFactoryTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/sftp/SftpSubsystemFactoryTest.java @@ -22,12 +22,15 @@ package org.apache.sshd.server.sftp; import java.util.concurrent.ExecutorService; import org.apache.sshd.util.BaseTestSupport; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.mockito.Mockito; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class SftpSubsystemFactoryTest extends BaseTestSupport { public SftpSubsystemFactoryTest() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/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 c3046ec..e66a238 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 @@ -25,8 +25,11 @@ import org.apache.sshd.util.BaseTestSupport; import org.apache.sshd.util.BogusEnvironment; import org.apache.sshd.util.BogusExitCallback; import org.apache.sshd.util.BogusInvertedShell; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class InvertedShellWrapperTest extends BaseTestSupport { @Test http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-core/src/test/java/org/apache/sshd/util/JSchLogger.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/JSchLogger.java b/sshd-core/src/test/java/org/apache/sshd/util/JSchLogger.java index a96f756..af01bc0 100644 --- a/sshd-core/src/test/java/org/apache/sshd/util/JSchLogger.java +++ b/sshd-core/src/test/java/org/apache/sshd/util/JSchLogger.java @@ -18,9 +18,10 @@ */ package org.apache.sshd.util; +import org.slf4j.LoggerFactory; + import com.jcraft.jsch.JSch; import com.jcraft.jsch.Logger; -import org.slf4j.LoggerFactory; /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-git/src/test/java/org/apache/sshd/git/pack/GitPackCommandTest.java ---------------------------------------------------------------------- diff --git a/sshd-git/src/test/java/org/apache/sshd/git/pack/GitPackCommandTest.java b/sshd-git/src/test/java/org/apache/sshd/git/pack/GitPackCommandTest.java index f0a2eb5..ad0da51 100644 --- a/sshd-git/src/test/java/org/apache/sshd/git/pack/GitPackCommandTest.java +++ b/sshd-git/src/test/java/org/apache/sshd/git/pack/GitPackCommandTest.java @@ -33,12 +33,15 @@ import org.eclipse.jgit.api.Git; import org.eclipse.jgit.transport.CredentialsProvider; import org.eclipse.jgit.transport.SshSessionFactory; import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import com.jcraft.jsch.JSch; /** */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class GitPackCommandTest { @Test http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/4ea340e7/sshd-git/src/test/java/org/apache/sshd/git/pgm/GitPgmCommandTest.java ---------------------------------------------------------------------- diff --git a/sshd-git/src/test/java/org/apache/sshd/git/pgm/GitPgmCommandTest.java b/sshd-git/src/test/java/org/apache/sshd/git/pgm/GitPgmCommandTest.java index 81a7ba5..ff6ccc5 100644 --- a/sshd-git/src/test/java/org/apache/sshd/git/pgm/GitPgmCommandTest.java +++ b/sshd-git/src/test/java/org/apache/sshd/git/pgm/GitPgmCommandTest.java @@ -33,10 +33,13 @@ import org.apache.sshd.git.util.Utils; import org.apache.sshd.server.Command; import org.apache.sshd.server.sftp.SftpSubsystemFactory; import org.eclipse.jgit.api.Git; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class GitPgmCommandTest { @Test
