From 70b61cfc3ea0fba3447a196d0f862b78b23cb625 Mon Sep 17 00:00:00 2001
From: mabofu <dev16302@linx-info.com>
Date: Mon, 28 Apr 2025 18:35:02 +0800
Subject: [PATCH] Fixed code coverage: fixed StorageDirApi code coverage

---
 .../storagedir/api/StorageDirApiTest.java     | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/dsms-engine-application/src/test/java/com/dsms/dfsbroker/storagedir/api/StorageDirApiTest.java b/dsms-engine-application/src/test/java/com/dsms/dfsbroker/storagedir/api/StorageDirApiTest.java
index fd58cd7..7b618cb 100644
--- a/dsms-engine-application/src/test/java/com/dsms/dfsbroker/storagedir/api/StorageDirApiTest.java
+++ b/dsms-engine-application/src/test/java/com/dsms/dfsbroker/storagedir/api/StorageDirApiTest.java
@@ -16,16 +16,18 @@
 
 package com.dsms.dfsbroker.storagedir.api;
 
+import static com.dsms.dfsbroker.storagedir.api.StorageDirApi.MAX_RETRIES;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.when;
 
+import com.alibaba.fastjson2.JSONArray;
 import com.dsms.ClusterProperties;
-import com.dsms.common.remotecall.model.RemoteFixedParam;
 import com.dsms.common.remotecall.model.RemoteRequest;
 import com.dsms.common.remotecall.model.RemoteResponse;
 import com.dsms.dfsbroker.cluster.model.Cluster;
 import com.dsms.dfsbroker.common.api.CommonApi;
 import com.dsms.dfsbroker.storagedir.model.dto.StorageDirDTO;
+import com.dsms.dfsbroker.storagedir.model.remote.SubvolumeInfoResponse;
 import com.dsms.dfsbroker.storagedir.model.remote.SubvolumeLsResponse;
 import com.dsms.modules.util.RemoteCallUtil;
 import lombok.SneakyThrows;
@@ -63,9 +65,15 @@ class StorageDirApiTest {
     }
 
     @Test
+    @SneakyThrows
     void getStorageDirList() {
+        SubvolumeLsResponse subvolumeLsResponse = new SubvolumeLsResponse();
+        subvolumeLsResponse.setName(VOL_NAME);
+        SubvolumeLsResponse[] subvolumeLsResponses = new SubvolumeLsResponse[]{subvolumeLsResponse};
         StorageDirDTO storageDirDTO = new StorageDirDTO();
         storageDirDTO.setVolName(VOL_NAME);
+        when(mockCommonApi.remoteCallRequest(request, MAX_RETRIES,
+            SubvolumeLsResponse[].class)).thenReturn(subvolumeLsResponses);
         Assertions.assertThatCode(() -> storageDirApi.getStorageDirList(request, storageDirDTO)).doesNotThrowAnyException();
     }
 
@@ -73,7 +81,7 @@ class StorageDirApiTest {
     @SneakyThrows
     void testGetStorageDirListThrowsThrowable() {
         final StorageDirDTO storageDirDTO = new StorageDirDTO(VOL_NAME, SUB_NAME);
-        when(mockCommonApi.remoteCallRequest(new RemoteRequest(new RemoteFixedParam()), 3,
+        when(mockCommonApi.remoteCallRequest(request, 3,
             SubvolumeLsResponse[].class)).thenThrow(Throwable.class);
         assertThatThrownBy(() -> storageDirApi.getStorageDirList(request, storageDirDTO))
             .isInstanceOf(Throwable.class);
@@ -91,17 +99,22 @@ class StorageDirApiTest {
     @SneakyThrows
     void testGetStorageDirInfoThrowsThrowable() {
         final StorageDirDTO storageDirDTO = new StorageDirDTO(VOL_NAME, SUB_NAME);
-        when(mockCommonApi.remoteCallRequest(new RemoteRequest(new RemoteFixedParam()), 3,
-            SubvolumeLsResponse[].class)).thenThrow(Throwable.class);
+        when(mockCommonApi.remoteCallRequest(request, MAX_RETRIES,
+            SubvolumeInfoResponse.class)).thenThrow(Throwable.class);
         assertThatThrownBy(() -> storageDirApi.getStorageDirInfo(request, storageDirDTO))
             .isInstanceOf(Throwable.class);
     }
 
     @Test
+    @SneakyThrows
     void getStorageDirAuthList() {
+        JSONArray objects = new JSONArray();
+
         StorageDirDTO storageDirDTO = new StorageDirDTO();
         storageDirDTO.setVolName(VOL_NAME);
         storageDirDTO.setSubName(SUB_NAME);
+        when(mockCommonApi.remoteCallRequest(request, MAX_RETRIES,
+            JSONArray.class)).thenReturn(objects);
         Assertions.assertThatCode(() -> storageDirApi.getStorageDirAuthList(request, storageDirDTO)).doesNotThrowAnyException();
     }
 
@@ -109,7 +122,7 @@ class StorageDirApiTest {
     @SneakyThrows
     void testGetStorageDirAuthListThrowsThrowable() {
         final StorageDirDTO storageDirDTO = new StorageDirDTO(VOL_NAME, SUB_NAME);
-        when(mockCommonApi.remoteCallRequest(new RemoteRequest(new RemoteFixedParam()), 3,
+        when(mockCommonApi.remoteCallRequest(request, MAX_RETRIES,
             SubvolumeLsResponse[].class)).thenThrow(Throwable.class);
         assertThatThrownBy(() -> storageDirApi.getStorageDirAuthList(request, storageDirDTO))
             .isInstanceOf(Throwable.class);
@@ -125,7 +138,7 @@ class StorageDirApiTest {
     @SneakyThrows
     void createStorageDirThrowsThrowable() {
         final StorageDirDTO storageDirDTO = new StorageDirDTO(VOL_NAME, SUB_NAME);
-        when(mockCommonApi.remoteCall(request, 3, RemoteResponse.class)).thenThrow(Throwable.class);
+        when(mockCommonApi.remoteCall(request, MAX_RETRIES, RemoteResponse.class)).thenThrow(Throwable.class);
         assertThatThrownBy(() -> storageDirApi.createStorageDir(request, storageDirDTO)).isInstanceOf(Throwable.class);
     }
 
@@ -139,7 +152,7 @@ class StorageDirApiTest {
     @SneakyThrows
     void removeStorageDirThrowsThrowable() {
         final StorageDirDTO storageDirDTO = new StorageDirDTO(VOL_NAME, SUB_NAME);
-        when(mockCommonApi.remoteCall(request, 3, RemoteResponse.class)).thenThrow(Throwable.class);
+        when(mockCommonApi.remoteCall(request, MAX_RETRIES, RemoteResponse.class)).thenThrow(Throwable.class);
         assertThatThrownBy(() -> storageDirApi.removeStorageDir(request, storageDirDTO)).isInstanceOf(Throwable.class);
     }
 
-- 
Gitee