Update Mockito to 5.16.1 (#10686)

Dependency name change mockito-inline to mockito-core. Inline is now the default and the last version of mockito-inline released is 5.2.0.

assertj-core in user-authenticators/saml2 pulls in an incompatible version of byte-buddy and required an exclusion. Updating the version of assertj is left for a future PR.
The upgrade requires Java 11+, dropping support for Java 8. CloudStack documentation already says to use Java 11 and does not indicate that java 8 is supported.

Test classes using @RunWith(MockitoJUnitRunner.class) now get run in strict mode. Changes were made to tests where the stubbing intention was clear. In ManagementServerMaintenanceManagerImplTest there are 5 tests where the intention of the test is unclear. Each of the statements now use Mockito.lenient() to avoid the exception. Other cases in the tests follow a similar pattern.
Minor clean up.

Both @SPY and Mockito.spy( should not be used. Favored the annotation.
Both @RunWith(MockitoJUnitRunner.class) and MockitoAnnotations.openMocks(this); should not be used. Favored the annotation.
Unnecessary extends TestCase removed.
@Injectmocks and new in statement unnecessary. Removed new when issue presented.
Some of the Cmd classes like UpdateNetworkCmd have a type tree that includes fields of type Object. This appears to cause issues with injection, requiring that @mock fields be available. This is where the following fields were added in multiple places:
Object job;
ResponseGenerator _responseGenerator;
Wrong number of parameters for Mockito.when in LibvirtRevertSnapshotCommandWrapperTest.java

Author: erickalendra

api/src/test/java/org/apache/cloudstack/api/command/admin/resource/PurgeExpungedResourcesCmdTest.java

@@ -44,7 +44,7 @@ public class PurgeExpungedResourcesCmdTest {
 
     @Spy
     @InjectMocks
-    PurgeExpungedResourcesCmd spyCmd = Mockito.spy(new PurgeExpungedResourcesCmd());
+    PurgeExpungedResourcesCmd spyCmd;
 
     @Test
     public void testGetResourceType() {

api/src/test/java/org/apache/cloudstack/api/command/admin/storage/DownloadImageStoreObjectCmdTest.java

@@ -20,14 +20,11 @@
 import com.cloud.utils.Pair;
 import org.apache.cloudstack.api.response.ExtractResponse;
 import org.apache.cloudstack.storage.browser.StorageBrowser;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -48,18 +45,6 @@ public class DownloadImageStoreObjectCmdTest {
     @Spy
     private DownloadImageStoreObjectCmd cmd;
 
-    private AutoCloseable closeable;
-
-    @Before
-    public void setUp() {
-        closeable = MockitoAnnotations.openMocks(this);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        closeable.close();
-    }
-
     @Test
     public void testExecute() throws Exception {
         ReflectionTestUtils.setField(cmd, "storeId", 1L);

api/src/test/java/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmdTest.java

@@ -68,6 +68,12 @@ public class MigrateVirtualMachineWithVolumeCmdTest {
     @Mock
     Host hostMock;
 
+    @Mock
+    private Object job;
+
+    @Mock
+    private Object _responseObject;
+
     @Spy
     @InjectMocks
     MigrateVirtualMachineWithVolumeCmd cmdSpy;

api/src/test/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdminTest.java

@@ -20,7 +20,6 @@
 import com.cloud.network.vpc.VpcService;
 import com.cloud.user.AccountService;
 import com.cloud.utils.db.EntityManager;
-import junit.framework.TestCase;
 import org.apache.cloudstack.api.ResponseGenerator;
 import org.junit.Assert;
 import org.junit.Test;
@@ -34,7 +33,7 @@
 import java.util.List;
 
 @RunWith(MockitoJUnitRunner.class)
-public class CreateVPCCmdByAdminTest extends TestCase {
+public class CreateVPCCmdByAdminTest {
 
     @Mock
     public VpcService _vpcService;
@@ -43,8 +42,10 @@ public class CreateVPCCmdByAdminTest extends TestCase {
     @Mock
     public AccountService _accountService;
     private ResponseGenerator responseGenerator;
+    @Mock
+    public Object job;
     @InjectMocks
-    CreateVPCCmdByAdmin cmd = new CreateVPCCmdByAdmin();
+    CreateVPCCmdByAdmin cmd;
 
     @Test
     public void testBgpPeerIds() {

api/src/test/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmdTest.java

@@ -41,7 +41,10 @@ public class UpdateNetworkCmdTest {
     NetworkService networkService;
     @Mock
     public EntityManager _entityMgr;
-    private ResponseGenerator responseGenerator;
+    @Mock
+    private ResponseGenerator _responseGenerator;
+    @Mock
+    private Object job;
     @InjectMocks
     UpdateNetworkCmd cmd = new UpdateNetworkCmd();
 
@@ -176,15 +179,13 @@ public void testExecute() throws InsufficientCapacityException {
         ReflectionTestUtils.setField(cmd, "id", networkId);
         ReflectionTestUtils.setField(cmd, "publicMtu", publicmtu);
         Network network = Mockito.mock(Network.class);
-        responseGenerator = Mockito.mock(ResponseGenerator.class);
         NetworkResponse response = Mockito.mock(NetworkResponse.class);
         response.setPublicMtu(publicmtu);
         Mockito.when(networkService.getNetwork(networkId)).thenReturn(network);
         Mockito.when(networkService.updateGuestNetwork(cmd)).thenReturn(network);
-        cmd._responseGenerator = responseGenerator;
-        Mockito.when(responseGenerator.createNetworkResponse(ResponseObject.ResponseView.Restricted, network)).thenReturn(response);
+        Mockito.when(_responseGenerator.createNetworkResponse(ResponseObject.ResponseView.Restricted, network)).thenReturn(response);
         cmd.execute();
-        Mockito.verify(responseGenerator).createNetworkResponse(Mockito.any(ResponseObject.ResponseView.class), Mockito.any(Network.class));
+        Mockito.verify(_responseGenerator).createNetworkResponse(Mockito.any(ResponseObject.ResponseView.class), Mockito.any(Network.class));
         NetworkResponse actualResponse = (NetworkResponse) cmd.getResponseObject();
 
         Assert.assertEquals(response, actualResponse);

api/src/test/java/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmdTest.java

@@ -25,7 +25,6 @@
 import com.cloud.network.vpc.VpcService;
 import com.cloud.user.AccountService;
 import com.cloud.utils.db.EntityManager;
-import junit.framework.TestCase;
 import org.apache.cloudstack.api.ResponseGenerator;
 import org.apache.cloudstack.api.ResponseObject;
 import org.apache.cloudstack.api.response.VpcResponse;
@@ -39,17 +38,21 @@
 import org.springframework.test.util.ReflectionTestUtils;
 
 @RunWith(MockitoJUnitRunner.class)
-public class CreateVPCCmdTest extends TestCase {
+public class CreateVPCCmdTest {
 
     @Mock
     public VpcService _vpcService;
     @Mock
     public EntityManager _entityMgr;
     @Mock
     public AccountService _accountService;
-    private ResponseGenerator responseGenerator;
+    @Mock
+    private ResponseGenerator _responseGenerator;
+    @Mock
+    private Object job;
+
     @InjectMocks
-    CreateVPCCmd cmd = new CreateVPCCmd();
+    CreateVPCCmd cmd;
 
     @Test
     public void testGetAccountName() {
@@ -185,11 +188,9 @@ public void testExecute() throws ResourceUnavailableException, InsufficientCapac
         VpcResponse response = Mockito.mock(VpcResponse.class);
 
         ReflectionTestUtils.setField(cmd, "id", 1L);
-        responseGenerator = Mockito.mock(ResponseGenerator.class);
         Mockito.doNothing().when(_vpcService).startVpc(cmd);
         Mockito.when(_entityMgr.findById(Mockito.eq(Vpc.class), Mockito.any(Long.class))).thenReturn(vpc);
-        cmd._responseGenerator = responseGenerator;
-        Mockito.when(responseGenerator.createVpcResponse(ResponseObject.ResponseView.Restricted, vpc)).thenReturn(response);
+        Mockito.when(_responseGenerator.createVpcResponse(ResponseObject.ResponseView.Restricted, vpc)).thenReturn(response);
         cmd.execute();
         Mockito.verify(_vpcService, Mockito.times(1)).startVpc(cmd);
     }

plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java

@@ -704,7 +704,7 @@ private void configureAndVerifyTestSearchDiskDefOnMigrateDiskInfoList(String ser
 
     @Test
     public void deleteOrDisconnectDisksOnSourcePoolTest() {
-        LibvirtMigrateCommandWrapper spyLibvirtMigrateCmdWrapper = Mockito.spy(libvirtMigrateCmdWrapper);
+        LibvirtMigrateCommandWrapper spyLibvirtMigrateCmdWrapper = libvirtMigrateCmdWrapper;
         Mockito.doNothing().when(spyLibvirtMigrateCmdWrapper).deleteLocalVolume("volPath");
 
         List<MigrateDiskInfo> migrateDiskInfoList = new ArrayList<>();

plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertSnapshotCommandWrapperTest.java

@@ -32,6 +32,7 @@
 import org.mockito.Mock;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
+import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
 
 import com.cloud.agent.api.to.DataStoreTO;
@@ -42,7 +43,8 @@
 @RunWith(MockitoJUnitRunner.class)
 public class LibvirtRevertSnapshotCommandWrapperTest {
 
-    LibvirtRevertSnapshotCommandWrapper libvirtRevertSnapshotCommandWrapperSpy = Mockito.spy(LibvirtRevertSnapshotCommandWrapper.class);
+    @Spy
+    LibvirtRevertSnapshotCommandWrapper libvirtRevertSnapshotCommandWrapperSpy;
 
     @Mock
     KVMStoragePool kvmStoragePoolPrimaryMock;
@@ -107,7 +109,7 @@ public void validateGetSnapshotPathExistsOnPrimaryStorage() {
         Mockito.doReturn(snapshotPath).when(snapshotObjectToPrimaryMock).getPath();
 
         try (MockedStatic<Files> ignored = Mockito.mockStatic(Files.class)) {
-            Mockito.when(Files.exists(Mockito.any(Path.class), Mockito.any())).thenReturn(true);
+            Mockito.when(Files.exists(Mockito.any(Path.class))).thenReturn(true);
 
             Pair<String, SnapshotObjectTO> result = libvirtRevertSnapshotCommandWrapperSpy.getSnapshot(
                     snapshotObjectToPrimaryMock, snapshotObjectToSecondaryMock,

plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImplTest.java

@@ -69,6 +69,8 @@ public class VmwareManagerImplTest {
     private Map<String, String> clusterDetails;
     @Mock
     private Map<String, String> hostDetails;
+    @Mock
+    private Map<String, Object> _configParams;
 
     @Before
     public void beforeTest() {

plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java

@@ -41,6 +41,8 @@
 import java.util.List;
 import java.util.Map;
 
+import com.cloud.agent.api.Command;
+import com.cloud.agent.api.ScaleVmAnswer;
 import com.cloud.hypervisor.vmware.mo.DatastoreMO;
 import com.cloud.hypervisor.vmware.mo.HostDatastoreBrowserMO;
 import com.cloud.hypervisor.vmware.mo.HypervisorHostHelper;
@@ -52,7 +54,6 @@
 import org.apache.cloudstack.storage.command.browser.ListDataStoreObjectsAnswer;
 import org.apache.cloudstack.storage.command.browser.ListDataStoreObjectsCommand;
 import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -62,17 +63,14 @@
 import org.mockito.MockedConstruction;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
 import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
 
 import com.cloud.agent.api.Answer;
-import com.cloud.agent.api.Command;
 import com.cloud.agent.api.CheckGuestOsMappingAnswer;
 import com.cloud.agent.api.CheckGuestOsMappingCommand;
 import com.cloud.agent.api.GetHypervisorGuestOsNamesAnswer;
 import com.cloud.agent.api.GetHypervisorGuestOsNamesCommand;
-import com.cloud.agent.api.ScaleVmAnswer;
 import com.cloud.agent.api.ScaleVmCommand;
 import com.cloud.agent.api.routing.GetAutoScaleMetricsAnswer;
 import com.cloud.agent.api.routing.GetAutoScaleMetricsCommand;
@@ -185,6 +183,8 @@ public VmwareHypervisorHost getHyperHost(VmwareContext context, Command cmd) {
     VimPortType vimService;
     @Mock
     HostCapability hostCapability;
+    @Mock
+    ManagedObjectReference _morHyperHost;
 
     CopyCommand storageCmd;
     EnumMap<VmwareStorageProcessorConfigurableFields, Object> params = new EnumMap<VmwareStorageProcessorConfigurableFields,Object>(VmwareStorageProcessorConfigurableFields.class);
@@ -201,11 +201,9 @@ public VmwareHypervisorHost getHyperHost(VmwareContext context, Command cmd) {
 
     private Map<String,String> specsArray = new HashMap<String,String>();
 
-    AutoCloseable closeable;
 
     @Before
     public void setup() throws Exception {
-        closeable = MockitoAnnotations.openMocks(this);
         storageCmd = mock(CopyCommand.class);
         doReturn(context).when(_resource).getServiceContext(null);
         when(cmd.getVirtualMachine()).thenReturn(vmSpec);
@@ -234,11 +232,6 @@ public void setup() throws Exception {
         when(hostCapability.isNestedHVSupported()).thenReturn(true);
     }
 
-    @After
-    public void tearDown() throws Exception {
-        closeable.close();
-    }
-
     //Test successful scaling up the vm
     @Test
     public void testScaleVMF1() throws Exception {