This is an automated email from the ASF dual-hosted git repository. twolf pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit 8f82e6c472b537170a1307a6b437b9140a1315f8 Author: Thomas Wolf <tw...@apache.org> AuthorDate: Fri May 13 21:00:53 2022 +0200 Mark more tests as NoIoTestCases --- .../sshd/certificates/GenerateOpenSSHClientCertificateTest.java | 3 +++ .../certificates/GenerateOpenSshClientCertificateOracleTest.java | 3 +++ .../org/apache/sshd/certificates/OpenSSHCertificateParserTest.java | 3 +++ sshd-mina/pom.xml | 6 +----- sshd-netty/pom.xml | 3 --- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/sshd-core/src/test/java/org/apache/sshd/certificates/GenerateOpenSSHClientCertificateTest.java b/sshd-core/src/test/java/org/apache/sshd/certificates/GenerateOpenSSHClientCertificateTest.java index cab4f0011..8110675cf 100644 --- a/sshd-core/src/test/java/org/apache/sshd/certificates/GenerateOpenSSHClientCertificateTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/certificates/GenerateOpenSSHClientCertificateTest.java @@ -40,10 +40,13 @@ 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.CommonTestSupportUtils; +import org.apache.sshd.util.test.NoIoTestCase; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(NoIoTestCase.class) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests public class GenerateOpenSSHClientCertificateTest extends BaseTestSupport { diff --git a/sshd-core/src/test/java/org/apache/sshd/certificates/GenerateOpenSshClientCertificateOracleTest.java b/sshd-core/src/test/java/org/apache/sshd/certificates/GenerateOpenSshClientCertificateOracleTest.java index c199fc6f8..00eca2caa 100644 --- a/sshd-core/src/test/java/org/apache/sshd/certificates/GenerateOpenSshClientCertificateOracleTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/certificates/GenerateOpenSshClientCertificateOracleTest.java @@ -38,10 +38,13 @@ 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.CommonTestSupportUtils; +import org.apache.sshd.util.test.NoIoTestCase; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(NoIoTestCase.class) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests public class GenerateOpenSshClientCertificateOracleTest extends BaseTestSupport { diff --git a/sshd-core/src/test/java/org/apache/sshd/certificates/OpenSSHCertificateParserTest.java b/sshd-core/src/test/java/org/apache/sshd/certificates/OpenSSHCertificateParserTest.java index 734f5aebd..e75f84b0b 100644 --- a/sshd-core/src/test/java/org/apache/sshd/certificates/OpenSSHCertificateParserTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/certificates/OpenSSHCertificateParserTest.java @@ -34,10 +34,13 @@ import org.apache.sshd.common.signature.Signature; 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.NoIoTestCase; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(NoIoTestCase.class) @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests public class OpenSSHCertificateParserTest extends BaseTestSupport { diff --git a/sshd-mina/pom.xml b/sshd-mina/pom.xml index 669373503..51037bce3 100644 --- a/sshd-mina/pom.xml +++ b/sshd-mina/pom.xml @@ -126,8 +126,6 @@ <exclude>**/CipherTest.java</exclude> <exclude>**/CompressionTest.java</exclude> <exclude>**/NoServerNoClientTest.java</exclude> - <exclude>**/OpenSSHCertificateTest.java</exclude> - <exclude>**/FileHostKeyCertificateProviderTest.java</exclude> <!-- exclude>**/PortForwardingTest.java</exclude --> <exclude>**/MacTest.java</exclude> <exclude>**/SpringConfigTest.java</exclude> @@ -138,9 +136,7 @@ <exclude>**/ClientOpenSSHCertificatesTest.java</exclude> <exclude>**/SessionReKeyHostKeyExchangeTest.java</exclude> <!-- reading files from classpath doesn't work correctly w/ reusable test jar --> - <exclude>**/OpenSSHCertificateParserTest.java</exclude> - <exclude>**/GenerateOpenSSHClientCertificateTest.java</exclude> - <exclude>**/GenerateOpenSshClientCertificateOracleTest.java</exclude> + <exclude>**/OpenSSHCertificateTest.java</exclude> </excludes> <!-- No need to re-run core tests that do not involve session creation --> <excludedGroups>org.apache.sshd.util.test.NoIoTestCase</excludedGroups> diff --git a/sshd-netty/pom.xml b/sshd-netty/pom.xml index 3f4eec573..443634268 100644 --- a/sshd-netty/pom.xml +++ b/sshd-netty/pom.xml @@ -163,9 +163,6 @@ <exclude>**/SessionReKeyHostKeyExchangeTest.java</exclude> <!-- reading files from classpath doesn't work correctly w/ reusable test jar --> <exclude>**/OpenSSHCertificateTest.java</exclude> - <exclude>**/OpenSSHCertificateParserTest.java</exclude> - <exclude>**/GenerateOpenSSHClientCertificateTest.java</exclude> - <exclude>**/GenerateOpenSshClientCertificateOracleTest.java</exclude> </excludes> <!-- No need to re-run core tests that do not involve session creation --> <excludedGroups>org.apache.sshd.util.test.NoIoTestCase</excludedGroups>