From 541fbff3521cc9a14b5e8c94f3efe69366dd0e3a Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 20 Jul 2017 13:36:46 +0100 Subject: [PATCH] Change matcher to accoutn for updates in mockito --- .../PropertyBasedSshSessionFactoryTest.java | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 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 cf41ce6d..45fb97ba 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,7 +16,17 @@ package org.springframework.cloud.config.server.ssh; -import com.jcraft.jsch.*; +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; +import java.util.HashMap; +import java.util.Map; + import org.eclipse.jgit.transport.OpenSshConfig.Host; import org.junit.Assert; import org.junit.Test; @@ -27,16 +37,11 @@ import org.mockito.runners.MockitoJUnitRunner; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.HashMap; -import java.util.Map; - -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.mockito.Mockito.when; +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; /** * Unit tests for property based SSH config processor @@ -127,7 +132,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(), any(UserInfo.class)); + verify(hostKeyRepository).add(captor.capture(), isNull(UserInfo.class)); HostKey hostKey = captor.getValue(); Assert.assertEquals("gitlab.example.local", hostKey.getHost()); Assert.assertEquals(HOST_KEY, hostKey.getKey());