diff --git a/src/test/java/com/dispose/test/qa/testcase/v20/P1All.java b/src/test/java/com/dispose/test/QaTestCasev200/P1All.java similarity index 99% rename from src/test/java/com/dispose/test/qa/testcase/v20/P1All.java rename to src/test/java/com/dispose/test/QaTestCasev200/P1All.java index b7dd3cb1..f14f694e 100644 --- a/src/test/java/com/dispose/test/qa/testcase/v20/P1All.java +++ b/src/test/java/com/dispose/test/QaTestCasev200/P1All.java @@ -1,4 +1,4 @@ -package com.dispose.test.qa.testcase.v20; +package com.dispose.test.QaTestCasev200; import com.dispose.common.DisposeCapacityType; import com.dispose.common.DisposeDeviceType; diff --git a/src/test/java/com/dispose/test/qa/testcase/v20/P2DeviceAdd.java b/src/test/java/com/dispose/test/QaTestCasev200/P2DeviceAdd.java similarity index 99% rename from src/test/java/com/dispose/test/qa/testcase/v20/P2DeviceAdd.java rename to src/test/java/com/dispose/test/QaTestCasev200/P2DeviceAdd.java index d160cc6c..370f876b 100644 --- a/src/test/java/com/dispose/test/qa/testcase/v20/P2DeviceAdd.java +++ b/src/test/java/com/dispose/test/QaTestCasev200/P2DeviceAdd.java @@ -1,4 +1,4 @@ -package com.dispose.test.qa.testcase.v20; +package com.dispose.test.QaTestCasev200; import com.dispose.common.DisposeCapacityType; import com.dispose.common.DisposeDeviceType; @@ -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.qa.exec.TestCaseRun; +import com.dispose.test.exec.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/qa/testcase/v20/P2DeviceDel.java b/src/test/java/com/dispose/test/QaTestCasev200/P2DeviceDel.java similarity index 98% rename from src/test/java/com/dispose/test/qa/testcase/v20/P2DeviceDel.java rename to src/test/java/com/dispose/test/QaTestCasev200/P2DeviceDel.java index eee58f26..69f7ae17 100644 --- a/src/test/java/com/dispose/test/qa/testcase/v20/P2DeviceDel.java +++ b/src/test/java/com/dispose/test/QaTestCasev200/P2DeviceDel.java @@ -1,4 +1,4 @@ -package com.dispose.test.qa.testcase.v20; +package com.dispose.test.QaTestCasev200; import com.dispose.common.ErrorCode; import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO; @@ -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.qa.exec.TestCaseRun; +import com.dispose.test.exec.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/qa/testcase/v20/P2DeviceQuery.java b/src/test/java/com/dispose/test/QaTestCasev200/P2DeviceQuery.java similarity index 98% rename from src/test/java/com/dispose/test/qa/testcase/v20/P2DeviceQuery.java rename to src/test/java/com/dispose/test/QaTestCasev200/P2DeviceQuery.java index 4d5c53d2..1e719dc6 100644 --- a/src/test/java/com/dispose/test/qa/testcase/v20/P2DeviceQuery.java +++ b/src/test/java/com/dispose/test/QaTestCasev200/P2DeviceQuery.java @@ -1,4 +1,4 @@ -package com.dispose.test.qa.testcase.v20; +package com.dispose.test.QaTestCasev200; import com.dispose.common.DisposeDeviceType; import com.dispose.common.ErrorCode; @@ -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.qa.exec.TestCaseRun; +import com.dispose.test.exec.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/qa/testcase/v20/P2DeviceUpgrade.java b/src/test/java/com/dispose/test/QaTestCasev200/P2DeviceUpgrade.java similarity index 99% rename from src/test/java/com/dispose/test/qa/testcase/v20/P2DeviceUpgrade.java rename to src/test/java/com/dispose/test/QaTestCasev200/P2DeviceUpgrade.java index 823d8a2b..7c40eab7 100644 --- a/src/test/java/com/dispose/test/qa/testcase/v20/P2DeviceUpgrade.java +++ b/src/test/java/com/dispose/test/QaTestCasev200/P2DeviceUpgrade.java @@ -1,4 +1,4 @@ -package com.dispose.test.qa.testcase.v20; +package com.dispose.test.QaTestCasev200; import com.dispose.common.CommonEnumHandler; import com.dispose.common.DisposeCapacityType; @@ -11,7 +11,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.qa.exec.TestCaseRun; +import com.dispose.test.exec.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/qa/testcase/v20/P2Info.java b/src/test/java/com/dispose/test/QaTestCasev200/P2Info.java similarity index 99% rename from src/test/java/com/dispose/test/qa/testcase/v20/P2Info.java rename to src/test/java/com/dispose/test/QaTestCasev200/P2Info.java index 092b695d..9a8c6a64 100644 --- a/src/test/java/com/dispose/test/qa/testcase/v20/P2Info.java +++ b/src/test/java/com/dispose/test/QaTestCasev200/P2Info.java @@ -1,4 +1,4 @@ -package com.dispose.test.qa.testcase.v20; +package com.dispose.test.QaTestCasev200; import com.dispose.common.DisposeCapacityType; import com.dispose.common.DisposeDeviceType; @@ -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.qa.exec.TestCaseRun; +import com.dispose.test.exec.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/qa/testcase/v20/P2Login.java b/src/test/java/com/dispose/test/QaTestCasev200/P2Login.java similarity index 99% rename from src/test/java/com/dispose/test/qa/testcase/v20/P2Login.java rename to src/test/java/com/dispose/test/QaTestCasev200/P2Login.java index e0847a4d..0b8d217d 100644 --- a/src/test/java/com/dispose/test/qa/testcase/v20/P2Login.java +++ b/src/test/java/com/dispose/test/QaTestCasev200/P2Login.java @@ -1,4 +1,4 @@ -package com.dispose.test.qa.testcase.v20; +package com.dispose.test.QaTestCasev200; import com.dispose.common.ErrorCode; import com.dispose.pojo.dto.protocol.auth.LoginRsp; @@ -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.qa.exec.TestCaseRun; +import com.dispose.test.exec.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/qa/testcase/v20/P2Logout.java b/src/test/java/com/dispose/test/QaTestCasev200/P2Logout.java similarity index 98% rename from src/test/java/com/dispose/test/qa/testcase/v20/P2Logout.java rename to src/test/java/com/dispose/test/QaTestCasev200/P2Logout.java index dc3fb81f..7f8f407f 100644 --- a/src/test/java/com/dispose/test/qa/testcase/v20/P2Logout.java +++ b/src/test/java/com/dispose/test/QaTestCasev200/P2Logout.java @@ -1,4 +1,4 @@ -package com.dispose.test.qa.testcase.v20; +package com.dispose.test.QaTestCasev200; import com.dispose.common.ErrorCode; import com.dispose.pojo.dto.protocol.auth.LoginRsp; @@ -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.qa.exec.TestCaseRun; +import com.dispose.test.exec.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/qa/testcase/v20/P2TaskList.java b/src/test/java/com/dispose/test/QaTestCasev200/P2TaskList.java similarity index 97% rename from src/test/java/com/dispose/test/qa/testcase/v20/P2TaskList.java rename to src/test/java/com/dispose/test/QaTestCasev200/P2TaskList.java index 675dd7b8..e7191d88 100644 --- a/src/test/java/com/dispose/test/qa/testcase/v20/P2TaskList.java +++ b/src/test/java/com/dispose/test/QaTestCasev200/P2TaskList.java @@ -1,4 +1,4 @@ -package com.dispose.test.qa.testcase.v20; +package com.dispose.test.QaTestCasev200; import com.dispose.common.DDoSAttackType; import com.dispose.common.DisposeCapacityType; @@ -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.qa.exec.TestCaseRun; +import com.dispose.test.exec.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/qa/testcase/v20/P2TaskStart.java b/src/test/java/com/dispose/test/QaTestCasev200/P2TaskStart.java similarity index 99% rename from src/test/java/com/dispose/test/qa/testcase/v20/P2TaskStart.java rename to src/test/java/com/dispose/test/QaTestCasev200/P2TaskStart.java index 39ba0216..30b6ba36 100644 --- a/src/test/java/com/dispose/test/qa/testcase/v20/P2TaskStart.java +++ b/src/test/java/com/dispose/test/QaTestCasev200/P2TaskStart.java @@ -1,4 +1,4 @@ -package com.dispose.test.qa.testcase.v20; +package com.dispose.test.QaTestCasev200; import com.dispose.common.ErrorCode; import com.dispose.common.Helper; @@ -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.qa.exec.TestCaseRun; +import com.dispose.test.exec.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/qa/testcase/v20/P2TaskStartMulIp.java b/src/test/java/com/dispose/test/QaTestCasev200/P2TaskStartMulIp.java similarity index 99% rename from src/test/java/com/dispose/test/qa/testcase/v20/P2TaskStartMulIp.java rename to src/test/java/com/dispose/test/QaTestCasev200/P2TaskStartMulIp.java index 203a6f10..86473206 100644 --- a/src/test/java/com/dispose/test/qa/testcase/v20/P2TaskStartMulIp.java +++ b/src/test/java/com/dispose/test/QaTestCasev200/P2TaskStartMulIp.java @@ -1,4 +1,4 @@ -package com.dispose.test.qa.testcase.v20; +package com.dispose.test.QaTestCasev200; import com.dispose.common.ErrorCode; import com.dispose.pojo.dto.protocol.base.BaseRespStatus; @@ -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.qa.exec.TestCaseRun; +import com.dispose.test.exec.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/qa/testcase/v20/P2TaskStop.java b/src/test/java/com/dispose/test/QaTestCasev200/P2TaskStop.java similarity index 98% rename from src/test/java/com/dispose/test/qa/testcase/v20/P2TaskStop.java rename to src/test/java/com/dispose/test/QaTestCasev200/P2TaskStop.java index 53e976b1..31ed7e06 100644 --- a/src/test/java/com/dispose/test/qa/testcase/v20/P2TaskStop.java +++ b/src/test/java/com/dispose/test/QaTestCasev200/P2TaskStop.java @@ -1,4 +1,4 @@ -package com.dispose.test.qa.testcase.v20; +package com.dispose.test.QaTestCasev200; import com.dispose.common.ErrorCode; import com.dispose.pojo.dto.protocol.task.TaskStopRsp; diff --git a/src/test/java/com/dispose/test/qa/testcase/v20/P3All.java b/src/test/java/com/dispose/test/QaTestCasev200/P3All.java similarity index 99% rename from src/test/java/com/dispose/test/qa/testcase/v20/P3All.java rename to src/test/java/com/dispose/test/QaTestCasev200/P3All.java index 77ffdecf..c3714516 100644 --- a/src/test/java/com/dispose/test/qa/testcase/v20/P3All.java +++ b/src/test/java/com/dispose/test/QaTestCasev200/P3All.java @@ -1,4 +1,4 @@ -package com.dispose.test.qa.testcase.v20; +package com.dispose.test.QaTestCasev200; import com.dispose.common.ErrorCode; import com.dispose.pojo.dto.protocol.auth.LoginRsp; @@ -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.qa.exec.TestCaseRun; +import com.dispose.test.exec.TestCaseRun; import org.junit.Assert; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/src/test/java/com/dispose/test/common/PrepareProtoReqCallback.java b/src/test/java/com/dispose/test/common/PrepareProtoReqCallback.java index f01adb13..360b1b80 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.qa.exec.TestCaseRun; +import com.dispose.test.exec.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 1bf4eafd..9ce5a874 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.qa.exec.TestCaseRun; +import com.dispose.test.exec.TestCaseRun; /** * The interface Verify proto resp callback. diff --git a/src/test/java/com/dispose/test/qa/controller/P1AuthControllerTest.java b/src/test/java/com/dispose/test/controller/P1AuthControllerTest.java similarity index 98% rename from src/test/java/com/dispose/test/qa/controller/P1AuthControllerTest.java rename to src/test/java/com/dispose/test/controller/P1AuthControllerTest.java index 7bf9409d..aabe757c 100644 --- a/src/test/java/com/dispose/test/qa/controller/P1AuthControllerTest.java +++ b/src/test/java/com/dispose/test/controller/P1AuthControllerTest.java @@ -1,4 +1,4 @@ -package com.dispose.test.qa.controller; +package com.dispose.test.controller; import com.dispose.common.ErrorCode; import com.dispose.common.ProtoCryptoType; diff --git a/src/test/java/com/dispose/test/qa/controller/P1DeviceManagerControllerTest.java b/src/test/java/com/dispose/test/controller/P1DeviceManagerControllerTest.java similarity index 99% rename from src/test/java/com/dispose/test/qa/controller/P1DeviceManagerControllerTest.java rename to src/test/java/com/dispose/test/controller/P1DeviceManagerControllerTest.java index 8c47ef05..379dab3e 100644 --- a/src/test/java/com/dispose/test/qa/controller/P1DeviceManagerControllerTest.java +++ b/src/test/java/com/dispose/test/controller/P1DeviceManagerControllerTest.java @@ -1,4 +1,4 @@ -package com.dispose.test.qa.controller; +package com.dispose.test.controller; import com.dispose.common.DisposeCapacityType; import com.dispose.common.DisposeDeviceType; diff --git a/src/test/java/com/dispose/test/qa/exec/TestCaseRun.java b/src/test/java/com/dispose/test/exec/TestCaseRun.java similarity index 73% rename from src/test/java/com/dispose/test/qa/exec/TestCaseRun.java rename to src/test/java/com/dispose/test/exec/TestCaseRun.java index 681a88ee..ffa7d713 100644 --- a/src/test/java/com/dispose/test/qa/exec/TestCaseRun.java +++ b/src/test/java/com/dispose/test/exec/TestCaseRun.java @@ -1,22 +1,22 @@ -package com.dispose.test.qa.exec; +package com.dispose.test.exec; import com.dispose.mapper.DisposeDeviceMapper; import com.dispose.mapper.DisposeTaskMapper; import com.dispose.service.DisposeDeviceManagerService; +import com.dispose.test.QaTestCasev200.P1All; +import com.dispose.test.QaTestCasev200.P2DeviceAdd; +import com.dispose.test.QaTestCasev200.P2DeviceDel; +import com.dispose.test.QaTestCasev200.P2DeviceQuery; +import com.dispose.test.QaTestCasev200.P2DeviceUpgrade; +import com.dispose.test.QaTestCasev200.P2Info; +import com.dispose.test.QaTestCasev200.P2Login; +import com.dispose.test.QaTestCasev200.P2Logout; +import com.dispose.test.QaTestCasev200.P2TaskList; +import com.dispose.test.QaTestCasev200.P2TaskStart; +import com.dispose.test.QaTestCasev200.P2TaskStartMulIp; +import com.dispose.test.QaTestCasev200.P2TaskStop; +import com.dispose.test.QaTestCasev200.P3All; import com.dispose.test.common.QATestItem; -import com.dispose.test.qa.testcase.v20.P1All; -import com.dispose.test.qa.testcase.v20.P2DeviceAdd; -import com.dispose.test.qa.testcase.v20.P2DeviceDel; -import com.dispose.test.qa.testcase.v20.P2DeviceQuery; -import com.dispose.test.qa.testcase.v20.P2DeviceUpgrade; -import com.dispose.test.qa.testcase.v20.P2Info; -import com.dispose.test.qa.testcase.v20.P2Login; -import com.dispose.test.qa.testcase.v20.P2Logout; -import com.dispose.test.qa.testcase.v20.P2TaskList; -import com.dispose.test.qa.testcase.v20.P2TaskStart; -import com.dispose.test.qa.testcase.v20.P2TaskStartMulIp; -import com.dispose.test.qa.testcase.v20.P2TaskStop; -import com.dispose.test.qa.testcase.v20.P3All; import java.util.ArrayList; import java.util.Collections; diff --git a/src/test/java/com/dispose/test/qa/exec/impl/JsonTestCaseRun.java b/src/test/java/com/dispose/test/exec/impl/JsonTestCaseRun.java similarity index 98% rename from src/test/java/com/dispose/test/qa/exec/impl/JsonTestCaseRun.java rename to src/test/java/com/dispose/test/exec/impl/JsonTestCaseRun.java index 949a2ab4..fb91f015 100644 --- a/src/test/java/com/dispose/test/qa/exec/impl/JsonTestCaseRun.java +++ b/src/test/java/com/dispose/test/exec/impl/JsonTestCaseRun.java @@ -1,4 +1,4 @@ -package com.dispose.test.qa.exec.impl; +package com.dispose.test.exec.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.qa.exec.TestCaseRun; +import com.dispose.test.exec.TestCaseRun; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; import org.junit.ClassRule; diff --git a/src/test/java/com/dispose/test/qa/exec/impl/ObjectTestCaseRun.java b/src/test/java/com/dispose/test/exec/impl/ObjectTestCaseRun.java similarity index 98% rename from src/test/java/com/dispose/test/qa/exec/impl/ObjectTestCaseRun.java rename to src/test/java/com/dispose/test/exec/impl/ObjectTestCaseRun.java index 05264ee1..63914e17 100644 --- a/src/test/java/com/dispose/test/qa/exec/impl/ObjectTestCaseRun.java +++ b/src/test/java/com/dispose/test/exec/impl/ObjectTestCaseRun.java @@ -1,4 +1,4 @@ -package com.dispose.test.qa.exec.impl; +package com.dispose.test.exec.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.qa.exec.TestCaseRun; +import com.dispose.test.exec.TestCaseRun; import lombok.extern.slf4j.Slf4j; import org.junit.Assert; import org.junit.ClassRule;