test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: 更改nameSpaces

This commit is contained in:
guoyuqi 2023-08-25 13:45:40 +08:00 committed by fit2-zhao
parent 511d0e2fb6
commit 5eed64f4ba
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/TestResourceDTO.java
View File

@ -45,7 +45,7 @@ public class TestResourceDTO {
* type为 k8s 时，接口测试，性能测试的命名空间 * type为 k8s 时，接口测试，性能测试的命名空间
*/ */
@Schema(description = "type为k8s时，接口测试，性能测试的命名空间") @Schema(description = "type为k8s时，接口测试，性能测试的命名空间")
private String nameSpaces; private String namespace;
/** /**
* type为 k8s 时，接口测试，性能测试，UI测试的最大并发数 * type为 k8s 时，接口测试，性能测试，UI测试的最大并发数
*/ */

2
backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/TestResourceReturnDTO.java
View File

@ -44,7 +44,7 @@ public class TestResourceReturnDTO {
* type为 k8s 时，接口测试，性能测试的命名空间 * type为 k8s 时，接口测试，性能测试的命名空间
*/ */
@Schema(description = "type为k8s时，接口测试，性能测试的命名空间") @Schema(description = "type为k8s时，接口测试，性能测试的命名空间")
private String nameSpaces; private String namespace;
/** /**
* type为 k8s 时，接口测试，性能测试，UI测试的最大并发数 * type为 k8s 时，接口测试，性能测试，UI测试的最大并发数
*/ */

2
backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties
View File

@ -86,7 +86,7 @@ port_is_null = Port cannot be null
concurrent_number_is_null = ConcurrentNumber cannot be null concurrent_number_is_null = ConcurrentNumber cannot be null
monitor_is_null = Monitor cannot be null monitor_is_null = Monitor cannot be null
token_is_null = Token can not be null token_is_null = Token can not be null
namespace_is_null=Namespaces can not be null namespace_is_null=Namespace can not be null
deploy_name_is_null=Deploy Name cannot be null deploy_name_is_null=Deploy Name cannot be null
api_test_image_is_null=API cannot be null api_test_image_is_null=API cannot be null
#project #project

8
backend/services/system-setting/src/test/java/io/metersphere/system/controller/TestResourcePoolControllerTests.java
View File

@ -74,7 +74,7 @@ class TestResourcePoolControllerTests extends BaseTest {
" }],\n" + " }],\n" +
"\"ip\":\"172.2.130.1\",\n" + "\"ip\":\"172.2.130.1\",\n" +
"\"token\":\"dsdfssdsvgsd\",\n" + "\"token\":\"dsdfssdsvgsd\",\n" +
"\"nameSpaces\":\"测试\",\n" + "\"namespace\":\"测试\",\n" +
"\"concurrentNumber\":3,\n" + "\"concurrentNumber\":3,\n" +
"\"podThreads\":2,\n" + "\"podThreads\":2,\n" +
"\"jobDefinition\":\"jsfsjs\",\n" + "\"jobDefinition\":\"jsfsjs\",\n" +
@ -97,7 +97,7 @@ class TestResourcePoolControllerTests extends BaseTest {
" \"orgIds\": [\"sys_default_organization_2\",\"sys_default_organization_3\"],\n" + " \"orgIds\": [\"sys_default_organization_2\",\"sys_default_organization_3\"],\n" +
" \"ip\": \"172.2.130.1\",\n" + " \"ip\": \"172.2.130.1\",\n" +
" \"token\": \"dsdfssdsvgsd\",\n" + " \"token\": \"dsdfssdsvgsd\",\n" +
" \"nameSpaces\": \"测试\",\n" + " \"namespace\": \"测试\",\n" +
" \"concurrentNumber\": 3,\n" + " \"concurrentNumber\": 3,\n" +
" \"podThreads\": 2,\n" + " \"podThreads\": 2,\n" +
" \"jobDefinition\": \"jsfsjs\",\n" + " \"jobDefinition\": \"jsfsjs\",\n" +
@ -311,7 +311,7 @@ class TestResourcePoolControllerTests extends BaseTest {
if (testResourcePoolRequest1.getApiTest()) { if (testResourcePoolRequest1.getApiTest()) {
Assertions.assertNotNull(testResourcePoolReturnDTO.getTestResourceReturnDTO().getIp()); Assertions.assertNotNull(testResourcePoolReturnDTO.getTestResourceReturnDTO().getIp());
Assertions.assertNotNull(testResourcePoolReturnDTO.getTestResourceReturnDTO().getToken()); Assertions.assertNotNull(testResourcePoolReturnDTO.getTestResourceReturnDTO().getToken());
Assertions.assertNotNull(testResourcePoolReturnDTO.getTestResourceReturnDTO().getNameSpaces()); Assertions.assertNotNull(testResourcePoolReturnDTO.getTestResourceReturnDTO().getNamespace());
Assertions.assertNotNull(testResourcePoolReturnDTO.getTestResourceReturnDTO().getDeployName()); Assertions.assertNotNull(testResourcePoolReturnDTO.getTestResourceReturnDTO().getDeployName());
Assertions.assertTrue(testResourcePoolReturnDTO.getTestResourceReturnDTO().getConcurrentNumber() > 0); Assertions.assertTrue(testResourcePoolReturnDTO.getTestResourceReturnDTO().getConcurrentNumber() > 0);
Assertions.assertTrue(testResourcePoolReturnDTO.getTestResourceReturnDTO().getPodThreads() > 0); Assertions.assertTrue(testResourcePoolReturnDTO.getTestResourceReturnDTO().getPodThreads() > 0);
@ -320,7 +320,7 @@ class TestResourcePoolControllerTests extends BaseTest {
if (testResourcePoolRequest1.getLoadTest()) { if (testResourcePoolRequest1.getLoadTest()) {
Assertions.assertNotNull(testResourcePoolReturnDTO.getTestResourceReturnDTO().getIp()); Assertions.assertNotNull(testResourcePoolReturnDTO.getTestResourceReturnDTO().getIp());
Assertions.assertNotNull(testResourcePoolReturnDTO.getTestResourceReturnDTO().getToken()); Assertions.assertNotNull(testResourcePoolReturnDTO.getTestResourceReturnDTO().getToken());
Assertions.assertNotNull(testResourcePoolReturnDTO.getTestResourceReturnDTO().getNameSpaces()); Assertions.assertNotNull(testResourcePoolReturnDTO.getTestResourceReturnDTO().getNamespace());
Assertions.assertTrue(testResourcePoolReturnDTO.getTestResourceReturnDTO().getConcurrentNumber() > 0); Assertions.assertTrue(testResourcePoolReturnDTO.getTestResourceReturnDTO().getConcurrentNumber() > 0);
Assertions.assertTrue(testResourcePoolReturnDTO.getTestResourceReturnDTO().getPodThreads() > 0); Assertions.assertTrue(testResourcePoolReturnDTO.getTestResourceReturnDTO().getPodThreads() > 0);
} }