cmhi
/
IntegrateService
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. 更新语法检查问题 

2. 更新测试配置
This commit is contained in:
黄昕 2024-03-12 11:17:05 +08:00
parent b638918697
commit 76525106b4
8 changed files with 26 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/application-test.yml
View File

@ -33,13 +33,13 @@ spring :
fail-on-unknown-properties: false fail-on-unknown-properties: false
datasource: datasource:
#url : jdbc:mysql://xajhuang.com:3307/common_framework?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true url : jdbc:mysql://xajhuang.com:3307/common_framework?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true
url : jdbc:mysql://localhost:3306/common_framework?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true #url : jdbc:mysql://localhost:3306/common_framework?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
#username : xajhuang username : xajhuang
#password : wkj!nky5cjb!GMV6guq password : wkj!nky5cjb!GMV6guq
username : root #username : root
password : aaaHuang1 #password : aaaHuang1
dbcp2 : dbcp2 :
max-total : 128 max-total : 128
max-wait-millis : 10000 max-wait-millis : 10000

2
cs-authentication/src/test/java/com/cf/cs/authentication/CsAuthenticationApplicationTests.java
View File

@ -2,10 +2,8 @@ package com.cf.cs.authentication;
import com.cf.cs.authentication.configure.SecuritySecurity; import com.cf.cs.authentication.configure.SecuritySecurity;
import com.cf.cs.authentication.configure.UserSecurityConfigure; import com.cf.cs.authentication.configure.UserSecurityConfigure;
import com.cf.cs.base.CsBaseApplication;
import com.cf.cs.base.config.CacheConfigure; import com.cf.cs.base.config.CacheConfigure;
import com.cf.cs.base.config.CommonConfigure; import com.cf.cs.base.config.CommonConfigure;
import com.cf.cs.database.CsDatabaseApplication;
import com.cf.cs.database.config.MybatisFlexConfigure; import com.cf.cs.database.config.MybatisFlexConfigure;
import com.cf.cs.protocol.config.ProtocolConfigure; import com.cf.cs.protocol.config.ProtocolConfigure;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

6
cs-integrate-test/src/test/java/com/cf/cs/integratetest/common/TestBaseAuthentication.java
View File

@ -76,7 +76,7 @@ public abstract class TestBaseAuthentication {
// 假设JWT在响应体中返回。您需要根据实际情况调整此行代码。 // 假设JWT在响应体中返回。您需要根据实际情况调整此行代码。
String respJson = mvcResult.getResponse().getContentAsString(); String respJson = mvcResult.getResponse().getContentAsString();
Assertions.assertNotNull(respJson); Assertions.assertNotNull(respJson);
Assertions.assertNotEquals(respJson.length(), 0); Assertions.assertNotEquals(0, respJson.length());
ProtocolResp<?> resp = ProtocolJsonUtils.jsonGetProtocolResp(respJson, LoginResp.class); ProtocolResp<?> resp = ProtocolJsonUtils.jsonGetProtocolResp(respJson, LoginResp.class);
Assertions.assertNotNull(resp); Assertions.assertNotNull(resp);
@ -87,7 +87,7 @@ public abstract class TestBaseAuthentication {
Assertions.assertEquals(loginResp.getStatus(), ErrorCode.ERR_OK.getCode()); Assertions.assertEquals(loginResp.getStatus(), ErrorCode.ERR_OK.getCode());
Assertions.assertNotNull(loginResp.getToken()); Assertions.assertNotNull(loginResp.getToken());
Assertions.assertNotEquals(loginResp.getToken().length(), 0); Assertions.assertNotEquals(0, loginResp.getToken().length());
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8"); MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
@ -169,7 +169,7 @@ public abstract class TestBaseAuthentication {
Assertions.assertNotNull(resp); Assertions.assertNotNull(resp);
Assertions.assertNotNull(resp.getStatus()); Assertions.assertNotNull(resp.getStatus());
Assertions.assertNotNull(resp.getMessage()); Assertions.assertNotNull(resp.getMessage());
Assertions.assertNotEquals(resp.getMessage().length, 0); Assertions.assertNotEquals(0, resp.getMessage().length);
Assertions.assertEquals(resp.getStatus(), ErrorCode.ERR_OK.getCode()); Assertions.assertEquals(resp.getStatus(), ErrorCode.ERR_OK.getCode());
} }
} }

5
cs-integrate-test/src/test/java/com/cf/cs/integratetest/controller/CommonFrameworkApiTest.java
View File

@ -6,7 +6,6 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
@ -17,7 +16,7 @@ public class CommonFrameworkApiTest extends TestBaseAuthentication {
@Test @Test
@DisplayName("获取版本信息") @DisplayName("获取版本信息")
void testGetVersion() throws Exception { void testGetVersion() throws Exception {
VersionResp resp = (VersionResp) performanceRestful(RequestMethod.GET, null, "/api/version", new Class[]{VersionResp.class}); VersionResp resp = (VersionResp) performanceRestful(RequestMethod.GET, null, "/api/version", new Class[] {VersionResp.class});
AssertValidCommonResp(resp); AssertValidCommonResp(resp);
Assertions.assertNotNull(resp.getVersion()); Assertions.assertNotNull(resp.getVersion());
@ -32,7 +31,7 @@ public class CommonFrameworkApiTest extends TestBaseAuthentication {
@Test @Test
@DisplayName("获取版本信息(POST)") @DisplayName("获取版本信息(POST)")
void testGetVersionV2() throws Exception { void testGetVersionV2() throws Exception {
VersionResp resp = (VersionResp) performanceRestful(RequestMethod.POST, null, "/api/version", new Class[]{VersionResp.class}); VersionResp resp = (VersionResp) performanceRestful(RequestMethod.POST, null, "/api/version", new Class[] {VersionResp.class});
AssertValidCommonResp(resp); AssertValidCommonResp(resp);
Assertions.assertNotNull(resp.getVersion()); Assertions.assertNotNull(resp.getVersion());

4
cs-integrate-test/src/test/java/com/cf/cs/integratetest/controller/OperationLogApiTest.java
View File

@ -15,7 +15,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
@ -87,8 +86,7 @@ public class OperationLogApiTest extends TestBaseAuthentication {
OperationLogDetailsReq req = new OperationLogDetailsReq(optIdArray); OperationLogDetailsReq req = new OperationLogDetailsReq(optIdArray);
Object obj = performanceRestful(RequestMethod.POST, req, "/api/operation/details", Object obj = performanceRestful(RequestMethod.POST, req, "/api/operation/details", new Class[] {OperationLogDetailsResp.class});
new Class[] {OperationLogDetailsResp.class});
Assertions.assertNotNull(obj); Assertions.assertNotNull(obj);
OperationLogDetailsResp resp = (OperationLogDetailsResp) obj; OperationLogDetailsResp resp = (OperationLogDetailsResp) obj;
AssertValidCommonResp(resp); AssertValidCommonResp(resp);

14
cs-integrate-test/src/test/java/com/cf/cs/integratetest/controller/PermissionManagerApiTest.java
View File

@ -19,7 +19,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
@ -147,8 +146,7 @@ public class PermissionManagerApiTest extends TestBaseAuthentication {
IdArrayReq req = new IdArrayReq(rid); IdArrayReq req = new IdArrayReq(rid);
RegisterResourceResp resp = (RegisterResourceResp) performanceRestful(RequestMethod.DELETE, req, RegisterResourceResp resp = (RegisterResourceResp) performanceRestful(RequestMethod.DELETE, req, "/api/permission/resource",
"/api/permission/resource",
new Class[] {RegisterResourceResp.class}); new Class[] {RegisterResourceResp.class});
AssertValidCommonResp(resp); AssertValidCommonResp(resp);
Assertions.assertNotNull(resp.getResult()); Assertions.assertNotNull(resp.getResult());
@ -179,12 +177,9 @@ public class PermissionManagerApiTest extends TestBaseAuthentication {
.httpMethod(new ArrayList<>() {{add("PUT");}}) .httpMethod(new ArrayList<>() {{add("PUT");}})
.build()); .build());
RegisterResourceReq req = RegisterResourceReq.builder() RegisterResourceReq req = RegisterResourceReq.builder().resources(resList).build();
.resources(resList)
.build();
RegisterResourceResp resp = (RegisterResourceResp) performanceRestful(RequestMethod.PUT, req, RegisterResourceResp resp = (RegisterResourceResp) performanceRestful(RequestMethod.PUT, req, "/api/permission/resource",
"/api/permission/resource",
new Class[] {RegisterResourceResp.class}); new Class[] {RegisterResourceResp.class});
AssertValidCommonResp(resp); AssertValidCommonResp(resp);
@ -207,8 +202,7 @@ public class PermissionManagerApiTest extends TestBaseAuthentication {
testRegisterResource(); testRegisterResource();
IdArrayReq req = new IdArrayReq(addResUid); IdArrayReq req = new IdArrayReq(addResUid);
RegisterResourceResp resp = (RegisterResourceResp) performanceRestful(RequestMethod.DELETE, req, RegisterResourceResp resp = (RegisterResourceResp) performanceRestful(RequestMethod.DELETE, req, "/api/permission/resource",
"/api/permission/resource",
new Class[] {RegisterResourceResp.class}); new Class[] {RegisterResourceResp.class});
AssertValidCommonResp(resp); AssertValidCommonResp(resp);
Assertions.assertNotNull(resp.getResult()); Assertions.assertNotNull(resp.getResult());

11
cs-integrate-test/src/test/java/com/cf/cs/integratetest/controller/SystemDictControllerTest.java
View File

@ -3,7 +3,6 @@ package com.cf.cs.integratetest.controller;
import com.cf.cs.integratetest.common.TestBaseAuthentication; import com.cf.cs.integratetest.common.TestBaseAuthentication;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -11,27 +10,27 @@ import org.springframework.transaction.annotation.Transactional;
@Transactional @Transactional
public class SystemDictControllerTest extends TestBaseAuthentication { public class SystemDictControllerTest extends TestBaseAuthentication {
@Test @Test
void testGetEnumDictionary() throws Exception { void testGetEnumDictionary() {
} }
@Test @Test
void testGetEnumDictionary_DictionaryServiceReturnsNoItems() throws Exception { void testGetEnumDictionary_DictionaryServiceReturnsNoItems() {
} }
@Test @Test
void testGetEnumDictionaryContent() throws Exception { void testGetEnumDictionaryContent() {
} }
@Test @Test
void testGetEnumDictionaryContent_DictionaryServiceReturnsNoItems() throws Exception { void testGetEnumDictionaryContent_DictionaryServiceReturnsNoItems() {
} }
@Test @Test
void testCreateNewDictionary() throws Exception { void testCreateNewDictionary() {
} }
} }

11
cs-integrate-test/src/test/java/com/cf/cs/integratetest/controller/UserManagerApiTest.java
View File

@ -6,7 +6,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -16,27 +15,27 @@ import org.springframework.transaction.annotation.Transactional;
@TestMethodOrder(MethodOrderer.OrderAnnotation.class) @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class UserManagerApiTest extends TestBaseAuthentication { public class UserManagerApiTest extends TestBaseAuthentication {
@Test @Test
void testGetUserInfoById() throws Exception { void testGetUserInfoById() {
} }
@Test @Test
void testGetAllUserInfoPaged() throws Exception { void testGetAllUserInfoPaged() {
} }
@Test @Test
void testGetCurrentUserInfo() throws Exception { void testGetCurrentUserInfo() {
} }
@Test @Test
void testCreateNewUser() throws Exception { void testCreateNewUser() {
} }
@Test @Test
void testRemoveUser() throws Exception { void testRemoveUser() {
} }
} }