From 0f3d5d4669d705b271e647dd1201b2c12743eb77 Mon Sep 17 00:00:00 2001 From: HuangXin Date: Sat, 9 May 2020 10:23:12 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E4=BC=98=E5=8C=96=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dispose/TestSuit/SmokeTest.java | 2 - .../controller/AuthControllerQATest.java | 1 - .../DeviceNodeInfoControllerSmokeTest.java | 148 ++++++++++-------- 3 files changed, 83 insertions(+), 68 deletions(-) diff --git a/src/test/java/com/dispose/TestSuit/SmokeTest.java b/src/test/java/com/dispose/TestSuit/SmokeTest.java index 4f824836..016ca028 100644 --- a/src/test/java/com/dispose/TestSuit/SmokeTest.java +++ b/src/test/java/com/dispose/TestSuit/SmokeTest.java @@ -1,8 +1,6 @@ package com.dispose.TestSuit; -import com.dispose.controller.AuthControllerQATest; import com.dispose.controller.AuthControllerSmokeTest; -import com.dispose.controller.TaskControllerExceptionSmokeTest; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/src/test/java/com/dispose/controller/AuthControllerQATest.java b/src/test/java/com/dispose/controller/AuthControllerQATest.java index 2fa0e385..a9fbb321 100644 --- a/src/test/java/com/dispose/controller/AuthControllerQATest.java +++ b/src/test/java/com/dispose/controller/AuthControllerQATest.java @@ -3,7 +3,6 @@ package com.dispose.controller; import com.dispose.Global.InitTestEnvironment; import com.dispose.common.ErrorCode; import com.dispose.pojo.po.ReturnStatus; -import com.dispose.pojo.vo.auth.LoginRsp; import com.dispose.pojo.vo.auth.LogoutRsp; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; diff --git a/src/test/java/com/dispose/controller/DeviceNodeInfoControllerSmokeTest.java b/src/test/java/com/dispose/controller/DeviceNodeInfoControllerSmokeTest.java index 8ee68c64..0d3ef7f7 100644 --- a/src/test/java/com/dispose/controller/DeviceNodeInfoControllerSmokeTest.java +++ b/src/test/java/com/dispose/controller/DeviceNodeInfoControllerSmokeTest.java @@ -12,6 +12,7 @@ * accordance with the terms of the license. */ package com.dispose.controller; + import com.dispose.Global.InitTestEnvironment; import com.dispose.common.ErrorCode; import com.dispose.pojo.entity.DisposeDevice; @@ -35,17 +36,17 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; + import javax.annotation.Resource; import java.util.List; + import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; /** - * @author lsx - * @Desc - * @date 2020-05-08 11:19 + * The type Device node info controller smoke test. */ @AutoConfigureMockMvc @RunWith(SpringRunner.class) @@ -66,14 +67,15 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ private ObjectMapper objectMapper; /** - * The Dispose device manager. + * The Dispose node manager. */ @Resource private DisposeNodeManager disposeNodeManager; /** - * 正常获取节点版本信息-获取存在的一个节点版本信息 - * @throws Exception + * A 1 get version normal one exist device test. + * + * @throws Exception the exception */ @Test public void a1_getVersionNormalOneExistDeviceTest() throws Exception { @@ -93,7 +95,7 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ String msgContent = verifyResp(ver); List verList = objectMapper.readValue(msgContent, new TypeReference>() { }); - Assert.assertTrue(verList.size() == 1); + Assert.assertEquals(1, verList.size()); for (VersionRsp versionRsp : verList ) { if (verifyDeviceIdExists(versionRsp.getId())) { @@ -109,8 +111,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 正常获取节点版本信息-获取多个节点版本信息 - * @throws Exception + * A 2 get version normal several device test. + * + * @throws Exception the exception */ @Test public void a2_getVersionNormalSeveralDeviceTest() throws Exception { @@ -146,8 +149,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 正常获取节点版本信息-获取不存在的一个节点版本信息 - * @throws Exception + * A 3 get version normal one not exist device test. + * + * @throws Exception the exception */ @Test public void a3_getVersionNormalOneNotExistDeviceTest() throws Exception { @@ -174,8 +178,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取节点版本信息-msgContent为空 - * @throws Exception + * A 4 get version msg empty exception test. + * + * @throws Exception the exception */ @Test public void a4_getVersionMsgEmptyExceptionTest() throws Exception{ @@ -200,8 +205,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取节点版本信息-msgContent为null - * @throws Exception + * A 5 get version msg null exception test. + * + * @throws Exception the exception */ @Test public void a5_getVersionMsgNullExceptionTest() throws Exception { @@ -226,8 +232,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取节点版本信息-id为null - * @throws Exception + * A 6 get version id null exception test. + * + * @throws Exception the exception */ @Test public void a6_getVersionIdNullExceptionTest() throws Exception { @@ -252,8 +259,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取节点版本信息-id为"abd" - * @throws Exception + * A 7 get version id character exception test. + * + * @throws Exception the exception */ @Test public void a7_getVersionIdCharacterExceptionTest() throws Exception { @@ -279,8 +287,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取节点版本信息-id为整形 - * @throws Exception + * A 8 get version id integer exception test. + * + * @throws Exception the exception */ @Test public void a8_getVersionIdIntegerExceptionTest() throws Exception { @@ -305,8 +314,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取设备信息-获取存在的一个节点设备信息 - * @throws Exception + * B 1 get device info normal one exist device test. + * + * @throws Exception the exception */ @Test public void b1_getDeviceInfoNormalOneExistDeviceTest() throws Exception { @@ -341,8 +351,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取设备信息-获取多个节点设备信息 - * @throws Exception + * B 2 get device info normal several device test. + * + * @throws Exception the exception */ @Test public void b2_getDeviceInfoNormalSeveralDeviceTest() throws Exception { @@ -377,8 +388,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取设备信息-获取不存在的一个节点设备信息 - * @throws Exception + * B 3 get device info normal one not exist device test. + * + * @throws Exception the exception */ @Test public void b3_getDeviceInfoNormalOneNotExistDeviceTest() throws Exception { @@ -413,8 +425,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取节点设备信息-msgContent为空 - * @throws Exception + * B 4 get device info empty msg exception test. + * + * @throws Exception the exception */ @Test public void b4_getDeviceInfoEmptyMsgExceptionTest() throws Exception{ @@ -436,8 +449,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取节点设备信息-msgContent为null - * @throws Exception + * B 5 get device info msg null exception test. + * + * @throws Exception the exception */ @Test public void b5_getDeviceInfoMsgNullExceptionTest() throws Exception{ @@ -459,8 +473,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取节点设备信息-id为null - * @throws Exception + * B 6 get device info id null exception test. + * + * @throws Exception the exception */ @Test public void b6_getDeviceInfoIdNullExceptionTest() throws Exception{ @@ -480,9 +495,11 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ Assert.assertTrue(msgContent.contains(String.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()))); Assert.assertTrue(msgContent.contains(ErrorCode.ERR_PARAMEXCEPTION.getMsg())); } - /** - * 获取节点设备信息-id为"abd" - * @throws Exception + + /** + * B 7 get device info id character exception test. + * + * @throws Exception the exception */ @Test public void b7_getDeviceInfoIdCharacterExceptionTest() throws Exception{ @@ -505,8 +522,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取节点设备信息-id为整型 - * @throws Exception + * B 8 get device info id integer exception test. + * + * @throws Exception the exception */ @Test public void b8_getDeviceInfoIdIntegerExceptionTest() throws Exception{ @@ -528,8 +546,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取链接状态-获取在线的一个节点链接状态 - * @throws Exception + * C 1 get link status normal one online device test. + * + * @throws Exception the exception */ @Test public void c1_getLinkStatusNormalOneOnlineDeviceTest() throws Exception{ @@ -568,8 +587,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取链接状态-获取在线的多个节点链接状态 - * @throws Exception + * C 2 get link status normal several device test. + * + * @throws Exception the exception */ @Test public void c2_getLinkStatusNormalSeveralDeviceTest() throws Exception{ @@ -608,8 +628,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取链接状态-获取不在线的一个节点链接状态 - * @throws Exception + * C 3 get link status normal one not online device test. + * + * @throws Exception the exception */ @Test public void c3_getLinkStatusNormalOneNotOnlineDeviceTest() throws Exception{ @@ -648,8 +669,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取链接状态 - msgContent为空 - * @throws Exception + * C 4 get link status msg empty exception test. + * + * @throws Exception the exception */ @Test public void c4_getLinkStatusMsgEmptyExceptionTest() throws Exception { @@ -671,8 +693,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取链接状态 - msgContent为null - * @throws Exception + * C 5 get link status msg null exception test. + * + * @throws Exception the exception */ @Test public void c5_getLinkStatusMsgNullExceptionTest() throws Exception { @@ -694,8 +717,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取链接状态 - id为null - * @throws Exception + * C 6 get link status id null exception test. + * + * @throws Exception the exception */ @Test public void c6_getLinkStatusIdNullExceptionTest() throws Exception { @@ -717,8 +741,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取链接状态 - id为"abd" - * @throws Exception + * C 7 get link status id character exception test. + * + * @throws Exception the exception */ @Test public void c7_getLinkStatusIdCharacterExceptionTest() throws Exception { @@ -741,8 +766,9 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * 获取链接状态 - id为整型 - * @throws Exception + * C 8 get link status id integer exception test. + * + * @throws Exception the exception */ @Test public void c8_getLinkStatusIdIntegerExceptionTest() throws Exception { @@ -764,9 +790,10 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } /** - * test Determine whether the Id exists.. + * Verify device id exists boolean. * - * @return boolean true-exists + * @param deviceId the device id + * @return the boolean */ public boolean verifyDeviceIdExists(String deviceId) { boolean exists = false; @@ -786,12 +813,3 @@ public class DeviceNodeInfoControllerSmokeTest extends InitTestEnvironment{ } } - -/** - * Revision history - * ------------------------------------------------------------------------- - *

- * Date Author Note - * ------------------------------------------------------------------------- - * 2020-05-08 lsx creat - */