REM:
1. 修改自动合并代码造成的代码错误
This commit is contained in:
HuangXin 2020-05-09 14:32:56 +08:00
parent 94cd7c0df1
commit 4cb3cfcc6d
4 changed files with 9 additions and 10 deletions

View File

@ -2,7 +2,8 @@ package com.dispose.TestSuit;
import com.dispose.controller.AuthControllerQATest; import com.dispose.controller.AuthControllerQATest;
import com.dispose.controller.AuthControllerSmokeTest; import com.dispose.controller.AuthControllerSmokeTest;
import com.dispose.controller.TaskControllerExceptionSmokeTest; import com.dispose.controller.TaskControllerQATest;
import com.dispose.controller.TaskControllerSmokeTest;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Suite; import org.junit.runners.Suite;
@ -10,7 +11,8 @@ import org.junit.runners.Suite;
@Suite.SuiteClasses({ @Suite.SuiteClasses({
AuthControllerQATest.class, AuthControllerQATest.class,
AuthControllerSmokeTest.class, AuthControllerSmokeTest.class,
TaskControllerExceptionSmokeTest.class TaskControllerQATest.class,
TaskControllerSmokeTest.class
}) })
public class QATest { public class QATest {
} }

View File

@ -1,6 +1,8 @@
package com.dispose.TestSuit; package com.dispose.TestSuit;
import com.dispose.controller.AuthControllerSmokeTest; import com.dispose.controller.AuthControllerSmokeTest;
import com.dispose.controller.DeviceNodeInfoControllerSmokeTest;
import com.dispose.controller.TaskControllerSmokeTest;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Suite; import org.junit.runners.Suite;
@ -9,7 +11,9 @@ import org.junit.runners.Suite;
*/ */
@RunWith(Suite.class) @RunWith(Suite.class)
@Suite.SuiteClasses({ @Suite.SuiteClasses({
AuthControllerSmokeTest.class AuthControllerSmokeTest.class,
DeviceNodeInfoControllerSmokeTest.class,
TaskControllerSmokeTest.class
}) })
public class SmokeTest { public class SmokeTest {

View File

@ -2,7 +2,6 @@ package com.dispose.controller;
import com.dispose.Global.InitTestEnvironment; import com.dispose.Global.InitTestEnvironment;
import com.dispose.common.ErrorCode; import com.dispose.common.ErrorCode;
import com.dispose.pojo.vo.auth.LoginRsp;
import com.dispose.pojo.vo.information.NodeTaskRsp; import com.dispose.pojo.vo.information.NodeTaskRsp;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

View File

@ -4,13 +4,9 @@ import com.dispose.Global.InitTestEnvironment;
import com.dispose.common.ErrorCode; import com.dispose.common.ErrorCode;
import com.dispose.pojo.entity.DisposeDevice; import com.dispose.pojo.entity.DisposeDevice;
import com.dispose.pojo.po.MReturnType; import com.dispose.pojo.po.MReturnType;
import com.dispose.pojo.po.ReturnStatus;
import com.dispose.pojo.vo.auth.LoginRsp;
import com.dispose.pojo.vo.common.IDArrayReq;
import com.dispose.pojo.vo.common.IDReturnStatus; import com.dispose.pojo.vo.common.IDReturnStatus;
import com.dispose.pojo.vo.device.AddNodeRetData; import com.dispose.pojo.vo.device.AddNodeRetData;
import com.dispose.pojo.vo.device.AddNodeRsp; import com.dispose.pojo.vo.device.AddNodeRsp;
import com.dispose.pojo.vo.task.StartTaskRsp;
import com.dispose.service.DisposeNodeManager; import com.dispose.service.DisposeNodeManager;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
@ -29,8 +25,6 @@ import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;