1 files changed, 27 insertions, 30 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/orchestrator/OrchestratorImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/orchestrator/OrchestratorImplTest.java
index e4c46c504be..936a7bb224d 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/orchestrator/OrchestratorImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/configserver/orchestrator/OrchestratorImplTest.java
@@ -12,6 +12,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -29,9 +30,10 @@ public class OrchestratorImplTest {
     @Test
     public void testSuspendCall() {
         when(configServerApi.put(
-                OrchestratorImpl.ORCHESTRATOR_PATH_PREFIX_HOST_API + "/" + hostName+ "/suspended",
-                Optional.empty(),
-                UpdateHostResponse.class
+                eq(OrchestratorImpl.ORCHESTRATOR_PATH_PREFIX_HOST_API + "/" + hostName+ "/suspended"),
+                eq(Optional.empty()),
+                eq(UpdateHostResponse.class),
+                any()
         )).thenReturn(new UpdateHostResponse(hostName, null));
 
         orchestrator.suspend(hostName);
@@ -40,9 +42,10 @@ public class OrchestratorImplTest {
     @Test(expected=OrchestratorException.class)
     public void testSuspendCallWithFailureReason() {
         when(configServerApi.put(
-                OrchestratorImpl.ORCHESTRATOR_PATH_PREFIX_HOST_API + "/" + hostName+ "/suspended",
-                Optional.empty(),
-                UpdateHostResponse.class
+                eq(OrchestratorImpl.ORCHESTRATOR_PATH_PREFIX_HOST_API + "/" + hostName+ "/suspended"),
+                eq(Optional.empty()),
+                eq(UpdateHostResponse.class),
+                any()
         )).thenReturn(new UpdateHostResponse(hostName, new HostStateChangeDenialReason("hostname", "fail")));
 
         orchestrator.suspend(hostName);
@@ -50,22 +53,16 @@ public class OrchestratorImplTest {
 
     @Test(expected=OrchestratorNotFoundException.class)
     public void testSuspendCallWithNotFound() {
-        when(configServerApi.put(
-                any(String.class),
-                any(),
-                any()
-        )).thenThrow(new HttpException.NotFoundException("Not Found"));
+        when(configServerApi.put(any(String.class), any(), any(), any()))
+                .thenThrow(new HttpException.NotFoundException("Not Found"));
 
         orchestrator.suspend(hostName);
     }
 
     @Test(expected=RuntimeException.class)
     public void testSuspendCallWithSomeOtherException() {
-        when(configServerApi.put(
-                any(String.class),
-                any(),
-                any()
-        )).thenThrow(new RuntimeException("Some parameter was wrong"));
+        when(configServerApi.put(any(String.class), any(), any(), any()))
+                .thenThrow(new RuntimeException("Some parameter was wrong"));
 
         orchestrator.suspend(hostName);
     }
@@ -103,11 +100,8 @@ public class OrchestratorImplTest {
 
     @Test(expected=RuntimeException.class)
     public void testResumeCallWithSomeOtherException() {
-        when(configServerApi.put(
-                any(String.class),
-                any(),
-                any()
-        )).thenThrow(new RuntimeException("Some parameter was wrong"));
+        when(configServerApi.put(any(String.class), any(), any(), any()))
+                .thenThrow(new RuntimeException("Some parameter was wrong"));
 
         orchestrator.suspend(hostName);
     }
@@ -118,9 +112,10 @@ public class OrchestratorImplTest {
         List<String> hostNames = Arrays.asList("a1.host1.test.yahoo.com", "a2.host1.test.yahoo.com");
 
         when(configServerApi.put(
-                "/orchestrator/v1/suspensions/hosts/host1.test.yahoo.com?hostname=a1.host1.test.yahoo.com&hostname=a2.host1.test.yahoo.com",
-                Optional.empty(),
-                BatchOperationResult.class
+                eq("/orchestrator/v1/suspensions/hosts/host1.test.yahoo.com?hostname=a1.host1.test.yahoo.com&hostname=a2.host1.test.yahoo.com"),
+                eq(Optional.empty()),
+                eq(BatchOperationResult.class),
+                any()
         )).thenReturn(BatchOperationResult.successResult());
 
         orchestrator.suspend(parentHostName, hostNames);
@@ -133,9 +128,10 @@ public class OrchestratorImplTest {
         String failureReason = "Failed to suspend";
 
         when(configServerApi.put(
-                "/orchestrator/v1/suspensions/hosts/host1.test.yahoo.com?hostname=a1.host1.test.yahoo.com&hostname=a2.host1.test.yahoo.com",
-                Optional.empty(),
-                BatchOperationResult.class
+                eq("/orchestrator/v1/suspensions/hosts/host1.test.yahoo.com?hostname=a1.host1.test.yahoo.com&hostname=a2.host1.test.yahoo.com"),
+                eq(Optional.empty()),
+                eq(BatchOperationResult.class),
+                any()
         )).thenReturn(new BatchOperationResult(failureReason));
 
         orchestrator.suspend(parentHostName, hostNames);
@@ -148,9 +144,10 @@ public class OrchestratorImplTest {
         String exceptionMessage = "Exception: Something crashed!";
 
         when(configServerApi.put(
-                "/orchestrator/v1/suspensions/hosts/host1.test.yahoo.com?hostname=a1.host1.test.yahoo.com&hostname=a2.host1.test.yahoo.com",
-                Optional.empty(),
-                BatchOperationResult.class
+                eq("/orchestrator/v1/suspensions/hosts/host1.test.yahoo.com?hostname=a1.host1.test.yahoo.com&hostname=a2.host1.test.yahoo.com"),
+                eq(Optional.empty()),
+                eq(BatchOperationResult.class),
+                any()
         )).thenThrow(new RuntimeException(exceptionMessage));
 
         orchestrator.suspend(parentHostName, hostNames);