DaanHoogland commented on code in PR #7986:
URL: https://github.com/apache/cloudstack/pull/7986#discussion_r1332627770
##########
server/src/test/java/com/cloud/api/query/QueryManagerImplTest.java:
##########
@@ -35,33 +35,29 @@
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
+import org.mockito.MockedStatic;
import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
import com.cloud.api.query.vo.EventJoinVO;
import com.cloud.event.dao.EventJoinDao;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.network.Network;
import com.cloud.network.dao.NetworkVO;
-import com.cloud.projects.Project;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.user.AccountVO;
import com.cloud.user.User;
import com.cloud.user.UserVO;
import com.cloud.utils.Pair;
-import com.cloud.utils.component.ComponentContext;
import com.cloud.utils.db.EntityManager;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.vm.VirtualMachine;
+import org.mockito.junit.MockitoJUnitRunner;
Review Comment:
reorganise to add with the other `org.mockito...`
##########
server/src/test/java/com/cloud/event/dao/EventJoinDaoImplTest.java:
##########
@@ -27,16 +27,13 @@
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
import com.cloud.api.query.vo.EventJoinVO;
-import com.cloud.utils.component.ComponentContext;
import com.cloud.utils.db.EntityManager;
import com.cloud.vm.VirtualMachine;
+import org.mockito.junit.MockitoJUnitRunner;
Review Comment:
reorganise?
##########
server/src/test/java/com/cloud/network/guru/ExternalGuestNetworkGuruTest.java:
##########
@@ -41,11 +39,10 @@
import com.cloud.offering.NetworkOffering;
import com.cloud.user.Account;
import com.cloud.utils.Pair;
-import com.cloud.utils.component.ComponentContext;
import com.cloud.vm.NicProfile;
+import org.mockito.junit.MockitoJUnitRunner;
Review Comment:
reorganise?
##########
server/src/test/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImplTest.java:
##########
@@ -114,16 +101,15 @@
import com.cloud.user.dao.UserDao;
import com.cloud.uservm.UserVm;
import com.cloud.utils.Pair;
-import com.cloud.vm.DiskProfile;
import com.cloud.vm.NicProfile;
import com.cloud.vm.UserVmManager;
import com.cloud.vm.UserVmVO;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.dao.VMInstanceDao;
+import org.mockito.junit.MockitoJUnitRunner;
Review Comment:
reorganise
##########
server/src/test/java/com/cloud/api/query/dao/VolumeJoinDaoImplTest.java:
##########
@@ -21,14 +21,11 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import com.cloud.api.ApiDBUtils;
import com.cloud.api.query.vo.VolumeJoinVO;
+import org.mockito.junit.MockitoJUnitRunner;
Review Comment:
reorganise?
##########
server/src/test/java/com/cloud/api/query/dao/GenericDaoBaseWithTagInformationBaseTest.java:
##########
@@ -18,13 +18,17 @@
import static org.junit.Assert.assertEquals;
+import com.cloud.api.query.vo.ResourceTagJoinVO;
import org.apache.cloudstack.api.BaseResponseWithTagInformation;
import org.apache.cloudstack.api.response.ResourceTagResponse;
-import org.powermock.api.mockito.PowerMockito;
+import org.junit.After;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.query.vo.BaseViewWithTagInformationVO;
import com.cloud.server.ResourceTag.ResourceObjectType;
+import org.springframework.test.util.ReflectionTestUtils;
Review Comment:
into the `org...`-section
##########
server/src/test/java/com/cloud/network/vpc/VpcManagerImplTest.java:
##########
@@ -207,18 +208,27 @@ public void setup()
manager._firewallDao = firewallDao;
CallContext.register(Mockito.mock(User.class),
Mockito.mock(Account.class));
registerCallContext();
+ overrideDefaultConfigValue(NetworkService.AllowUsersToSpecifyVRMtu,
"_defaultValue", "false");
}
@After
- public void tearDown() {
+ public void tearDown() throws Exception {
CallContext.unregister();
+ closeable.close();
+ }
+
+ private void overrideDefaultConfigValue(final ConfigKey configKey, final
String name, final Object o) throws IllegalAccessException,
NoSuchFieldException {
+ Field f = ConfigKey.class.getDeclaredField(name);
+ f.setAccessible(true);
+ f.set(configKey, o);
}
+
@Test
public void getVpcOffSvcProvidersMapForEmptyServiceTest() {
long vpcOffId = 1L;
List<VpcOfferingServiceMapVO> list = new
ArrayList<VpcOfferingServiceMapVO>();
list.add(mock(VpcOfferingServiceMapVO.class));
-
when(manager._vpcOffSvcMapDao.listByVpcOffId(vpcOffId)).thenReturn(list);
+
Mockito.when(manager._vpcOffSvcMapDao.listByVpcOffId(vpcOffId)).thenReturn(list);
Review Comment:
now that we have only one `when()` left, should we statically import it?
##########
server/src/test/java/com/cloud/network/vpc/VpcManagerImplTest.java:
##########
@@ -98,14 +96,16 @@
import com.cloud.utils.db.EntityManager;
import com.cloud.utils.net.Ip;
import com.cloud.vm.DomainRouterVO;
-import com.cloud.vm.NicVO;
import com.cloud.vm.dao.DomainRouterDao;
import com.cloud.vm.dao.NicDao;
import com.cloud.network.vpc.dao.VpcOfferingDao;
import com.cloud.user.ResourceLimitService;
import com.cloud.user.UserVO;
import com.cloud.utils.net.NetUtils;
+import org.mockito.junit.MockitoJUnitRunner;
Review Comment:
prior disorganisation, but now we are in this file; reorganise?
##########
server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java:
##########
@@ -81,9 +80,9 @@
import com.cloud.vm.dao.UserVmDetailsDao;
import com.cloud.vm.dao.VMInstanceDao;
import com.trilead.ssh2.Connection;
+import org.mockito.junit.MockitoJUnitRunner;
Review Comment:
reorganise?
##########
server/src/test/java/com/cloud/network/Ipv6ServiceImplTest.java:
##########
@@ -165,8 +167,19 @@ public void setup() {
persistedPrefixSubnetMap.add(map);
return map;
});
- PowerMockito.mockStatic(ApiDBUtils.class);
-
Mockito.when(ApiDBUtils.findZoneById(Mockito.anyLong())).thenReturn(Mockito.mock(DataCenterVO.class));
+ apiDBUtilsMocked = Mockito.mockStatic(ApiDBUtils.class);
+ apiDBUtilsMocked.when(() ->
ApiDBUtils.findZoneById(Mockito.anyLong())).thenReturn(Mockito.mock(DataCenterVO.class));
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ apiDBUtilsMocked.close();
+ if (actionEventUtilsMocked != null) {
+ actionEventUtilsMocked.close();
+ }
+ if (usageEventUtilsMocked != null) {
+ usageEventUtilsMocked.close();
+ }
Review Comment:
would it be better to open thos globally and close them unconditionally?
in a flawless run these are created twice (and closed only once)
##########
server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java:
##########
@@ -25,18 +25,16 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
+import org.mockito.MockedStatic;
import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.storage.StorageManager;
import com.cloud.utils.net.NetUtils;
+import org.mockito.junit.MockitoJUnitRunner;
Review Comment:
reorganise?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
