From f419fe6239dd619bcf8ebf03d6247d12e41748c0 Mon Sep 17 00:00:00 2001
From: Yichao Yang <1048262223@qq.com>
Date: Mon, 10 Aug 2020 15:01:20 +0800
Subject: [PATCH] [Test][server] Add LoggerServerTest (#3405)
---
.../server/log/LoggerServerTest.java | 62 ++++++++++++-------
pom.xml | 2 +-
2 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/log/LoggerServerTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/log/LoggerServerTest.java
index 0da88746f..d3b1dcf84 100644
--- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/log/LoggerServerTest.java
+++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/log/LoggerServerTest.java
@@ -17,46 +17,62 @@
package org.apache.dolphinscheduler.server.log;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+
import org.apache.dolphinscheduler.common.Constants;
+import org.apache.dolphinscheduler.common.utils.FileUtils;
+import org.apache.dolphinscheduler.common.utils.StringUtils;
import org.apache.dolphinscheduler.service.log.LogClientService;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
public class LoggerServerTest {
+ private LoggerServer loggerServer;
- @Test
- public void testRollViewLog(){
- LoggerServer loggerServer = new LoggerServer();
- loggerServer.start();
+ private LogClientService logClientService;
- LogClientService logClientService = new LogClientService();
- logClientService.rollViewLog("localhost", Constants.RPC_PORT,"/opt/demo.txt",0,1000);
+ @Before
+ public void startServerAndClient() {
+ this.loggerServer = new LoggerServer();
+ this.loggerServer.start();
+ this.logClientService = new LogClientService();
+ }
- try {
- Thread.sleep(5000);
- } catch (InterruptedException e) {
+ @Test
+ public void testRollViewLog() throws IOException {
+ String expectedTmpDemoString = "testRolloViewLog";
+ FileUtils.writeStringToFile(new File("/tmp/demo.txt"), expectedTmpDemoString, Charset.defaultCharset());
- }
+ String resultTmpDemoString = this.logClientService.rollViewLog(
+ "localhost", Constants.RPC_PORT,"/tmp/demo.txt", 0, 1000);
- loggerServer.stop();
- logClientService.close();
+ Assert.assertEquals(expectedTmpDemoString, resultTmpDemoString.replaceAll("[\r|\n|\t]", StringUtils.EMPTY));
+
+ FileUtils.deleteFile("/tmp/demo.txt");
}
@Test
- public void testRemoveTaskLog(){
- LoggerServer loggerServer = new LoggerServer();
- loggerServer.start();
+ public void testRemoveTaskLog() throws IOException {
+ String expectedTmpRemoveString = "testRemoveTaskLog";
+ FileUtils.writeStringToFile(new File("/tmp/remove.txt"), expectedTmpRemoveString, Charset.defaultCharset());
+
+ Boolean b = this.logClientService.removeTaskLog("localhost", Constants.RPC_PORT,"/tmp/remove.txt");
- LogClientService logClientService = new LogClientService();
- logClientService.removeTaskLog("localhost", Constants.RPC_PORT,"/opt/zhangsan");
+ Assert.assertTrue(b);
- try {
- Thread.sleep(5000);
- } catch (InterruptedException e) {
+ String result = this.logClientService.viewLog("localhost", Constants.RPC_PORT,"/tmp/demo.txt");
- }
+ Assert.assertEquals(StringUtils.EMPTY, result);
+ }
- loggerServer.stop();
- logClientService.close();
+ @After
+ public void stopServerAndClient() {
+ this.loggerServer.stop();
+ this.logClientService.close();
}
}
diff --git a/pom.xml b/pom.xml
index 0b546b3ec..173265a39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -795,7 +795,7 @@
**/remote/RemoveTaskLogRequestCommandTest.java
**/remote/ResponseFutureTest.java
-
+ **/server/log/LoggerServerTest.java
**/server/entity/SQLTaskExecutionContextTest.java
**/server/log/MasterLogFilterTest.java
**/server/log/SensitiveDataConverterTest.java
--
GitLab