diff --git a/config/application-test.properties b/config/application-test.properties index 77de0ca5..deb7769d 100644 --- a/config/application-test.properties +++ b/config/application-test.properties @@ -33,7 +33,7 @@ mybatis.mapper-locations=classpath*:mappers/*.xml mybatis.type-aliases-package=com.dispose.pojo.entity mybatis.configuration.default-enum-type-handler=com.dispose.common.CommonEnumHandler #config log -logging.config=file:config/logback_debug.xml +logging.config=file:config/logback.xml #config tomcat server.tomcat.max-threads=128 #Json sort diff --git a/src/test/java/com/dispose/test/common/PrepareProtoReqCallback.java b/src/test/java/com/dispose/test/common/PrepareProtoReqCallback.java index 360b1b80..d933e52b 100644 --- a/src/test/java/com/dispose/test/common/PrepareProtoReqCallback.java +++ b/src/test/java/com/dispose/test/common/PrepareProtoReqCallback.java @@ -1,6 +1,6 @@ package com.dispose.test.common; -import com.dispose.test.exec.TestCaseRun; +import com.dispose.test.qa.TestCaseRun; /** * The interface Prepare proto req callback. diff --git a/src/test/java/com/dispose/test/common/VerifyProtoRespCallback.java b/src/test/java/com/dispose/test/common/VerifyProtoRespCallback.java index 9ce5a874..38508577 100644 --- a/src/test/java/com/dispose/test/common/VerifyProtoRespCallback.java +++ b/src/test/java/com/dispose/test/common/VerifyProtoRespCallback.java @@ -2,7 +2,7 @@ package com.dispose.test.common; import com.dispose.common.ErrorCode; import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO; -import com.dispose.test.exec.TestCaseRun; +import com.dispose.test.qa.TestCaseRun; /** * The interface Verify proto resp callback. diff --git a/src/test/java/com/dispose/test/exec/TestCaseRun.java b/src/test/java/com/dispose/test/qa/TestCaseRun.java similarity index 98% rename from src/test/java/com/dispose/test/exec/TestCaseRun.java rename to src/test/java/com/dispose/test/qa/TestCaseRun.java index 4a188486..2f1a2b16 100644 --- a/src/test/java/com/dispose/test/exec/TestCaseRun.java +++ b/src/test/java/com/dispose/test/qa/TestCaseRun.java @@ -1,4 +1,4 @@ -package com.dispose.test.exec; +package com.dispose.test.qa; import com.dispose.mapper.DisposeDeviceMapper; import com.dispose.mapper.DisposeTaskMapper; diff --git a/src/test/java/com/dispose/test/exec/impl/JsonTestCaseRun.java b/src/test/java/com/dispose/test/qa/impl/JsonTestCaseRun.java similarity index 98% rename from src/test/java/com/dispose/test/exec/impl/JsonTestCaseRun.java rename to src/test/java/com/dispose/test/qa/impl/JsonTestCaseRun.java index f87b8c06..09883e7e 100644 --- a/src/test/java/com/dispose/test/exec/impl/JsonTestCaseRun.java +++ b/src/test/java/com/dispose/test/qa/impl/JsonTestCaseRun.java @@ -1,4 +1,4 @@ -package com.dispose.test.exec.impl; +package com.dispose.test.qa.impl; import com.dispose.mapper.DisposeDeviceMapper; import com.dispose.mapper.DisposeTaskMapper; @@ -8,7 +8,7 @@ import com.dispose.service.DisposeDeviceManagerService; import com.dispose.test.common.CommonEnvironment; import com.dispose.test.common.CommonRestfulJson; import com.dispose.test.common.QATestItem; -import com.dispose.test.exec.TestCaseRun; +import com.dispose.test.qa.TestCaseRun; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; import org.junit.ClassRule; diff --git a/src/test/java/com/dispose/test/exec/impl/ObjectTestCaseRun.java b/src/test/java/com/dispose/test/qa/impl/ObjectTestCaseRun.java similarity index 98% rename from src/test/java/com/dispose/test/exec/impl/ObjectTestCaseRun.java rename to src/test/java/com/dispose/test/qa/impl/ObjectTestCaseRun.java index 63914e17..3f278d2f 100644 --- a/src/test/java/com/dispose/test/exec/impl/ObjectTestCaseRun.java +++ b/src/test/java/com/dispose/test/qa/impl/ObjectTestCaseRun.java @@ -1,4 +1,4 @@ -package com.dispose.test.exec.impl; +package com.dispose.test.qa.impl; import com.dispose.common.ProtoCryptoType; import com.dispose.mapper.DisposeDeviceMapper; @@ -8,7 +8,7 @@ import com.dispose.service.DisposeDeviceManagerService; import com.dispose.test.common.CommonEnvironment; import com.dispose.test.common.CommonRestful; import com.dispose.test.common.QATestItem; -import com.dispose.test.exec.TestCaseRun; +import com.dispose.test.qa.TestCaseRun; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; import org.junit.ClassRule; diff --git a/src/test/java/com/dispose/test/testcase/dev/v200/CodeCoverage.java b/src/test/java/com/dispose/test/testcase/dev/v200/CodeCoverage.java index c78e359c..f4383809 100644 --- a/src/test/java/com/dispose/test/testcase/dev/v200/CodeCoverage.java +++ b/src/test/java/com/dispose/test/testcase/dev/v200/CodeCoverage.java @@ -10,7 +10,7 @@ import com.dispose.pojo.dto.protocol.task.TaskStartMulRsp; import com.dispose.test.common.QATestItem; import com.dispose.test.common.TestPriority; import com.dispose.test.common.VerifyProtoRespCallback; -import com.dispose.test.exec.TestCaseRun; +import com.dispose.test.qa.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceAdd.java b/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceAdd.java index 2301c1b6..ac07fa4a 100644 --- a/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceAdd.java +++ b/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceAdd.java @@ -10,7 +10,7 @@ import com.dispose.pojo.entity.DisposeDevice; import com.dispose.test.common.QATestItem; import com.dispose.test.common.TestPriority; import com.dispose.test.common.VerifyProtoRespCallback; -import com.dispose.test.exec.TestCaseRun; +import com.dispose.test.qa.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceDel.java b/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceDel.java index 8c47aaca..14e80cd0 100644 --- a/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceDel.java +++ b/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceDel.java @@ -6,7 +6,7 @@ import com.dispose.pojo.dto.protocol.device.manager.CommDeviceListRsp; import com.dispose.test.common.QATestItem; import com.dispose.test.common.TestPriority; import com.dispose.test.common.VerifyProtoRespCallback; -import com.dispose.test.exec.TestCaseRun; +import com.dispose.test.qa.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceQuery.java b/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceQuery.java index 30e66f5c..39855b39 100644 --- a/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceQuery.java +++ b/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceQuery.java @@ -8,7 +8,7 @@ import com.dispose.pojo.entity.DisposeDevice; import com.dispose.test.common.QATestItem; import com.dispose.test.common.TestPriority; import com.dispose.test.common.VerifyProtoRespCallback; -import com.dispose.test.exec.TestCaseRun; +import com.dispose.test.qa.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceUpgrade.java b/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceUpgrade.java index 02a0c63f..a2f93a18 100644 --- a/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceUpgrade.java +++ b/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceUpgrade.java @@ -9,7 +9,7 @@ import com.dispose.pojo.entity.DisposeDevice; import com.dispose.test.common.QATestItem; import com.dispose.test.common.TestPriority; import com.dispose.test.common.VerifyProtoRespCallback; -import com.dispose.test.exec.TestCaseRun; +import com.dispose.test.qa.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/testcase/qa/v200/P2Info.java b/src/test/java/com/dispose/test/testcase/qa/v200/P2Info.java index 8225a776..cace8113 100644 --- a/src/test/java/com/dispose/test/testcase/qa/v200/P2Info.java +++ b/src/test/java/com/dispose/test/testcase/qa/v200/P2Info.java @@ -17,7 +17,7 @@ import com.dispose.pojo.entity.DisposeDevice; import com.dispose.test.common.QATestItem; import com.dispose.test.common.TestPriority; import com.dispose.test.common.VerifyProtoRespCallback; -import com.dispose.test.exec.TestCaseRun; +import com.dispose.test.qa.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/testcase/qa/v200/P2Login.java b/src/test/java/com/dispose/test/testcase/qa/v200/P2Login.java index 57fde6d5..429e7a49 100644 --- a/src/test/java/com/dispose/test/testcase/qa/v200/P2Login.java +++ b/src/test/java/com/dispose/test/testcase/qa/v200/P2Login.java @@ -6,7 +6,7 @@ import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO; import com.dispose.test.common.QATestItem; import com.dispose.test.common.TestPriority; import com.dispose.test.common.VerifyProtoRespCallback; -import com.dispose.test.exec.TestCaseRun; +import com.dispose.test.qa.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/testcase/qa/v200/P2Logout.java b/src/test/java/com/dispose/test/testcase/qa/v200/P2Logout.java index 1b22b549..c401f1d8 100644 --- a/src/test/java/com/dispose/test/testcase/qa/v200/P2Logout.java +++ b/src/test/java/com/dispose/test/testcase/qa/v200/P2Logout.java @@ -6,7 +6,7 @@ import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO; import com.dispose.test.common.QATestItem; import com.dispose.test.common.TestPriority; import com.dispose.test.common.VerifyProtoRespCallback; -import com.dispose.test.exec.TestCaseRun; +import com.dispose.test.qa.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskList.java b/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskList.java index 0a78834c..4df6ca76 100644 --- a/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskList.java +++ b/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskList.java @@ -9,7 +9,7 @@ import com.dispose.pojo.entity.DisposeTask; import com.dispose.test.common.QATestItem; import com.dispose.test.common.TestPriority; import com.dispose.test.common.VerifyProtoRespCallback; -import com.dispose.test.exec.TestCaseRun; +import com.dispose.test.qa.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStart.java b/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStart.java index 366a4df7..5a396aba 100644 --- a/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStart.java +++ b/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStart.java @@ -8,7 +8,7 @@ import com.dispose.pojo.dto.protocol.task.TaskStartRsp; import com.dispose.test.common.QATestItem; import com.dispose.test.common.TestPriority; import com.dispose.test.common.VerifyProtoRespCallback; -import com.dispose.test.exec.TestCaseRun; +import com.dispose.test.qa.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStartMulIp.java b/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStartMulIp.java index 7d23e2c3..e2e8106b 100644 --- a/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStartMulIp.java +++ b/src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStartMulIp.java @@ -7,7 +7,7 @@ import com.dispose.pojo.dto.protocol.task.TaskStartMulRsp; import com.dispose.test.common.QATestItem; import com.dispose.test.common.TestPriority; import com.dispose.test.common.VerifyProtoRespCallback; -import com.dispose.test.exec.TestCaseRun; +import com.dispose.test.qa.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/testcase/qa/v200/P3All.java b/src/test/java/com/dispose/test/testcase/qa/v200/P3All.java index 01c0ae91..1ed6e857 100644 --- a/src/test/java/com/dispose/test/testcase/qa/v200/P3All.java +++ b/src/test/java/com/dispose/test/testcase/qa/v200/P3All.java @@ -13,7 +13,7 @@ import com.dispose.pojo.dto.protocol.task.TaskStopRsp; import com.dispose.test.common.QATestItem; import com.dispose.test.common.TestPriority; import com.dispose.test.common.VerifyProtoRespCallback; -import com.dispose.test.exec.TestCaseRun; +import com.dispose.test.qa.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod;