OCT

REM:
1. 重命名单元测试名空间

src/main/java/com/dispose/pojo/dto/ProtocolDTO.java

@@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -14,7 +13,6 @@ import lombok.NoArgsConstructor;
  */
 @Data
 @NoArgsConstructor
-@AllArgsConstructor
 @ApiModel("通信协议实体")
 @JsonPropertyOrder({"ver", "cryptoType", "timeStamp", "msgContent"})
 public abstract class ProtocolDTO {

src/main/java/com/dispose/pojo/dto/ProtocolReqDTO.java

@@ -6,8 +6,6 @@ import com.dispose.common.GlobalVar;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpHeaders;
@@ -17,8 +15,6 @@ import java.util.Objects;
 /**
  * The type Protocol req dto.
  */
-@EqualsAndHashCode(callSuper = true)
-@Data
 @NoArgsConstructor
 @Slf4j
 public class ProtocolReqDTO extends ProtocolDTO {

src/main/java/com/dispose/pojo/dto/ProtocolRespDTO.java

@@ -8,17 +8,13 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 /**
  * The type Protocol resp dto.
  */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Builder
+@Setter
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonPropertyOrder({"ver", "cryptoType", "timeStamp", "code", "msgContent"})

src/test/java/com/dispose/TestSuit/AllDisposePlatformTest.java

@@ -1,43 +0,0 @@
-package com.dispose.TestSuit;
-
-
-import com.dispose.config.DisposeConfigureTest;
-import com.dispose.config.MyConfigTest;
-import com.dispose.controller.AuthControllerTest;
-import com.dispose.controller.DeviceNodeInfoControllerTest;
-import com.dispose.controller.DeviceNodeManagerControllerTest;
-import com.dispose.controller.TaskControllerTest;
-import com.dispose.dptech.DPTechInterfaceTestCase;
-import com.dispose.manager.UserAccountManagerTest;
-import com.dispose.mapper.DisposeDeviceMapperTest;
-import com.dispose.mapper.DisposeTaskMapperTest;
-import com.dispose.mapper.UserAccountMapperTest;
-import com.dispose.service.DisposeNodeManagerTest;
-import com.dispose.service.TaskServiceTest;
-import com.dispose.service.UserAccountServiceTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/**
- * The type All dispose platform test.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-            MyConfigTest.class,
-			TaskServiceTest.class,
-            DisposeConfigureTest.class,
-            DisposeTaskMapperTest.class,
-            DisposeNodeManagerTest.class,
-            DPTechInterfaceTestCase.class,
-            UserAccountMapperTest.class,
-            UserAccountManagerTest.class,
-        	DisposeDeviceMapperTest.class,
-            AuthControllerTest.class,
-            DeviceNodeManagerControllerTest.class,
-            DeviceNodeInfoControllerTest.class,
-            UserAccountServiceTest.class,
-            TaskControllerTest.class
-})
-
-public class AllDisposePlatformTest {
-}

src/test/java/com/dispose/TestSuit/QATest.java

@@ -1,26 +0,0 @@
-package com.dispose.TestSuit;
-
-import com.dispose.controller.AuthControllerQATest;
-import com.dispose.controller.AuthControllerSmokeTest;
-import com.dispose.controller.DeviceNodeInfoControllerQATest;
-import com.dispose.controller.DeviceNodeInfoControllerSmokeTest;
-import com.dispose.controller.DeviceNodeManagerControllerQATest;
-import com.dispose.controller.DeviceNodeManagerControllerSmokeTest;
-import com.dispose.controller.TaskControllerQATest;
-import com.dispose.controller.TaskControllerSmokeTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-        AuthControllerQATest.class,
-        AuthControllerSmokeTest.class,
-        DeviceNodeManagerControllerQATest.class,
-        DeviceNodeManagerControllerSmokeTest.class,
-        DeviceNodeInfoControllerQATest.class,
-        DeviceNodeInfoControllerSmokeTest.class,
-        TaskControllerQATest.class,
-        TaskControllerSmokeTest.class
-})
-public class QATest {
-}

src/test/java/com/dispose/test/Global/InitTestEnvironment.java

@@ -1,4 +1,4 @@
-package com.dispose.Global;
+package com.dispose.test.Global;
 
 import com.dispose.common.ConstValue;
 import com.dispose.common.ErrorCode;

src/test/java/com/dispose/test/TestSuit/AllDisposePlatformTest.java

@@ -0,0 +1,43 @@
+package com.dispose.test.TestSuit;
+
+
+import com.dispose.test.config.DisposeConfigureTest;
+import com.dispose.test.config.MyConfigTest;
+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;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * The type All dispose platform test.
+ */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+            MyConfigTest.class,
+			TaskServiceTest.class,
+            DisposeConfigureTest.class,
+            DisposeTaskMapperTest.class,
+            DisposeNodeManagerTest.class,
+            DPTechInterfaceTestCase.class,
+            UserAccountMapperTest.class,
+            UserAccountManagerTest.class,
+        	DisposeDeviceMapperTest.class,
+            AuthControllerTest.class,
+            DeviceNodeManagerControllerTest.class,
+            DeviceNodeInfoControllerTest.class,
+            UserAccountServiceTest.class,
+            TaskControllerTest.class
+})
+
+public class AllDisposePlatformTest {
+}

src/test/java/com/dispose/test/TestSuit/QATest.java

@@ -0,0 +1,26 @@
+package com.dispose.test.TestSuit;
+
+import com.dispose.test.controller.AuthControllerQATest;
+import com.dispose.test.controller.AuthControllerSmokeTest;
+import com.dispose.test.controller.DeviceNodeInfoControllerQATest;
+import com.dispose.test.controller.DeviceNodeInfoControllerSmokeTest;
+import com.dispose.test.controller.DeviceNodeManagerControllerQATest;
+import com.dispose.test.controller.DeviceNodeManagerControllerSmokeTest;
+import com.dispose.test.controller.TaskControllerQATest;
+import com.dispose.test.controller.TaskControllerSmokeTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+        AuthControllerQATest.class,
+        AuthControllerSmokeTest.class,
+        DeviceNodeManagerControllerQATest.class,
+        DeviceNodeManagerControllerSmokeTest.class,
+        DeviceNodeInfoControllerQATest.class,
+        DeviceNodeInfoControllerSmokeTest.class,
+        TaskControllerQATest.class,
+        TaskControllerSmokeTest.class
+})
+public class QATest {
+}

src/test/java/com/dispose/test/TestSuit/SmokeTest.java

@@ -1,9 +1,9 @@
-package com.dispose.TestSuit;
+package com.dispose.test.TestSuit;
 
-import com.dispose.controller.AuthControllerSmokeTest;
-import com.dispose.controller.DeviceNodeInfoControllerSmokeTest;
-import com.dispose.controller.DeviceNodeManagerControllerSmokeTest;
-import com.dispose.controller.TaskControllerSmokeTest;
+import com.dispose.test.controller.AuthControllerSmokeTest;
+import com.dispose.test.controller.DeviceNodeInfoControllerSmokeTest;
+import com.dispose.test.controller.DeviceNodeManagerControllerSmokeTest;
+import com.dispose.test.controller.TaskControllerSmokeTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 

src/test/java/com/dispose/test/config/DisposeConfigureTest.java

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

src/test/java/com/dispose/test/config/MyConfigTest.java

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

src/test/java/com/dispose/test/controller/AuthControllerQATest.java

@@ -1,6 +1,6 @@
-package com.dispose.controller;
+package com.dispose.test.controller;
 
-import com.dispose.Global.InitTestEnvironment;
+import com.dispose.test.Global.InitTestEnvironment;
 import com.dispose.common.ErrorCode;
 import com.dispose.pojo.po.ReturnStatus;
 import com.dispose.pojo.vo.auth.LogoutRsp;

src/test/java/com/dispose/test/controller/AuthControllerSmokeTest.java

@@ -1,6 +1,6 @@
-package com.dispose.controller;
+package com.dispose.test.controller;
 
-import com.dispose.Global.InitTestEnvironment;
+import com.dispose.test.Global.InitTestEnvironment;
 import com.dispose.common.ErrorCode;
 import com.dispose.pojo.po.ReturnStatus;
 import com.dispose.pojo.vo.auth.LoginRsp;

src/test/java/com/dispose/test/controller/AuthControllerTest.java

@@ -1,6 +1,6 @@
-package com.dispose.controller;
+package com.dispose.test.controller;
 
-import com.dispose.Global.InitTestEnvironment;
+import com.dispose.test.Global.InitTestEnvironment;
 import com.dispose.common.ConstValue;
 import com.dispose.pojo.dto.ProtocolReqDTO;
 import com.dispose.pojo.dto.ProtocolRespDTO;

src/test/java/com/dispose/test/controller/DeviceNodeInfoControllerQATest.java

@@ -11,9 +11,9 @@
  * disclose such Confidential Information and shall use it only in
  * accordance with the terms of the license.
  */
-package com.dispose.controller;
+package com.dispose.test.controller;
 
-import com.dispose.Global.InitTestEnvironment;
+import com.dispose.test.Global.InitTestEnvironment;
 import com.dispose.common.ErrorCode;
 import com.dispose.pojo.entity.DisposeDevice;
 import com.dispose.pojo.po.ReturnStatus;

src/test/java/com/dispose/test/controller/DeviceNodeInfoControllerSmokeTest.java

@@ -1,10 +1,9 @@
-package com.dispose.controller;
+package com.dispose.test.controller;
 
-import com.dispose.Global.InitTestEnvironment;
+import com.dispose.test.Global.InitTestEnvironment;
 import com.dispose.common.DisposeTaskStatus;
 import com.dispose.common.ErrorCode;
 import com.dispose.mapper.DisposeTaskMapper;
-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;
@@ -13,8 +12,6 @@ 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.pojo.vo.information.VersionRsp;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
@@ -233,7 +230,7 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment {
 
         Assert.assertNotNull(dpData);
         Assert.assertNotNull(dpData.getId());
-        Assert.assertNotNull(dpData.getType());
+        //Assert.assertNotNull(dpData.getType());
         Assert.assertNotNull(dpData.getIp());
         Assert.assertNotNull(dpData.getStatus());
         Assert.assertNotNull(dpData.getMessage());

src/test/java/com/dispose/test/controller/DeviceNodeInfoControllerTest.java

@@ -1,6 +1,6 @@
-package com.dispose.controller;
+package com.dispose.test.controller;
 
-import com.dispose.Global.InitTestEnvironment;
+import com.dispose.test.Global.InitTestEnvironment;
 import com.dispose.common.ConstValue;
 import com.dispose.common.ErrorCode;
 import com.dispose.mapper.DisposeDeviceMapper;

src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerQATest.java

@@ -1,6 +1,6 @@
-package com.dispose.controller;
+package com.dispose.test.controller;
 
-import com.dispose.Global.InitTestEnvironment;
+import com.dispose.test.Global.InitTestEnvironment;
 import com.dispose.common.ErrorCode;
 import com.dispose.pojo.vo.device.AddNodeRetData;
 import com.dispose.service.DisposeNodeManager;

src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerSmokeTest.java

@@ -1,6 +1,6 @@
-package com.dispose.controller;
+package com.dispose.test.controller;
 
-import com.dispose.Global.InitTestEnvironment;
+import com.dispose.test.Global.InitTestEnvironment;
 import com.dispose.common.ErrorCode;
 import com.dispose.pojo.entity.DisposeDevice;
 import com.dispose.pojo.po.MReturnType;

src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerTest.java

@@ -1,6 +1,6 @@
-package com.dispose.controller;
+package com.dispose.test.controller;
 
-import com.dispose.Global.InitTestEnvironment;
+import com.dispose.test.Global.InitTestEnvironment;
 import com.dispose.common.ConstValue;
 import com.dispose.common.DisposeDeviceType;
 import com.dispose.common.ErrorCode;

src/test/java/com/dispose/test/controller/TaskControllerQATest.java

@@ -1,6 +1,6 @@
-package com.dispose.controller;
+package com.dispose.test.controller;
 
-import com.dispose.Global.InitTestEnvironment;
+import com.dispose.test.Global.InitTestEnvironment;
 import com.dispose.common.ErrorCode;
 import com.dispose.pojo.po.ReturnStatus;
 import com.dispose.pojo.vo.common.TaskInfoData;

src/test/java/com/dispose/test/controller/TaskControllerSmokeTest.java

@@ -1,6 +1,6 @@
-package com.dispose.controller;
+package com.dispose.test.controller;
 
-import com.dispose.Global.InitTestEnvironment;
+import com.dispose.test.Global.InitTestEnvironment;
 import com.dispose.common.ErrorCode;
 import com.dispose.pojo.vo.common.TaskInfoData;
 import com.dispose.pojo.vo.task.StartTaskRsp;

src/test/java/com/dispose/test/controller/TaskControllerTest.java

@@ -1,6 +1,6 @@
-package com.dispose.controller;
+package com.dispose.test.controller;
 
-import com.dispose.Global.InitTestEnvironment;
+import com.dispose.test.Global.InitTestEnvironment;
 import com.dispose.common.ConstValue;
 import com.dispose.common.DeviceCapacity;
 import com.dispose.common.ErrorCode;

src/test/java/com/dispose/test/dptech/DPTechInterfaceTestCase.java

@@ -1,6 +1,6 @@
-package com.dispose.dptech;
+package com.dispose.test.dptech;
 
-import com.dispose.Global.InitTestEnvironment;
+import com.dispose.test.Global.InitTestEnvironment;
 import com.dispose.common.DeviceCapacity;
 import com.dispose.common.DisposeDeviceType;
 import com.dispose.common.ErrorCode;

src/test/java/com/dispose/test/exception/ExceptionTest.java

@@ -1,6 +1,6 @@
-package com.dispose.exception;
+package com.dispose.test.exception;
 
-import com.dispose.Global.InitTestEnvironment;
+import com.dispose.test.Global.InitTestEnvironment;
 import com.dispose.common.ConstValue;
 import com.dispose.pojo.dto.ProtocolReqDTO;
 import com.dispose.pojo.vo.auth.LoginReq;

src/test/java/com/dispose/test/manager/UserAccountManagerTest.java

@@ -1,7 +1,8 @@
-package com.dispose.manager;
+package com.dispose.test.manager;
 
-import com.dispose.Global.InitTestEnvironment;
+import com.dispose.test.Global.InitTestEnvironment;
 import com.dispose.common.ErrorCode;
+import com.dispose.manager.UserAccountCacheManager;
 import com.dispose.pojo.po.MReturnType;
 import com.dispose.service.UserAccountService;
 import com.fasterxml.jackson.core.JsonProcessingException;

src/test/java/com/dispose/test/mapper/DisposeDeviceMapperTest.java

@@ -1,7 +1,8 @@
-package com.dispose.mapper;
+package com.dispose.test.mapper;
 
-import com.dispose.Global.InitTestEnvironment;
+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.fasterxml.jackson.core.JsonProcessingException;

src/test/java/com/dispose/test/mapper/DisposeTaskMapperTest.java

@@ -1,9 +1,12 @@
-package com.dispose.mapper;
+package com.dispose.test.mapper;
 
-import com.dispose.Global.InitTestEnvironment;
+import com.dispose.test.Global.InitTestEnvironment;
 import com.dispose.common.DeviceCapacity;
 import com.dispose.common.DisposeTaskStatus;
 import com.dispose.common.FlowDirection;
+import com.dispose.mapper.DisposeDeviceMapper;
+import com.dispose.mapper.DisposeTaskMapper;
+import com.dispose.mapper.UserAccountMapper;
 import com.dispose.pojo.vo.common.TaskInfoDetail;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;

src/test/java/com/dispose/test/mapper/UserAccountMapperTest.java

@@ -1,7 +1,8 @@
-package com.dispose.mapper;
+package com.dispose.test.mapper;
 
-import com.dispose.Global.InitTestEnvironment;
+import com.dispose.test.Global.InitTestEnvironment;
 import com.dispose.common.ConstValue;
+import com.dispose.mapper.UserAccountMapper;
 import com.dispose.pojo.entity.UserAccount;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;

src/test/java/com/dispose/test/service/DisposeNodeManagerTest.java

@@ -1,10 +1,11 @@
-package com.dispose.service;
+package com.dispose.test.service;
 
-import com.dispose.Global.InitTestEnvironment;
+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.MReturnType;
+import com.dispose.service.DisposeNodeManager;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;

src/test/java/com/dispose/test/service/TaskServiceTest.java

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

src/test/java/com/dispose/test/service/UserAccountServiceTest.java

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