diff --git a/src/test/java/com/dispose/config/DisposeConfigureTest.java b/src/test/java/com/dispose/config/DisposeConfigureTest.java index 49579183..115793b6 100644 --- a/src/test/java/com/dispose/config/DisposeConfigureTest.java +++ b/src/test/java/com/dispose/config/DisposeConfigureTest.java @@ -3,7 +3,6 @@ package com.dispose.config; import com.dispose.Global.InitTestEnvironment; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; import org.junit.FixMethodOrder; @@ -13,6 +12,8 @@ import org.junit.runners.MethodSorters; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import javax.annotation.Resource; + /** * The type Dispose configure test. */ diff --git a/src/test/java/com/dispose/config/MyConfigTest.java b/src/test/java/com/dispose/config/MyConfigTest.java index 7264c81a..4281000c 100644 --- a/src/test/java/com/dispose/config/MyConfigTest.java +++ b/src/test/java/com/dispose/config/MyConfigTest.java @@ -3,7 +3,6 @@ package com.dispose.config; import com.dispose.Global.InitTestEnvironment; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; import org.junit.FixMethodOrder; @@ -13,6 +12,8 @@ import org.junit.runners.MethodSorters; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import javax.annotation.Resource; + /** * The type My config test. */ diff --git a/src/test/java/com/dispose/controller/AuthControllerExceptionSmokeTest.java b/src/test/java/com/dispose/controller/AuthControllerExceptionSmokeTest.java index 4792b2a0..106470fd 100644 --- a/src/test/java/com/dispose/controller/AuthControllerExceptionSmokeTest.java +++ b/src/test/java/com/dispose/controller/AuthControllerExceptionSmokeTest.java @@ -1,15 +1,10 @@ package com.dispose.controller; import com.dispose.Global.InitTestEnvironment; -import com.dispose.common.ConstValue; import com.dispose.common.ErrorCode; -import com.dispose.pojo.dto.ProtocolReqDTO; -import com.dispose.pojo.dto.ProtocolRespDTO; import com.dispose.pojo.po.ReturnStatus; -import com.dispose.pojo.vo.auth.LoginReq; import com.dispose.pojo.vo.auth.LoginRsp; import com.dispose.pojo.vo.auth.LogoutRsp; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; diff --git a/src/test/java/com/dispose/controller/AuthControllerTest.java b/src/test/java/com/dispose/controller/AuthControllerTest.java index f413a43b..6d5c1d4a 100644 --- a/src/test/java/com/dispose/controller/AuthControllerTest.java +++ b/src/test/java/com/dispose/controller/AuthControllerTest.java @@ -7,7 +7,6 @@ import com.dispose.pojo.dto.ProtocolRespDTO; import com.dispose.pojo.vo.auth.LoginReq; import com.dispose.pojo.vo.auth.LoginRsp; import com.fasterxml.jackson.databind.ObjectMapper; -import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; import org.junit.FixMethodOrder; @@ -21,6 +20,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; + +import javax.annotation.Resource; + import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; diff --git a/src/test/java/com/dispose/controller/DeviceNodeInfoControllerTest.java b/src/test/java/com/dispose/controller/DeviceNodeInfoControllerTest.java index 9172867d..f118a847 100644 --- a/src/test/java/com/dispose/controller/DeviceNodeInfoControllerTest.java +++ b/src/test/java/com/dispose/controller/DeviceNodeInfoControllerTest.java @@ -2,22 +2,26 @@ package com.dispose.controller; import com.dispose.Global.InitTestEnvironment; import com.dispose.common.ConstValue; - import com.dispose.mapper.DisposeDeviceMapper; import com.dispose.pojo.dto.ProtocolReqDTO; import com.dispose.pojo.entity.DisposeDevice; import com.dispose.pojo.vo.common.DisposeCapacity; import com.dispose.pojo.vo.common.IDArrayReq; 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.LinkStatusRsp; +import com.dispose.pojo.vo.information.NodeTaskData; +import com.dispose.pojo.vo.information.NodeTaskRsp; +import com.dispose.pojo.vo.information.VersionRsp; import com.dispose.service.DisposeNodeManager; import com.dispose.service.UserAccountService; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; - -import java.util.List; -import javax.annotation.Resource; - import org.junit.Assert; import org.junit.FixMethodOrder; import org.junit.Test; @@ -31,6 +35,9 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import javax.annotation.Resource; +import java.util.List; + import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; diff --git a/src/test/java/com/dispose/controller/DeviceNodeManagerControllerTest.java b/src/test/java/com/dispose/controller/DeviceNodeManagerControllerTest.java index 999c0e87..e940c0cf 100644 --- a/src/test/java/com/dispose/controller/DeviceNodeManagerControllerTest.java +++ b/src/test/java/com/dispose/controller/DeviceNodeManagerControllerTest.java @@ -15,11 +15,6 @@ import com.dispose.pojo.vo.device.AddNodeRsp; import com.dispose.service.DisposeNodeManager; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; - -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Resource; - import lombok.extern.slf4j.Slf4j; import org.junit.Assert; import org.junit.FixMethodOrder; @@ -34,6 +29,10 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; diff --git a/src/test/java/com/dispose/controller/TaskControllerTest.java b/src/test/java/com/dispose/controller/TaskControllerTest.java index 3b5230da..5eedf5c0 100644 --- a/src/test/java/com/dispose/controller/TaskControllerTest.java +++ b/src/test/java/com/dispose/controller/TaskControllerTest.java @@ -7,19 +7,18 @@ import com.dispose.manager.TaskCacheManager; import com.dispose.mapper.DisposeDeviceMapper; import com.dispose.pojo.dto.ProtocolReqDTO; import com.dispose.pojo.entity.DisposeDevice; -import com.dispose.pojo.vo.common.DisposeCapacity; import com.dispose.pojo.vo.common.IDArrayReq; import com.dispose.pojo.vo.common.TaskInfoData; import com.dispose.pojo.vo.common.TaskInfoDetail; import com.dispose.pojo.vo.information.NodeTaskData; import com.dispose.pojo.vo.information.NodeTaskRsp; -import com.dispose.pojo.vo.task.*; +import com.dispose.pojo.vo.task.GetTaskReq; +import com.dispose.pojo.vo.task.StartTaskReq; +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.fasterxml.jackson.databind.ObjectMapper; - -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Resource; - import org.junit.Assert; import org.junit.FixMethodOrder; import org.junit.Test; @@ -33,6 +32,10 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; diff --git a/src/test/java/com/dispose/dptech/DPTechInterfaceTestCase.java b/src/test/java/com/dispose/dptech/DPTechInterfaceTestCase.java index bbd11790..42549eca 100644 --- a/src/test/java/com/dispose/dptech/DPTechInterfaceTestCase.java +++ b/src/test/java/com/dispose/dptech/DPTechInterfaceTestCase.java @@ -11,8 +11,6 @@ import com.dptech.dispose.DetectionObjectDataForService; import com.dptech.dispose.ProtectionObjectDataForService; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import java.util.List; -import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; import org.junit.FixMethodOrder; @@ -22,6 +20,9 @@ import org.junit.runners.MethodSorters; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import javax.annotation.Resource; +import java.util.List; + /** * The type Dp tech interface test case. */ diff --git a/src/test/java/com/dispose/exception/ExceptionTest.java b/src/test/java/com/dispose/exception/ExceptionTest.java index 2dfcb6e6..0b00411c 100644 --- a/src/test/java/com/dispose/exception/ExceptionTest.java +++ b/src/test/java/com/dispose/exception/ExceptionTest.java @@ -5,7 +5,6 @@ import com.dispose.common.ConstValue; import com.dispose.pojo.dto.ProtocolReqDTO; import com.dispose.pojo.vo.auth.LoginReq; import com.fasterxml.jackson.databind.ObjectMapper; -import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.junit.FixMethodOrder; import org.junit.Rule; @@ -20,6 +19,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; + +import javax.annotation.Resource; + import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; diff --git a/src/test/java/com/dispose/manager/UserAccountManagerTest.java b/src/test/java/com/dispose/manager/UserAccountManagerTest.java index 0c040b48..ee443917 100644 --- a/src/test/java/com/dispose/manager/UserAccountManagerTest.java +++ b/src/test/java/com/dispose/manager/UserAccountManagerTest.java @@ -5,8 +5,6 @@ import com.dispose.common.ErrorCode; import com.dispose.pojo.po.MReturnType; import com.dispose.service.UserAccountService; import com.fasterxml.jackson.core.JsonProcessingException; -import java.security.NoSuchAlgorithmException; -import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; import org.junit.Before; @@ -17,6 +15,9 @@ import org.junit.runners.MethodSorters; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import javax.annotation.Resource; +import java.security.NoSuchAlgorithmException; + /** * The type User account manager test. */ diff --git a/src/test/java/com/dispose/mapper/DisposeDeviceMapperTest.java b/src/test/java/com/dispose/mapper/DisposeDeviceMapperTest.java index 91b03917..3a58358b 100644 --- a/src/test/java/com/dispose/mapper/DisposeDeviceMapperTest.java +++ b/src/test/java/com/dispose/mapper/DisposeDeviceMapperTest.java @@ -6,9 +6,6 @@ import com.dispose.pojo.entity.DisposeDevice; import com.dispose.pojo.po.DisposeDeviceCapacity; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; import org.junit.FixMethodOrder; @@ -16,9 +13,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.annotation.Rollback; import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; /** * The type Dispose device mapper test. diff --git a/src/test/java/com/dispose/mapper/DisposeTaskMapperTest.java b/src/test/java/com/dispose/mapper/DisposeTaskMapperTest.java index e553aad4..8f4bd486 100644 --- a/src/test/java/com/dispose/mapper/DisposeTaskMapperTest.java +++ b/src/test/java/com/dispose/mapper/DisposeTaskMapperTest.java @@ -7,7 +7,6 @@ import com.dispose.common.FlowDirection; import com.dispose.pojo.vo.common.TaskInfoDetail; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; import org.junit.FixMethodOrder; @@ -19,6 +18,8 @@ import org.springframework.test.annotation.Rollback; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; + /** * The type Dispose task mapper test. */ diff --git a/src/test/java/com/dispose/mapper/UserAccountMapperTest.java b/src/test/java/com/dispose/mapper/UserAccountMapperTest.java index b3255cca..7f2ff075 100644 --- a/src/test/java/com/dispose/mapper/UserAccountMapperTest.java +++ b/src/test/java/com/dispose/mapper/UserAccountMapperTest.java @@ -5,7 +5,6 @@ import com.dispose.common.ConstValue; import com.dispose.pojo.entity.UserAccount; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; import org.junit.FixMethodOrder; @@ -18,6 +17,8 @@ import org.springframework.test.annotation.Rollback; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; + /** * The type User account mapper test. */ diff --git a/src/test/java/com/dispose/service/DisposeNodeManagerTest.java b/src/test/java/com/dispose/service/DisposeNodeManagerTest.java index ab3ce5af..a04e31a8 100644 --- a/src/test/java/com/dispose/service/DisposeNodeManagerTest.java +++ b/src/test/java/com/dispose/service/DisposeNodeManagerTest.java @@ -7,9 +7,7 @@ import com.dispose.mapper.DisposeDeviceMapper; import com.dispose.pojo.po.MReturnType; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import org.junit.After; import org.junit.Assert; import org.junit.FixMethodOrder; import org.junit.Test; @@ -20,6 +18,8 @@ import org.springframework.test.annotation.Rollback; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; + /** * The type Dispose node manager test. */ diff --git a/src/test/java/com/dispose/service/UserAccountServiceTest.java b/src/test/java/com/dispose/service/UserAccountServiceTest.java index 687a4ce8..441654bd 100644 --- a/src/test/java/com/dispose/service/UserAccountServiceTest.java +++ b/src/test/java/com/dispose/service/UserAccountServiceTest.java @@ -4,8 +4,6 @@ import com.dispose.Global.InitTestEnvironment; import com.dispose.common.ErrorCode; import com.dispose.pojo.entity.UserAccount; import com.dispose.pojo.po.MReturnType; -import java.security.NoSuchAlgorithmException; -import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; import org.junit.Before; @@ -16,6 +14,9 @@ import org.junit.runners.MethodSorters; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import javax.annotation.Resource; +import java.security.NoSuchAlgorithmException; + /** * The type User account service test. */