Do not execute methods on spy in LdapFacadeTest

Author: ahornace

plugins/src/test/java/opengrok/auth/plugin/ldap/LdapFacadeTest.java

@@ -37,12 +37,13 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-public class LdapFacadeTest {
+class LdapFacadeTest {
     @Test
-    public void testSearchControlsConfig() {
+    void testSearchControlsConfig() {
         Configuration config = new Configuration();
         int searchTimeout = 1234;
         config.setSearchTimeout(searchTimeout);
@@ -62,13 +63,13 @@ private LdapServer getSpyLdapServer(String name) throws UnknownHostException {
     private LdapServer getSpyLdapServer(String name, boolean working) throws UnknownHostException {
         LdapServer server = new LdapServer(name);
         LdapServer serverSpy = Mockito.spy(server);
-        Mockito.when(serverSpy.getAddresses(any())).thenReturn(new InetAddress[]{InetAddress.getLocalHost()});
-        Mockito.when(serverSpy.isWorking()).thenReturn(working);
+        doReturn(new InetAddress[]{InetAddress.getLocalHost()}).when(serverSpy).getAddresses(any());
+        doReturn(working).when(serverSpy).isWorking();
         return serverSpy;
     }
 
     @Test
-    public void testConnectTimeoutInheritance() throws UnknownHostException {
+    void testConnectTimeoutInheritance() throws UnknownHostException {
         Configuration config = new Configuration();
 
         LdapServer[] servers = {getSpyLdapServer("ldap://foo.com"), getSpyLdapServer("ldap://bar.com")};
@@ -87,12 +88,12 @@ public void testConnectTimeoutInheritance() throws UnknownHostException {
     }
 
     @Test
-    public void testToStringNegative() throws UnknownHostException {
+    void testToStringNegative() throws UnknownHostException {
         Configuration config = new Configuration();
         LdapServer server1 = new LdapServer("ldap://foo.com");
         LdapServer serverSpy1 = Mockito.spy(server1);
-        Mockito.when(serverSpy1.getAddresses(any())).thenReturn(new InetAddress[]{InetAddress.getLocalHost()});
-        Mockito.when(serverSpy1.isReachable()).thenReturn(false);
+        doReturn(new InetAddress[]{InetAddress.getLocalHost()}).when(serverSpy1).getAddresses(any());
+        doReturn(false).when(serverSpy1).isReachable();
 
         config.setServers(Collections.singletonList(serverSpy1));
         config.setSearchBase("dc=foo,dc=com");
@@ -104,11 +105,11 @@ public void testToStringNegative() throws UnknownHostException {
     }
 
     @Test
-    public void testToStringPositive() throws UnknownHostException {
+    void testToStringPositive() {
         Configuration config = new Configuration();
         LdapServer server1 = new LdapServer("ldap://foo.com");
         LdapServer serverSpy1 = Mockito.spy(server1);
-        Mockito.doReturn(true).when(serverSpy1).isWorking();
+        doReturn(true).when(serverSpy1).isWorking();
 
         config.setServers(Collections.singletonList(serverSpy1));
         config.setSearchBase("dc=foo,dc=com");
@@ -120,7 +121,7 @@ public void testToStringPositive() throws UnknownHostException {
     }
 
     @Test
-    public void testPrepareServersNegative() throws UnknownHostException {
+    void testPrepareServersNegative() throws UnknownHostException {
         Configuration config = new Configuration();
         config.setServers(Arrays.asList(getSpyLdapServer("ldap://foo.com", false),
                 getSpyLdapServer("ldap://bar.com", true)));
@@ -129,15 +130,15 @@ public void testPrepareServersNegative() throws UnknownHostException {
     }
 
     @Test
-    public void testGetSearchDescription() {
+    void testGetSearchDescription() {
         assertEquals("DN: foo, filter: bar, attributes: Bilbo,Frodo",
                 LdapFacade.getSearchDescription("foo", "bar", new String[]{"Bilbo", "Frodo"}));
         assertEquals("DN: foo, filter: bar",
                 LdapFacade.getSearchDescription("foo", "bar", null));
     }
 
     @Test
-    public void testPrepareServersCloseUnused() throws UnknownHostException {
+    void testPrepareServersCloseUnused() throws UnknownHostException {
         Configuration config = new Configuration();
 
         LdapServer server1 = getSpyLdapServer("ldap://foo.com");