From 59f5552c4d73fe2d9c04f7acb3119b2b612d9423 Mon Sep 17 00:00:00 2001 From: chenlinghy Date: Tue, 23 Jun 2020 15:35:21 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E5=A2=9E=E5=8A=A0=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=B8=85=E6=B4=97=E4=BB=BB=E5=8A=A1=E7=9A=84=E6=B5=81?= =?UTF-8?q?=E9=87=8F=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E5=92=8C=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=B8=85=E6=B4=97=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E7=9A=84=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=202.=20=E5=A2=9E=E5=8A=A0=E8=BF=AA=E6=99=AE?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=94=99=E8=AF=AF=E7=A0=81=203.=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=8B=E5=8F=91=E6=B8=85=E6=B4=97=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dispose/test/haohan/HaoHanErrorCode.java | 8 ++ .../test/haohan/HaoHanInterfaceTestCase.java | 74 ++++++++++++++++++- .../dispose/test/haohan/sendTowResult.java | 1 + 3 files changed, 79 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/dispose/test/haohan/HaoHanErrorCode.java b/src/test/java/com/dispose/test/haohan/HaoHanErrorCode.java index 7a34446b..f9ff97c7 100644 --- a/src/test/java/com/dispose/test/haohan/HaoHanErrorCode.java +++ b/src/test/java/com/dispose/test/haohan/HaoHanErrorCode.java @@ -33,6 +33,14 @@ public enum HaoHanErrorCode { * Err no running task error code. */ ERR_NORUNNINGTASK("没有正在清洗的ip"), + /** + * Err task does not existed or task is running error code. + */ + ERR_TASKNOEND("请检查清洗任务是否存在或清洗状态是否为结束！"), + /** + * Err task does not existed error code. + */ + ERR_NOTASK("该清洗任务不存在！"), ; private final String errMsg; diff --git a/src/test/java/com/dispose/test/haohan/HaoHanInterfaceTestCase.java b/src/test/java/com/dispose/test/haohan/HaoHanInterfaceTestCase.java index 3256b287..6ee07f2c 100644 --- a/src/test/java/com/dispose/test/haohan/HaoHanInterfaceTestCase.java +++ b/src/test/java/com/dispose/test/haohan/HaoHanInterfaceTestCase.java @@ -185,7 +185,7 @@ public class HaoHanInterfaceTestCase { } @Test - public void c1_delTowTest() throws JsonProcessingException { + public void c1_allIpFlowTest() throws JsonProcessingException { String jsonRequest = "{\"orderFrom\":\"hangyan\"}"; String svrReturn = Http.postJson("http://10.88.77.88:18080/DDoSClean/clean/allIpFlow", null, @@ -207,18 +207,84 @@ public class HaoHanInterfaceTestCase { } @Test - public void c2_delTowTest() throws JsonProcessingException { + public void c2_allIpFlowTest() throws JsonProcessingException { String jsonRequest = "{\"orderFrom\":123}"; String svrReturn = Http.postJson("http://10.88.77.88:18080/DDoSClean/clean/allIpFlow", null, jsonRequest); + log.info("Server Return: [{}]", svrReturn); + allIpFlowResult result = objectMapper.readValue(svrReturn, allIpFlowResult.class); + + Assert.assertNotNull(result); + Assert.assertEquals(result.getMsg(), HaoHanErrorCode.ERR_ORDERFROMFORMA.getMsg()); + Assert.assertEquals(result.getState(), Integer.valueOf(1)); + } + + @Test + public void d1_cleanTaskFlowTest() throws JsonProcessingException { + String jsonRequest = "{\"cleanTaskId\":119}"; + String svrReturn = Http.postJson("http://10.88.77.88:18080/DDoSClean/clean/cleanTaskFlow", + null, + jsonRequest); + + log.info("Server Return: [{}]", svrReturn); + allIpFlowResult result = objectMapper.readValue(svrReturn, allIpFlowResult.class); + + Assert.assertNotNull(result); + if (result.getState() == 0) { + Assert.assertEquals(result.getMsg(), HaoHanErrorCode.ERR_OK.getMsg()); + for (allIpFlowData data : result.getData() + ) { + Assert.assertNotNull(data.getIp()); + } + } else { + Assert.assertEquals(result.getMsg(), HaoHanErrorCode.ERR_TASKNOEND.getMsg()); + } + } + + @Test + public void d2_cleanTaskFlowTest() throws JsonProcessingException { + String jsonRequest = "{\"cleanTaskId\":\"abc\"}"; + String svrReturn = Http.postJson("http://10.88.77.88:18080/DDoSClean/clean/cleanTaskFlow", + null, + jsonRequest); + + log.info("Server Return: [{}]", svrReturn); + allIpFlowResult result = objectMapper.readValue(svrReturn, allIpFlowResult.class); + Assert.assertNotNull(result); + Assert.assertEquals(result.getMsg(), HaoHanErrorCode.ERR_CLEANTASKIDFORMA.getMsg()); + } + + @Test + public void e1_getCleanTaskStateTest() throws JsonProcessingException { + String jsonRequest = "{\"cleanTaskId\":119}"; + String svrReturn = Http.postJson("http://10.88.77.88:18080/DDoSClean/clean/getCleanTaskState", + null, + jsonRequest); + log.info("Server Return: [{}]", svrReturn); sendTowResult result = objectMapper.readValue(svrReturn, sendTowResult.class); Assert.assertNotNull(result); - Assert.assertEquals(result.getMsg(), HaoHanErrorCode.ERR_ORDERFROMFORMA.getMsg()); - Assert.assertEquals(result.getState(), Integer.valueOf(1)); + if (result.getState() == 0) { + Assert.assertEquals(result.getMsg(), HaoHanErrorCode.ERR_OK.getMsg()); + } else { + Assert.assertEquals(result.getMsg(), HaoHanErrorCode.ERR_NOTASK.getMsg()); + } + } + + @Test + public void e2_getCleanTaskStateTest() throws JsonProcessingException { + String jsonRequest = "{\"cleanTaskId\":\"adb\"}"; + String svrReturn = Http.postJson("http://10.88.77.88:18080/DDoSClean/clean/getCleanTaskState", + null, + jsonRequest); + + log.info("Server Return: [{}]", svrReturn); + sendTowResult result = objectMapper.readValue(svrReturn, sendTowResult.class); + Assert.assertNotNull(result); + Assert.assertEquals(result.getMsg(), HaoHanErrorCode.ERR_CLEANTASKIDFORMA.getMsg()); } } diff --git a/src/test/java/com/dispose/test/haohan/sendTowResult.java b/src/test/java/com/dispose/test/haohan/sendTowResult.java index b82b29c2..9b88a354 100644 --- a/src/test/java/com/dispose/test/haohan/sendTowResult.java +++ b/src/test/java/com/dispose/test/haohan/sendTowResult.java @@ -9,4 +9,5 @@ public class sendTowResult { private Integer state; private String msg; private Integer cleanTaskId; + private Integer cleanTaskState; }