Skip to content

Update XenServer610WrapperTest.java #8139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 2 commits into from
Nov 3, 2023
Merged

Update XenServer610WrapperTest.java #8139

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6369bc
Update XenServer610WrapperTest.java
gzhao9 Oct 24, 2023
a5b5015
Apply suggestions from code review
gzhao9 Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions ...java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/XenServer610WrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -481,4 +475,10 @@ public void testXenServer610MigrateVolumeCommandWrapper() {

assertFalse(answer.getResult());
}

VolumeTO MockVolumeTO(String path){
VolumeTO vol = Mockito.mock(VolumeTO.class);
when(vol.getPath()).thenReturn(path);
return vol;
}
}