diff --git a/src/test/java/com/dispose/test/TestSuit/AllDisposePlatformTest.java b/src/test/java/com/dispose/test/TestSuit/AllDisposePlatformTest.java index 271642d1..a3985cb9 100644 --- a/src/test/java/com/dispose/test/TestSuit/AllDisposePlatformTest.java +++ b/src/test/java/com/dispose/test/TestSuit/AllDisposePlatformTest.java @@ -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; diff --git a/src/test/java/com/dispose/test/config/DisposeConfigureTest.java b/src/test/java/com/dispose/test/config/DisposeConfigureTest.java index 3aeb7cbe..9e42376e 100644 --- a/src/test/java/com/dispose/test/config/DisposeConfigureTest.java +++ b/src/test/java/com/dispose/test/config/DisposeConfigureTest.java @@ -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; diff --git a/src/test/java/com/dispose/test/config/MyConfigTest.java b/src/test/java/com/dispose/test/config/MyConfigTest.java index 5201c8ea..21ae0553 100644 --- a/src/test/java/com/dispose/test/config/MyConfigTest.java +++ b/src/test/java/com/dispose/test/config/MyConfigTest.java @@ -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; diff --git a/src/test/java/com/dispose/test/controller/AuthControllerQATest.java b/src/test/java/com/dispose/test/controller/AuthControllerQATest.java index 237b4794..a66d3a77 100644 --- a/src/test/java/com/dispose/test/controller/AuthControllerQATest.java +++ b/src/test/java/com/dispose/test/controller/AuthControllerQATest.java @@ -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; diff --git a/src/test/java/com/dispose/test/controller/AuthControllerSmokeTest.java b/src/test/java/com/dispose/test/controller/AuthControllerSmokeTest.java index 45ee290e..d84841f2 100644 --- a/src/test/java/com/dispose/test/controller/AuthControllerSmokeTest.java +++ b/src/test/java/com/dispose/test/controller/AuthControllerSmokeTest.java @@ -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; diff --git a/src/test/java/com/dispose/test/controller/DeviceNodeInfoControllerQATest.java b/src/test/java/com/dispose/test/controller/DeviceNodeInfoControllerQATest.java index 2ecc3e7e..f9a653cc 100644 --- a/src/test/java/com/dispose/test/controller/DeviceNodeInfoControllerQATest.java +++ b/src/test/java/com/dispose/test/controller/DeviceNodeInfoControllerQATest.java @@ -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; diff --git a/src/test/java/com/dispose/test/controller/DeviceNodeInfoControllerSmokeTest.java b/src/test/java/com/dispose/test/controller/DeviceNodeInfoControllerSmokeTest.java index 4492f0cb..68938bc7 100644 --- a/src/test/java/com/dispose/test/controller/DeviceNodeInfoControllerSmokeTest.java +++ b/src/test/java/com/dispose/test/controller/DeviceNodeInfoControllerSmokeTest.java @@ -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; diff --git a/src/test/java/com/dispose/test/controller/DeviceNodeInfoControllerTest.java b/src/test/java/com/dispose/test/controller/DeviceNodeInfoControllerTest.java index f449b81f..a54c863e 100644 --- a/src/test/java/com/dispose/test/controller/DeviceNodeInfoControllerTest.java +++ b/src/test/java/com/dispose/test/controller/DeviceNodeInfoControllerTest.java @@ -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; diff --git a/src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerQATest.java b/src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerQATest.java index 1070d377..19a72c34 100644 --- a/src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerQATest.java +++ b/src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerQATest.java @@ -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; diff --git a/src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerSmokeTest.java b/src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerSmokeTest.java index 08e28309..f3175838 100644 --- a/src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerSmokeTest.java +++ b/src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerSmokeTest.java @@ -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; diff --git a/src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerTest.java b/src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerTest.java index 8db88db8..f458bc93 100644 --- a/src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerTest.java +++ b/src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerTest.java @@ -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; diff --git a/src/test/java/com/dispose/test/controller/TaskControllerQATest.java b/src/test/java/com/dispose/test/controller/TaskControllerQATest.java index f41e1158..1d78912e 100644 --- a/src/test/java/com/dispose/test/controller/TaskControllerQATest.java +++ b/src/test/java/com/dispose/test/controller/TaskControllerQATest.java @@ -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; diff --git a/src/test/java/com/dispose/test/controller/TaskControllerSmokeTest.java b/src/test/java/com/dispose/test/controller/TaskControllerSmokeTest.java index 76838813..c4b11955 100644 --- a/src/test/java/com/dispose/test/controller/TaskControllerSmokeTest.java +++ b/src/test/java/com/dispose/test/controller/TaskControllerSmokeTest.java @@ -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; diff --git a/src/test/java/com/dispose/test/controller/TaskControllerTest.java b/src/test/java/com/dispose/test/controller/TaskControllerTest.java index 8b4fb015..9fbf07b9 100644 --- a/src/test/java/com/dispose/test/controller/TaskControllerTest.java +++ b/src/test/java/com/dispose/test/controller/TaskControllerTest.java @@ -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; diff --git a/src/test/java/com/dispose/test/debug/demo.java b/src/test/java/com/dispose/test/debug/demo.java index 7fd1be01..cc8d66c8 100644 --- a/src/test/java/com/dispose/test/debug/demo.java +++ b/src/test/java/com/dispose/test/debug/demo.java @@ -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); diff --git a/src/test/java/com/dispose/test/dptech/DPTechInterfaceTestCase.java b/src/test/java/com/dispose/test/dptech/DPTechInterfaceTestCase.java index 19281b76..07ce2ca5 100644 --- a/src/test/java/com/dispose/test/dptech/DPTechInterfaceTestCase.java +++ b/src/test/java/com/dispose/test/dptech/DPTechInterfaceTestCase.java @@ -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; diff --git a/src/test/java/com/dispose/test/exception/ExceptionTest.java b/src/test/java/com/dispose/test/exception/ExceptionTest.java index 6dc70721..bebbbee6 100644 --- a/src/test/java/com/dispose/test/exception/ExceptionTest.java +++ b/src/test/java/com/dispose/test/exception/ExceptionTest.java @@ -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; diff --git a/src/test/java/com/dispose/test/manager/UserAccountManagerTest.java b/src/test/java/com/dispose/test/manager/UserAccountManagerTest.java index 025a68b7..f8a5cb32 100644 --- a/src/test/java/com/dispose/test/manager/UserAccountManagerTest.java +++ b/src/test/java/com/dispose/test/manager/UserAccountManagerTest.java @@ -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; diff --git a/src/test/java/com/dispose/test/mapper/DisposeDeviceMapperTest.java b/src/test/java/com/dispose/test/mapper/DisposeDeviceMapperTest.java index a6a3ea06..daf5e71a 100644 --- a/src/test/java/com/dispose/test/mapper/DisposeDeviceMapperTest.java +++ b/src/test/java/com/dispose/test/mapper/DisposeDeviceMapperTest.java @@ -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; diff --git a/src/test/java/com/dispose/test/mapper/DisposeTaskMapperTest.java b/src/test/java/com/dispose/test/mapper/DisposeTaskMapperTest.java index 00d64f92..382a064e 100644 --- a/src/test/java/com/dispose/test/mapper/DisposeTaskMapperTest.java +++ b/src/test/java/com/dispose/test/mapper/DisposeTaskMapperTest.java @@ -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; diff --git a/src/test/java/com/dispose/test/mapper/UserAccountMapperTest.java b/src/test/java/com/dispose/test/mapper/UserAccountMapperTest.java index 1a8a85de..35f68fc8 100644 --- a/src/test/java/com/dispose/test/mapper/UserAccountMapperTest.java +++ b/src/test/java/com/dispose/test/mapper/UserAccountMapperTest.java @@ -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; diff --git a/src/test/java/com/dispose/test/service/DisposeNodeManagerTest.java b/src/test/java/com/dispose/test/service/DisposeNodeManagerTest.java index f534fa39..c49b043c 100644 --- a/src/test/java/com/dispose/test/service/DisposeNodeManagerTest.java +++ b/src/test/java/com/dispose/test/service/DisposeNodeManagerTest.java @@ -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; diff --git a/src/test/java/com/dispose/test/service/TaskServiceTest.java b/src/test/java/com/dispose/test/service/TaskServiceTest.java index 4b68e60c..9b53b9c2 100644 --- a/src/test/java/com/dispose/test/service/TaskServiceTest.java +++ b/src/test/java/com/dispose/test/service/TaskServiceTest.java @@ -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; diff --git a/src/test/java/com/dispose/test/service/UserAccountServiceTest.java b/src/test/java/com/dispose/test/service/UserAccountServiceTest.java index e5155ffc..19b918c1 100644 --- a/src/test/java/com/dispose/test/service/UserAccountServiceTest.java +++ b/src/test/java/com/dispose/test/service/UserAccountServiceTest.java @@ -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;