diff --git a/src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerTest.java b/src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerTest.java index f458bc93..6ffc08d2 100644 --- a/src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerTest.java +++ b/src/test/java/com/dispose/test/controller/DeviceNodeManagerControllerTest.java @@ -281,7 +281,7 @@ public class DeviceNodeManagerControllerTest extends InitTestEnvironment { .header("Authorization", GlobalVar.STRING_HTTP_AUTH_HEAD + getLogToken()) .content(objectMapper.writeValueAsString(reqInfo))) .andDo(print()).andExpect(status().isOk()) - .andExpect(jsonPath("$.code").value(525)) + .andExpect(jsonPath("$.code").value(ErrorCode.ERR_OK.getHttpCode())) .andReturn() .getResponse() .getContentAsString(); diff --git a/src/test/java/com/dispose/test/controller/TaskControllerTest.java b/src/test/java/com/dispose/test/controller/TaskControllerTest.java index ad53f2c0..9fbf07b9 100644 --- a/src/test/java/com/dispose/test/controller/TaskControllerTest.java +++ b/src/test/java/com/dispose/test/controller/TaskControllerTest.java @@ -168,8 +168,6 @@ public class TaskControllerTest extends InitTestEnvironment { Assert.assertNotEquals(Long.valueOf(startTaskRsp.getStatus()), Long.valueOf(ErrorCode.ERR_OK.getCode())); Assert.assertNotEquals(startTaskRsp.getMessage(), ErrorCode.ERR_OK.getMsg()); } - - Thread.sleep(1000 * 300); } /** diff --git a/src/test/java/com/dispose/test/mapper/DisposeDeviceMapperTest.java b/src/test/java/com/dispose/test/mapper/DisposeDeviceMapperTest.java index daf5e71a..d60ef000 100644 --- a/src/test/java/com/dispose/test/mapper/DisposeDeviceMapperTest.java +++ b/src/test/java/com/dispose/test/mapper/DisposeDeviceMapperTest.java @@ -135,24 +135,20 @@ public class DisposeDeviceMapperTest extends InitTestEnvironment { }); } - /** - * T 0 del dispose device by ip. - * - * @throws JsonProcessingException the json processing exception - */ - @Test - public void t0_delDisposeDeviceByIp() throws JsonProcessingException { - String ipAddr = "10.88.77.15"; - disposeDeviceMapper.delDisposeDeviceByIp(ipAddr); - List dp = disposeDeviceMapper.selectAll(); - log.info(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(dp)); - dp.forEach(v -> { - if (v.getIpAddr().equals(ipAddr)) { - Assert.fail(); - } - }); - } +// @Test +// public void t0_delDisposeDeviceByIp() throws JsonProcessingException { +// String ipAddr = "10.88.77.15"; +// disposeDeviceMapper.delDisposeDeviceByIp(ipAddr); +// +// List dp = disposeDeviceMapper.selectAll(); +// log.info(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(dp)); +// dp.forEach(v -> { +// if (v.getIpAddr().equals(ipAddr)) { +// Assert.fail(); +// } +// }); +// } /** * T 6 get dispose device by ip is not existed. diff --git a/src/test/java/com/dispose/test/mapper/DisposeTaskMapperTest.java b/src/test/java/com/dispose/test/mapper/DisposeTaskMapperTest.java index 00fb7fc7..01a7b840 100644 --- a/src/test/java/com/dispose/test/mapper/DisposeTaskMapperTest.java +++ b/src/test/java/com/dispose/test/mapper/DisposeTaskMapperTest.java @@ -100,16 +100,13 @@ public class DisposeTaskMapperTest extends InitTestEnvironment { Assert.assertNotNull(disposeTaskMapper.getTaskById(taskData.getId())); } - /** - * Remove task test. - */ - @Test - public void t99_removeTaskTest() { - disposeTaskMapper.selectAll().forEach(v -> { - disposeTaskMapper.removeTaskById(v.getId()); - Assert.assertNull(disposeTaskMapper.getTaskById(v.getId())); - }); - } +// @Test +// public void t99_removeTaskTest() { +// disposeTaskMapper.selectAll().forEach(v -> { +// disposeTaskMapper.removeTaskById(v.getId()); +// Assert.assertNull(disposeTaskMapper.getTaskById(v.getId())); +// }); +// } /** * T 2 change task status test. diff --git a/src/test/java/com/dispose/test/service/DisposeNodeManagerTest.java b/src/test/java/com/dispose/test/service/DisposeNodeManagerTest.java index c49b043c..1c95e748 100644 --- a/src/test/java/com/dispose/test/service/DisposeNodeManagerTest.java +++ b/src/test/java/com/dispose/test/service/DisposeNodeManagerTest.java @@ -41,8 +41,7 @@ public class DisposeNodeManagerTest extends InitTestEnvironment { * The Un used ip addr. */ private final String[] unUsedIpAddr = new String[]{"192.168.3.1", "192.168.3.6", - "192.168.6.8", "192.168.6.10", - "0.0.0.0", "255.255.255.255"}; + "192.168.6.8", "192.168.6.10", "255.255.255.255"}; /** * The Object mapper. */ @@ -86,7 +85,7 @@ public class DisposeNodeManagerTest extends InitTestEnvironment { log.info("Test:{} --> {}", s, objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString( disposeNodeManager.getDisposeDevice(s, DeviceCapacity.CLEANUP) )); - Assert.assertNull(disposeNodeManager.getDisposeDevice(s, DeviceCapacity.CLEANUP)); + Assert.assertEquals(disposeNodeManager.getDisposeDevice(s, DeviceCapacity.CLEANUP).size(), 0); } }