From 8c54c2b799e241f07e118d481e9656b5a2c168d9 Mon Sep 17 00:00:00 2001 From: gi1tee Date: Fri, 14 Jun 2024 17:47:41 +0800 Subject: [PATCH] f --- .../adapter/common/DatabaseExceptionTest.java | 76 ------------------- .../execute/RedisExecuteAdapterTest.java | 72 ------------------ .../ApplicationPackageQueryAdapterTest.java | 2 - .../ApplicationVersionQueryAdapterTest.java | 8 -- .../query/EPKGPackageQueryAdapterTest.java | 2 - ...java => FieldPackageQueryAdapterTest.java} | 74 +++++------------- .../query/RPMPackageQueryAdapterTest.java | 2 - .../gateway/OperationConfigGatewayTest.java | 7 -- 8 files changed, 18 insertions(+), 225 deletions(-) delete mode 100644 src/test/java/com/easysoftware/adapter/common/DatabaseExceptionTest.java delete mode 100644 src/test/java/com/easysoftware/adapter/execute/RedisExecuteAdapterTest.java rename src/test/java/com/easysoftware/adapter/query/{DomainPackageQueryAdapterTest.java => FieldPackageQueryAdapterTest.java} (70%) diff --git a/src/test/java/com/easysoftware/adapter/common/DatabaseExceptionTest.java b/src/test/java/com/easysoftware/adapter/common/DatabaseExceptionTest.java deleted file mode 100644 index ce5c3a1..0000000 --- a/src/test/java/com/easysoftware/adapter/common/DatabaseExceptionTest.java +++ /dev/null @@ -1,76 +0,0 @@ -/* Copyright (c) 2024 openEuler Community - EasySoftware is licensed under the Mulan PSL v2. - You can use this software according to the terms and conditions of the Mulan PSL v2. - You may obtain a copy of Mulan PSL v2 at: - http://license.coscl.org.cn/MulanPSL2 - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - See the Mulan PSL v2 for more details. -*/ - -package com.easysoftware.adapter.common; - -import static org.junit.Assert.assertThrows; -import static org.mockito.Mockito.when; - -import org.apache.ibatis.exceptions.PersistenceException; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.mybatis.spring.MyBatisSystemException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.jdbc.CannotGetJdbcConnectionException; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import org.springframework.web.context.WebApplicationContext; - -import com.easysoftware.application.applicationpackage.ApplicationPackageService; -import com.easysoftware.application.applicationpackage.dto.ApplicationPackageSearchCondition; -import com.easysoftware.common.entity.MessageCode; -import com.easysoftware.common.entity.ResultVo; -import com.easysoftware.common.utils.CommonUtil; -import com.easysoftware.common.utils.ObjectMapperUtil; -import com.easysoftware.domain.applicationpackage.gateway.ApplicationPackageGateway; - -import lombok.extern.slf4j.Slf4j; - -@SpringBootTest -@AutoConfigureMockMvc -@Slf4j -public class DatabaseExceptionTest { - @Autowired - private WebApplicationContext webApplicationContext; - - private MockMvc mockMvc; - - @MockBean - private ApplicationPackageGateway gateway; - - @BeforeEach - public void setUp() throws Exception { - mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); - } - - @Test - void test_mysql_exception() throws Exception { - ApplicationPackageSearchCondition con = new ApplicationPackageSearchCondition(); - con.setName("apppkg"); - con.setPageNum(1); - con.setPageSize(10); - - Exception e = new MyBatisSystemException( - new PersistenceException( - new CannotGetJdbcConnectionException("Failed to obtain JDBC Connection"))); - when(gateway.queryMenuByName(con)).thenThrow(e); - - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - paramMap.add("name", "apppkg"); - ResultVo res = CommonUtil.executeGet(mockMvc, "/domain", paramMap); - CommonUtil.assertMsg(res, MessageCode.ES0001); - } -} diff --git a/src/test/java/com/easysoftware/adapter/execute/RedisExecuteAdapterTest.java b/src/test/java/com/easysoftware/adapter/execute/RedisExecuteAdapterTest.java deleted file mode 100644 index 71eaa27..0000000 --- a/src/test/java/com/easysoftware/adapter/execute/RedisExecuteAdapterTest.java +++ /dev/null @@ -1,72 +0,0 @@ -/* Copyright (c) 2024 openEuler Community - EasySoftware is licensed under the Mulan PSL v2. - You can use this software according to the terms and conditions of the Mulan PSL v2. - You may obtain a copy of Mulan PSL v2 at: - http://license.coscl.org.cn/MulanPSL2 - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, - EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, - MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. - See the Mulan PSL v2 for more details. -*/ - -package com.easysoftware.adapter.execute; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.http.HttpStatus; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; - -import com.easysoftware.common.entity.ResultVo; -import com.easysoftware.common.utils.CommonUtil; -import com.easysoftware.redis.RedisService; - - -@SpringBootTest -@AutoConfigureMockMvc -public class RedisExecuteAdapterTest { - - @Autowired - private WebApplicationContext webApplicationContext; - - @MockBean - private RedisTemplate redisTemplate; - - private MockMvc mockMvc; - @BeforeEach - public void setUp() throws Exception { - mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); - } - - @Test - void test_update() throws Exception { - - MultiValueMap paramMap = new LinkedMultiValueMap<>(); - // case 1 bad request - ResultVo res; - paramMap.add("name", "domainPage"); - res = CommonUtil.executeGet(mockMvc, "/redis/update", paramMap); - assertEquals(res.getCode(), HttpStatus.INTERNAL_SERVER_ERROR.value()); - - // case 2 bad request - paramMap.add("nameSpace", "domainPage"); - res = CommonUtil.executeGet(mockMvc, "/redis/update", paramMap); - assertEquals(res.getCode(), HttpStatus.INTERNAL_SERVER_ERROR.value()); - - // case 3 right request - paramMap.add("namespace", "domainPage"); - res = CommonUtil.executeGet(mockMvc, "/redis/update", paramMap); - CommonUtil.assertOk(res); - } -} \ No newline at end of file diff --git a/src/test/java/com/easysoftware/adapter/query/ApplicationPackageQueryAdapterTest.java b/src/test/java/com/easysoftware/adapter/query/ApplicationPackageQueryAdapterTest.java index 6d1a561..bee6f13 100644 --- a/src/test/java/com/easysoftware/adapter/query/ApplicationPackageQueryAdapterTest.java +++ b/src/test/java/com/easysoftware/adapter/query/ApplicationPackageQueryAdapterTest.java @@ -25,11 +25,9 @@ import org.springframework.web.context.WebApplicationContext; import com.easysoftware.common.entity.ResultVo; import com.easysoftware.common.utils.CommonUtil; -import lombok.extern.slf4j.Slf4j; @SpringBootTest @AutoConfigureMockMvc -@Slf4j public class ApplicationPackageQueryAdapterTest { private static final String REQUEST_MAPPING = "/apppkg"; @Autowired diff --git a/src/test/java/com/easysoftware/adapter/query/ApplicationVersionQueryAdapterTest.java b/src/test/java/com/easysoftware/adapter/query/ApplicationVersionQueryAdapterTest.java index f7d017b..39f7d91 100644 --- a/src/test/java/com/easysoftware/adapter/query/ApplicationVersionQueryAdapterTest.java +++ b/src/test/java/com/easysoftware/adapter/query/ApplicationVersionQueryAdapterTest.java @@ -11,8 +11,6 @@ package com.easysoftware.adapter.query; -import java.util.ArrayList; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -24,11 +22,8 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.context.WebApplicationContext; -import com.easysoftware.application.applicationversion.ApplicationVersionService; -import com.easysoftware.common.entity.MessageCode; import com.easysoftware.common.entity.ResultVo; import com.easysoftware.common.utils.CommonUtil; -import com.easysoftware.common.utils.ObjectMapperUtil; @SpringBootTest @AutoConfigureMockMvc @@ -36,9 +31,6 @@ public class ApplicationVersionQueryAdapterTest { @Autowired private WebApplicationContext webApplicationContext; - @Autowired - private ApplicationVersionService applicationVersionService; - private MockMvc mockMvc; @BeforeEach diff --git a/src/test/java/com/easysoftware/adapter/query/EPKGPackageQueryAdapterTest.java b/src/test/java/com/easysoftware/adapter/query/EPKGPackageQueryAdapterTest.java index 0359c4a..22240e3 100644 --- a/src/test/java/com/easysoftware/adapter/query/EPKGPackageQueryAdapterTest.java +++ b/src/test/java/com/easysoftware/adapter/query/EPKGPackageQueryAdapterTest.java @@ -27,11 +27,9 @@ import com.easysoftware.common.entity.ResultVo; import com.easysoftware.common.utils.CommonUtil; import com.easysoftware.domain.rpmpackage.gateway.RPMPackageGateway; -import lombok.extern.slf4j.Slf4j; @SpringBootTest @AutoConfigureMockMvc -@Slf4j public class EPKGPackageQueryAdapterTest { @Autowired private WebApplicationContext webApplicationContext; diff --git a/src/test/java/com/easysoftware/adapter/query/DomainPackageQueryAdapterTest.java b/src/test/java/com/easysoftware/adapter/query/FieldPackageQueryAdapterTest.java similarity index 70% rename from src/test/java/com/easysoftware/adapter/query/DomainPackageQueryAdapterTest.java rename to src/test/java/com/easysoftware/adapter/query/FieldPackageQueryAdapterTest.java index 311361e..d6012ab 100644 --- a/src/test/java/com/easysoftware/adapter/query/DomainPackageQueryAdapterTest.java +++ b/src/test/java/com/easysoftware/adapter/query/FieldPackageQueryAdapterTest.java @@ -11,64 +11,26 @@ package com.easysoftware.adapter.query; -import static org.junit.Assert.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.when; - -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; - -import org.json.JSONObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.data.redis.connection.ReactiveRedisConnection.MultiValueResponse; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import org.springframework.test.web.servlet.result.MockMvcResultHandlers; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.context.WebApplicationContext; -import com.easysoftware.application.applicationpackage.dto.ApplicationPackageSearchCondition; -import com.easysoftware.application.applicationpackage.vo.ApplicationPackageDetailVo; -import com.easysoftware.application.applicationpackage.vo.ApplicationPackageMenuVo; -import com.easysoftware.application.epkgpackage.vo.EPKGPackageDetailVo; -import com.easysoftware.application.rpmpackage.vo.RPMPackageDetailVo; import com.easysoftware.common.entity.ResultVo; -import com.easysoftware.common.utils.ObjectMapperUtil; import com.easysoftware.common.utils.CommonUtil; -import com.easysoftware.domain.applicationpackage.gateway.ApplicationPackageGateway; -import com.easysoftware.domain.epkgpackage.gateway.EPKGPackageGateway; -import com.easysoftware.domain.rpmpackage.gateway.RPMPackageGateway; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.power.common.constants.BaseErrorCode.Common; - -import jakarta.validation.constraints.AssertTrue; -import lombok.extern.slf4j.Slf4j; - @SpringBootTest @AutoConfigureMockMvc -@Slf4j -public class DomainPackageQueryAdapterTest { +public class FieldPackageQueryAdapterTest { @Autowired private WebApplicationContext webApplicationContext; @@ -80,10 +42,10 @@ public class DomainPackageQueryAdapterTest { mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build(); } - // test /domain/stat + // test /field/stat @Test void test_domain_stat() throws Exception { - ResultVo res = CommonUtil.executeGet(mockMvc, "/domain/stat", null); + ResultVo res = CommonUtil.executeGet(mockMvc, "/field/stat", null); CommonUtil.assertOk(res); @@ -108,7 +70,7 @@ public class DomainPackageQueryAdapterTest { CommonUtil.assert400(res); } - // test /domain/column + // test /field/column @Test void test_domain_column() throws Exception { List names = List.of("rpmpkg", "epkgpkg"); @@ -126,7 +88,7 @@ public class DomainPackageQueryAdapterTest { MultiValueMap paramMap = new LinkedMultiValueMap<>(); paramMap.add("column", column); paramMap.add("name", name); - ResultVo res = CommonUtil.executeGet(mockMvc, "/domain/column", paramMap); + ResultVo res = CommonUtil.executeGet(mockMvc, "/field/column", paramMap); return res; } @@ -136,32 +98,32 @@ public class DomainPackageQueryAdapterTest { paramMap.add("appPkgId", "error"); paramMap.add("epkgPkgId", "openEuler-22.03-LTS-SP1texlive-apnum-docsvn47510-24noarch"); paramMap.add("rpmPkgId", "openeEuler-22.03-LTS-SP1texlive-apnum-docsvn47510-24noarch"); - ResultVo res = CommonUtil.executeGet(mockMvc, "/domain/detail", paramMap); + ResultVo res = CommonUtil.executeGet(mockMvc, "/field/detail", paramMap); CommonUtil.assert400(res); paramMap = new LinkedMultiValueMap<>(); paramMap.add("appPkgId", "memcached"); paramMap.add("epkgPkgId", "error"); paramMap.add("rpmPkgId", "openeEuler-22.03-LTS-SP1texlive-apnum-docsvn47510-24noarch"); - res = CommonUtil.executeGet(mockMvc, "/domain/detail", paramMap); + res = CommonUtil.executeGet(mockMvc, "/field/detail", paramMap); CommonUtil.assert400(res); paramMap = new LinkedMultiValueMap<>(); paramMap.add("appPkgId", "memcached"); paramMap.add("epkgPkgId", "openEuler-22.03-LTS-SP1texlive-apnum-docsvn47510-24noarch"); paramMap.add("rpmPkgId", "error"); - res = CommonUtil.executeGet(mockMvc, "/domain/detail", paramMap); + res = CommonUtil.executeGet(mockMvc, "/field/detail", paramMap); CommonUtil.assert400(res); } - // test /domain/detail + // test /field/detail @Test void test_domain_detail() throws Exception { MultiValueMap paramMap = new LinkedMultiValueMap<>(); paramMap.add("appPkgId", "memcached"); paramMap.add("epkgPkgId", "openEuler-22.03-LTS-SP1texlive-apnum-docsvn47510-24noarch"); paramMap.add("rpmPkgId", "openeEuler-22.03-LTS-SP1texlive-apnum-docsvn47510-24noarch"); - ResultVo res = CommonUtil.executeGet(mockMvc, "/domain/detail", paramMap); + ResultVo res = CommonUtil.executeGet(mockMvc, "/field/detail", paramMap); CommonUtil.assertOk(res); assertTrue(res.getData() instanceof Map); @@ -177,10 +139,10 @@ public class DomainPackageQueryAdapterTest { } // test - // 1. /domain?name=apppkg - // 2. /domain?name=rpmpkg - // 3. /domain?name=epkgpkg - // 4. /domain?name=all + // 1. /field?name=apppkg + // 2. /field?name=rpmpkg + // 3. /field?name=epkgpkg + // 4. /field?name=all @Test void test_domain_pkg() throws Exception { List names = List.of("apppkg", "rpmpkg", "epkgpkg", "all"); @@ -200,7 +162,7 @@ public class DomainPackageQueryAdapterTest { MultiValueMap paramMap = new LinkedMultiValueMap<>(); paramMap.add("name", name); paramMap.add("timeOrder", "asc"); - ResultVo res = CommonUtil.executeGet(mockMvc, "/domain", paramMap); + ResultVo res = CommonUtil.executeGet(mockMvc, "/field", paramMap); return res; } @@ -212,7 +174,7 @@ public class DomainPackageQueryAdapterTest { paramMap.add("os", "openEuler-20.03-LTS-SP2"); paramMap.add("arch", "noarch, x86_64"); paramMap.add("timeOrder", "desc"); - ResultVo res = CommonUtil.executeGet(mockMvc, "/domain", paramMap); + ResultVo res = CommonUtil.executeGet(mockMvc, "/field", paramMap); CommonUtil.assertList(res); } @@ -223,7 +185,7 @@ public class DomainPackageQueryAdapterTest { paramMap.add("os", "openEuler-20.03-LTS-SP2"); paramMap.add("arch", "noarch, x86_64"); paramMap.add("timeOrder", "desc"); - ResultVo res = CommonUtil.executeGet(mockMvc, "/domain", paramMap); + ResultVo res = CommonUtil.executeGet(mockMvc, "/field", paramMap); CommonUtil.assert400(res); paramMap = new LinkedMultiValueMap<>(); @@ -231,7 +193,7 @@ public class DomainPackageQueryAdapterTest { paramMap.add("os", "error"); paramMap.add("arch", "noarch, x86_64"); paramMap.add("timeOrder", "desc"); - res = CommonUtil.executeGet(mockMvc, "/domain", paramMap); + res = CommonUtil.executeGet(mockMvc, "/field", paramMap); CommonUtil.assertNone(res); } } diff --git a/src/test/java/com/easysoftware/adapter/query/RPMPackageQueryAdapterTest.java b/src/test/java/com/easysoftware/adapter/query/RPMPackageQueryAdapterTest.java index be3a5f2..3524a44 100644 --- a/src/test/java/com/easysoftware/adapter/query/RPMPackageQueryAdapterTest.java +++ b/src/test/java/com/easysoftware/adapter/query/RPMPackageQueryAdapterTest.java @@ -25,11 +25,9 @@ import org.springframework.web.context.WebApplicationContext; import com.easysoftware.common.entity.ResultVo; import com.easysoftware.common.utils.CommonUtil; import com.easysoftware.domain.rpmpackage.gateway.RPMPackageGateway; -import lombok.extern.slf4j.Slf4j; @SpringBootTest @AutoConfigureMockMvc -@Slf4j public class RPMPackageQueryAdapterTest { @Autowired private WebApplicationContext webApplicationContext; diff --git a/src/test/java/com/easysoftware/domain/operationconfig/gateway/OperationConfigGatewayTest.java b/src/test/java/com/easysoftware/domain/operationconfig/gateway/OperationConfigGatewayTest.java index e4cedce..dd35a13 100644 --- a/src/test/java/com/easysoftware/domain/operationconfig/gateway/OperationConfigGatewayTest.java +++ b/src/test/java/com/easysoftware/domain/operationconfig/gateway/OperationConfigGatewayTest.java @@ -17,22 +17,15 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import com.easysoftware.application.operationconfig.vo.OperationConfigVo; -import com.easysoftware.infrastructure.mapper.OperationConfigDOMapper; -import com.easysoftware.infrastructure.operationconfig.gatewayimpl.OperationConfigGatewayImpl; -import com.easysoftware.infrastructure.operationconfig.gatewayimpl.dataobject.OperationConfigDO; @SpringBootTest public class OperationConfigGatewayTest { @Autowired OperationConfigGateway gateway; - @Autowired - private OperationConfigDOMapper mapper; - @Test void test_selectall() { List res = gateway.selectAll(); -- Gitee