Repository: mina-sshd Updated Branches: refs/heads/master 376d1aee5 -> 6256245da
Using JUnit4ClassRunnerWithParametersFactory to avoid repeated instantions in case of parameterized tests Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/f2798ec0 Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/f2798ec0 Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/f2798ec0 Branch: refs/heads/master Commit: f2798ec05ebd8bf3e0b92e076d12ce11cd4ee8a9 Parents: 376d1ae Author: Goldstein Lyor <l...@c-b4.com> Authored: Sun May 14 09:41:26 2017 +0300 Committer: Lyor Goldstein <lyor.goldst...@gmail.com> Committed: Mon May 15 19:38:21 2017 +0300 ---------------------------------------------------------------------- .../keys/loader/putty/PuttyKeyUtilsTest.java | 3 + .../auth/BuiltinUserAuthFactoriesTest.java | 3 + .../org/apache/sshd/client/kex/KexTest.java | 3 + .../client/subsystem/sftp/SftpVersionsTest.java | 3 + .../helpers/AbstractCheckFileExtensionTest.java | 3 + .../helpers/AbstractMD5HashExtensionTest.java | 3 + .../helpers/CopyDataExtensionImplTest.java | 3 + .../sshd/common/channel/WindowInitTest.java | 3 + .../apache/sshd/common/cipher/CipherTest.java | 3 + .../common/compression/CompressionTest.java | 3 + .../config/keys/BuiltinIdentitiesTest.java | 3 + .../common/config/keys/KeyRandomArtTest.java | 6 ++ .../common/config/keys/KeyUtilsCloneTest.java | 3 + .../KeyUtilsFingerprintCaseSensitivityTest.java | 3 + .../keys/KeyUtilsFingerprintGenerationTest.java | 15 +++-- .../loader/AESPrivateKeyObfuscatorTest.java | 3 + .../OpenSSHKeyPairResourceParserTest.java | 3 + .../org/apache/sshd/common/mac/MacTest.java | 3 + .../apache/sshd/common/mac/MacVectorsTest.java | 3 + .../sshd/common/random/RandomFactoryTest.java | 3 + .../signature/SignatureFactoriesTest.java | 3 + .../sshd/common/util/io/der/ASN1ClassTest.java | 3 + .../sshd/common/util/io/der/ASN1TypeTest.java | 3 + ...SecurityProviderRegistrarCipherNameTest.java | 3 + .../util/security/eddsa/Ed25519VectorsTest.java | 3 + .../auth/BuiltinUserAuthFactoriesTest.java | 3 + .../server/auth/WelcomeBannerPhaseTest.java | 3 + .../server/shell/TtyFilterInputStreamTest.java | 3 + .../server/shell/TtyFilterOutputStreamTest.java | 3 + .../test/JUnit4ClassRunnerWithParameters.java | 48 ++++++++++++++++ .../JUnit4ClassRunnerWithParametersFactory.java | 58 ++++++++++++++++++++ 31 files changed, 202 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-contrib/src/test/java/org/apache/sshd/common/config/keys/loader/putty/PuttyKeyUtilsTest.java ---------------------------------------------------------------------- diff --git a/sshd-contrib/src/test/java/org/apache/sshd/common/config/keys/loader/putty/PuttyKeyUtilsTest.java b/sshd-contrib/src/test/java/org/apache/sshd/common/config/keys/loader/putty/PuttyKeyUtilsTest.java index aea094f..e8208d1 100644 --- a/sshd-contrib/src/test/java/org/apache/sshd/common/config/keys/loader/putty/PuttyKeyUtilsTest.java +++ b/sshd-contrib/src/test/java/org/apache/sshd/common/config/keys/loader/putty/PuttyKeyUtilsTest.java @@ -33,6 +33,7 @@ import org.apache.sshd.common.config.keys.KeyUtils; import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.common.util.io.IoUtils; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.junit.Assume; import org.junit.FixMethodOrder; import org.junit.Test; @@ -40,12 +41,14 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class PuttyKeyUtilsTest extends BaseTestSupport { public static final String PASSWORD = "super secret passphrase"; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/client/auth/BuiltinUserAuthFactoriesTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/client/auth/BuiltinUserAuthFactoriesTest.java b/sshd-core/src/test/java/org/apache/sshd/client/auth/BuiltinUserAuthFactoriesTest.java index ee81a0b..17f9fa2 100644 --- a/sshd-core/src/test/java/org/apache/sshd/client/auth/BuiltinUserAuthFactoriesTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/client/auth/BuiltinUserAuthFactoriesTest.java @@ -29,6 +29,7 @@ import org.apache.sshd.client.auth.BuiltinUserAuthFactories.ParseResult; import org.apache.sshd.common.auth.UserAuthMethodFactory; import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.junit.BeforeClass; import org.junit.FixMethodOrder; import org.junit.Test; @@ -36,12 +37,14 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class BuiltinUserAuthFactoriesTest extends BaseTestSupport { private final BuiltinUserAuthFactories factory; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/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 b9e47f3..5509799 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 @@ -41,6 +41,7 @@ import org.apache.sshd.common.kex.KeyExchange; import org.apache.sshd.common.util.security.SecurityUtils; import org.apache.sshd.server.SshServer; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.apache.sshd.util.test.TeeOutputStream; import org.apache.sshd.util.test.Utils; import org.junit.AfterClass; @@ -52,6 +53,7 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * Test client key exchange algorithms. @@ -60,6 +62,7 @@ import org.junit.runners.Parameterized.Parameters; */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class KexTest extends BaseTestSupport { private static SshServer sshd; private static int port; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpVersionsTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpVersionsTest.java b/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpVersionsTest.java index 4ae153a..5c53825 100644 --- a/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpVersionsTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpVersionsTest.java @@ -57,6 +57,7 @@ import org.apache.sshd.server.subsystem.sftp.DefaultGroupPrincipal; import org.apache.sshd.server.subsystem.sftp.SftpEventListener; import org.apache.sshd.server.subsystem.sftp.SftpSubsystem; import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.apache.sshd.util.test.Utils; import org.junit.Before; import org.junit.FixMethodOrder; @@ -65,12 +66,14 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class SftpVersionsTest extends AbstractSftpClientTestSupport { private static final List<Integer> VERSIONS = Collections.unmodifiableList( http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/AbstractCheckFileExtensionTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/AbstractCheckFileExtensionTest.java b/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/AbstractCheckFileExtensionTest.java index d337244..d636096 100644 --- a/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/AbstractCheckFileExtensionTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/AbstractCheckFileExtensionTest.java @@ -49,6 +49,7 @@ import org.apache.sshd.common.util.NumberUtils; import org.apache.sshd.common.util.Pair; import org.apache.sshd.common.util.buffer.BufferUtils; import org.apache.sshd.common.util.io.IoUtils; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.apache.sshd.util.test.Utils; import org.junit.Before; import org.junit.FixMethodOrder; @@ -57,12 +58,14 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class AbstractCheckFileExtensionTest extends AbstractSftpClientTestSupport { private static final Collection<Integer> DATA_SIZES = Collections.unmodifiableList( http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/AbstractMD5HashExtensionTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/AbstractMD5HashExtensionTest.java b/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/AbstractMD5HashExtensionTest.java index 12ebf4b..fc3c607 100644 --- a/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/AbstractMD5HashExtensionTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/AbstractMD5HashExtensionTest.java @@ -43,6 +43,7 @@ import org.apache.sshd.common.subsystem.sftp.SftpException; import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.common.util.buffer.BufferUtils; import org.apache.sshd.common.util.io.IoUtils; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.apache.sshd.util.test.Utils; import org.junit.Assume; import org.junit.Before; @@ -53,12 +54,14 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class AbstractMD5HashExtensionTest extends AbstractSftpClientTestSupport { private static final List<Integer> DATA_SIZES = Collections.unmodifiableList( http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/CopyDataExtensionImplTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/CopyDataExtensionImplTest.java b/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/CopyDataExtensionImplTest.java index 16f49ba..1c04c32 100644 --- a/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/CopyDataExtensionImplTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/CopyDataExtensionImplTest.java @@ -43,6 +43,7 @@ import org.apache.sshd.common.Factory; import org.apache.sshd.common.random.Random; import org.apache.sshd.common.subsystem.sftp.SftpConstants; import org.apache.sshd.common.util.io.IoUtils; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.apache.sshd.util.test.Utils; import org.junit.Before; import org.junit.FixMethodOrder; @@ -51,12 +52,14 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class CopyDataExtensionImplTest extends AbstractSftpClientTestSupport { private static final List<Object[]> PARAMETERS = Collections.unmodifiableList( http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/common/channel/WindowInitTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/channel/WindowInitTest.java b/sshd-core/src/test/java/org/apache/sshd/common/channel/WindowInitTest.java index cfd982e..dfa279c 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/channel/WindowInitTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/channel/WindowInitTest.java @@ -29,18 +29,21 @@ import org.apache.sshd.common.PropertyResolver; import org.apache.sshd.common.util.buffer.Buffer; import org.apache.sshd.common.util.buffer.BufferUtils; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class WindowInitTest extends BaseTestSupport { private static final AbstractChannel MOCK_CHANNEL = new AbstractChannel(true) { @Override http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/common/cipher/CipherTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/cipher/CipherTest.java b/sshd-core/src/test/java/org/apache/sshd/common/cipher/CipherTest.java index 92828cc..54b4ca3 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/cipher/CipherTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/cipher/CipherTest.java @@ -38,6 +38,7 @@ import org.apache.sshd.common.util.buffer.BufferUtils; import org.apache.sshd.server.SshServer; import org.apache.sshd.util.test.BaseTestSupport; import org.apache.sshd.util.test.JSchLogger; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.apache.sshd.util.test.SimpleUserInfo; import org.apache.sshd.util.test.Utils; import org.junit.AfterClass; @@ -49,6 +50,7 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * Test Cipher algorithms. @@ -57,6 +59,7 @@ import org.junit.runners.Parameterized.Parameters; */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class CipherTest extends BaseTestSupport { private static final Integer NUM_LOADTEST_ROUNDS = 100000; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/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 135261c..87fb973 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 @@ -36,6 +36,7 @@ import org.apache.sshd.common.session.SessionListener; import org.apache.sshd.server.SshServer; import org.apache.sshd.util.test.BaseTestSupport; import org.apache.sshd.util.test.JSchLogger; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.apache.sshd.util.test.SimpleUserInfo; import org.apache.sshd.util.test.Utils; import org.junit.After; @@ -49,6 +50,7 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * Test compression algorithms. @@ -57,6 +59,7 @@ import org.junit.runners.Parameterized.Parameters; */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class CompressionTest extends BaseTestSupport { private static final Collection<KexProposalOption> COMPRESSION_OPTIONS = Collections.unmodifiableSet(EnumSet.of(KexProposalOption.C2SCOMP, KexProposalOption.S2CCOMP)); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/common/config/keys/BuiltinIdentitiesTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/config/keys/BuiltinIdentitiesTest.java b/sshd-core/src/test/java/org/apache/sshd/common/config/keys/BuiltinIdentitiesTest.java index 2fa299a..9f7a981 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/config/keys/BuiltinIdentitiesTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/config/keys/BuiltinIdentitiesTest.java @@ -28,6 +28,7 @@ import java.util.List; import org.apache.sshd.common.util.security.SecurityUtils; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.junit.Assume; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -36,12 +37,14 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class BuiltinIdentitiesTest extends BaseTestSupport { private final BuiltinIdentities expected; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyRandomArtTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyRandomArtTest.java b/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyRandomArtTest.java index b3ff78f..a272cb1 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyRandomArtTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyRandomArtTest.java @@ -29,17 +29,23 @@ import org.apache.sshd.common.cipher.ECCurves; import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.common.util.security.SecurityUtils; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.apache.sshd.util.test.Utils; import org.junit.AfterClass; +import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class KeyRandomArtTest extends BaseTestSupport { private static final Collection<KeyPair> KEYS = new LinkedList<>(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyUtilsCloneTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyUtilsCloneTest.java b/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyUtilsCloneTest.java index b8b46d8..4939584 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyUtilsCloneTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyUtilsCloneTest.java @@ -33,18 +33,21 @@ import org.apache.sshd.common.keyprovider.KeyPairProvider; import org.apache.sshd.common.util.ValidateUtils; import org.apache.sshd.common.util.security.SecurityUtils; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class KeyUtilsCloneTest extends BaseTestSupport { private final String keyType; private final int keySize; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyUtilsFingerprintCaseSensitivityTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyUtilsFingerprintCaseSensitivityTest.java b/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyUtilsFingerprintCaseSensitivityTest.java index a100aa9..ebc8752 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyUtilsFingerprintCaseSensitivityTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyUtilsFingerprintCaseSensitivityTest.java @@ -27,6 +27,7 @@ import java.util.Collection; import org.apache.sshd.common.util.Pair; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.junit.BeforeClass; import org.junit.FixMethodOrder; import org.junit.Test; @@ -34,12 +35,14 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class KeyUtilsFingerprintCaseSensitivityTest extends BaseTestSupport { // CHECKSTYLE:OFF http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyUtilsFingerprintGenerationTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyUtilsFingerprintGenerationTest.java b/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyUtilsFingerprintGenerationTest.java index b360cb7..c43a64f 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyUtilsFingerprintGenerationTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/config/keys/KeyUtilsFingerprintGenerationTest.java @@ -33,18 +33,21 @@ import org.apache.sshd.common.digest.BuiltinDigests; import org.apache.sshd.common.digest.DigestFactory; import org.apache.sshd.common.util.Pair; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class KeyUtilsFingerprintGenerationTest extends BaseTestSupport { private final PublicKey key; private final DigestFactory digestFactory; @@ -66,11 +69,11 @@ public class KeyUtilsFingerprintGenerationTest extends BaseTestSupport { // CHECKSTYLE:ON Arrays.asList( new Pair<>( - (DigestFactory)BuiltinDigests.md5, + BuiltinDigests.md5, "MD5:24:32:3c:80:01:b3:e1:fa:7c:53:ca:e3:e8:4e:c6:8e" ), new Pair<>( - (DigestFactory)BuiltinDigests.sha256, + BuiltinDigests.sha256, "SHA256:1wNOZO+/XgNGJMx8UUJst33V+bBMTz5EcL0B6y2iRv0" ) ) @@ -81,11 +84,11 @@ public class KeyUtilsFingerprintGenerationTest extends BaseTestSupport { // CHECKSTYLE:ON Arrays.asList( new Pair<>( - (DigestFactory)BuiltinDigests.md5, + BuiltinDigests.md5, "MD5:fb:29:14:8d:94:f9:1d:cf:6b:0e:a4:35:1d:83:44:2f" ), new Pair<>( - (DigestFactory)BuiltinDigests.sha256, + BuiltinDigests.sha256, "SHA256:grxw4KhY1cK6eOczBWs7tDVvo9V0PQw4E1wN1gJvHlw" ) ) @@ -96,11 +99,11 @@ public class KeyUtilsFingerprintGenerationTest extends BaseTestSupport { // CHECKSTYLE:ON Arrays.asList( new Pair<>( - (DigestFactory)BuiltinDigests.md5, + BuiltinDigests.md5, "MD5:e6:dc:a2:4f:5b:11:b2:3c:0f:e8:f6:d8:d1:01:e9:d3" ), new Pair<>( - (DigestFactory)BuiltinDigests.sha512, + BuiltinDigests.sha512, "SHA512:4w6ZB78tmFWhpN2J50Ok6WeMJhZp1X0xN0EKWxZmRLcYDbCWhyJDe8lgrQKWqdTCMZ5aNEBl9xQUklcC5Gt2jg" ) ) http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/common/config/keys/loader/AESPrivateKeyObfuscatorTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/config/keys/loader/AESPrivateKeyObfuscatorTest.java b/sshd-core/src/test/java/org/apache/sshd/common/config/keys/loader/AESPrivateKeyObfuscatorTest.java index 352283a..63fab33 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/config/keys/loader/AESPrivateKeyObfuscatorTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/config/keys/loader/AESPrivateKeyObfuscatorTest.java @@ -29,18 +29,21 @@ import javax.crypto.spec.SecretKeySpec; import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.common.util.security.SecurityUtils; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class AESPrivateKeyObfuscatorTest extends BaseTestSupport { private static final Random RANDOMIZER = new Random(System.currentTimeMillis()); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest.java b/sshd-core/src/test/java/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest.java index 9c54638..b18564a 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest.java @@ -33,6 +33,7 @@ import org.apache.sshd.common.config.keys.PublicKeyEntryResolver; import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.common.util.ValidateUtils; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.junit.Assume; import org.junit.FixMethodOrder; import org.junit.Test; @@ -40,12 +41,14 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class OpenSSHKeyPairResourceParserTest extends BaseTestSupport { private static final OpenSSHKeyPairResourceParser PARSER = OpenSSHKeyPairResourceParser.INSTANCE; private final BuiltinIdentities identity; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java b/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java index c4eb730..e92a5c5 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java @@ -35,6 +35,7 @@ import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.server.SshServer; import org.apache.sshd.util.test.BaseTestSupport; import org.apache.sshd.util.test.JSchLogger; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.apache.sshd.util.test.SimpleUserInfo; import org.apache.sshd.util.test.Utils; import org.junit.AfterClass; @@ -47,6 +48,7 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; import ch.ethz.ssh2.Connection; import ch.ethz.ssh2.ConnectionInfo; @@ -58,6 +60,7 @@ import ch.ethz.ssh2.ConnectionInfo; */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class MacTest extends BaseTestSupport { private static final Collection<String> GANYMEDE_MACS = Collections.unmodifiableSet( http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/common/mac/MacVectorsTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/mac/MacVectorsTest.java b/sshd-core/src/test/java/org/apache/sshd/common/mac/MacVectorsTest.java index cc41c86..8ebed89 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/mac/MacVectorsTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/mac/MacVectorsTest.java @@ -33,18 +33,21 @@ import org.apache.sshd.common.util.Pair; import org.apache.sshd.common.util.ValidateUtils; import org.apache.sshd.common.util.buffer.BufferUtils; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class MacVectorsTest extends BaseTestSupport { private final VectorSeed seed; private final Factory<? extends Mac> macFactory; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/common/random/RandomFactoryTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/random/RandomFactoryTest.java b/sshd-core/src/test/java/org/apache/sshd/common/random/RandomFactoryTest.java index af471e4..dd6a043 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/random/RandomFactoryTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/random/RandomFactoryTest.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; import org.apache.sshd.common.util.security.SecurityUtils; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.junit.Assume; import org.junit.FixMethodOrder; import org.junit.Test; @@ -31,12 +32,14 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class RandomFactoryTest extends BaseTestSupport { private final RandomFactory factory; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureFactoriesTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureFactoriesTest.java b/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureFactoriesTest.java index 9c21f33..8b2943b 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureFactoriesTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureFactoriesTest.java @@ -43,6 +43,7 @@ import org.apache.sshd.common.util.ValidateUtils; import org.apache.sshd.common.util.security.SecurityUtils; import org.apache.sshd.server.SshServer; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.apache.sshd.util.test.Utils; import org.junit.AfterClass; import org.junit.Assume; @@ -53,12 +54,14 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class SignatureFactoriesTest extends BaseTestSupport implements OptionalFeature { private static SshServer sshd; private static SshClient client; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/common/util/io/der/ASN1ClassTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/io/der/ASN1ClassTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/io/der/ASN1ClassTest.java index c70d250..7b6c1d1 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/io/der/ASN1ClassTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/io/der/ASN1ClassTest.java @@ -21,18 +21,21 @@ package org.apache.sshd.common.util.io.der; import java.util.List; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class ASN1ClassTest extends BaseTestSupport { private final ASN1Class expected; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/common/util/io/der/ASN1TypeTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/io/der/ASN1TypeTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/io/der/ASN1TypeTest.java index ce24b66..d997194 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/io/der/ASN1TypeTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/io/der/ASN1TypeTest.java @@ -21,18 +21,21 @@ package org.apache.sshd.common.util.io.der; import java.util.List; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class ASN1TypeTest extends BaseTestSupport { private final ASN1Type expected; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/common/util/security/SecurityProviderRegistrarCipherNameTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/security/SecurityProviderRegistrarCipherNameTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/security/SecurityProviderRegistrarCipherNameTest.java index a256552..f7d0f1a 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/security/SecurityProviderRegistrarCipherNameTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/security/SecurityProviderRegistrarCipherNameTest.java @@ -27,18 +27,21 @@ import javax.crypto.Cipher; import org.apache.sshd.common.cipher.BuiltinCiphers; import org.apache.sshd.common.cipher.CipherInformation; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class SecurityProviderRegistrarCipherNameTest extends BaseTestSupport { private final CipherInformation cipherInfo; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/Ed25519VectorsTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/Ed25519VectorsTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/Ed25519VectorsTest.java index b58aad3..5bda71a 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/Ed25519VectorsTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/Ed25519VectorsTest.java @@ -33,6 +33,7 @@ import org.apache.sshd.common.signature.Signature; import org.apache.sshd.common.util.buffer.BufferUtils; import org.apache.sshd.common.util.security.SecurityUtils; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.junit.Assume; import org.junit.BeforeClass; import org.junit.FixMethodOrder; @@ -41,6 +42,7 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> @@ -49,6 +51,7 @@ import org.junit.runners.Parameterized.Parameters; */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class Ed25519VectorsTest extends BaseTestSupport { private final byte[] prvBytes; private final PrivateKey privateKey; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/server/auth/BuiltinUserAuthFactoriesTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/auth/BuiltinUserAuthFactoriesTest.java b/sshd-core/src/test/java/org/apache/sshd/server/auth/BuiltinUserAuthFactoriesTest.java index df6ed4c..b26e0e8 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/auth/BuiltinUserAuthFactoriesTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/auth/BuiltinUserAuthFactoriesTest.java @@ -30,6 +30,7 @@ import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.server.auth.BuiltinUserAuthFactories.ParseResult; import org.apache.sshd.server.auth.gss.UserAuthGSSFactory; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.junit.BeforeClass; import org.junit.FixMethodOrder; import org.junit.Test; @@ -37,12 +38,14 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class BuiltinUserAuthFactoriesTest extends BaseTestSupport { private final BuiltinUserAuthFactories factory; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/server/auth/WelcomeBannerPhaseTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/auth/WelcomeBannerPhaseTest.java b/sshd-core/src/test/java/org/apache/sshd/server/auth/WelcomeBannerPhaseTest.java index 2541558..bc5b2b2 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/auth/WelcomeBannerPhaseTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/auth/WelcomeBannerPhaseTest.java @@ -30,6 +30,7 @@ import org.apache.sshd.common.PropertyResolverUtils; import org.apache.sshd.server.ServerAuthenticationManager; import org.apache.sshd.server.SshServer; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.apache.sshd.util.test.Utils; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -39,12 +40,14 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class WelcomeBannerPhaseTest extends BaseTestSupport { private static SshServer sshd; private static SshClient client; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/server/shell/TtyFilterInputStreamTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/shell/TtyFilterInputStreamTest.java b/sshd-core/src/test/java/org/apache/sshd/server/shell/TtyFilterInputStreamTest.java index eff05da..f733273 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/shell/TtyFilterInputStreamTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/shell/TtyFilterInputStreamTest.java @@ -38,18 +38,21 @@ import org.apache.sshd.common.channel.PtyMode; import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.common.util.io.IoUtils; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class TtyFilterInputStreamTest extends BaseTestSupport { private static final List<PtyMode> MODES = Collections.unmodifiableList( http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/server/shell/TtyFilterOutputStreamTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/shell/TtyFilterOutputStreamTest.java b/sshd-core/src/test/java/org/apache/sshd/server/shell/TtyFilterOutputStreamTest.java index 7271813..24d4004 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/shell/TtyFilterOutputStreamTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/shell/TtyFilterOutputStreamTest.java @@ -35,18 +35,21 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.sshd.common.channel.PtyMode; import org.apache.sshd.util.test.BaseTestSupport; +import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.runners.Parameterized.UseParametersRunnerFactory; /** * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests +@UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) public class TtyFilterOutputStreamTest extends BaseTestSupport { private final PtyMode mode; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4ClassRunnerWithParameters.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4ClassRunnerWithParameters.java b/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4ClassRunnerWithParameters.java new file mode 100644 index 0000000..acf44a5 --- /dev/null +++ b/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4ClassRunnerWithParameters.java @@ -0,0 +1,48 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.sshd.util.test; + +import org.junit.runners.model.InitializationError; +import org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters; +import org.junit.runners.parameterized.TestWithParameters; + +/** + * Uses a cached created instance instead of a new one on every call of {@code #createTest()} + * + * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> + */ +public class JUnit4ClassRunnerWithParameters extends BlockJUnit4ClassRunnerWithParameters { + private volatile Object testInstance; + + public JUnit4ClassRunnerWithParameters(TestWithParameters test) throws InitializationError { + super(test); + } + + @Override + public Object createTest() throws Exception { + synchronized (this) { + if (testInstance == null) { + testInstance = super.createTest(); + } + } + + return testInstance; + } +} http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2798ec0/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4ClassRunnerWithParametersFactory.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4ClassRunnerWithParametersFactory.java b/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4ClassRunnerWithParametersFactory.java new file mode 100644 index 0000000..9dc2308 --- /dev/null +++ b/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4ClassRunnerWithParametersFactory.java @@ -0,0 +1,58 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.sshd.util.test; + +import org.junit.runner.Runner; +import org.junit.runners.model.InitializationError; +import org.junit.runners.parameterized.ParametersRunnerFactory; +import org.junit.runners.parameterized.TestWithParameters; + +/** + * Avoids re-creating a test class instance for each parameterized test method. Usage: + * + * <PRE>{@code + * @FixMethodOrder(MethodSorters.NAME_ASCENDING) + * @RunWith(Parameterized.class) + * @UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) + * public class MyParameterizedTest { + * public MyParameterizedTest(...params...) { + * .... + * } + * + * @Parameters(...) + * public static List<Object[]> parameters() { + * ... + * } + * } + * }</PRE> + * + * @see JUnit4ClassRunnerWithParameters + * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a> + */ +public class JUnit4ClassRunnerWithParametersFactory implements ParametersRunnerFactory { + public JUnit4ClassRunnerWithParametersFactory() { + super(); + } + + @Override + public Runner createRunnerForTestWithParameters(TestWithParameters test) throws InitializationError { + return new JUnit4ClassRunnerWithParameters(test); + } +}
