You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2015/05/18 12:38:04 UTC
[2/3] mina-sshd git commit: [SSHD-464] Make BaseTest extend
org.junit.Assert instead of TestWatcher
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 1b46453..feef53e 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
@@ -33,15 +33,14 @@ import org.apache.sshd.common.NamedFactory;
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.BaseTest;
-import org.junit.Assert;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Test;
import org.mockito.Mockito;
/**
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public class BuiltinCiphersTest extends BaseTest {
+public class BuiltinCiphersTest extends BaseTestSupport {
public BuiltinCiphersTest() {
super();
}
@@ -53,7 +52,7 @@ public class BuiltinCiphersTest extends BaseTest {
for (int index=0; index < name.length(); index++) {
BuiltinCiphers actual=BuiltinCiphers.fromString(name);
- Assert.assertSame(name + " - mismatched enum values", expected, actual);
+ assertSame(name + " - mismatched enum values", expected, actual);
name = shuffleCase(name); // prepare for next time
}
}
@@ -66,7 +65,7 @@ public class BuiltinCiphersTest extends BaseTest {
for (int index=0; index < name.length(); index++) {
BuiltinCiphers actual=BuiltinCiphers.fromFactoryName(name);
- Assert.assertSame(name + " - mismatched enum values", expected, actual);
+ assertSame(name + " - mismatched enum values", expected, actual);
name = shuffleCase(name); // prepare for next time
}
}
@@ -81,10 +80,10 @@ public class BuiltinCiphersTest extends BaseTest {
}
NamedFactory<Cipher> factory=expected;
- Assert.assertEquals(expected.name() + " - mismatched factory names", expected.getName(), factory.getName());
+ assertEquals(expected.name() + " - mismatched factory names", expected.getName(), factory.getName());
BuiltinCiphers actual=BuiltinCiphers.fromFactory(factory);
- Assert.assertSame(expected.getName() + " - mismatched enum values", expected, actual);
+ assertSame(expected.getName() + " - mismatched enum values", expected, actual);
}
}
@@ -95,11 +94,11 @@ public class BuiltinCiphersTest extends BaseTest {
for (Field f : fields) {
String name=(String) f.get(null);
BuiltinCiphers value=BuiltinCiphers.fromFactoryName(name);
- Assert.assertNotNull("No match found for " + name, value);
- Assert.assertTrue(name + " re-specified", avail.add(value));
+ assertNotNull("No match found for " + name, value);
+ assertTrue(name + " re-specified", avail.add(value));
}
- Assert.assertEquals("Incomplete coverage", BuiltinCiphers.VALUES, avail);
+ assertEquals("Incomplete coverage", BuiltinCiphers.VALUES, avail);
}
@Test
@@ -157,7 +156,7 @@ public class BuiltinCiphersTest extends BaseTest {
for (NamedFactory<Cipher> expected : BuiltinCiphers.VALUES) {
String name=expected.getName();
NamedFactory<Cipher> actual=BuiltinCiphers.resolveFactory(name);
- Assert.assertSame(name, expected, actual);
+ assertSame(name, expected, actual);
}
}
@@ -166,7 +165,7 @@ public class BuiltinCiphersTest extends BaseTest {
for (CipherFactory expected : BuiltinCiphers.VALUES) {
try {
BuiltinCiphers.registerExtension(expected);
- Assert.fail("Unexpected sucess for " + expected.getName());
+ fail("Unexpected sucess for " + expected.getName());
} catch(IllegalArgumentException e) {
// expected - ignored
}
@@ -182,7 +181,7 @@ public class BuiltinCiphersTest extends BaseTest {
try {
for (int index=1; index <= Byte.SIZE; index++) {
BuiltinCiphers.registerExtension(expected);
- Assert.assertEquals("Unexpected success at attempt #" + index, 1, index);
+ assertEquals("Unexpected success at attempt #" + index, 1, index);
}
} finally {
BuiltinCiphers.unregisterExtension(name);
@@ -196,27 +195,27 @@ public class BuiltinCiphersTest extends BaseTest {
String name=expected.getName();
try {
- Assert.assertNull("Extension already registered", BuiltinCiphers.resolveFactory(name));
+ assertNull("Extension already registered", BuiltinCiphers.resolveFactory(name));
BuiltinCiphers.registerExtension(expected);
NamedFactory<Cipher> actual=BuiltinCiphers.resolveFactory(name);
- Assert.assertSame("Mismatched resolved instance", expected, actual);
+ assertSame("Mismatched resolved instance", expected, actual);
} finally {
NamedFactory<Cipher> actual=BuiltinCiphers.unregisterExtension(name);
- Assert.assertSame("Mismatched unregistered instance", expected, actual);
- Assert.assertNull("Extension not un-registered", BuiltinCiphers.resolveFactory(name));
+ assertSame("Mismatched unregistered instance", expected, actual);
+ assertNull("Extension not un-registered", BuiltinCiphers.resolveFactory(name));
}
}
@Test
public void testFac2NamedTransformer() {
- Assert.assertNull("Invalid null transformation", CipherFactory.FAC2NAMED.transform(null));
+ assertNull("Invalid null transformation", CipherFactory.FAC2NAMED.transform(null));
for (CipherFactory expected : BuiltinCiphers.VALUES) {
NamedFactory<Cipher> actual=CipherFactory.FAC2NAMED.transform(expected);
- Assert.assertSame("Mismatched transformed instance for " + expected.getName(), expected, actual);
+ assertSame("Mismatched transformed instance for " + expected.getName(), expected, actual);
}
CipherFactory mock=Mockito.mock(CipherFactory.class);
- Assert.assertSame("Mismatched transformed mocked instance", mock, CipherFactory.FAC2NAMED.transform(mock));
+ assertSame("Mismatched transformed mocked instance", mock, CipherFactory.FAC2NAMED.transform(mock));
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 601b28f..83e46f2 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
@@ -32,15 +32,14 @@ import org.apache.sshd.common.NamedFactory;
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.BaseTest;
-import org.junit.Assert;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Test;
import org.mockito.Mockito;
/**
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public class BuiltinCompressionsTest extends BaseTest {
+public class BuiltinCompressionsTest extends BaseTestSupport {
public BuiltinCompressionsTest() {
super();
}
@@ -52,7 +51,7 @@ public class BuiltinCompressionsTest extends BaseTest {
for (int index=0; index < name.length(); index++) {
BuiltinCompressions actual=BuiltinCompressions.fromFactoryName(name);
- Assert.assertSame(name, expected, actual);
+ assertSame(name, expected, actual);
name = shuffleCase(name);
}
}
@@ -64,11 +63,11 @@ public class BuiltinCompressionsTest extends BaseTest {
for (Field f : fields) {
String name=(String) f.get(null);
BuiltinCompressions value=BuiltinCompressions.fromFactoryName(name);
- Assert.assertNotNull("No match found for " + name, value);
- Assert.assertTrue(name + " re-specified", avail.add(value));
+ assertNotNull("No match found for " + name, value);
+ assertTrue(name + " re-specified", avail.add(value));
}
- Assert.assertEquals("Incomplete coverage", BuiltinCompressions.VALUES, avail);
+ assertEquals("Incomplete coverage", BuiltinCompressions.VALUES, avail);
}
@Test
@@ -112,7 +111,7 @@ public class BuiltinCompressionsTest extends BaseTest {
for (NamedFactory<Compression> expected : BuiltinCompressions.VALUES) {
String name=expected.getName();
NamedFactory<Compression> actual=BuiltinCompressions.resolveFactory(name);
- Assert.assertSame(name, expected, actual);
+ assertSame(name, expected, actual);
}
}
@@ -121,7 +120,7 @@ public class BuiltinCompressionsTest extends BaseTest {
for (CompressionFactory expected : BuiltinCompressions.VALUES) {
try {
BuiltinCompressions.registerExtension(expected);
- Assert.fail("Unexpected sucess for " + expected.getName());
+ fail("Unexpected sucess for " + expected.getName());
} catch(IllegalArgumentException e) {
// expected - ignored
}
@@ -137,7 +136,7 @@ public class BuiltinCompressionsTest extends BaseTest {
try {
for (int index=1; index <= Byte.SIZE; index++) {
BuiltinCompressions.registerExtension(expected);
- Assert.assertEquals("Unexpected success at attempt #" + index, 1, index);
+ assertEquals("Unexpected success at attempt #" + index, 1, index);
}
} finally {
BuiltinCompressions.unregisterExtension(name);
@@ -151,27 +150,27 @@ public class BuiltinCompressionsTest extends BaseTest {
String name=expected.getName();
try {
- Assert.assertNull("Extension already registered", BuiltinCompressions.resolveFactory(name));
+ assertNull("Extension already registered", BuiltinCompressions.resolveFactory(name));
BuiltinCompressions.registerExtension(expected);
NamedFactory<Compression> actual=BuiltinCompressions.resolveFactory(name);
- Assert.assertSame("Mismatched resolved instance", expected, actual);
+ assertSame("Mismatched resolved instance", expected, actual);
} finally {
NamedFactory<Compression> actual=BuiltinCompressions.unregisterExtension(name);
- Assert.assertSame("Mismatched unregistered instance", expected, actual);
- Assert.assertNull("Extension not un-registered", BuiltinCompressions.resolveFactory(name));
+ assertSame("Mismatched unregistered instance", expected, actual);
+ assertNull("Extension not un-registered", BuiltinCompressions.resolveFactory(name));
}
}
@Test
public void testFac2NamedTransformer() {
- Assert.assertNull("Invalid null transformation", CompressionFactory.FAC2NAMED.transform(null));
+ assertNull("Invalid null transformation", CompressionFactory.FAC2NAMED.transform(null));
for (CompressionFactory expected : BuiltinCompressions.VALUES) {
NamedFactory<Compression> actual=CompressionFactory.FAC2NAMED.transform(expected);
- Assert.assertSame("Mismatched transformed instance for " + expected.getName(), expected, actual);
+ assertSame("Mismatched transformed instance for " + expected.getName(), expected, actual);
}
CompressionFactory mock=Mockito.mock(CompressionFactory.class);
- Assert.assertSame("Mismatched transformed mocked instance", mock, CompressionFactory.FAC2NAMED.transform(mock));
+ assertSame("Mismatched transformed mocked instance", mock, CompressionFactory.FAC2NAMED.transform(mock));
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 9ae5fd4..2fa32b2 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
@@ -18,8 +18,6 @@
*/
package org.apache.sshd.common.compression;
-import static org.junit.Assert.assertEquals;
-
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
@@ -27,7 +25,7 @@ import java.util.Arrays;
import org.apache.sshd.SshServer;
import org.apache.sshd.common.NamedFactory;
-import org.apache.sshd.util.BaseTest;
+import org.apache.sshd.util.BaseTestSupport;
import org.apache.sshd.util.BogusPasswordAuthenticator;
import org.apache.sshd.util.EchoShellFactory;
import org.apache.sshd.util.JSchLogger;
@@ -43,7 +41,7 @@ import com.jcraft.jsch.JSch;
*
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public class CompressionTest extends BaseTest {
+public class CompressionTest extends BaseTestSupport {
private SshServer sshd;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 4c61be3..375023b 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
@@ -44,14 +44,13 @@ import org.apache.sshd.common.kex.BuiltinDHFactories;
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.BaseTest;
-import org.junit.Assert;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Test;
/**
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public class SshConfigFileReaderTest extends BaseTest {
+public class SshConfigFileReaderTest extends BaseTestSupport {
public SshConfigFileReaderTest() {
super();
}
@@ -59,18 +58,18 @@ public class SshConfigFileReaderTest extends BaseTest {
@Test
public void testReadFromURL() throws IOException {
URL url=getClass().getResource("sshd_config");
- Assert.assertNotNull("Cannot locate test file", url);
+ assertNotNull("Cannot locate test file", url);
Properties props=SshConfigFileReader.readConfigFile(url);
- Assert.assertFalse("No properties read", props.isEmpty());
- Assert.assertTrue("Unexpected commented property data", GenericUtils.isEmpty(props.getProperty("ListenAddress")));
- Assert.assertTrue("Unexpected non-existing property data", GenericUtils.isEmpty(props.getProperty(getCurrentTestName())));
+ assertFalse("No properties read", props.isEmpty());
+ assertTrue("Unexpected commented property data", GenericUtils.isEmpty(props.getProperty("ListenAddress")));
+ assertTrue("Unexpected non-existing property data", GenericUtils.isEmpty(props.getProperty(getCurrentTestName())));
String keysList=props.getProperty("HostKey");
- Assert.assertFalse("No host keys", GenericUtils.isEmpty(keysList));
+ assertFalse("No host keys", GenericUtils.isEmpty(keysList));
String[] keys=GenericUtils.split(keysList, ',');
- Assert.assertTrue("No multiple keys", GenericUtils.length((Object[]) keys) > 1);
+ assertTrue("No multiple keys", GenericUtils.length((Object[]) keys) > 1);
}
@Test
@@ -112,8 +111,8 @@ public class SshConfigFileReaderTest extends BaseTest {
props.setProperty(SshConfigFileReader.COMPRESSION_PROP, expected.name().toLowerCase());
NamedResource actual=SshConfigFileReader.getCompression(props);
- Assert.assertNotNull("No match for " + expected.name(), actual);
- Assert.assertEquals(expected.name(), expected.getName(), actual.getName());
+ assertNotNull("No match for " + expected.name(), actual);
+ assertEquals(expected.name(), expected.getName(), actual.getName());
}
}
@@ -128,7 +127,7 @@ public class SshConfigFileReaderTest extends BaseTest {
};
// must be lenient since we do not cover the full default spectrum
AbstractFactoryManager actual=SshConfigFileReader.configure(expected, props, true, true);
- Assert.assertSame("Mismatched configured result", expected, actual);
+ assertSame("Mismatched configured result", expected, actual);
validateAbstractFactoryManagerConfiguration(expected, props, true);
}
@@ -144,7 +143,7 @@ public class SshConfigFileReaderTest extends BaseTest {
getCurrentTestName(),
false,
true);
- Assert.fail("Unexpected success: " + NamedResource.Utils.getNames(manager.getCipherFactories()));
+ fail("Unexpected success: " + NamedResource.Utils.getNames(manager.getCipherFactories()));
}
@Test(expected=IllegalArgumentException.class)
@@ -159,7 +158,7 @@ public class SshConfigFileReaderTest extends BaseTest {
getCurrentTestName(),
false,
true);
- Assert.fail("Unexpected success: " + NamedResource.Utils.getNames(manager.getSignatureFactories()));
+ fail("Unexpected success: " + NamedResource.Utils.getNames(manager.getSignatureFactories()));
}
@Test(expected=IllegalArgumentException.class)
@@ -174,7 +173,7 @@ public class SshConfigFileReaderTest extends BaseTest {
getCurrentTestName(),
false,
true);
- Assert.fail("Unexpected success: " + NamedResource.Utils.getNames(manager.getMacFactories()));
+ fail("Unexpected success: " + NamedResource.Utils.getNames(manager.getMacFactories()));
}
@Test
@@ -199,8 +198,8 @@ public class SshConfigFileReaderTest extends BaseTest {
false,
true);
List<NamedFactory<Compression>> compressions=manager.getCompressionFactories();
- Assert.assertEquals(prefix + "(size)", 1, GenericUtils.size(compressions));
- Assert.assertSame(prefix + "[instance]", expected, compressions.get(0));
+ assertEquals(prefix + "(size)", 1, GenericUtils.size(compressions));
+ assertSame(prefix + "[instance]", expected, compressions.get(0));
}
}
@@ -248,7 +247,7 @@ public class SshConfigFileReaderTest extends BaseTest {
private static <M extends FactoryManager> M validateFactoryManagerCompressions(M manager, String value, boolean lenient) {
NamedFactory<Compression> factory=CompressionConfigValue.fromName(value);
- Assert.assertTrue("Unknown compression: " + value, lenient || (factory != null));
+ assertTrue("Unknown compression: " + value, lenient || (factory != null));
if (factory != null) {
validateFactoryManagerFactories(Compression.class, Collections.singletonList(factory), manager.getCompressionFactories());
}
@@ -269,12 +268,12 @@ public class SshConfigFileReaderTest extends BaseTest {
private static <T extends NamedResource> List<T> testParsedFactoriesList(
List<? extends NamedResource> expected, List<T> actual, Collection<String> unsupported) {
- Assert.assertTrue("Unexpected unsupported factories: " + unsupported, GenericUtils.isEmpty(unsupported));
- Assert.assertEquals("Mismatched list size", expected.size(), GenericUtils.size(actual));
+ assertTrue("Unexpected unsupported factories: " + unsupported, GenericUtils.isEmpty(unsupported));
+ assertEquals("Mismatched list size", expected.size(), GenericUtils.size(actual));
for (int index=0; index < expected.size(); index++) {
NamedResource e=expected.get(index), a=actual.get(index);
String n1=e.getName(), n2=a.getName();
- Assert.assertEquals("Mismatched name at index=" + index, n1, n2);
+ assertEquals("Mismatched name at index=" + index, n1, n2);
}
return actual;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 27c8add..c702d6b 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
@@ -21,14 +21,13 @@ package org.apache.sshd.common.config;
import java.util.concurrent.TimeUnit;
-import org.apache.sshd.util.BaseTest;
-import org.junit.Assert;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Test;
/**
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public class TimeValueConfigTest extends BaseTest {
+public class TimeValueConfigTest extends BaseTestSupport {
public TimeValueConfigTest() {
super();
}
@@ -46,7 +45,7 @@ public class TimeValueConfigTest extends BaseTest {
String s=(String) values[index];
Number expected=(Number) values[index + 1];
long actual=TimeValueConfig.durationOf(s);
- Assert.assertEquals(s, expected.longValue(), actual);
+ assertEquals(s, expected.longValue(), actual);
}
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 55c6b74..94f0a5c 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
@@ -31,17 +31,11 @@ import java.util.Collection;
import java.util.List;
import java.util.Set;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-public class BasePathTest {
+public class BasePathTest extends BaseTestSupport {
private TestFileSystem fileSystem;
@@ -232,12 +226,14 @@ public class BasePathTest {
parsePath("/foo/bar").relativize(parsePath("foo"));
fail();
} catch (IllegalArgumentException expected) {
+ // ignored
}
try {
parsePath("foo").relativize(parsePath("/foo/bar"));
fail();
} catch (IllegalArgumentException expected) {
+ // ignored
}
}
@@ -336,7 +332,7 @@ public class BasePathTest {
@Override
public void close() throws IOException {
-
+ // ignored
}
@Override
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 145088f..047b70a 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
@@ -18,14 +18,12 @@
*/
package org.apache.sshd.common.future;
-import org.apache.sshd.util.BaseTest;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Test;
-import static junit.framework.Assert.assertNotNull;
-
/**
*/
-public class FutureTest extends BaseTest {
+public class FutureTest extends BaseTestSupport {
@Test
public void testAwaitUnint() {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 04d17a5..c921e03 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
@@ -31,15 +31,14 @@ import java.util.Set;
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.BaseTest;
-import org.junit.Assert;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Test;
import org.mockito.Mockito;
/**
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public class BuiltinDHFactoriesTest extends BaseTest {
+public class BuiltinDHFactoriesTest extends BaseTestSupport {
public BuiltinDHFactoriesTest() {
super();
}
@@ -49,7 +48,7 @@ public class BuiltinDHFactoriesTest extends BaseTest {
for (BuiltinDHFactories expected : BuiltinDHFactories.VALUES) {
String name = expected.getName();
BuiltinDHFactories actual = BuiltinDHFactories.fromFactoryName(name);
- Assert.assertSame(name, expected, actual);
+ assertSame(name, expected, actual);
}
}
@@ -60,11 +59,11 @@ public class BuiltinDHFactoriesTest extends BaseTest {
for (Field f : fields) {
String name=(String) f.get(null);
BuiltinDHFactories value=BuiltinDHFactories.fromFactoryName(name);
- Assert.assertNotNull("No match found for " + name, value);
- Assert.assertTrue(name + " re-specified", avail.add(value));
+ assertNotNull("No match found for " + name, value);
+ assertTrue(name + " re-specified", avail.add(value));
}
- Assert.assertEquals("Incomplete coverage", BuiltinDHFactories.VALUES, avail);
+ assertEquals("Incomplete coverage", BuiltinDHFactories.VALUES, avail);
}
@Test
@@ -108,7 +107,7 @@ public class BuiltinDHFactoriesTest extends BaseTest {
for (DHFactory expected : BuiltinDHFactories.VALUES) {
String name=expected.getName();
DHFactory actual=BuiltinDHFactories.resolveFactory(name);
- Assert.assertSame(name, expected, actual);
+ assertSame(name, expected, actual);
}
}
@@ -117,7 +116,7 @@ public class BuiltinDHFactoriesTest extends BaseTest {
for (DHFactory expected : BuiltinDHFactories.VALUES) {
try {
BuiltinDHFactories.registerExtension(expected);
- Assert.fail("Unexpected sucess for " + expected.getName());
+ fail("Unexpected sucess for " + expected.getName());
} catch(IllegalArgumentException e) {
// expected - ignored
}
@@ -133,7 +132,7 @@ public class BuiltinDHFactoriesTest extends BaseTest {
try {
for (int index=1; index <= Byte.SIZE; index++) {
BuiltinDHFactories.registerExtension(expected);
- Assert.assertEquals("Unexpected success at attempt #" + index, 1, index);
+ assertEquals("Unexpected success at attempt #" + index, 1, index);
}
} finally {
BuiltinDHFactories.unregisterExtension(name);
@@ -147,15 +146,15 @@ public class BuiltinDHFactoriesTest extends BaseTest {
String name=expected.getName();
try {
- Assert.assertNull("Extension already registered", BuiltinDHFactories.resolveFactory(name));
+ assertNull("Extension already registered", BuiltinDHFactories.resolveFactory(name));
BuiltinDHFactories.registerExtension(expected);
DHFactory actual=BuiltinDHFactories.resolveFactory(name);
- Assert.assertSame("Mismatched resolved instance", expected, actual);
+ assertSame("Mismatched resolved instance", expected, actual);
} finally {
DHFactory actual=BuiltinDHFactories.unregisterExtension(name);
- Assert.assertSame("Mismatched unregistered instance", expected, actual);
- Assert.assertNull("Extension not un-registered", BuiltinDHFactories.resolveFactory(name));
+ assertSame("Mismatched unregistered instance", expected, actual);
+ assertNull("Extension not un-registered", BuiltinDHFactories.resolveFactory(name));
}
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 a93f73e..6fd7d58 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
@@ -33,15 +33,14 @@ import org.apache.sshd.common.NamedFactory;
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.BaseTest;
-import org.junit.Assert;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Test;
import org.mockito.Mockito;
/**
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public class BuiltinMacsTest extends BaseTest {
+public class BuiltinMacsTest extends BaseTestSupport {
public BuiltinMacsTest() {
super();
}
@@ -51,7 +50,7 @@ public class BuiltinMacsTest extends BaseTest {
for (BuiltinMacs expected : BuiltinMacs.VALUES) {
String name = expected.getName();
BuiltinMacs actual = BuiltinMacs.fromFactoryName(name);
- Assert.assertSame(name, expected, actual);
+ assertSame(name, expected, actual);
}
}
@@ -62,11 +61,11 @@ public class BuiltinMacsTest extends BaseTest {
for (Field f : fields) {
String name=(String) f.get(null);
BuiltinMacs value=BuiltinMacs.fromFactoryName(name);
- Assert.assertNotNull("No match found for " + name, value);
- Assert.assertTrue(name + " re-specified", avail.add(value));
+ assertNotNull("No match found for " + name, value);
+ assertTrue(name + " re-specified", avail.add(value));
}
- Assert.assertEquals("Incomplete coverage", BuiltinMacs.VALUES, avail);
+ assertEquals("Incomplete coverage", BuiltinMacs.VALUES, avail);
}
@Test
@@ -110,7 +109,7 @@ public class BuiltinMacsTest extends BaseTest {
for (MacFactory expected : BuiltinMacs.VALUES) {
String name=expected.getName();
MacFactory actual=BuiltinMacs.resolveFactory(name);
- Assert.assertSame(name, expected, actual);
+ assertSame(name, expected, actual);
}
}
@@ -119,7 +118,7 @@ public class BuiltinMacsTest extends BaseTest {
for (MacFactory expected : BuiltinMacs.VALUES) {
try {
BuiltinMacs.registerExtension(expected);
- Assert.fail("Unexpected sucess for " + expected.getName());
+ fail("Unexpected sucess for " + expected.getName());
} catch(IllegalArgumentException e) {
// expected - ignored
}
@@ -135,7 +134,7 @@ public class BuiltinMacsTest extends BaseTest {
try {
for (int index=1; index <= Byte.SIZE; index++) {
BuiltinMacs.registerExtension(expected);
- Assert.assertEquals("Unexpected success at attempt #" + index, 1, index);
+ assertEquals("Unexpected success at attempt #" + index, 1, index);
}
} finally {
BuiltinMacs.unregisterExtension(name);
@@ -149,27 +148,27 @@ public class BuiltinMacsTest extends BaseTest {
String name=expected.getName();
try {
- Assert.assertNull("Extension already registered", BuiltinMacs.resolveFactory(name));
+ assertNull("Extension already registered", BuiltinMacs.resolveFactory(name));
BuiltinMacs.registerExtension(expected);
MacFactory actual=BuiltinMacs.resolveFactory(name);
- Assert.assertSame("Mismatched resolved instance", expected, actual);
+ assertSame("Mismatched resolved instance", expected, actual);
} finally {
MacFactory actual=BuiltinMacs.unregisterExtension(name);
- Assert.assertSame("Mismatched unregistered instance", expected, actual);
- Assert.assertNull("Extension not un-registered", BuiltinMacs.resolveFactory(name));
+ assertSame("Mismatched unregistered instance", expected, actual);
+ assertNull("Extension not un-registered", BuiltinMacs.resolveFactory(name));
}
}
@Test
public void testFac2NamedTransformer() {
- Assert.assertNull("Invalid null transformation", MacFactory.FAC2NAMED.transform(null));
+ assertNull("Invalid null transformation", MacFactory.FAC2NAMED.transform(null));
for (MacFactory expected : BuiltinMacs.VALUES) {
NamedFactory<Mac> actual=MacFactory.FAC2NAMED.transform(expected);
- Assert.assertSame("Mismatched transformed instance for " + expected.getName(), expected, actual);
+ assertSame("Mismatched transformed instance for " + expected.getName(), expected, actual);
}
MacFactory mock=Mockito.mock(MacFactory.class);
- Assert.assertSame("Mismatched transformed mocked instance", mock, MacFactory.FAC2NAMED.transform(mock));
+ assertSame("Mismatched transformed mocked instance", mock, MacFactory.FAC2NAMED.transform(mock));
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 155c7c8..5f1d35d 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
@@ -30,15 +30,14 @@ import org.apache.sshd.common.NamedResource;
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.BaseTest;
-import org.junit.Assert;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Test;
import org.mockito.Mockito;
/**
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public class BuiltinSignaturesTest extends BaseTest {
+public class BuiltinSignaturesTest extends BaseTestSupport {
public BuiltinSignaturesTest() {
super();
}
@@ -48,7 +47,7 @@ public class BuiltinSignaturesTest extends BaseTest {
for (BuiltinSignatures expected : BuiltinSignatures.VALUES) {
String name = expected.getName();
BuiltinSignatures actual = BuiltinSignatures.fromFactoryName(name);
- Assert.assertSame(name, expected, actual);
+ assertSame(name, expected, actual);
}
}
@@ -93,7 +92,7 @@ public class BuiltinSignaturesTest extends BaseTest {
for (SignatureFactory expected : BuiltinSignatures.VALUES) {
String name=expected.getName();
SignatureFactory actual=BuiltinSignatures.resolveFactory(name);
- Assert.assertSame(name, expected, actual);
+ assertSame(name, expected, actual);
}
}
@@ -102,7 +101,7 @@ public class BuiltinSignaturesTest extends BaseTest {
for (SignatureFactory expected : BuiltinSignatures.VALUES) {
try {
BuiltinSignatures.registerExtension(expected);
- Assert.fail("Unexpected sucess for " + expected.getName());
+ fail("Unexpected sucess for " + expected.getName());
} catch(IllegalArgumentException e) {
// expected - ignored
}
@@ -118,7 +117,7 @@ public class BuiltinSignaturesTest extends BaseTest {
try {
for (int index=1; index <= Byte.SIZE; index++) {
BuiltinSignatures.registerExtension(expected);
- Assert.assertEquals("Unexpected success at attempt #" + index, 1, index);
+ assertEquals("Unexpected success at attempt #" + index, 1, index);
}
} finally {
BuiltinSignatures.unregisterExtension(name);
@@ -132,27 +131,27 @@ public class BuiltinSignaturesTest extends BaseTest {
String name=expected.getName();
try {
- Assert.assertNull("Extension already registered", BuiltinSignatures.resolveFactory(name));
+ assertNull("Extension already registered", BuiltinSignatures.resolveFactory(name));
BuiltinSignatures.registerExtension(expected);
SignatureFactory actual=BuiltinSignatures.resolveFactory(name);
- Assert.assertSame("Mismatched resolved instance", expected, actual);
+ assertSame("Mismatched resolved instance", expected, actual);
} finally {
SignatureFactory actual=BuiltinSignatures.unregisterExtension(name);
- Assert.assertSame("Mismatched unregistered instance", expected, actual);
- Assert.assertNull("Extension not un-registered", BuiltinSignatures.resolveFactory(name));
+ assertSame("Mismatched unregistered instance", expected, actual);
+ assertNull("Extension not un-registered", BuiltinSignatures.resolveFactory(name));
}
}
@Test
public void testFac2NamedTransformer() {
- Assert.assertNull("Invalid null transformation", SignatureFactory.FAC2NAMED.transform(null));
+ assertNull("Invalid null transformation", SignatureFactory.FAC2NAMED.transform(null));
for (SignatureFactory expected : BuiltinSignatures.VALUES) {
NamedFactory<Signature> actual=SignatureFactory.FAC2NAMED.transform(expected);
- Assert.assertSame("Mismatched transformed instance for " + expected.getName(), expected, actual);
+ assertSame("Mismatched transformed instance for " + expected.getName(), expected, actual);
}
SignatureFactory mock=Mockito.mock(SignatureFactory.class);
- Assert.assertSame("Mismatched transformed mocked instance", mock, SignatureFactory.FAC2NAMED.transform(mock));
+ assertSame("Mismatched transformed mocked instance", mock, SignatureFactory.FAC2NAMED.transform(mock));
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 481c117..a8dc3c6 100644
--- a/sshd-core/src/test/java/org/apache/sshd/common/util/BufferTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/common/util/BufferTest.java
@@ -18,17 +18,15 @@
*/
package org.apache.sshd.common.util;
-import static org.junit.Assert.assertEquals;
-
import java.io.ByteArrayOutputStream;
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.BaseTest;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Test;
-public class BufferTest extends BaseTest {
+public class BufferTest extends BaseTestSupport {
@Test
public void testGetLong() throws Exception {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 3bb8994..518cf6b 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
@@ -28,14 +28,13 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.sshd.common.Closeable;
import org.apache.sshd.common.future.CloseFuture;
import org.apache.sshd.common.future.DefaultCloseFuture;
-import org.apache.sshd.util.BaseTest;
-import org.junit.Assert;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Test;
/**
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public class CloseableUtilsTest extends BaseTest {
+public class CloseableUtilsTest extends BaseTestSupport {
public CloseableUtilsTest() {
super();
}
@@ -43,15 +42,18 @@ public class CloseableUtilsTest extends BaseTest {
@Test
public void testCloseImmediateNotCalledIfAlreadyClosed() throws IOException {
Closeable closeable=new CloseableUtils.IoBaseCloseable() {
+ @Override
public CloseFuture close(boolean immediately) {
- Assert.fail("Unexpected call to close(" + immediately + ")");
+ fail("Unexpected call to close(" + immediately + ")");
return null;
}
+ @Override
public boolean isClosed() {
return true;
}
+ @Override
public boolean isClosing() {
return false;
}
@@ -62,15 +64,18 @@ public class CloseableUtilsTest extends BaseTest {
@Test
public void testCloseImmediateNotCalledIfIsClosing() throws IOException {
Closeable closeable=new CloseableUtils.IoBaseCloseable() {
+ @Override
public CloseFuture close(boolean immediately) {
- Assert.fail("Unexpected call to close(" + immediately + ")");
+ fail("Unexpected call to close(" + immediately + ")");
return null;
}
+ @Override
public boolean isClosed() {
return false;
}
+ @Override
public boolean isClosing() {
return true;
}
@@ -83,16 +88,19 @@ public class CloseableUtilsTest extends BaseTest {
final DefaultCloseFuture future=new DefaultCloseFuture(this);
final AtomicInteger callsCount=new AtomicInteger(0);
final Closeable closeable=new CloseableUtils.IoBaseCloseable() {
+ @Override
public CloseFuture close(boolean immediately) {
- Assert.assertTrue("Closure is not immediate", immediately);
- Assert.assertEquals("Multiple close immediate calls", 1, callsCount.incrementAndGet());
+ assertTrue("Closure is not immediate", immediately);
+ assertEquals("Multiple close immediate calls", 1, callsCount.incrementAndGet());
return future;
}
+ @Override
public boolean isClosed() {
return false;
}
+ @Override
public boolean isClosing() {
return false;
}
@@ -100,6 +108,7 @@ public class CloseableUtilsTest extends BaseTest {
ExecutorService service=ThreadUtils.newSingleThreadExecutor(getCurrentTestName());
try {
Future<?> task=service.submit(new Runnable() {
+ @Override
public void run() {
try {
closeable.close();
@@ -110,7 +119,7 @@ public class CloseableUtilsTest extends BaseTest {
});
future.setClosed(); // signal close complete
task.get(5L, TimeUnit.SECONDS); // make sure #await call terminated
- Assert.assertEquals("Close immediate not called", 1, callsCount.get());
+ assertEquals("Close immediate not called", 1, callsCount.get());
} finally {
service.shutdownNow();
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 862e2b7..778bcde 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
@@ -23,14 +23,13 @@ import java.util.ArrayList;
import java.util.EventListener;
import java.util.List;
-import org.apache.sshd.util.BaseTest;
-import org.junit.Assert;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Test;
/**
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public class EventListenerUtilsTest extends BaseTest {
+public class EventListenerUtilsTest extends BaseTestSupport {
public EventListenerUtilsTest() {
super();
}
@@ -51,8 +50,8 @@ public class EventListenerUtilsTest extends BaseTest {
for (int index = 0; index < impls.size(); index++) {
ProxyListenerImpl l = impls.get(index);
- Assert.assertSame("Mismatched string at listener #" + index, expStr, l.getStringValue());
- Assert.assertSame("Mismatched number at listener #" + index, expNum, l.getNumberValue());
+ assertSame("Mismatched string at listener #" + index, expStr, l.getStringValue());
+ assertSame("Mismatched number at listener #" + index, expNum, l.getNumberValue());
}
}
@@ -70,6 +69,7 @@ public class EventListenerUtilsTest extends BaseTest {
return strValue;
}
+ @Override
public void callMeWithString(String s) {
strValue = s;
}
@@ -78,6 +78,7 @@ public class EventListenerUtilsTest extends BaseTest {
return numValue;
}
+ @Override
public void callMeWithNumber(Number n) {
numValue = n;
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 3a9b035..1b594f5 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
@@ -23,14 +23,13 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.sshd.util.BaseTest;
-import org.junit.Assert;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Test;
/**
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public class GenericUtilsTest extends BaseTest {
+public class GenericUtilsTest extends BaseTestSupport {
public GenericUtilsTest() {
super();
}
@@ -45,12 +44,12 @@ public class GenericUtilsTest extends BaseTest {
String sep=String.valueOf(ch);
String s=GenericUtils.join(expected, sep);
String[] actual=GenericUtils.split(s, ch);
- Assert.assertEquals("Mismatched split length for separator=" + sep, expected.size(), GenericUtils.length((Object[]) actual));
+ assertEquals("Mismatched split length for separator=" + sep, expected.size(), GenericUtils.length((Object[]) actual));
for (int index=0; index < actual.length; index++) {
String e=expected.get(index), a=actual[index];
if (!e.endsWith(a)) {
- Assert.fail("Mismatched value at index=" + index + " for separator=" + sep + ": expected=" + e + ", actual=" + a);
+ fail("Mismatched value at index=" + index + " for separator=" + sep + ": expected=" + e + ", actual=" + a);
}
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 31d4811..18fe689 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
@@ -23,7 +23,7 @@ import java.io.Reader;
import java.util.Map;
import org.apache.sshd.common.PtyMode;
-import org.apache.sshd.util.BaseTest;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Test;
/**
@@ -31,7 +31,7 @@ import org.junit.Test;
*
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public class SttySupportTest extends BaseTest {
+public class SttySupportTest extends BaseTestSupport {
@Test
public void parseOutput1() throws Exception {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 cb05322..7af65d5 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
@@ -23,14 +23,13 @@ import java.util.Collection;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import org.apache.sshd.util.BaseTest;
-import org.junit.Assert;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Test;
/**
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public class ThreadUtilsTest extends BaseTest {
+public class ThreadUtilsTest extends BaseTestSupport {
public ThreadUtilsTest() {
super();
}
@@ -38,25 +37,25 @@ public class ThreadUtilsTest extends BaseTest {
@Test
public void testProtectExecutorServiceShutdown() {
for (boolean shutdownOnExit : new boolean[] { true, false }) {
- Assert.assertNull("Unexpected instance for shutdown=" + shutdownOnExit, ThreadUtils.protectExecutorServiceShutdown(null, shutdownOnExit));
+ assertNull("Unexpected instance for shutdown=" + shutdownOnExit, ThreadUtils.protectExecutorServiceShutdown(null, shutdownOnExit));
}
ExecutorService service=Executors.newSingleThreadExecutor();
try {
- Assert.assertSame("Unexpected wrapped instance", service, ThreadUtils.protectExecutorServiceShutdown(service, true));
+ assertSame("Unexpected wrapped instance", service, ThreadUtils.protectExecutorServiceShutdown(service, true));
ExecutorService wrapped=ThreadUtils.protectExecutorServiceShutdown(service, false);
try {
- Assert.assertNotSame("No wrapping occurred", service, wrapped);
+ assertNotSame("No wrapping occurred", service, wrapped);
wrapped.shutdown();
- Assert.assertTrue("Wrapped service not shutdown", wrapped.isShutdown());
- Assert.assertFalse("Protected service is shutdown", service.isShutdown());
+ assertTrue("Wrapped service not shutdown", wrapped.isShutdown());
+ assertFalse("Protected service is shutdown", service.isShutdown());
Collection<?> running=wrapped.shutdownNow();
- Assert.assertTrue("Non-empty runners list", running.isEmpty());
- Assert.assertTrue("Wrapped service not shutdownNow", wrapped.isShutdown());
- Assert.assertFalse("Protected service is shutdownNow", service.isShutdown());
+ assertTrue("Non-empty runners list", running.isEmpty());
+ assertTrue("Wrapped service not shutdownNow", wrapped.isShutdown());
+ assertFalse("Protected service is shutdownNow", service.isShutdown());
} finally {
wrapped.shutdownNow(); // just in case
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 8e8b9a3..af9d7ee 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
@@ -19,12 +19,12 @@
package org.apache.sshd.common.util;
-import org.apache.sshd.util.BaseTest;
+import org.apache.sshd.util.BaseTestSupport;
/**
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public class ValidateUtilsTest extends BaseTest {
+public class ValidateUtilsTest extends BaseTestSupport {
public ValidateUtilsTest() {
super();
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java b/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java
index f2dfc68..a15a3ab 100644
--- a/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java
+++ b/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java
@@ -43,10 +43,12 @@ public class ClientUserAuthServiceOld extends CloseableUtils.AbstractCloseable i
public static class Factory implements ServiceFactory {
+ @Override
public String getName() {
return "ssh-userauth";
}
+ @Override
public Service create(Session session) throws IOException {
return new ClientUserAuthServiceOld(session);
}
@@ -79,10 +81,12 @@ public class ClientUserAuthServiceOld extends CloseableUtils.AbstractCloseable i
authFuture = new DefaultAuthFuture(lock);
}
+ @Override
public ClientSessionImpl getSession() {
return session;
}
+ @Override
public void start() {
synchronized (lock) {
log.debug("accepted");
@@ -91,6 +95,7 @@ public class ClientUserAuthServiceOld extends CloseableUtils.AbstractCloseable i
}
}
+ @Override
public void process(byte cmd, Buffer buffer) throws Exception {
if (this.authFuture.isSuccess()) {
throw new IllegalStateException("UserAuth message delivered to authenticated client");
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java
index 126b1b3..918db97 100644
--- a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java
+++ b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java
@@ -18,15 +18,19 @@
*/
package org.apache.sshd.deprecated;
+import static org.apache.sshd.common.SshConstants.SSH_MSG_USERAUTH_FAILURE;
+import static org.apache.sshd.common.SshConstants.SSH_MSG_USERAUTH_INFO_REQUEST;
+import static org.apache.sshd.common.SshConstants.SSH_MSG_USERAUTH_INFO_RESPONSE;
+import static org.apache.sshd.common.SshConstants.SSH_MSG_USERAUTH_SUCCESS;
+
import java.io.IOException;
+import java.util.Arrays;
import org.apache.sshd.client.UserInteraction;
import org.apache.sshd.client.session.ClientSessionImpl;
import org.apache.sshd.common.SshConstants;
import org.apache.sshd.common.util.buffer.Buffer;
-import static org.apache.sshd.common.SshConstants.*;
-
/**
* Userauth with keyboard-interactive method.
*
@@ -42,6 +46,7 @@ public class UserAuthKeyboardInteractive extends AbstractUserAuth {
this.password = password;
}
+ @Override
public Result next(Buffer buffer) throws IOException {
if (buffer == null) {
log.debug("Send SSH_MSG_USERAUTH_REQUEST for password");
@@ -69,7 +74,7 @@ public class UserAuthKeyboardInteractive extends AbstractUserAuth {
prompt[i] = buffer.getString();
echo[i] = (buffer.getByte() != 0);
}
- log.debug("Promt: {}", prompt);
+ log.debug("Promt: {}", Arrays.toString(prompt));
log.debug("Echo: {}", echo);
String[] rep = null;
@@ -102,7 +107,7 @@ public class UserAuthKeyboardInteractive extends AbstractUserAuth {
log.debug("Received SSH_MSG_USERAUTH_FAILURE");
return Result.Failure;
default:
- log.debug("Received unknown packet {}", cmd);
+ log.debug("Received unknown packet {}", Byte.valueOf(cmd));
return Result.Continued;
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPassword.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPassword.java b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPassword.java
index 43aec24..60ac764 100644
--- a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPassword.java
+++ b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPassword.java
@@ -42,6 +42,7 @@ public class UserAuthPassword extends AbstractUserAuth {
this.password = password;
}
+ @Override
public Result next(Buffer buffer) throws IOException {
if (buffer == null) {
log.debug("Send SSH_MSG_USERAUTH_REQUEST for password");
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 15bb12c..447413e 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
@@ -18,9 +18,6 @@
*/
package org.apache.sshd.server.channel;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import java.io.IOException;
import java.util.Collection;
@@ -29,11 +26,11 @@ import org.apache.sshd.common.util.buffer.Buffer;
import org.apache.sshd.common.util.buffer.ByteArrayBuffer;
import org.apache.sshd.server.Signal;
import org.apache.sshd.server.SignalListener;
-import org.apache.sshd.util.BaseTest;
+import org.apache.sshd.util.BaseTestSupport;
import org.apache.sshd.util.BogusChannel;
import org.junit.Test;
-public class ChannelSessionTest extends BaseTest {
+public class ChannelSessionTest extends BaseTestSupport {
private boolean expanded = false;
@@ -45,16 +42,18 @@ public class ChannelSessionTest extends BaseTest {
final Buffer buffer = new ByteArrayBuffer();
buffer.putInt(1234);
- final ChannelSession channelSession = new ChannelSession();
- channelSession.asyncOut = new ChannelAsyncOutputStream(new BogusChannel(), (byte) 0) {
- @Override
- public void onWindowExpanded() throws IOException {
- expanded = true;
- super.onWindowExpanded();
- }
- };
- channelSession.handleWindowAdjust(buffer);
- assertTrue(expanded);
+ try(ChannelSession channelSession = new ChannelSession()) {
+ channelSession.asyncOut = new ChannelAsyncOutputStream(new BogusChannel(), (byte) 0) {
+ @SuppressWarnings("synthetic-access")
+ @Override
+ public void onWindowExpanded() throws IOException {
+ expanded = true;
+ super.onWindowExpanded();
+ }
+ };
+ channelSession.handleWindowAdjust(buffer);
+ assertTrue(expanded);
+ }
}
@Test
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 5c497c5..0bba1d4 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
@@ -23,15 +23,14 @@ import java.util.concurrent.ExecutorService;
import org.apache.sshd.common.scp.ScpHelper;
import org.apache.sshd.server.CommandFactory;
-import org.apache.sshd.util.BaseTest;
-import org.junit.Assert;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Test;
import org.mockito.Mockito;
/**
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public class ScpCommandFactoryTest extends BaseTest {
+public class ScpCommandFactoryTest extends BaseTestSupport {
public ScpCommandFactoryTest() {
super();
}
@@ -43,11 +42,11 @@ public class ScpCommandFactoryTest extends BaseTest {
@Test
public void testBuilderDefaultFactoryValues() {
ScpCommandFactory factory = new ScpCommandFactory.Builder().build();
- Assert.assertNull("Mismatched delegate", factory.getDelegateCommandFactory());
- Assert.assertNull("Mismatched executor", factory.getExecutorService());
- Assert.assertEquals("Mismatched send size", ScpHelper.MIN_SEND_BUFFER_SIZE, factory.getSendBufferSize());
- Assert.assertEquals("Mismatched receive size", ScpHelper.MIN_RECEIVE_BUFFER_SIZE, factory.getReceiveBufferSize());
- Assert.assertFalse("Mismatched shutdown state", factory.isShutdownOnExit());
+ assertNull("Mismatched delegate", factory.getDelegateCommandFactory());
+ assertNull("Mismatched executor", factory.getExecutorService());
+ assertEquals("Mismatched send size", ScpHelper.MIN_SEND_BUFFER_SIZE, factory.getSendBufferSize());
+ assertEquals("Mismatched receive size", ScpHelper.MIN_RECEIVE_BUFFER_SIZE, factory.getReceiveBufferSize());
+ assertFalse("Mismatched shutdown state", factory.isShutdownOnExit());
}
/**
@@ -65,11 +64,11 @@ public class ScpCommandFactoryTest extends BaseTest {
.withReceiveBufferSize(receiveSize)
.withShutdownOnExit(true)
.build();
- Assert.assertSame("Mismatched delegate", delegate, factory.getDelegateCommandFactory());
- Assert.assertSame("Mismatched executor", service, factory.getExecutorService());
- Assert.assertEquals("Mismatched send size", sendSize, factory.getSendBufferSize());
- Assert.assertEquals("Mismatched receive size", receiveSize, factory.getReceiveBufferSize());
- Assert.assertTrue("Mismatched shutdown state", factory.isShutdownOnExit());
+ assertSame("Mismatched delegate", delegate, factory.getDelegateCommandFactory());
+ assertSame("Mismatched executor", service, factory.getExecutorService());
+ assertEquals("Mismatched send size", sendSize, factory.getSendBufferSize());
+ assertEquals("Mismatched receive size", receiveSize, factory.getReceiveBufferSize());
+ assertTrue("Mismatched shutdown state", factory.isShutdownOnExit());
}
/**
@@ -90,11 +89,11 @@ public class ScpCommandFactoryTest extends BaseTest {
ScpCommandFactory.Builder builder = new ScpCommandFactory.Builder();
ScpCommandFactory f1 = builder.withDelegate(dummyFactory()).build();
ScpCommandFactory f2 = builder.build();
- Assert.assertNotSame("No new instance built", f1, f2);
- Assert.assertSame("Mismatched delegate", f1.getDelegateCommandFactory(), f2.getDelegateCommandFactory());
+ assertNotSame("No new instance built", f1, f2);
+ assertSame("Mismatched delegate", f1.getDelegateCommandFactory(), f2.getDelegateCommandFactory());
ScpCommandFactory f3=builder.withDelegate(dummyFactory()).build();
- Assert.assertNotSame("Delegate not changed", f1.getDelegateCommandFactory(), f3.getDelegateCommandFactory());
+ assertNotSame("Delegate not changed", f1.getDelegateCommandFactory(), f3.getDelegateCommandFactory());
}
private static ExecutorService dummyExecutor() {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 69691d4..e700b52 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
@@ -33,26 +33,22 @@ import javax.security.auth.login.Configuration;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
-import org.apache.sshd.util.BaseTest;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
/**
* TODO Add javadoc
*
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public class JaasPasswordAuthenticatorTest extends BaseTest {
+public class JaasPasswordAuthenticatorTest extends BaseTestSupport {
@Before
public void setUp() {
Configuration config = new Configuration() {
+ @Override
public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
return new AppConfigurationEntry[] {
new AppConfigurationEntry(DummyLoginModule.class.getName(),
@@ -60,7 +56,9 @@ public class JaasPasswordAuthenticatorTest extends BaseTest {
new HashMap<String,Object>())
};
}
+ @Override
public void refresh() {
+ // ignored
}
};
Configuration.setConfiguration(config);
@@ -90,11 +88,13 @@ public class JaasPasswordAuthenticatorTest extends BaseTest {
public DummyLoginModule() {
}
+ @Override
public void initialize(Subject subject, CallbackHandler callbackHandler, Map<String, ?> sharedState, Map<String, ?> options) {
this.subject = subject;
this.callbackHandler = callbackHandler;
}
+ @Override
public boolean login() throws LoginException {
Callback[] callbacks = new Callback[2];
callbacks[0] = new NameCallback("Username: ");
@@ -111,14 +111,17 @@ public class JaasPasswordAuthenticatorTest extends BaseTest {
return user.equals(new String(tmpPassword));
}
+ @Override
public boolean commit() throws LoginException {
return true;
}
+ @Override
public boolean abort() throws LoginException {
return true;
}
+ @Override
public boolean logout() throws LoginException {
return true;
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 73cd8c4..84427c7 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
@@ -18,20 +18,18 @@
*/
package org.apache.sshd.server.keyprovider;
-import static org.junit.Assert.assertEquals;
-
import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
import java.security.KeyPair;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.sshd.util.BaseTest;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-public class AbstractGeneratorHostKeyProviderTest extends BaseTest {
+public class AbstractGeneratorHostKeyProviderTest extends BaseTestSupport {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 33a0c82..39fb3e7 100644
--- a/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProviderTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/PEMGeneratorHostKeyProviderTest.java
@@ -18,9 +18,6 @@
*/
package org.apache.sshd.server.keyprovider;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
import java.io.File;
import java.security.KeyPair;
import java.security.PublicKey;
@@ -30,7 +27,7 @@ import java.security.spec.ECGenParameterSpec;
import org.apache.sshd.common.KeyPairProvider;
import org.apache.sshd.common.util.SecurityUtils;
-import org.apache.sshd.util.BaseTest;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Assume;
import org.junit.Test;
@@ -39,7 +36,7 @@ import org.junit.Test;
*
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public class PEMGeneratorHostKeyProviderTest extends BaseTest {
+public class PEMGeneratorHostKeyProviderTest extends BaseTestSupport {
@Test
public void testDSA() {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 67bc71a..8c8d352 100644
--- a/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProviderTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/server/keyprovider/SimpleGeneratorHostKeyProviderTest.java
@@ -18,9 +18,6 @@
*/
package org.apache.sshd.server.keyprovider;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
import java.io.File;
import java.security.KeyPair;
import java.security.spec.AlgorithmParameterSpec;
@@ -28,7 +25,7 @@ import java.security.spec.ECGenParameterSpec;
import org.apache.sshd.common.KeyPairProvider;
import org.apache.sshd.common.util.SecurityUtils;
-import org.apache.sshd.util.BaseTest;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Assume;
import org.junit.Test;
@@ -37,7 +34,7 @@ import org.junit.Test;
*
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public class SimpleGeneratorHostKeyProviderTest extends BaseTest {
+public class SimpleGeneratorHostKeyProviderTest extends BaseTestSupport {
@Test
public void testDSA() {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 dcd9fcb..157b3fa 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
@@ -21,15 +21,14 @@ package org.apache.sshd.server.sftp;
import java.util.concurrent.ExecutorService;
-import org.apache.sshd.util.BaseTest;
-import org.junit.Assert;
+import org.apache.sshd.util.BaseTestSupport;
import org.junit.Test;
import org.mockito.Mockito;
/**
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public class SftpSubsystemFactoryTest extends BaseTest {
+public class SftpSubsystemFactoryTest extends BaseTestSupport {
public SftpSubsystemFactoryTest() {
super();
}
@@ -41,9 +40,9 @@ public class SftpSubsystemFactoryTest extends BaseTest {
@Test
public void testBuilderDefaultFactoryValues() {
SftpSubsystemFactory factory = new SftpSubsystemFactory.Builder().build();
- Assert.assertNull("Mismatched executor", factory.getExecutorService());
- Assert.assertFalse("Mismatched shutdown state", factory.isShutdownOnExit());
- Assert.assertSame("Mismatched unsupported attribute policy", SftpSubsystemFactory.DEFAULT_POLICY, factory.getUnsupportedAttributePolicy());
+ assertNull("Mismatched executor", factory.getExecutorService());
+ assertFalse("Mismatched shutdown state", factory.isShutdownOnExit());
+ assertSame("Mismatched unsupported attribute policy", SftpSubsystemFactory.DEFAULT_POLICY, factory.getUnsupportedAttributePolicy());
}
/**
@@ -56,12 +55,12 @@ public class SftpSubsystemFactoryTest extends BaseTest {
SftpSubsystemFactory factory = builder.withExecutorService(service)
.withShutdownOnExit(true)
.build();
- Assert.assertSame("Mismatched executor", service, factory.getExecutorService());
- Assert.assertTrue("Mismatched shutdown state", factory.isShutdownOnExit());
+ assertSame("Mismatched executor", service, factory.getExecutorService());
+ assertTrue("Mismatched shutdown state", factory.isShutdownOnExit());
for (UnsupportedAttributePolicy policy : UnsupportedAttributePolicy.VALUES) {
SftpSubsystemFactory actual = builder.withUnsupportedAttributePolicy(policy).build();
- Assert.assertSame("Mismatched unsupported attribute policy", policy, actual.getUnsupportedAttributePolicy());
+ assertSame("Mismatched unsupported attribute policy", policy, actual.getUnsupportedAttributePolicy());
}
}
@@ -83,11 +82,11 @@ public class SftpSubsystemFactoryTest extends BaseTest {
SftpSubsystemFactory.Builder builder = new SftpSubsystemFactory.Builder();
SftpSubsystemFactory f1 = builder.withExecutorService(dummyExecutor()).build();
SftpSubsystemFactory f2 = builder.build();
- Assert.assertNotSame("No new instance built", f1, f2);
- Assert.assertSame("Mismatched executors", f1.getExecutorService(), f2.getExecutorService());
+ assertNotSame("No new instance built", f1, f2);
+ assertSame("Mismatched executors", f1.getExecutorService(), f2.getExecutorService());
SftpSubsystemFactory f3 = builder.withExecutorService(dummyExecutor()).build();
- Assert.assertNotSame("Executor service not changed", f1.getExecutorService(), f3.getExecutorService());
+ assertNotSame("Executor service not changed", f1.getExecutorService(), f3.getExecutorService());
}
private static ExecutorService dummyExecutor() {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/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 b153ff1..40922cc 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
@@ -21,15 +21,13 @@ package org.apache.sshd.server.shell;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import org.apache.sshd.util.BaseTest;
+import org.apache.sshd.util.BaseTestSupport;
import org.apache.sshd.util.BogusEnvironment;
import org.apache.sshd.util.BogusExitCallback;
import org.apache.sshd.util.BogusInvertedShell;
import org.junit.Test;
-import static junit.framework.Assert.assertEquals;
-
-public class InvertedShellWrapperTest extends BaseTest {
+public class InvertedShellWrapperTest extends BaseTestSupport {
@Test
public void testStreamsAreFlushedBeforeClosing() throws Exception {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bd1d975a/sshd-core/src/test/java/org/apache/sshd/util/AsyncEchoShellFactory.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/util/AsyncEchoShellFactory.java b/sshd-core/src/test/java/org/apache/sshd/util/AsyncEchoShellFactory.java
index dc86ab9..f1bbe1d 100644
--- a/sshd-core/src/test/java/org/apache/sshd/util/AsyncEchoShellFactory.java
+++ b/sshd-core/src/test/java/org/apache/sshd/util/AsyncEchoShellFactory.java
@@ -73,18 +73,22 @@ public class AsyncEchoShellFactory implements Factory<Command> {
@Override
public void setInputStream(InputStream in) {
+ // ignored
}
@Override
public void setOutputStream(OutputStream out) {
+ // ignored
}
@Override
public void setErrorStream(OutputStream err) {
+ // ignored
}
@Override
public void setIoInputStream(IoInputStream in) {
+ // ignored
}
@Override
@@ -116,6 +120,7 @@ public class AsyncEchoShellFactory implements Factory<Command> {
@Override
public void close() throws IOException {
out.close(false).addListener(new SshFutureListener<CloseFuture>() {
+ @SuppressWarnings("synthetic-access")
@Override
public void operationComplete(CloseFuture future) {
callback.onExit(0);
@@ -125,6 +130,7 @@ public class AsyncEchoShellFactory implements Factory<Command> {
@Override
public void destroy() {
+ // ignored
}
@Override