From d1561f8fb6a090dc922ed579ad0ee4ff16ab28ba Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 21 Jul 2017 09:31:20 -0600 Subject: [PATCH] polish --- .../ssh/PropertyBasedSshSessionFactoryTest.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ssh/PropertyBasedSshSessionFactoryTest.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ssh/PropertyBasedSshSessionFactoryTest.java index 45fb97ba..c9c10f19 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ssh/PropertyBasedSshSessionFactoryTest.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ssh/PropertyBasedSshSessionFactoryTest.java @@ -16,11 +16,6 @@ package org.springframework.cloud.config.server.ssh; -import static org.mockito.Matchers.isNull; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.when; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -33,7 +28,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; @@ -41,7 +36,11 @@ import com.jcraft.jsch.HostKey; import com.jcraft.jsch.HostKeyRepository; import com.jcraft.jsch.JSch; import com.jcraft.jsch.Session; -import com.jcraft.jsch.UserInfo; + +import static org.mockito.Matchers.isNull; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; /** * Unit tests for property based SSH config processor @@ -132,7 +131,7 @@ public class PropertyBasedSshSessionFactoryTest { factory.createSession(hc, null, SshUriPropertyProcessor.getHostname(sshKey.getUri()), 22, null); ArgumentCaptor captor = ArgumentCaptor.forClass(HostKey.class); - verify(hostKeyRepository).add(captor.capture(), isNull(UserInfo.class)); + verify(hostKeyRepository).add(captor.capture(), isNull()); HostKey hostKey = captor.getValue(); Assert.assertEquals("gitlab.example.local", hostKey.getHost()); Assert.assertEquals(HOST_KEY, hostKey.getKey()); @@ -151,7 +150,7 @@ public class PropertyBasedSshSessionFactoryTest { Resource resource = new ClassPathResource(path); try (BufferedReader br = new BufferedReader(new InputStreamReader(resource.getInputStream()))) { StringBuilder builder = new StringBuilder(); - String line = ""; + String line; while ((line = br.readLine()) != null) { builder.append(line).append('\n'); }