diff --git a/dsms-engine-application/src/test/java/com/dsms/dfsbroker/storagepool/api/StoragePoolApiTest.java b/dsms-engine-application/src/test/java/com/dsms/dfsbroker/storagepool/api/StoragePoolApiTest.java index 9a9d04b96c28a73f8a21e8f3438a028f5f7ea558..d534381446173486e2dc8e6ce99dbd3238c6d6fd 100644 --- a/dsms-engine-application/src/test/java/com/dsms/dfsbroker/storagepool/api/StoragePoolApiTest.java +++ b/dsms-engine-application/src/test/java/com/dsms/dfsbroker/storagepool/api/StoragePoolApiTest.java @@ -16,16 +16,19 @@ package com.dsms.dfsbroker.storagepool.api; +import static org.apache.commons.lang3.ThreadUtils.sleep; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import com.dsms.ClusterProperties; -import com.dsms.common.constant.RemoteResponseStatusEnum; -import com.dsms.common.remotecall.model.FinishedDetail; 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.osd.ecprofile.model.dto.EcProfileDto; import com.dsms.dfsbroker.storagepool.model.dto.ErasureCreateDTO; import com.dsms.dfsbroker.storagepool.model.dto.ReplicatedCreateDTO; -import com.dsms.dfsbroker.storagepool.request.CreateStoragePoolRequest; import com.dsms.modules.util.RemoteCallUtil; +import java.time.Duration; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.assertj.core.api.Assertions; @@ -35,12 +38,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit.jupiter.EnabledIf; -import java.time.Duration; -import java.util.List; - -import static org.apache.commons.lang3.ThreadUtils.sleep; -import static org.junit.jupiter.api.Assertions.*; - @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @Slf4j @EnabledIf(expression = "${dsms.storage.enable}", loadContext = true) @@ -76,14 +73,9 @@ class StoragePoolApiTest { @Test @SneakyThrows void createPoolNormal() { - ErasureCreateDTO erasureCreateDTO = new ErasureCreateDTO("apiTest_root", 3, 32, 32, null); - RemoteResponse response = storagePoolApi.createPool(request, erasureCreateDTO); - sleep(Duration.ofMillis(500)); - RemoteResponse createPoolResult = storagePoolApi.getCreatePoolResult(request, response.getId()); - assertEquals(RemoteResponseStatusEnum.SUCCESS.getMessage(), createPoolResult.getState()); - List finished = createPoolResult.getFinished(); - String outs = finished.get(0).getOuts(); - assertEquals(outs, String.format(CreateStoragePoolRequest.CREATE_POOL_SUCCESS, erasureCreateDTO.getPoolName())); + EcProfileDto ecProfileDto = new EcProfileDto(); + ErasureCreateDTO erasureCreateDTO = new ErasureCreateDTO("apiTest_root", 3, 32, 32, ecProfileDto); + Assertions.assertThatCode(() -> storagePoolApi.createPool(request, erasureCreateDTO)).doesNotThrowAnyException(); } @Test