From 964ce4b318d96aeeb871e3fa7f5d3bbff1fe5397 Mon Sep 17 00:00:00 2001 From: chenlinghy Date: Wed, 13 May 2020 17:20:46 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E7=B1=BB=202.=20=E8=A7=A3=E5=86=B3warning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceNodeInfoControllerTest.java | 13 ++----------- .../com/dispose/controller/TaskControllerTest.java | 2 -- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/test/java/com/dispose/controller/DeviceNodeInfoControllerTest.java b/src/test/java/com/dispose/controller/DeviceNodeInfoControllerTest.java index 44c38d76..1da341b1 100644 --- a/src/test/java/com/dispose/controller/DeviceNodeInfoControllerTest.java +++ b/src/test/java/com/dispose/controller/DeviceNodeInfoControllerTest.java @@ -23,7 +23,6 @@ import com.dispose.pojo.vo.information.VersionListRsp; import com.dispose.pojo.vo.information.VersionRsp; import com.dispose.service.DisposeNodeManager; import com.dispose.service.UserAccountService; -import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.FixMethodOrder; @@ -1022,11 +1021,7 @@ public class DeviceNodeInfoControllerTest extends InitTestEnvironment { Assert.assertNotNull(d.getId()); // no task - if (d.getTaskArray().size() == 0) { - Assert.assertEquals(Long.valueOf(d.getStatus()), Long.valueOf(ErrorCode.ERR_OK.getCode())); - } else { - Assert.assertEquals(Long.valueOf(d.getStatus()), Long.valueOf(ErrorCode.ERR_OK.getCode())); - } + Assert.assertEquals(Long.valueOf(d.getStatus()), Long.valueOf(ErrorCode.ERR_OK.getCode())); Assert.assertNotNull(d.getTaskArray()); for (TaskInfoData task : d.getTaskArray() @@ -1083,11 +1078,7 @@ public class DeviceNodeInfoControllerTest extends InitTestEnvironment { Assert.assertNotNull(d.getId()); // no task - if (d.getTaskArray().size() == 0) { - Assert.assertEquals(Long.valueOf(d.getStatus()), Long.valueOf(ErrorCode.ERR_OK.getCode())); - } else { - Assert.assertEquals(Long.valueOf(d.getStatus()), Long.valueOf(ErrorCode.ERR_OK.getCode())); - } + Assert.assertEquals(Long.valueOf(d.getStatus()), Long.valueOf(ErrorCode.ERR_OK.getCode())); Assert.assertNotNull(d.getTaskArray()); for (TaskInfoData task : d.getTaskArray() diff --git a/src/test/java/com/dispose/controller/TaskControllerTest.java b/src/test/java/com/dispose/controller/TaskControllerTest.java index 5c241836..9a2e4014 100644 --- a/src/test/java/com/dispose/controller/TaskControllerTest.java +++ b/src/test/java/com/dispose/controller/TaskControllerTest.java @@ -39,7 +39,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; -import java.util.Objects; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; @@ -364,7 +363,6 @@ public class TaskControllerTest extends InitTestEnvironment { .getResponse() .getContentAsString(); - String regex = "\\A(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z"; String msgContent = verifyRep(taskStopByNode, reqTimeStamp); System.out.print("msgContent=" + msgContent);