parent
99fdfad37f
commit
d6c248fab9
src/test/java/com/dispose/controller
|
@ -406,29 +406,16 @@ public class TaskControllerTest extends InitTestEnvironment {
|
|||
List<TaskInfoData> taskInfoList = taskStopByIpRsp.getItems();
|
||||
for (TaskInfoData task : taskInfoList
|
||||
) {
|
||||
Assert.assertNotNull(task.getId());
|
||||
Assert.assertNotNull(task.getTaskId());
|
||||
Assert.assertNotNull(task.getStatus());
|
||||
Assert.assertNotNull(task.getMessage());
|
||||
if (task.getStatus() == ErrorCode.ERR_OK.getCode()) {
|
||||
Assert.assertEquals((int) task.getStatus(), ErrorCode.ERR_OK.getCode());
|
||||
Assert.assertEquals(task.getMessage(), ErrorCode.ERR_OK.getMsg());
|
||||
|
||||
if (task.getStatus() == 0) {
|
||||
Assert.assertEquals(String.valueOf(task.getStatus()), "0");
|
||||
Assert.assertEquals(task.getMessage(), "成功");
|
||||
Assert.assertNotNull(task.getId());
|
||||
Assert.assertNotNull(task.getTaskId());
|
||||
Assert.assertNotNull(task.getStatus());
|
||||
Assert.assertNotNull(task.getMessage());
|
||||
} else {
|
||||
Assert.assertNotEquals(String.valueOf(task.getStatus()), "0");
|
||||
Assert.assertNotEquals(task.getMessage(), "成功");
|
||||
}
|
||||
|
||||
if (task.getType() != null) {
|
||||
Assert.assertNotEquals(String.valueOf(task.getType()), -1);
|
||||
}
|
||||
|
||||
if (task.getDisposeIp() != null) {
|
||||
Assert.assertTrue(task.getDisposeIp().matches(regex));
|
||||
}
|
||||
|
||||
if (task.getDisposeTime() != null) {
|
||||
Assert.assertNotEquals(String.valueOf(task.getDisposeTime()), -1);
|
||||
Assert.assertNotEquals((int) task.getStatus(), ErrorCode.ERR_OK.getCode());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -472,29 +459,16 @@ public class TaskControllerTest extends InitTestEnvironment {
|
|||
List<TaskInfoData> taskInfoList = taskStopByIpRsp.getItems();
|
||||
for (TaskInfoData task : taskInfoList
|
||||
) {
|
||||
Assert.assertNotNull(task.getId());
|
||||
Assert.assertNotNull(task.getTaskId());
|
||||
Assert.assertNotNull(task.getStatus());
|
||||
Assert.assertNotNull(task.getMessage());
|
||||
if (task.getStatus() == ErrorCode.ERR_OK.getCode()) {
|
||||
Assert.assertEquals((int) task.getStatus(), ErrorCode.ERR_OK.getCode());
|
||||
Assert.assertEquals(task.getMessage(), ErrorCode.ERR_OK.getMsg());
|
||||
|
||||
if (task.getStatus() == 0) {
|
||||
Assert.assertEquals(String.valueOf(task.getStatus()), "0");
|
||||
Assert.assertEquals(task.getMessage(), "成功");
|
||||
Assert.assertNotNull(task.getId());
|
||||
Assert.assertNotNull(task.getTaskId());
|
||||
Assert.assertNotNull(task.getStatus());
|
||||
Assert.assertNotNull(task.getMessage());
|
||||
} else {
|
||||
Assert.assertNotEquals(String.valueOf(task.getStatus()), "0");
|
||||
Assert.assertNotEquals(task.getMessage(), "成功");
|
||||
}
|
||||
|
||||
if (task.getType() != null) {
|
||||
Assert.assertNotEquals(String.valueOf(task.getType()), -1);
|
||||
}
|
||||
|
||||
if (task.getDisposeIp() != null) {
|
||||
Assert.assertTrue(task.getDisposeIp().matches(regex));
|
||||
}
|
||||
|
||||
if (task.getDisposeTime() != null) {
|
||||
Assert.assertNotEquals(String.valueOf(task.getDisposeTime()), -1);
|
||||
Assert.assertNotEquals((int) task.getStatus(), ErrorCode.ERR_OK.getCode());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue