DaanHoogland commented on code in PR #7818:
URL: https://github.com/apache/cloudstack/pull/7818#discussion_r1287000657
##########
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ScaleIOStoragePoolTest.java:
##########
@@ -146,35 +149,38 @@ public void testGetPhysicalDiskWithWildcardFileFilter()
throws Exception {
final String volumePath = "6c3362b500000001:vol-139-3d2c-12f0";
final String systemId = "218ce1797566a00f";
- File dir = PowerMockito.mock(File.class);
- PowerMockito.whenNew(File.class).withAnyArguments().thenReturn(dir);
-
// TODO: Mock file in dir
- File[] files = new File[1];
- String volumeId = ScaleIOUtil.getVolumePath(volumePath);
- String diskFilePath = ScaleIOUtil.DISK_PATH + File.separator +
ScaleIOUtil.DISK_NAME_PREFIX + systemId + "-" + volumeId;
- files[0] = new File(diskFilePath);
-
PowerMockito.when(dir.listFiles(any(FileFilter.class))).thenReturn(files);
-
- KVMPhysicalDisk disk = adapter.getPhysicalDisk(volumePath, pool);
- assertNull(disk);
+
+ try (MockedConstruction<File> ignored =
Mockito.mockConstruction(File.class, (mock, context) -> {
+ File[] files = new File[1];
+ String volumeId = ScaleIOUtil.getVolumePath(volumePath);
+ String diskFilePath =
+ ScaleIOUtil.DISK_PATH + File.separator +
ScaleIOUtil.DISK_NAME_PREFIX + systemId + "-" + volumeId;
+ files[0] = new File(diskFilePath);
+
Mockito.when(mock.listFiles(any(FileFilter.class))).thenReturn(files);
+ })) {
+ KVMPhysicalDisk disk = adapter.getPhysicalDisk(volumePath, pool);
+ assertNull(disk);
+ }
}
+
@Test
public void testGetPhysicalDiskWithSystemId() throws Exception {
final String volumePath = "6c3362b500000001:vol-139-3d2c-12f0";
final String volumeId = ScaleIOUtil.getVolumePath(volumePath);
final String systemId = "218ce1797566a00f";
- PowerMockito.mockStatic(ScaleIOUtil.class);
- when(ScaleIOUtil.getSystemIdForVolume(volumeId)).thenReturn(systemId);
+ try (MockedStatic<ScaleIOUtil> ignored =
Mockito.mockStatic(ScaleIOUtil.class, Mockito.CALLS_REAL_METHODS)) {
+
when(ScaleIOUtil.getSystemIdForVolume(volumeId)).thenReturn(systemId);
- // TODO: Mock file exists
- File file = PowerMockito.mock(File.class);
- PowerMockito.whenNew(File.class).withAnyArguments().thenReturn(file);
- PowerMockito.when(file.exists()).thenReturn(true);
+ // TODO: Mock file exists
+// File file = PowerMockito.mock(File.class);
+//
PowerMockito.whenNew(File.class).withAnyArguments().thenReturn(file);
+// PowerMockito.when(file.exists()).thenReturn(true);
Review Comment:
should this go?
--
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]
