sync: review comments changes for test files

Author: Srivastava, Piyush

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java

@@ -54,7 +54,6 @@
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.apache.cloudstack.storage.feign.model.Igroup;
 import org.apache.cloudstack.storage.feign.client.SnapshotFeignClient;
 import org.apache.cloudstack.storage.feign.model.FlexVolSnapshot;
 import org.apache.cloudstack.storage.feign.model.Lun;

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java

@@ -378,7 +378,6 @@ public boolean attachZone(DataStore dataStore, ZoneScope scope, Hypervisor.Hyper
         _dataStoreHelper.attachZone(dataStore);
         return true;
     }
-    
     private boolean validateProtocolSupportAndFetchHostsIdentifier(List<HostVO> hosts, ProtocolType protocolType, List<String> hostIdentifiers) {
         switch (protocolType) {
             case ISCSI:

plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriverTest.java

@@ -158,7 +158,6 @@ void testCreateAsync_NullCallback_ThrowsException() {
     void testCreateAsync_VolumeWithISCSI_Success() {
         // Setup
         when(dataStore.getId()).thenReturn(1L);
-        when(dataStore.getUuid()).thenReturn("pool-uuid-123");
         when(dataStore.getName()).thenReturn("ontap-pool");
         when(volumeInfo.getType()).thenReturn(VOLUME);
         when(volumeInfo.getId()).thenReturn(100L);
@@ -212,7 +211,6 @@ void testCreateAsync_VolumeWithNFS_Success() {
         storagePoolDetails.put(OntapStorageConstants.PROTOCOL, ProtocolType.NFS3.name());
 
         when(dataStore.getId()).thenReturn(1L);
-        when(dataStore.getUuid()).thenReturn("pool-uuid-123");
         when(dataStore.getName()).thenReturn("ontap-pool");
         when(volumeInfo.getType()).thenReturn(VOLUME);
         when(volumeInfo.getId()).thenReturn(100L);
@@ -336,7 +334,6 @@ void testGrantAccess_NullParameters_ThrowsException() {
     void testGrantAccess_ClusterScope_Success() {
         // Setup
         when(dataStore.getId()).thenReturn(1L);
-        when(dataStore.getUuid()).thenReturn("pool-uuid-123");
         when(volumeInfo.getType()).thenReturn(VOLUME);
         when(volumeInfo.getId()).thenReturn(100L);
 
@@ -389,7 +386,6 @@ void testGrantAccess_IgroupNotFound_CreatesNewIgroup() {
         when(hostVO.getName()).thenReturn("host1");
 
         when(dataStore.getId()).thenReturn(1L);
-        when(dataStore.getUuid()).thenReturn("pool-uuid-123");
         when(volumeInfo.getType()).thenReturn(VOLUME);
         when(volumeInfo.getId()).thenReturn(100L);
 

plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/vmsnapshot/OntapVMSnapshotStrategyTest.java

@@ -30,7 +30,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -49,6 +48,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -107,6 +107,7 @@ class OntapVMSnapshotStrategyTest {
     private static final String VM_UUID = "vm-uuid-123";
 
     @Spy
+    @InjectMocks
     private OntapVMSnapshotStrategy strategy;
 
     @Mock
@@ -133,34 +134,8 @@ class OntapVMSnapshotStrategyTest {
     private VolumeDetailsDao volumeDetailsDao;
 
     @BeforeEach
-    void setUp() throws Exception {
-        // Inject mocks into the inherited fields via reflection
-        // DefaultVMSnapshotStrategy fields
-        setField(strategy, DefaultVMSnapshotStrategy.class, "vmSnapshotHelper", vmSnapshotHelper);
-        setField(strategy, DefaultVMSnapshotStrategy.class, "guestOSDao", guestOSDao);
-        setField(strategy, DefaultVMSnapshotStrategy.class, "userVmDao", userVmDao);
-        setField(strategy, DefaultVMSnapshotStrategy.class, "vmSnapshotDao", vmSnapshotDao);
-        setField(strategy, DefaultVMSnapshotStrategy.class, "agentMgr", agentMgr);
-        setField(strategy, DefaultVMSnapshotStrategy.class, "volumeDao", volumeDao);
-
-        // StorageVMSnapshotStrategy fields
-        setField(strategy, StorageVMSnapshotStrategy.class, "storagePool", storagePool);
-        setField(strategy, StorageVMSnapshotStrategy.class, "vmSnapshotDetailsDao", vmSnapshotDetailsDao);
-        setField(strategy, StorageVMSnapshotStrategy.class, "volumeDataFactory", volumeDataFactory);
-
-        // OntapVMSnapshotStrategy fields
-        setField(strategy, OntapVMSnapshotStrategy.class, "storagePoolDetailsDao", storagePoolDetailsDao);
-        setField(strategy, OntapVMSnapshotStrategy.class, "volumeDetailsDao", volumeDetailsDao);
-    }
-
-    // ──────────────────────────────────────────────────────────────────────────
-    // Helper: inject field via reflection into a specific declaring class
-    // ──────────────────────────────────────────────────────────────────────────
-
-    private void setField(Object target, Class<?> declaringClass, String fieldName, Object value) throws Exception {
-        Field field = declaringClass.getDeclaredField(fieldName);
-        field.setAccessible(true);
-        field.set(target, value);
+    void setUp() {
+        // @InjectMocks handles injection into inherited fields
     }
 
     // ──────────────────────────────────────────────────────────────────────────