cmhi
/
dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
HuangXin 2020-09-28 09:20:20 +08:00
parent 7c777cbadf 6202085ec3
commit d4f6434753
19 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/java/com/dispose/test/common/PrepareProtoReqCallback.java
View File

@ -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.

2
src/test/java/com/dispose/test/common/VerifyProtoRespCallback.java
View File

@ -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.

14
src/test/java/com/dispose/test/qa/DemoTest2.java Normal file
View File

@ -0,0 +1,14 @@
package com.dispose.test.qa;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.wildfly.common.Assert;
@Slf4j
public class DemoTest2 {
@Test
public void t1_demo() {
log.error("++++++++++++++++++++++com.dispose.test.qa.DemoTest2.t1_demo");
Assert.assertFalse(false);
}
}

2
src/test/java/com/dispose/test/exec/TestCaseRun.java → src/test/java/com/dispose/test/qa/TestCaseRun.java
View File

@ -1,4 +1,4 @@
package com.dispose.test.exec;
package com.dispose.test.qa;
import com.dispose.mapper.DisposeDeviceMapper;
import com.dispose.mapper.DisposeTaskMapper;

14
src/test/java/com/dispose/test/qa/impl/DemoTest.java Normal file
View File

@ -0,0 +1,14 @@
package com.dispose.test.qa.impl;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.wildfly.common.Assert;
@Slf4j
public class DemoTest {
@Test
public void t1_demo() {
log.error("++++++++++++++++++++++com.dispose.test.qa.DemoTest.t1_demo");
Assert.assertTrue(true);
}
}

4
src/test/java/com/dispose/test/exec/impl/JsonTestCaseRun.java → src/test/java/com/dispose/test/qa/impl/JsonTestCaseRun.java
View File

@ -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;

4
src/test/java/com/dispose/test/exec/impl/ObjectTestCaseRun.java → src/test/java/com/dispose/test/qa/impl/ObjectTestCaseRun.java
View File

@ -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;

2
src/test/java/com/dispose/test/testcase/dev/v200/CodeCoverage.java
View File

@ -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;

2
src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceAdd.java
View File

@ -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;

2
src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceDel.java
View File

@ -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;

2
src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceQuery.java
View File

@ -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;

2
src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceUpgrade.java
View File

@ -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;

2
src/test/java/com/dispose/test/testcase/qa/v200/P2Info.java
View File

@ -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;

2
src/test/java/com/dispose/test/testcase/qa/v200/P2Login.java
View File

@ -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;

2
src/test/java/com/dispose/test/testcase/qa/v200/P2Logout.java
View File

@ -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;

2
src/test/java/com/dispose/test/testcase/qa/v200/P2TaskList.java
View File

@ -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;

2
src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStart.java
View File

@ -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;

2
src/test/java/com/dispose/test/testcase/qa/v200/P2TaskStartMulIp.java
View File

@ -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;

2
src/test/java/com/dispose/test/testcase/qa/v200/P3All.java
View File

@ -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;