Repository: mina-sshd Updated Branches: refs/heads/master 1875912eb -> f8e01979e
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f8e01979/sshd-core/src/test/java/org/apache/sshd/common/util/TransformerTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/TransformerTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/TransformerTest.java index 063112b..579ec11 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/TransformerTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/TransformerTest.java @@ -38,21 +38,21 @@ public class TransformerTest extends BaseTestSupport { @Test public void testToString() { - assertNull("Invalid null result", Transformer.TOSTRING.transform(null)); + assertNull("Invalid null result", Transformer.TOSTRING.apply(null)); for (Object o : new Object[] {"", getClass(), new Date()}) { String expected = o.toString(); - String actual = Transformer.TOSTRING.transform(o); + String actual = Transformer.TOSTRING.apply(o); assertEquals("Mismatched result for type=" + o.getClass().getSimpleName(), expected, actual); } } @Test public void testExtractEnumName() { - assertNull("Invalid null result", Transformer.ENUM_NAME_EXTRACTOR.transform(null)); + assertNull("Invalid null result", Transformer.ENUM_NAME_EXTRACTOR.apply(null)); for (TimeUnit u : TimeUnit.values()) { String expected = u.name(); - String actual = Transformer.ENUM_NAME_EXTRACTOR.transform(u); + String actual = Transformer.ENUM_NAME_EXTRACTOR.apply(u); assertEquals("Mismatched name", expected, actual); } } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f8e01979/sshd-core/src/test/java/org/apache/sshd/server/ServerSessionListenerTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/ServerSessionListenerTest.java b/sshd-core/src/test/java/org/apache/sshd/server/ServerSessionListenerTest.java index 5430e59..01c96b4 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/ServerSessionListenerTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/ServerSessionListenerTest.java @@ -32,7 +32,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.sshd.client.SshClient; import org.apache.sshd.client.session.ClientSession; import org.apache.sshd.common.NamedFactory; -import org.apache.sshd.common.NamedResource; import org.apache.sshd.common.cipher.Cipher; import org.apache.sshd.common.io.IoSession; import org.apache.sshd.common.kex.KexProposalOption; @@ -183,12 +182,11 @@ public class ServerSessionListenerTest extends BaseTestSupport { sshd.addSessionListener(listener); try (ClientSession session = createTestClientSession()) { - for (Map.Entry<KexProposalOption, ? extends NamedResource> ke : kexParams.entrySet()) { - KexProposalOption option = ke.getKey(); - String expected = ke.getValue().getName(); + kexParams.forEach((option, factory) -> { + String expected = factory.getName(); String actual = session.getNegotiatedKexParameter(option); assertEquals("Mismatched values for KEX=" + option, expected, actual); - } + }); } finally { sshd.removeSessionListener(listener); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f8e01979/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java b/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java index 7354c20..e398b0d 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java @@ -644,6 +644,7 @@ public class ServerTest extends BaseTestSupport { client.start(); try (ClientSession s = createTestClientSession(sshd); ChannelExec shell = s.createExecChannel(getCurrentTestName())) { + // Cannot use forEach because of the potential IOException(s) being thrown for (Map.Entry<String, String> ee : expected.entrySet()) { shell.setEnv(ee.getKey(), ee.getValue()); } @@ -674,12 +675,10 @@ public class ServerTest extends BaseTestSupport { Map<String, String> vars = cmdEnv.getEnv(); assertTrue("Mismatched vars count", GenericUtils.size(vars) >= GenericUtils.size(expected)); - for (Map.Entry<String, String> ee : expected.entrySet()) { - String key = ee.getKey(); - String expValue = ee.getValue(); + expected.forEach((key, expValue) -> { String actValue = vars.get(key); assertEquals("Mismatched value for " + key, expValue, actValue); - } + }); } @Test // see SSHD-611 http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f8e01979/sshd-core/src/test/java/org/apache/sshd/util/test/BaseTestSupport.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/test/BaseTestSupport.java b/sshd-core/src/test/java/org/apache/sshd/util/test/BaseTestSupport.java index b76b7e6..49a535f 100644 --- a/sshd-core/src/test/java/org/apache/sshd/util/test/BaseTestSupport.java +++ b/sshd-core/src/test/java/org/apache/sshd/util/test/BaseTestSupport.java @@ -379,12 +379,10 @@ public abstract class BaseTestSupport extends Assert { assertEquals(message + "[size]", numItems, GenericUtils.size(actual)); if (numItems > 0) { - for (Map.Entry<? extends K, ? extends V> ee : expected.entrySet()) { - K key = ee.getKey(); - V expValue = ee.getValue(); + expected.forEach((key, expValue) -> { V actValue = actual.get(key); assertEquals(message + "[" + key + "]", expValue, actValue); - } + }); } } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f8e01979/sshd-ldap/src/test/java/org/apache/sshd/server/auth/password/LdapPasswordAuthenticatorTest.java ---------------------------------------------------------------------- diff --git a/sshd-ldap/src/test/java/org/apache/sshd/server/auth/password/LdapPasswordAuthenticatorTest.java b/sshd-ldap/src/test/java/org/apache/sshd/server/auth/password/LdapPasswordAuthenticatorTest.java index a942b79..2dd76b4 100644 --- a/sshd-ldap/src/test/java/org/apache/sshd/server/auth/password/LdapPasswordAuthenticatorTest.java +++ b/sshd-ldap/src/test/java/org/apache/sshd/server/auth/password/LdapPasswordAuthenticatorTest.java @@ -69,11 +69,9 @@ public class LdapPasswordAuthenticatorTest extends BaseAuthenticatorTest { ServerSession session = Mockito.mock(ServerSession.class); outputDebugMessage("%s: %s", getCurrentTestName(), auth); - for (Map.Entry<String, String> ue : usersMap.entrySet()) { - String username = ue.getKey(); - String password = ue.getValue(); + usersMap.forEach((username, password) -> { outputDebugMessage("Authenticate: user=%s, password=%s", username, password); assertTrue("Failed to authenticate " + username, auth.authenticate(username, password, session)); - } + }); } } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f8e01979/sshd-ldap/src/test/java/org/apache/sshd/server/auth/pubkey/LdapPublickeyAuthenticatorTest.java ---------------------------------------------------------------------- diff --git a/sshd-ldap/src/test/java/org/apache/sshd/server/auth/pubkey/LdapPublickeyAuthenticatorTest.java b/sshd-ldap/src/test/java/org/apache/sshd/server/auth/pubkey/LdapPublickeyAuthenticatorTest.java index bb2ecdd..9ae0d3b 100644 --- a/sshd-ldap/src/test/java/org/apache/sshd/server/auth/pubkey/LdapPublickeyAuthenticatorTest.java +++ b/sshd-ldap/src/test/java/org/apache/sshd/server/auth/pubkey/LdapPublickeyAuthenticatorTest.java @@ -62,6 +62,7 @@ public class LdapPublickeyAuthenticatorTest extends BaseAuthenticatorTest { populateUsers(LDAP_CONTEX_HOLDER.get().getSecond(), LdapPublickeyAuthenticatorTest.class, TEST_ATTR_NAME); assertFalse("No keys retrieved", GenericUtils.isEmpty(credentials)); + // Cannot use forEach because of the potential GeneraSecurityException being thrown for (Map.Entry<String, String> ce : credentials.entrySet()) { String username = ce.getKey(); AuthorizedKeyEntry entry = AuthorizedKeyEntry.parseAuthorizedKeyEntry(ce.getValue()); @@ -87,12 +88,10 @@ public class LdapPublickeyAuthenticatorTest extends BaseAuthenticatorTest { ServerSession session = Mockito.mock(ServerSession.class); outputDebugMessage("%s: %s", getCurrentTestName(), auth); - for (Map.Entry<String, PublicKey> ke : KEYS_MAP.entrySet()) { - String username = ke.getKey(); - PublicKey key = ke.getValue(); + KEYS_MAP.forEach((username, key) -> { outputDebugMessage("Authenticate: user=%s, key-type=%s, fingerprint=%s", username, KeyUtils.getKeyType(key), KeyUtils.getFingerPrint(key)); assertTrue("Failed to authenticate user=" + username, auth.authenticate(username, key, session)); - } + }); } }
