From b6369bcbc2f647fb8b137ede520df8a84a2bb30a Mon Sep 17 00:00:00 2001 From: gzhao9 <74684732+gzhao9@users.noreply.github.com> Date: Tue, 24 Oct 2023 13:58:59 -0400 Subject: [PATCH 1/2] Update XenServer610WrapperTest.java --- .../xenbase/XenServer610WrapperTest.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java index 73d2ca6d333d..1e7297c87a50 100644 --- a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java +++ b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java @@ -259,8 +259,8 @@ public void testMigrateWithStorageSendCommand() { final Connection conn = Mockito.mock(Connection.class); final VirtualMachineTO vmSpec = Mockito.mock(VirtualMachineTO.class); - final VolumeTO volume1 = Mockito.mock(VolumeTO.class); - final VolumeTO volume2 = Mockito.mock(VolumeTO.class); + final VolumeTO volume1 =MockVolumeTO(path); + final VolumeTO volume2 = MockVolumeTO(path); final SR sr1 = Mockito.mock(SR.class); final SR sr2 = Mockito.mock(SR.class); @@ -295,9 +295,6 @@ public void testMigrateWithStorageSendCommand() { when(xenServer610Resource.getConnection()).thenReturn(conn); when(vmSpec.getName()).thenReturn(vmName); - when(volume1.getPath()).thenReturn(path); - when(volume2.getPath()).thenReturn(path); - when(nic1.getMac()).thenReturn(mac); when(nic2.getMac()).thenReturn(mac); @@ -369,8 +366,8 @@ public void testMigrateWithStorageSendCommandNetException() { final Connection conn = Mockito.mock(Connection.class); final VirtualMachineTO vmSpec = Mockito.mock(VirtualMachineTO.class); - final VolumeTO volume1 = Mockito.mock(VolumeTO.class); - final VolumeTO volume2 = Mockito.mock(VolumeTO.class); + final VolumeTO volume1 = MockVolumeTO(path); + final VolumeTO volume2 = MockVolumeTO(path); final SR sr1 = Mockito.mock(SR.class); final SR sr2 = Mockito.mock(SR.class); @@ -399,9 +396,6 @@ public void testMigrateWithStorageSendCommandNetException() { when(xenServer610Resource.getConnection()).thenReturn(conn); when(vmSpec.getName()).thenReturn(vmName); - when(volume1.getPath()).thenReturn(path); - when(volume2.getPath()).thenReturn(path); - when(xenServer610Resource.getVDIbyUuid(conn, volume1.getPath())).thenReturn(vdi1); when(xenServer610Resource.getVDIbyUuid(conn, volume2.getPath())).thenReturn(vdi2); @@ -481,4 +475,9 @@ public void testXenServer610MigrateVolumeCommandWrapper() { assertFalse(answer.getResult()); } + VolumeTO MockVolumeTO(String path){ + VolumeTO vol = Mockito.mock(VolumeTO.class); + when(vol.getPath()).thenReturn(path); + return vol; + } } From a5b5015924dc7fbc0b6a7a1d48830af36918032e Mon Sep 17 00:00:00 2001 From: gzhao9 <74684732+gzhao9@users.noreply.github.com> Date: Wed, 25 Oct 2023 09:39:40 -0400 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Rohit Yadav --- .../resource/wrapper/xenbase/XenServer610WrapperTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java index 1e7297c87a50..4b2dd1ac3ec6 100644 --- a/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java +++ b/plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java @@ -259,7 +259,7 @@ public void testMigrateWithStorageSendCommand() { final Connection conn = Mockito.mock(Connection.class); final VirtualMachineTO vmSpec = Mockito.mock(VirtualMachineTO.class); - final VolumeTO volume1 =MockVolumeTO(path); + final VolumeTO volume1 = MockVolumeTO(path); final VolumeTO volume2 = MockVolumeTO(path); final SR sr1 = Mockito.mock(SR.class); @@ -475,6 +475,7 @@ public void testXenServer610MigrateVolumeCommandWrapper() { assertFalse(answer.getResult()); } + VolumeTO MockVolumeTO(String path){ VolumeTO vol = Mockito.mock(VolumeTO.class); when(vol.getPath()).thenReturn(path);