Skip to content

Commit 55f0801

Browse files
vishesh92vishesh92
authored
Remove powermock from network elements (#7791)
1 parent 0318e9f commit 55f0801

63 files changed

Lines changed: 1158 additions & 904 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎plugins/network-elements/elastic-loadbalancer/src/test/java/com/cloud/network/lb/ElasticLoadBalancerManagerImplTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
import org.junit.Test;
2626
import org.junit.runner.RunWith;
2727
import org.mockito.InjectMocks;
28-
import org.mockito.runners.MockitoJUnitRunner;
29-
import org.powermock.reflect.Whitebox;
28+
import org.mockito.junit.MockitoJUnitRunner;
3029

3130
import com.cloud.agent.api.check.CheckSshAnswer;
3231
import com.cloud.agent.manager.Commands;
3332
import com.cloud.network.lb.dao.ElasticLbVmMapDao;
3433
import com.cloud.vm.ReservationContext;
3534
import com.cloud.vm.VirtualMachineProfile;
35+
import org.springframework.test.util.ReflectionTestUtils;
3636

3737
@RunWith(MockitoJUnitRunner.class)
3838
public class ElasticLoadBalancerManagerImplTest {
@@ -90,7 +90,7 @@ public void testFinalizeStartWhenCmdsAnswerIsNotNullAndAnswerResultIsTrue() thro
9090
public void testGarbageCollectUnusedElbVmsWhenVariableUnusedElbVmsIsNull() throws Exception {
9191
ElasticLbVmMapDao elasticLbVmMapDaoMock = mock(ElasticLbVmMapDao.class);
9292
when(elasticLbVmMapDaoMock.listUnusedElbVms()).thenReturn(null);
93-
Whitebox.setInternalState(elasticLoadBalancerManagerImpl, "_elbVmMapDao", elasticLbVmMapDaoMock);
93+
ReflectionTestUtils.setField(elasticLoadBalancerManagerImpl, "_elbVmMapDao", elasticLbVmMapDaoMock);
9494

9595
try {
9696
elasticLoadBalancerManagerImpl.garbageCollectUnusedElbVms();

‎plugins/network-elements/elastic-loadbalancer/src/test/java/com/cloud/network/lb/LoadBalanceRuleHandlerTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
import org.junit.runner.RunWith;
3737
import org.mockito.InjectMocks;
3838
import org.mockito.Mock;
39-
import org.mockito.runners.MockitoJUnitRunner;
40-
import org.powermock.reflect.Whitebox;
4139

4240
import com.cloud.dc.PodVlanMapVO;
4341
import com.cloud.dc.dao.PodVlanMapDao;
@@ -47,6 +45,8 @@
4745
import com.cloud.vm.VirtualMachineManager;
4846
import com.cloud.vm.VirtualMachineProfile.Param;
4947
import com.cloud.vm.dao.DomainRouterDao;
48+
import org.mockito.junit.MockitoJUnitRunner;
49+
import org.springframework.test.util.ReflectionTestUtils;
5050

5151
@RunWith(MockitoJUnitRunner.class)
5252
public class LoadBalanceRuleHandlerTest {
@@ -68,10 +68,10 @@ public class LoadBalanceRuleHandlerTest {
6868

6969
@Before
7070
public void setup() {
71-
Whitebox.setInternalState(loadBalanceRuleHandler, "_itMgr", virtualMachineManagerMock);
72-
Whitebox.setInternalState(loadBalanceRuleHandler, "_routerDao", domainRouterDaoMock);
73-
Whitebox.setInternalState(loadBalanceRuleHandler, "_elbVmMapDao", elasticLbVmMapDao);
74-
Whitebox.setInternalState(loadBalanceRuleHandler, "_podVlanMapDao", podVlanMapDao);
71+
ReflectionTestUtils.setField(loadBalanceRuleHandler, "_itMgr", virtualMachineManagerMock);
72+
ReflectionTestUtils.setField(loadBalanceRuleHandler, "_routerDao", domainRouterDaoMock);
73+
ReflectionTestUtils.setField(loadBalanceRuleHandler, "_elbVmMapDao", elasticLbVmMapDao);
74+
ReflectionTestUtils.setField(loadBalanceRuleHandler, "_podVlanMapDao", podVlanMapDao);
7575
}
7676

7777
@Test

‎plugins/network-elements/elastic-loadbalancer/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
mock-maker-inline

‎plugins/network-elements/tungsten/src/test/java/org/apache/cloudstack/network/tungsten/api/command/AddTungstenFabricNetworkGatewayToLogicalRouterCmdTest.java‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,36 +24,47 @@
2424
import org.apache.cloudstack.api.BaseResponse;
2525
import org.apache.cloudstack.api.ServerApiException;
2626
import org.apache.cloudstack.network.tungsten.service.TungstenService;
27+
import org.junit.After;
2728
import org.junit.Assert;
2829
import org.junit.Before;
2930
import org.junit.Test;
31+
import org.junit.runner.RunWith;
3032
import org.mockito.ArgumentMatchers;
3133
import org.mockito.Mock;
3234
import org.mockito.Mockito;
3335
import org.mockito.MockitoAnnotations;
34-
import org.powermock.reflect.Whitebox;
36+
import org.mockito.junit.MockitoJUnitRunner;
37+
import org.springframework.test.util.ReflectionTestUtils;
3538

3639
import java.util.List;
3740

41+
@RunWith(MockitoJUnitRunner.class)
3842
public class AddTungstenFabricNetworkGatewayToLogicalRouterCmdTest {
3943

4044
@Mock
4145
TungstenService tungstenService;
4246

4347
AddTungstenFabricNetworkGatewayToLogicalRouterCmd addTungstenFabricNetworkGatewayToLogicalRouterCmd;
4448

49+
AutoCloseable closeable;
50+
4551
@Before
4652
public void setup() {
47-
MockitoAnnotations.initMocks(this);
53+
closeable = MockitoAnnotations.openMocks(this);
4854
addTungstenFabricNetworkGatewayToLogicalRouterCmd = new AddTungstenFabricNetworkGatewayToLogicalRouterCmd();
4955
addTungstenFabricNetworkGatewayToLogicalRouterCmd.tungstenService = tungstenService;
50-
Whitebox.setInternalState(addTungstenFabricNetworkGatewayToLogicalRouterCmd, "zoneId", 1L);
51-
Whitebox.setInternalState(addTungstenFabricNetworkGatewayToLogicalRouterCmd, "networkUuid", "005f0dea-0196" +
56+
ReflectionTestUtils.setField(addTungstenFabricNetworkGatewayToLogicalRouterCmd, "zoneId", 1L);
57+
ReflectionTestUtils.setField(addTungstenFabricNetworkGatewayToLogicalRouterCmd, "networkUuid", "005f0dea-0196" +
5258
"-11ec-a1ed-b42e99f6e187");
53-
Whitebox.setInternalState(addTungstenFabricNetworkGatewayToLogicalRouterCmd, "logicalRouterUuid", "125f0dea" +
59+
ReflectionTestUtils.setField(addTungstenFabricNetworkGatewayToLogicalRouterCmd, "logicalRouterUuid", "125f0dea" +
5460
"-0196-11ec-a1ed-b42e99f6e187");
5561
}
5662

63+
@After
64+
public void tearDown() throws Exception {
65+
closeable.close();
66+
}
67+
5768
@Test
5869
public void executeTest() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException,
5970
ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {

‎plugins/network-elements/tungsten/src/test/java/org/apache/cloudstack/network/tungsten/api/command/AddTungstenFabricPolicyRuleCmdTest.java‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,39 +27,48 @@
2727
import org.junit.Assert;
2828
import org.junit.Before;
2929
import org.junit.Test;
30+
import org.junit.runner.RunWith;
3031
import org.mockito.ArgumentMatchers;
3132
import org.mockito.Mock;
3233
import org.mockito.Mockito;
3334
import org.mockito.MockitoAnnotations;
34-
import org.powermock.reflect.Whitebox;
35+
import org.mockito.junit.MockitoJUnitRunner;
36+
import org.springframework.test.util.ReflectionTestUtils;
3537

38+
@RunWith(MockitoJUnitRunner.class)
3639
public class AddTungstenFabricPolicyRuleCmdTest {
3740

3841
@Mock
3942
TungstenService tungstenService;
4043

4144
AddTungstenFabricPolicyRuleCmd addTungstenFabricPolicyRuleCmd;
4245

46+
AutoCloseable closeable;
47+
4348
@Before
4449
public void setup() {
45-
MockitoAnnotations.initMocks(this);
50+
closeable = MockitoAnnotations.openMocks(this);
4651
addTungstenFabricPolicyRuleCmd = new AddTungstenFabricPolicyRuleCmd();
4752
addTungstenFabricPolicyRuleCmd.tungstenService = tungstenService;
48-
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "zoneId", 1L);
49-
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "policyUuid", "test");
50-
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "action", "test");
51-
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "direction", "oneway");
52-
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "protocol", "test");
53-
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "srcNetwork", "test");
54-
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "srcIpPrefix", "test");
55-
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "srcIpPrefixLen", 1);
56-
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "srcStartPort", 1);
57-
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "srcEndPort", 1);
58-
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "destNetwork", "test");
59-
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "destIpPrefix", "test");
60-
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "destIpPrefixLen", 1);
61-
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "destStartPort", 1);
62-
Whitebox.setInternalState(addTungstenFabricPolicyRuleCmd, "destEndPort", 1);
53+
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "zoneId", 1L);
54+
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "policyUuid", "test");
55+
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "action", "test");
56+
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "direction", "oneway");
57+
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "protocol", "test");
58+
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "srcNetwork", "test");
59+
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "srcIpPrefix", "test");
60+
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "srcIpPrefixLen", 1);
61+
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "srcStartPort", 1);
62+
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "srcEndPort", 1);
63+
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "destNetwork", "test");
64+
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "destIpPrefix", "test");
65+
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "destIpPrefixLen", 1);
66+
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "destStartPort", 1);
67+
ReflectionTestUtils.setField(addTungstenFabricPolicyRuleCmd, "destEndPort", 1);
68+
}
69+
70+
public void tearDown() throws Exception {
71+
closeable.close();
6372
}
6473

6574
@Test

‎plugins/network-elements/tungsten/src/test/java/org/apache/cloudstack/network/tungsten/api/command/ApplyTungstenFabricPolicyCmdTest.java‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,32 +24,43 @@
2424
import org.apache.cloudstack.api.ServerApiException;
2525
import org.apache.cloudstack.network.tungsten.api.response.TungstenFabricPolicyResponse;
2626
import org.apache.cloudstack.network.tungsten.service.TungstenService;
27+
import org.junit.After;
2728
import org.junit.Assert;
2829
import org.junit.Before;
2930
import org.junit.Test;
31+
import org.junit.runner.RunWith;
3032
import org.mockito.ArgumentMatchers;
3133
import org.mockito.Mock;
3234
import org.mockito.Mockito;
3335
import org.mockito.MockitoAnnotations;
34-
import org.powermock.reflect.Whitebox;
36+
import org.mockito.junit.MockitoJUnitRunner;
37+
import org.springframework.test.util.ReflectionTestUtils;
3538

39+
@RunWith(MockitoJUnitRunner.class)
3640
public class ApplyTungstenFabricPolicyCmdTest {
3741

3842
@Mock
3943
TungstenService tungstenService;
4044

4145
ApplyTungstenFabricPolicyCmd applyTungstenFabricPolicyCmd;
4246

47+
AutoCloseable closeable;
48+
4349
@Before
4450
public void setup() {
45-
MockitoAnnotations.initMocks(this);
51+
closeable = MockitoAnnotations.openMocks(this);
4652
applyTungstenFabricPolicyCmd = new ApplyTungstenFabricPolicyCmd();
4753
applyTungstenFabricPolicyCmd.tungstenService = tungstenService;
48-
Whitebox.setInternalState(applyTungstenFabricPolicyCmd, "zoneId", 1L);
49-
Whitebox.setInternalState(applyTungstenFabricPolicyCmd, "networkUuid", "test");
50-
Whitebox.setInternalState(applyTungstenFabricPolicyCmd, "policyUuid", "test");
51-
Whitebox.setInternalState(applyTungstenFabricPolicyCmd, "majorSequence", 1);
52-
Whitebox.setInternalState(applyTungstenFabricPolicyCmd, "minorSequence", 1);
54+
ReflectionTestUtils.setField(applyTungstenFabricPolicyCmd, "zoneId", 1L);
55+
ReflectionTestUtils.setField(applyTungstenFabricPolicyCmd, "networkUuid", "test");
56+
ReflectionTestUtils.setField(applyTungstenFabricPolicyCmd, "policyUuid", "test");
57+
ReflectionTestUtils.setField(applyTungstenFabricPolicyCmd, "majorSequence", 1);
58+
ReflectionTestUtils.setField(applyTungstenFabricPolicyCmd, "minorSequence", 1);
59+
}
60+
61+
@After
62+
public void tearDown() throws Exception {
63+
closeable.close();
5364
}
5465

5566
@Test

‎plugins/network-elements/tungsten/src/test/java/org/apache/cloudstack/network/tungsten/api/command/ApplyTungstenFabricTagCmdTest.java‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,36 +24,47 @@
2424
import org.apache.cloudstack.api.ServerApiException;
2525
import org.apache.cloudstack.network.tungsten.api.response.TungstenFabricTagResponse;
2626
import org.apache.cloudstack.network.tungsten.service.TungstenService;
27+
import org.junit.After;
2728
import org.junit.Assert;
2829
import org.junit.Before;
2930
import org.junit.Test;
31+
import org.junit.runner.RunWith;
3032
import org.mockito.ArgumentMatchers;
3133
import org.mockito.Mock;
3234
import org.mockito.Mockito;
3335
import org.mockito.MockitoAnnotations;
34-
import org.powermock.reflect.Whitebox;
36+
import org.mockito.junit.MockitoJUnitRunner;
37+
import org.springframework.test.util.ReflectionTestUtils;
3538

3639
import java.util.Arrays;
3740

41+
@RunWith(MockitoJUnitRunner.class)
3842
public class ApplyTungstenFabricTagCmdTest {
3943

4044
@Mock
4145
TungstenService tungstenService;
4246

4347
ApplyTungstenFabricTagCmd applyTungstenFabricTagCmd;
4448

49+
AutoCloseable closeable;
50+
4551
@Before
4652
public void setup() {
47-
MockitoAnnotations.initMocks(this);
53+
closeable = MockitoAnnotations.openMocks(this);
4854
applyTungstenFabricTagCmd = new ApplyTungstenFabricTagCmd();
4955
applyTungstenFabricTagCmd.tungstenService = tungstenService;
50-
Whitebox.setInternalState(applyTungstenFabricTagCmd, "zoneId", 1L);
51-
Whitebox.setInternalState(applyTungstenFabricTagCmd, "networkUuids", Arrays.asList("test"));
52-
Whitebox.setInternalState(applyTungstenFabricTagCmd, "vmUuids", Arrays.asList("test"));
53-
Whitebox.setInternalState(applyTungstenFabricTagCmd, "nicUuids", Arrays.asList("test"));
54-
Whitebox.setInternalState(applyTungstenFabricTagCmd, "policyUuid", "test");
55-
Whitebox.setInternalState(applyTungstenFabricTagCmd, "applicationPolicySetUuid", "test");
56-
Whitebox.setInternalState(applyTungstenFabricTagCmd, "tagUuid", "test");
56+
ReflectionTestUtils.setField(applyTungstenFabricTagCmd, "zoneId", 1L);
57+
ReflectionTestUtils.setField(applyTungstenFabricTagCmd, "networkUuids", Arrays.asList("test"));
58+
ReflectionTestUtils.setField(applyTungstenFabricTagCmd, "vmUuids", Arrays.asList("test"));
59+
ReflectionTestUtils.setField(applyTungstenFabricTagCmd, "nicUuids", Arrays.asList("test"));
60+
ReflectionTestUtils.setField(applyTungstenFabricTagCmd, "policyUuid", "test");
61+
ReflectionTestUtils.setField(applyTungstenFabricTagCmd, "applicationPolicySetUuid", "test");
62+
ReflectionTestUtils.setField(applyTungstenFabricTagCmd, "tagUuid", "test");
63+
}
64+
65+
@After
66+
public void tearDown() throws Exception {
67+
closeable.close();
5768
}
5869

5970
@Test

‎plugins/network-elements/tungsten/src/test/java/org/apache/cloudstack/network/tungsten/api/command/ConfigTungstenFabricServiceCmdTest.java‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,25 @@
2828
import com.cloud.utils.db.Transaction;
2929
import com.cloud.utils.db.TransactionCallbackNoReturn;
3030
import org.apache.cloudstack.api.response.SuccessResponse;
31+
import org.junit.After;
3132
import org.junit.Assert;
3233
import org.junit.Before;
3334
import org.junit.Test;
3435
import org.junit.runner.RunWith;
3536
import org.mockito.ArgumentMatchers;
3637
import org.mockito.Mock;
38+
import org.mockito.MockedStatic;
3739
import org.mockito.Mockito;
3840
import org.mockito.MockitoAnnotations;
39-
import org.powermock.api.mockito.PowerMockito;
40-
import org.powermock.core.classloader.annotations.PrepareForTest;
41-
import org.powermock.modules.junit4.PowerMockRunner;
42-
import org.powermock.reflect.Whitebox;
41+
import org.mockito.junit.MockitoJUnitRunner;
42+
import org.springframework.test.util.ReflectionTestUtils;
4343

4444
import java.util.Arrays;
4545
import java.util.List;
4646

4747
import static org.mockito.ArgumentMatchers.any;
48-
import static org.powermock.api.mockito.PowerMockito.mockStatic;
4948

50-
@RunWith(PowerMockRunner.class)
51-
@PrepareForTest({Transaction.class, ConfigTungstenFabricServiceCmd.class})
49+
@RunWith(MockitoJUnitRunner.class)
5250
public class ConfigTungstenFabricServiceCmdTest {
5351
@Mock
5452
EntityManager entityManager;
@@ -65,18 +63,24 @@ public class ConfigTungstenFabricServiceCmdTest {
6563

6664
ConfigTungstenFabricServiceCmd configTungstenFabricServiceCmd;
6765

66+
AutoCloseable closeable;
6867
@Before
6968
public void setup() {
70-
MockitoAnnotations.initMocks(this);
69+
closeable = MockitoAnnotations.openMocks(this);
7170
configTungstenFabricServiceCmd = new ConfigTungstenFabricServiceCmd();
7271
configTungstenFabricServiceCmd._entityMgr = entityManager;
7372
configTungstenFabricServiceCmd.networkModel = networkModel;
7473
configTungstenFabricServiceCmd.networkOfferingDao = networkOfferingDao;
7574
configTungstenFabricServiceCmd.networkOfferingServiceMapDao = networkOfferingServiceMapDao;
7675
configTungstenFabricServiceCmd.networkServiceMapDao = networkServiceMapDao;
7776
configTungstenFabricServiceCmd.physicalNetworkServiceProviderDao = physicalNetworkServiceProviderDao;
78-
Whitebox.setInternalState(configTungstenFabricServiceCmd, "zoneId", 1L);
79-
Whitebox.setInternalState(configTungstenFabricServiceCmd, "physicalNetworkId", 1L);
77+
ReflectionTestUtils.setField(configTungstenFabricServiceCmd, "zoneId", 1L);
78+
ReflectionTestUtils.setField(configTungstenFabricServiceCmd, "physicalNetworkId", 1L);
79+
}
80+
81+
@After
82+
public void tearDown() throws Exception {
83+
closeable.close();
8084
}
8185

8286
@Test
@@ -86,16 +90,14 @@ public void executeTest() throws Exception {
8690
Network managementNetwork = Mockito.mock(Network.class);
8791
TransactionCallbackNoReturn transactionCallbackNoReturn = Mockito.mock(TransactionCallbackNoReturn.class);
8892
List<NetworkOfferingVO> systemNetworkOffering = Arrays.asList(Mockito.mock(NetworkOfferingVO.class));
89-
mockStatic(Transaction.class);
9093
Mockito.when(entityManager.findById(ArgumentMatchers.any(), ArgumentMatchers.anyLong())).thenReturn(dataCenter);
9194
Mockito.when(dataCenter.isSecurityGroupEnabled()).thenReturn(true);
92-
Mockito.when(networkModel.getSystemNetworkByZoneAndTrafficType(ArgumentMatchers.anyLong(),
93-
ArgumentMatchers.any())).thenReturn(managementNetwork);
94-
Mockito.when(networkOfferingDao.listSystemNetworkOfferings()).thenReturn(systemNetworkOffering);
95-
PowerMockito.when(Transaction.execute(any(TransactionCallbackNoReturn.class))).thenReturn(transactionCallbackNoReturn);
96-
PowerMockito.whenNew(SuccessResponse.class).withAnyArguments().thenReturn(successResponse);
97-
configTungstenFabricServiceCmd.execute();
98-
Assert.assertEquals(successResponse, configTungstenFabricServiceCmd.getResponseObject());
95+
try (MockedStatic<Transaction> transactionMocked = Mockito.mockStatic(Transaction.class)) {
96+
transactionMocked.when(() -> Transaction.execute(any(TransactionCallbackNoReturn.class))).thenReturn(transactionCallbackNoReturn);
97+
configTungstenFabricServiceCmd.execute();
98+
SuccessResponse response = (SuccessResponse) configTungstenFabricServiceCmd.getResponseObject();
99+
Assert.assertTrue(response.getSuccess());
100+
}
99101
}
100102

101103
}

0 commit comments

Comments
 (0)