Browse Source

[TEST] fix log related test (#15659)

Co-authored-by: abzymeinsjtu <abzymeinsjtu@B-54Q8MD6R-0244.local>
Co-authored-by: xiangzihao <460888207@qq.com>
dev_wenjun_refactorMaster
Evan Sun 9 months ago committed by GitHub
parent
commit
502b49a1cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 22
      dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/LoggerServiceTest.java

22
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/LoggerServiceTest.java

@ -49,6 +49,8 @@ import org.apache.dolphinscheduler.extract.common.transportor.TaskInstanceLogFil
import org.apache.dolphinscheduler.extract.common.transportor.TaskInstanceLogPageQueryRequest; import org.apache.dolphinscheduler.extract.common.transportor.TaskInstanceLogPageQueryRequest;
import org.apache.dolphinscheduler.extract.common.transportor.TaskInstanceLogPageQueryResponse; import org.apache.dolphinscheduler.extract.common.transportor.TaskInstanceLogPageQueryResponse;
import java.io.IOException;
import java.net.ServerSocket;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -89,9 +91,17 @@ public class LoggerServiceTest {
private NettyRemotingServer nettyRemotingServer; private NettyRemotingServer nettyRemotingServer;
private int nettyServerPort = 18080;
@BeforeEach @BeforeEach
public void setUp() { public void setUp() {
nettyRemotingServer = new NettyRemotingServer(NettyServerConfig.builder().listenPort(8080).build()); try (ServerSocket s = new ServerSocket(0)) {
nettyServerPort = s.getLocalPort();
} catch (IOException e) {
return;
}
nettyRemotingServer = new NettyRemotingServer(NettyServerConfig.builder().listenPort(nettyServerPort).build());
nettyRemotingServer.start(); nettyRemotingServer.start();
SpringServerMethodInvokerDiscovery springServerMethodInvokerDiscovery = SpringServerMethodInvokerDiscovery springServerMethodInvokerDiscovery =
new SpringServerMethodInvokerDiscovery(nettyRemotingServer); new SpringServerMethodInvokerDiscovery(nettyRemotingServer);
@ -148,7 +158,7 @@ public class LoggerServiceTest {
Assertions.assertEquals(Status.TASK_INSTANCE_HOST_IS_NULL.getCode(), result.getCode().intValue()); Assertions.assertEquals(Status.TASK_INSTANCE_HOST_IS_NULL.getCode(), result.getCode().intValue());
// PROJECT_NOT_EXIST // PROJECT_NOT_EXIST
taskInstance.setHost("127.0.0.1:8080"); taskInstance.setHost("127.0.0.1:" + nettyServerPort);
taskInstance.setLogPath("/temp/log"); taskInstance.setLogPath("/temp/log");
doThrow(new ServiceException(Status.PROJECT_NOT_EXIST)).when(projectService) doThrow(new ServiceException(Status.PROJECT_NOT_EXIST)).when(projectService)
.checkProjectAndAuthThrowException(loginUser, taskInstance.getProjectCode(), VIEW_LOG); .checkProjectAndAuthThrowException(loginUser, taskInstance.getProjectCode(), VIEW_LOG);
@ -198,7 +208,7 @@ public class LoggerServiceTest {
} }
// PROJECT_NOT_EXIST // PROJECT_NOT_EXIST
taskInstance.setHost("127.0.0.1:8080"); taskInstance.setHost("127.0.0.1:" + nettyServerPort);
taskInstance.setLogPath("/temp/log"); taskInstance.setLogPath("/temp/log");
doThrow(new ServiceException(Status.PROJECT_NOT_EXIST)).when(projectService) doThrow(new ServiceException(Status.PROJECT_NOT_EXIST)).when(projectService)
.checkProjectAndAuthThrowException(loginUser, taskInstance.getProjectCode(), VIEW_LOG); .checkProjectAndAuthThrowException(loginUser, taskInstance.getProjectCode(), VIEW_LOG);
@ -215,7 +225,7 @@ public class LoggerServiceTest {
doNothing().when(projectService).checkProjectAndAuthThrowException(loginUser, taskInstance.getProjectCode(), doNothing().when(projectService).checkProjectAndAuthThrowException(loginUser, taskInstance.getProjectCode(),
DOWNLOAD_LOG); DOWNLOAD_LOG);
byte[] logBytes = loggerService.getLogBytes(loginUser, 1); byte[] logBytes = loggerService.getLogBytes(loginUser, 1);
Assertions.assertEquals(47, logBytes.length); Assertions.assertEquals(43, logBytes.length - String.valueOf(nettyServerPort).length());
} }
@Test @Test
@ -233,7 +243,7 @@ public class LoggerServiceTest {
// SUCCESS // SUCCESS
taskInstance.setTaskCode(1L); taskInstance.setTaskCode(1L);
taskInstance.setId(1); taskInstance.setId(1);
taskInstance.setHost("127.0.0.1:8080"); taskInstance.setHost("127.0.0.1:" + nettyServerPort);
taskInstance.setLogPath("/temp/log"); taskInstance.setLogPath("/temp/log");
doNothing().when(projectService).checkProjectAndAuthThrowException(loginUser, projectCode, VIEW_LOG); doNothing().when(projectService).checkProjectAndAuthThrowException(loginUser, projectCode, VIEW_LOG);
when(taskInstanceDao.queryById(1)).thenReturn(taskInstance); when(taskInstanceDao.queryById(1)).thenReturn(taskInstance);
@ -259,7 +269,7 @@ public class LoggerServiceTest {
// SUCCESS // SUCCESS
taskInstance.setTaskCode(1L); taskInstance.setTaskCode(1L);
taskInstance.setId(1); taskInstance.setId(1);
taskInstance.setHost("127.0.0.1:8080"); taskInstance.setHost("127.0.0.1:" + nettyServerPort);
taskInstance.setLogPath("/temp/log"); taskInstance.setLogPath("/temp/log");
doNothing().when(projectService).checkProjectAndAuthThrowException(loginUser, projectCode, DOWNLOAD_LOG); doNothing().when(projectService).checkProjectAndAuthThrowException(loginUser, projectCode, DOWNLOAD_LOG);
when(taskInstanceDao.queryById(1)).thenReturn(taskInstance); when(taskInstanceDao.queryById(1)).thenReturn(taskInstance);

Loading…
Cancel
Save