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

OCT 

REM:
1. 优化test case import导入
This commit is contained in:
HuangXin 2020-06-22 15:20:36 +08:00
parent 3231008163
commit 5794aaaf3e
24 changed files with 55 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/java/com/dispose/test/TestSuit/AllDisposePlatformTest.java
View File

@ -3,15 +3,15 @@ package com.dispose.test.TestSuit;
import com.dispose.test.config.DisposeConfigureTest;
import com.dispose.test.config.MyConfigTest;
import com.dispose.test.controller.AuthControllerTest;
import com.dispose.test.controller.DeviceNodeInfoControllerTest;
import com.dispose.test.controller.DeviceNodeManagerControllerTest;
import com.dispose.test.controller.TaskControllerTest;
import com.dispose.test.dptech.DPTechInterfaceTestCase;
import com.dispose.test.manager.UserAccountManagerTest;
import com.dispose.test.mapper.DisposeDeviceMapperTest;
import com.dispose.test.mapper.DisposeTaskMapperTest;
import com.dispose.test.mapper.UserAccountMapperTest;
import com.dispose.test.controller.AuthControllerTest;
import com.dispose.test.controller.DeviceNodeInfoControllerTest;
import com.dispose.test.controller.DeviceNodeManagerControllerTest;
import com.dispose.test.controller.TaskControllerTest;
import com.dispose.test.service.DisposeNodeManagerTest;
import com.dispose.test.service.TaskServiceTest;
import com.dispose.test.service.UserAccountServiceTest;

2
src/test/java/com/dispose/test/config/DisposeConfigureTest.java
View File

@ -1,7 +1,7 @@
package com.dispose.test.config;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.config.DisposeConfigure;
import com.dispose.test.Global.InitTestEnvironment;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;

2
src/test/java/com/dispose/test/config/MyConfigTest.java
View File

@ -1,7 +1,7 @@
package com.dispose.test.config;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.config.MyConfig;
import com.dispose.test.Global.InitTestEnvironment;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;

4
src/test/java/com/dispose/test/controller/AuthControllerQATest.java
View File

@ -1,10 +1,10 @@
package com.dispose.test.controller;
import com.dispose.common.GlobalVar;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.ErrorCode;
import com.dispose.common.GlobalVar;
import com.dispose.pojo.po.ReturnStatus;
import com.dispose.pojo.vo.auth.LogoutRsp;
import com.dispose.test.Global.InitTestEnvironment;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;

2
src/test/java/com/dispose/test/controller/AuthControllerSmokeTest.java
View File

@ -1,9 +1,9 @@
package com.dispose.test.controller;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.ErrorCode;
import com.dispose.pojo.po.ReturnStatus;
import com.dispose.pojo.vo.auth.LoginRsp;
import com.dispose.test.Global.InitTestEnvironment;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;

17
src/test/java/com/dispose/test/controller/DeviceNodeInfoControllerQATest.java
View File

@ -13,15 +13,26 @@
*/
package com.dispose.test.controller;
import com.dispose.common.GlobalVar;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.ErrorCode;
import com.dispose.common.GlobalVar;
import com.dispose.pojo.entity.DisposeDevice;
import com.dispose.pojo.po.ReturnStatus;
import com.dispose.pojo.vo.common.DisposeCapacity;
import com.dispose.pojo.vo.common.TaskInfoData;
import com.dispose.pojo.vo.information.*;
import com.dispose.pojo.vo.information.DeviceCapacityData;
import com.dispose.pojo.vo.information.DeviceCapacityRsp;
import com.dispose.pojo.vo.information.DeviceInfoData;
import com.dispose.pojo.vo.information.DeviceInfoRsp;
import com.dispose.pojo.vo.information.DisposeNodeData;
import com.dispose.pojo.vo.information.DisposeNodeListRsp;
import com.dispose.pojo.vo.information.LinkStatusListRsp;
import com.dispose.pojo.vo.information.LinkStatusRsp;
import com.dispose.pojo.vo.information.NodeTaskData;
import com.dispose.pojo.vo.information.NodeTaskRsp;
import com.dispose.pojo.vo.information.VersionListRsp;
import com.dispose.pojo.vo.information.VersionRsp;
import com.dispose.service.DisposeNodeManager;
import com.dispose.test.Global.InitTestEnvironment;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;

4
src/test/java/com/dispose/test/controller/DeviceNodeInfoControllerSmokeTest.java
View File

@ -1,9 +1,8 @@
package com.dispose.test.controller;
import com.dispose.common.GlobalVar;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.DisposeTaskStatus;
import com.dispose.common.ErrorCode;
import com.dispose.common.GlobalVar;
import com.dispose.mapper.DisposeTaskMapper;
import com.dispose.pojo.po.ReturnStatus;
import com.dispose.pojo.vo.common.DisposeCapacity;
@ -13,6 +12,7 @@ import com.dispose.pojo.vo.information.DisposeNodeData;
import com.dispose.pojo.vo.information.DisposeNodeListRsp;
import com.dispose.pojo.vo.information.NodeTaskData;
import com.dispose.pojo.vo.information.NodeTaskRsp;
import com.dispose.test.Global.InitTestEnvironment;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;

4
src/test/java/com/dispose/test/controller/DeviceNodeInfoControllerTest.java
View File

@ -1,9 +1,8 @@
package com.dispose.test.controller;
import com.dispose.common.GlobalVar;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.ConstValue;
import com.dispose.common.ErrorCode;
import com.dispose.common.GlobalVar;
import com.dispose.mapper.DisposeDeviceMapper;
import com.dispose.pojo.dto.ProtocolReqDTO;
import com.dispose.pojo.entity.DisposeDevice;
@ -24,6 +23,7 @@ import com.dispose.pojo.vo.information.VersionListRsp;
import com.dispose.pojo.vo.information.VersionRsp;
import com.dispose.service.DisposeNodeManager;
import com.dispose.service.UserAccountService;
import com.dispose.test.Global.InitTestEnvironment;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Assert;
import org.junit.FixMethodOrder;

8
src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerQATest.java
View File

@ -1,13 +1,13 @@
package com.dispose.test.controller;
import com.dispose.common.ErrorCode;
import com.dispose.common.GlobalVar;
import com.dispose.pojo.entity.DisposeDevice;
import com.dispose.pojo.vo.common.IDReturnStatus;
import com.dispose.pojo.vo.device.AddNodeRsp;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.ErrorCode;
import com.dispose.pojo.vo.device.AddNodeRetData;
import com.dispose.pojo.vo.device.AddNodeRsp;
import com.dispose.service.DisposeNodeManager;
import com.dispose.test.Global.InitTestEnvironment;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
@ -27,8 +27,6 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;

4
src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerSmokeTest.java
View File

@ -1,14 +1,14 @@
package com.dispose.test.controller;
import com.dispose.common.GlobalVar;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.ErrorCode;
import com.dispose.common.GlobalVar;
import com.dispose.pojo.entity.DisposeDevice;
import com.dispose.pojo.po.MulReturnType;
import com.dispose.pojo.vo.common.IDReturnStatus;
import com.dispose.pojo.vo.device.AddNodeRetData;
import com.dispose.pojo.vo.device.AddNodeRsp;
import com.dispose.service.DisposeNodeManager;
import com.dispose.test.Global.InitTestEnvironment;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;

4
src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerTest.java
View File

@ -1,10 +1,9 @@
package com.dispose.test.controller;
import com.dispose.common.GlobalVar;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.ConstValue;
import com.dispose.common.DisposeDeviceType;
import com.dispose.common.ErrorCode;
import com.dispose.common.GlobalVar;
import com.dispose.pojo.dto.ProtocolReqDTO;
import com.dispose.pojo.entity.DisposeDevice;
import com.dispose.pojo.po.MulReturnType;
@ -15,6 +14,7 @@ import com.dispose.pojo.vo.device.AddNodeReq;
import com.dispose.pojo.vo.device.AddNodeRetData;
import com.dispose.pojo.vo.device.AddNodeRsp;
import com.dispose.service.DisposeNodeManager;
import com.dispose.test.Global.InitTestEnvironment;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;

4
src/test/java/com/dispose/test/controller/TaskControllerQATest.java
View File

@ -1,13 +1,13 @@
package com.dispose.test.controller;
import com.dispose.common.GlobalVar;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.ErrorCode;
import com.dispose.common.GlobalVar;
import com.dispose.pojo.po.ReturnStatus;
import com.dispose.pojo.vo.common.TaskInfoData;
import com.dispose.pojo.vo.information.NodeTaskRsp;
import com.dispose.pojo.vo.task.StartTaskRsp;
import com.dispose.pojo.vo.task.TaskInfoRsp;
import com.dispose.test.Global.InitTestEnvironment;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;

4
src/test/java/com/dispose/test/controller/TaskControllerSmokeTest.java
View File

@ -1,11 +1,11 @@
package com.dispose.test.controller;
import com.dispose.common.GlobalVar;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.ErrorCode;
import com.dispose.common.GlobalVar;
import com.dispose.pojo.vo.common.TaskInfoData;
import com.dispose.pojo.vo.task.StartTaskRsp;
import com.dispose.pojo.vo.task.TaskInfoRsp;
import com.dispose.test.Global.InitTestEnvironment;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;

10
src/test/java/com/dispose/test/controller/TaskControllerTest.java
View File

@ -1,13 +1,11 @@
package com.dispose.test.controller;
import com.dispose.common.DisposeTaskStatus;
import com.dispose.common.FlowDirection;
import com.dispose.common.GlobalVar;
import com.dispose.service.TaskService;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.ConstValue;
import com.dispose.common.DeviceCapacity;
import com.dispose.common.DisposeTaskStatus;
import com.dispose.common.ErrorCode;
import com.dispose.common.FlowDirection;
import com.dispose.common.GlobalVar;
import com.dispose.common.IPAddrType;
import com.dispose.manager.TaskCacheManager;
import com.dispose.mapper.DisposeDeviceMapper;
@ -24,6 +22,8 @@ import com.dispose.pojo.vo.task.StartTaskRsp;
import com.dispose.pojo.vo.task.StopTaskData;
import com.dispose.pojo.vo.task.StopTaskReq;
import com.dispose.pojo.vo.task.TaskInfoRsp;
import com.dispose.service.TaskService;
import com.dispose.test.Global.InitTestEnvironment;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;

4
src/test/java/com/dispose/test/debug/demo.java
View File

@ -8,8 +8,6 @@ import inet.ipaddr.AddressStringException;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.junit4.SpringRunner;
/**
* The type Demo.
@ -28,7 +26,7 @@ public class demo {
String json = "{\"id\":[\"1\", \"123\", \"1234\", \"1234\"]}";
String json2 = "{\"id\":[\"1\", \"123\", \"1234\"]}";
String json3 = "{\"id\":[\"\", \"1\", \"123\", \"1234\"]}";
String json4 = "{\"id\":[\"1\", \"123\", \"1234\", null]}";
//String json4 = "{\"id\":[\"1\", \"123\", \"1234\", null]}";
IDArrayReq id = new ObjectMapper().readValue(json3, IDArrayReq.class);

2
src/test/java/com/dispose/test/dptech/DPTechInterfaceTestCase.java
View File

@ -1,12 +1,12 @@
package com.dispose.test.dptech;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.DeviceCapacity;
import com.dispose.common.DisposeDeviceType;
import com.dispose.common.ErrorCode;
import com.dispose.dispose.DeviceRouter;
import com.dispose.dispose.DisposeEntryManager;
import com.dispose.pojo.po.DisposeDeviceCapacity;
import com.dispose.test.Global.InitTestEnvironment;
import com.dptech.dispose.DetectionObjectDataForService;
import com.dptech.dispose.ProtectionObjectDataForService;
import com.fasterxml.jackson.core.JsonProcessingException;

6
src/test/java/com/dispose/test/exception/ExceptionTest.java
View File

@ -1,12 +1,12 @@
package com.dispose.test.exception;
import com.dispose.common.ConstValue;
import com.dispose.common.ErrorCode;
import com.dispose.common.GlobalVar;
import com.dispose.pojo.po.ReturnStatus;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.ConstValue;
import com.dispose.pojo.dto.ProtocolReqDTO;
import com.dispose.pojo.po.ReturnStatus;
import com.dispose.pojo.vo.auth.LoginReq;
import com.dispose.test.Global.InitTestEnvironment;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;

2
src/test/java/com/dispose/test/manager/UserAccountManagerTest.java
View File

@ -1,10 +1,10 @@
package com.dispose.test.manager;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.ErrorCode;
import com.dispose.manager.UserAccountCacheManager;
import com.dispose.pojo.po.MulReturnType;
import com.dispose.service.UserAccountService;
import com.dispose.test.Global.InitTestEnvironment;
import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;

2
src/test/java/com/dispose/test/mapper/DisposeDeviceMapperTest.java
View File

@ -1,10 +1,10 @@
package com.dispose.test.mapper;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.DisposeDeviceType;
import com.dispose.mapper.DisposeDeviceMapper;
import com.dispose.pojo.entity.DisposeDevice;
import com.dispose.pojo.po.DisposeDeviceCapacity;
import com.dispose.test.Global.InitTestEnvironment;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;

2
src/test/java/com/dispose/test/mapper/DisposeTaskMapperTest.java
View File

@ -1,6 +1,5 @@
package com.dispose.test.mapper;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.DeviceCapacity;
import com.dispose.common.DisposeTaskStatus;
import com.dispose.common.FlowDirection;
@ -8,6 +7,7 @@ import com.dispose.mapper.DisposeDeviceMapper;
import com.dispose.mapper.DisposeTaskMapper;
import com.dispose.mapper.UserAccountMapper;
import com.dispose.pojo.vo.common.TaskInfoDetail;
import com.dispose.test.Global.InitTestEnvironment;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;

2
src/test/java/com/dispose/test/mapper/UserAccountMapperTest.java
View File

@ -1,9 +1,9 @@
package com.dispose.test.mapper;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.ConstValue;
import com.dispose.mapper.UserAccountMapper;
import com.dispose.pojo.entity.UserAccount;
import com.dispose.test.Global.InitTestEnvironment;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;

2
src/test/java/com/dispose/test/service/DisposeNodeManagerTest.java
View File

@ -1,11 +1,11 @@
package com.dispose.test.service;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.DeviceCapacity;
import com.dispose.common.ErrorCode;
import com.dispose.mapper.DisposeDeviceMapper;
import com.dispose.pojo.po.MulReturnType;
import com.dispose.service.DisposeNodeManager;
import com.dispose.test.Global.InitTestEnvironment;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;

2
src/test/java/com/dispose/test/service/TaskServiceTest.java
View File

@ -1,6 +1,5 @@
package com.dispose.test.service;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.DeviceCapacity;
import com.dispose.common.DisposeTaskStatus;
import com.dispose.common.ErrorCode;
@ -8,6 +7,7 @@ import com.dispose.common.FlowDirection;
import com.dispose.mapper.DisposeTaskMapper;
import com.dispose.pojo.vo.common.TaskInfoDetail;
import com.dispose.service.TaskService;
import com.dispose.test.Global.InitTestEnvironment;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;
import org.junit.FixMethodOrder;

2
src/test/java/com/dispose/test/service/UserAccountServiceTest.java
View File

@ -1,10 +1,10 @@
package com.dispose.test.service;
import com.dispose.test.Global.InitTestEnvironment;
import com.dispose.common.ErrorCode;
import com.dispose.pojo.entity.UserAccount;
import com.dispose.pojo.po.MulReturnType;
import com.dispose.service.UserAccountService;
import com.dispose.test.Global.InitTestEnvironment;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;
import org.junit.Before;