Skip to content

Commit d3917ef

Browse files
authored
Remove powermock form VM Manager test (#8199)
1 parent 3d7281d commit d3917ef

File tree

2 files changed

+24
-25
lines changed

2 files changed

+24
-25
lines changed

engine/orchestration/src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@
6666
import org.mockito.InOrder;
6767
import org.mockito.InjectMocks;
6868
import org.mockito.Mock;
69+
import org.mockito.MockedStatic;
6970
import org.mockito.Mockito;
7071
import org.mockito.Spy;
72+
import org.mockito.junit.MockitoJUnitRunner;
7173
import org.mockito.stubbing.Answer;
7274

7375
import com.cloud.agent.AgentManager;
@@ -107,15 +109,9 @@
107109
import com.cloud.vm.VirtualMachine.State;
108110
import com.cloud.vm.dao.UserVmDao;
109111
import com.cloud.vm.dao.VMInstanceDao;
110-
import org.powermock.api.mockito.PowerMockito;
111-
import org.powermock.core.classloader.annotations.PowerMockIgnore;
112-
import org.powermock.core.classloader.annotations.PrepareForTest;
113-
import org.powermock.modules.junit4.PowerMockRunner;
114112
import org.springframework.test.util.ReflectionTestUtils;
115113

116-
@RunWith(PowerMockRunner.class)
117-
@PrepareForTest(CallContext.class)
118-
@PowerMockIgnore({"javax.xml.*", "org.w3c.dom.*", "org.apache.xerces.*", "org.xml.*"})
114+
@RunWith(MockitoJUnitRunner.class)
119115
public class VirtualMachineManagerImplTest {
120116

121117
@Spy
@@ -1014,15 +1010,16 @@ public void testOrchestrateStartNonNullPodId() throws Exception {
10141010
doReturn(false).when(virtualMachineManagerImpl).areAllVolumesAllocated(Mockito.anyLong());
10151011

10161012
CallContext callContext = mock(CallContext.class);
1017-
Mockito.when(callContext.getCallingAccount()).thenReturn(account);
1018-
Mockito.when(callContext.getCallingUser()).thenReturn(user);
1019-
PowerMockito.mockStatic(CallContext.class);
1020-
PowerMockito.when(CallContext.current()).thenReturn(callContext);
1021-
1022-
try {
1023-
virtualMachineManagerImpl.orchestrateStart("vm-uuid", params, plan, planner);
1024-
} catch (CloudRuntimeException e) {
1025-
assertEquals(e.getMessage(), "Error while transitioning");
1013+
when(callContext.getCallingAccount()).thenReturn(account);
1014+
when(callContext.getCallingUser()).thenReturn(user);
1015+
try (MockedStatic<CallContext> ignored = Mockito.mockStatic(CallContext.class)) {
1016+
when(CallContext.current()).thenReturn(callContext);
1017+
1018+
try {
1019+
virtualMachineManagerImpl.orchestrateStart("vm-uuid", params, plan, planner);
1020+
} catch (CloudRuntimeException e) {
1021+
assertEquals(e.getMessage(), "Error while transitioning");
1022+
}
10261023
}
10271024

10281025
assertEquals(vmInstance.getPodIdToDeployIn(), (Long) destPod.getId());
@@ -1106,15 +1103,16 @@ public void testOrchestrateStartNullPodId() throws Exception {
11061103
doReturn(true).when(virtualMachineManagerImpl).areAllVolumesAllocated(Mockito.anyLong());
11071104

11081105
CallContext callContext = mock(CallContext.class);
1109-
Mockito.when(callContext.getCallingAccount()).thenReturn(account);
1110-
Mockito.when(callContext.getCallingUser()).thenReturn(user);
1111-
PowerMockito.mockStatic(CallContext.class);
1112-
PowerMockito.when(CallContext.current()).thenReturn(callContext);
1113-
1114-
try {
1115-
virtualMachineManagerImpl.orchestrateStart("vm-uuid", params, plan, planner);
1116-
} catch (CloudRuntimeException e) {
1117-
assertEquals(e.getMessage(), "Error while transitioning");
1106+
when(callContext.getCallingAccount()).thenReturn(account);
1107+
when(callContext.getCallingUser()).thenReturn(user);
1108+
try (MockedStatic<CallContext> ignored = Mockito.mockStatic(CallContext.class)) {
1109+
when(CallContext.current()).thenReturn(callContext);
1110+
1111+
try {
1112+
virtualMachineManagerImpl.orchestrateStart("vm-uuid", params, plan, planner);
1113+
} catch (CloudRuntimeException e) {
1114+
assertEquals(e.getMessage(), "Error while transitioning");
1115+
}
11181116
}
11191117

11201118
assertNull(vmInstance.getPodIdToDeployIn());
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
mock-maker-inline

0 commit comments

Comments
 (0)