From 2f0fc971c2d4691a1638e7adfff855f5f6aecde2 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Fri, 27 Mar 2026 15:24:07 -0400 Subject: [PATCH] fix EOF and trailing spaces --- .../endpoint/DefaultEndPointSelectorTest.java | 26 +++---------------- .../storage/volume/VolumeServiceImpl.java | 1 - .../kvm/storage/KVMStorageProcessorTest.java | 9 ++++--- .../storage/VolumeApiServiceImplTest.java | 2 -- 4 files changed, 10 insertions(+), 28 deletions(-) diff --git a/engine/storage/src/test/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelectorTest.java b/engine/storage/src/test/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelectorTest.java index c22a5ee4e17..8dc06b3ef10 100644 --- a/engine/storage/src/test/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelectorTest.java +++ b/engine/storage/src/test/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelectorTest.java @@ -85,7 +85,7 @@ public class DefaultEndPointSelectorTest { @Before public void setup() { Mockito.doReturn(volumeInfoMock).when(snapshotInfoMock).getBaseVolume(); - + // Common volume mock setup Mockito.when(volumeInfoMock.getId()).thenReturn(VOLUME_ID); Mockito.when(volumeInfoMock.getUuid()).thenReturn(VOLUME_UUID); @@ -234,11 +234,9 @@ public class DefaultEndPointSelectorTest { Mockito.verify(defaultEndPointSelectorSpy, Mockito.times(1)).select(snapshotInfoMock, false); } - // ==================== CLVM/CLVM_NG Tests ==================== @Test public void testSelectClvmEndpoint_VolumeWithDestinationHost_CLVM() { - // Setup CLVM pool Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary); Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID); Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock); @@ -256,7 +254,6 @@ public class DefaultEndPointSelectorTest { @Test public void testSelectClvmEndpoint_VolumeWithDestinationHost_CLVM_NG() { - // Setup CLVM_NG pool Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary); Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID); Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock); @@ -274,7 +271,6 @@ public class DefaultEndPointSelectorTest { @Test public void testSelectClvmEndpoint_VolumeWithoutDestinationHost() { - // Setup CLVM pool but no destination host Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary); Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID); Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock); @@ -293,7 +289,6 @@ public class DefaultEndPointSelectorTest { @Test public void testSelectClvmEndpoint_NonCLVMPool() { - // Setup NFS pool (non-CLVM) Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary); Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID); Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock); @@ -311,7 +306,6 @@ public class DefaultEndPointSelectorTest { @Test public void testSelectClvmEndpoint_SnapshotWithBaseVolumeDestHost() { - // Setup snapshot with base volume having destination host Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary); Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID); Mockito.when(snapshotInfoMock.getDataStore()).thenReturn(datastoreMock); @@ -331,7 +325,6 @@ public class DefaultEndPointSelectorTest { @Test public void testSelectWithAction_DeleteVolume_CLVMWithLockHost() { - // Setup CLVM volume with lock host Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary); Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID); Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock); @@ -351,7 +344,6 @@ public class DefaultEndPointSelectorTest { @Test public void testSelectWithAction_DeleteVolume_CLVM_NG_WithLockHost() { - // Setup CLVM_NG volume with lock host Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary); Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID); Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock); @@ -371,7 +363,6 @@ public class DefaultEndPointSelectorTest { @Test public void testSelectWithAction_DeleteVolume_CLVMWithoutLockHost() { - // Setup CLVM volume without lock host Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary); Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID); Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock); @@ -390,7 +381,6 @@ public class DefaultEndPointSelectorTest { @Test public void testSelectWithAction_DeleteVolume_NonCLVM() { - // Setup non-CLVM volume (NFS) Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary); Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID); Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock); @@ -408,7 +398,6 @@ public class DefaultEndPointSelectorTest { @Test public void testSelectObject_CLVMVolumeWithLockHost() { - // Setup CLVM volume with lock host tracked in volume_details Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary); Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID); Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock); @@ -427,7 +416,6 @@ public class DefaultEndPointSelectorTest { @Test public void testSelectObject_CLVM_NG_VolumeWithLockHost() { - // Setup CLVM_NG volume with lock host tracked in volume_details Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary); Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID); Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock); @@ -446,7 +434,6 @@ public class DefaultEndPointSelectorTest { @Test public void testSelectObject_CLVMVolumeWithoutLockHost() { - // Setup CLVM volume without lock host Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary); Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID); Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock); @@ -464,7 +451,6 @@ public class DefaultEndPointSelectorTest { @Test public void testSelectObject_CLVMVolumeWithInvalidLockHostId() { - // Setup CLVM volume with invalid lock host ID (non-numeric) Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary); Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID); Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock); @@ -483,7 +469,6 @@ public class DefaultEndPointSelectorTest { @Test public void testSelectObject_CLVMVolumeWithEmptyLockHostId() { - // Setup CLVM volume with empty lock host ID Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary); Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID); Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock); @@ -502,10 +487,8 @@ public class DefaultEndPointSelectorTest { @Test public void testSelectTwoObjects_TemplateToVolume_CLVMWithDestHost() { - // Test template-to-volume copy for CLVM with destination host DataObject srcDataMock = Mockito.mock(DataObject.class); - DataStore srcStoreMock = Mockito.mock(DataStore.class); - + Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock); Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary); Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID); @@ -523,13 +506,12 @@ public class DefaultEndPointSelectorTest { @Test public void testSelectTwoObjects_TemplateToVolume_CLVMWithoutDestHost() { - // Test template-to-volume copy for CLVM without destination host DataObject srcDataMock = Mockito.mock(DataObject.class); DataStore srcStoreMock = Mockito.mock(DataStore.class); - + Mockito.when(srcDataMock.getDataStore()).thenReturn(srcStoreMock); Mockito.when(srcStoreMock.getRole()).thenReturn(DataStoreRole.Image); - + Mockito.when(volumeInfoMock.getDataStore()).thenReturn(datastoreMock); Mockito.when(datastoreMock.getRole()).thenReturn(DataStoreRole.Primary); Mockito.when(datastoreMock.getId()).thenReturn(STORE_ID); diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java index 424f3f73afb..d5f0940b3ef 100644 --- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java +++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java @@ -3129,4 +3129,3 @@ public class VolumeServiceImpl implements VolumeService { return poolPath.startsWith("/") ? poolPath.substring(1) : poolPath; } } - diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java index 899309905e9..c9199b11e3f 100644 --- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java +++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java @@ -829,7 +829,7 @@ public class KVMStorageProcessorTest { @Test public void testComputeMd5Hash_ValidInput() { String input = "snapshot-uuid-123"; - + try { Method method = KVMStorageProcessor.class.getDeclaredMethod( "computeMd5Hash", String.class); @@ -847,7 +847,7 @@ public class KVMStorageProcessorTest { @Test public void testComputeMd5Hash_EmptyInput() { String input = ""; - + try { java.lang.reflect.Method method = KVMStorageProcessor.class.getDeclaredMethod( "computeMd5Hash", String.class); @@ -864,7 +864,7 @@ public class KVMStorageProcessorTest { @Test public void testComputeMd5Hash_ConsistentResults() { String input = "snapshot-uuid-456"; - + try { java.lang.reflect.Method method = KVMStorageProcessor.class.getDeclaredMethod( "computeMd5Hash", String.class); @@ -938,6 +938,9 @@ public class KVMStorageProcessorTest { method.invoke(storageProcessorSpy, kvmStoragePoolMock, volumeObjectToMock, bitmapName); Assert.assertTrue("Method should handle null volume path gracefully", true); + } catch (java.lang.reflect.InvocationTargetException e) { + Assert.fail("Method should handle null volume path internally, but threw: " + + (e.getCause() != null ? e.getCause().getMessage() : e.getMessage())); } catch (Exception e) { Assert.fail("Failed to test cleanupBrokenBitmap: " + e.getMessage()); } diff --git a/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java b/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java index c40cd746d4e..d480d79a3a7 100644 --- a/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java +++ b/server/src/test/java/com/cloud/storage/VolumeApiServiceImplTest.java @@ -2643,5 +2643,3 @@ public class VolumeApiServiceImplTest { } } } - -