cmhi
/
dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OCT 

REM:
1. 增加service层任务管理和用户认证断言
This commit is contained in:
chenlinghy 2020-06-11 15:53:31 +08:00
parent 23b455441c
commit 1dadd71895
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/java/com/dispose/test/service/TaskServiceTest.java
View File

@ -73,6 +73,10 @@ public class TaskServiceTest extends InitTestEnvironment {
disposeTaskMapper.getAllTaskByStatus(DisposeTaskStatus.TASK_NEW.getCode()).forEach(v -> { disposeTaskMapper.getAllTaskByStatus(DisposeTaskStatus.TASK_NEW.getCode()).forEach(v -> {
ErrorCode err = taskService.startTask(v.getId()); ErrorCode err = taskService.startTask(v.getId());
Assert.assertEquals(err, ErrorCode.ERR_OK); Assert.assertEquals(err, ErrorCode.ERR_OK);
int currentStatus = disposeTaskMapper.getTaskCurrentStatus(v.getId());
log.info("current status:{}", currentStatus);
Assert.assertEquals(currentStatus, DisposeTaskStatus.TASK_RUNNING.getCode());
}); });
} }
@ -85,7 +89,13 @@ public class TaskServiceTest extends InitTestEnvironment {
disposeTaskMapper.getAllTaskByStatus(DisposeTaskStatus.TASK_RUNNING.getCode()).forEach(v -> { disposeTaskMapper.getAllTaskByStatus(DisposeTaskStatus.TASK_RUNNING.getCode()).forEach(v -> {
ErrorCode err = taskService.stopTask(v.getId()); ErrorCode err = taskService.stopTask(v.getId());
Assert.assertEquals(err, ErrorCode.ERR_OK); Assert.assertEquals(err, ErrorCode.ERR_OK);
int currentStatus = disposeTaskMapper.getTaskCurrentStatus(v.getId());
log.info("current status:{}", currentStatus);
Assert.assertEquals(currentStatus, DisposeTaskStatus.TASK_FINISH.getCode());
taskService.finishTask(v.getId()); taskService.finishTask(v.getId());
Assert.assertNotNull(taskService.getNodeAllTask(v.getDeviceId()));
}); });
} }

8
src/test/java/com/dispose/test/service/UserAccountServiceTest.java
View File

@ -44,7 +44,7 @@ public class UserAccountServiceTest extends InitTestEnvironment {
@Before @Before
public void userLoginTest() throws NoSuchAlgorithmException { public void userLoginTest() throws NoSuchAlgorithmException {
MulReturnType<ErrorCode, String> ret = userAccountService.loginService(getUSER_NAME(), MulReturnType<ErrorCode, String> ret = userAccountService.loginService(getUSER_NAME(),
getPASSWORD()); getPASSWORD());
if (ret.getFirstParam() == ErrorCode.ERR_OK) { if (ret.getFirstParam() == ErrorCode.ERR_OK) {
UserAccountServiceTest.token = ret.getSecondParam(); UserAccountServiceTest.token = ret.getSecondParam();
@ -59,7 +59,7 @@ public class UserAccountServiceTest extends InitTestEnvironment {
@Test @Test
public void t1_logServiceTest() throws NoSuchAlgorithmException { public void t1_logServiceTest() throws NoSuchAlgorithmException {
MulReturnType<ErrorCode, String> ret = userAccountService.loginService(getUSER_NAME(), MulReturnType<ErrorCode, String> ret = userAccountService.loginService(getUSER_NAME(),
getPASSWORD()); getPASSWORD());
Assert.assertEquals(ret.getFirstParam(), ErrorCode.ERR_OK); Assert.assertEquals(ret.getFirstParam(), ErrorCode.ERR_OK);
Assert.assertNotNull(ret.getSecondParam()); Assert.assertNotNull(ret.getSecondParam());
@ -80,6 +80,9 @@ public class UserAccountServiceTest extends InitTestEnvironment {
public void t2_logoutServiceTest() { public void t2_logoutServiceTest() {
ErrorCode err = userAccountService.logoutService(getUSER_NAME(), token); ErrorCode err = userAccountService.logoutService(getUSER_NAME(), token);
Assert.assertEquals(err, ErrorCode.ERR_OK); Assert.assertEquals(err, ErrorCode.ERR_OK);
err = userAccountService.logoutService(getUSER_NAME(), token + "1235");
Assert.assertEquals(err, ErrorCode.ERR_LOGOUT);
} }
/** /**
@ -98,5 +101,6 @@ public class UserAccountServiceTest extends InitTestEnvironment {
@Test @Test
public void t4_authTokenCheckTest() { public void t4_authTokenCheckTest() {
Assert.assertEquals(userAccountService.authTokenCheck(token), ErrorCode.ERR_OK); Assert.assertEquals(userAccountService.authTokenCheck(token), ErrorCode.ERR_OK);
Assert.assertEquals(userAccountService.authTokenCheck(token + "1235"), ErrorCode.ERR_LOGOUT);
} }
} }