Skip to content

Commit 6a461b1

Browse files
committed
vTPM: update unit tests in VmwareResourceTest
1 parent 3588be7 commit 6a461b1

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -855,10 +855,12 @@ public void testAddVirtualTPMDevice() throws Exception {
855855
details.put(VmDetailConstants.VIRTUAL_TPM_ENABLED, "true");
856856
when(vmSpec.getDetails()).thenReturn(details);
857857
when(vmMo.getAllDeviceList()).thenReturn(new ArrayList<>());
858-
Mockito.doNothing().when(vmwareResource).addVirtualTPMDevice(vmConfigSpec);
858+
List<VirtualDeviceConfigSpec> deviceChanges = Mockito.mock(List.class);
859+
when(vmConfigSpec.getDeviceChange()).thenReturn(deviceChanges);
859860

860861
vmwareResource.configureVirtualTPM(vmMo, vmSpec, vmConfigSpec, "uefi");
861862
Mockito.verify(vmwareResource, Mockito.times(1)).addVirtualTPMDevice(vmConfigSpec);
863+
Mockito.verify(deviceChanges, Mockito.times(1)).add(any(VirtualDeviceConfigSpec.class));
862864
}
863865

864866
@Test
@@ -872,9 +874,11 @@ public void testRemoveVirtualTPMDevice() throws Exception {
872874
when(vmSpec.getDetails()).thenReturn(details);
873875
VirtualTPM tpm = new VirtualTPM();
874876
when(vmMo.getAllDeviceList()).thenReturn(List.of(tpm));
875-
Mockito.doNothing().when(vmwareResource).removeVirtualTPMDevice(vmConfigSpec, tpm);
877+
List<VirtualDeviceConfigSpec> deviceChanges = Mockito.mock(List.class);
878+
when(vmConfigSpec.getDeviceChange()).thenReturn(deviceChanges);
876879

877880
vmwareResource.configureVirtualTPM(vmMo, vmSpec, vmConfigSpec, "uefi");
878881
Mockito.verify(vmwareResource, Mockito.times(1)).removeVirtualTPMDevice(vmConfigSpec, tpm);
882+
Mockito.verify(deviceChanges, Mockito.times(1)).add(any(VirtualDeviceConfigSpec.class));
879883
}
880884
}

0 commit comments

Comments
 (0)