You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by lg...@apache.org on 2020/05/14 09:50:54 UTC
[incubator-dolphinscheduler] branch dev-1.3.0 updated: add UT
(#2717)
This is an automated email from the ASF dual-hosted git repository.
lgcareer pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
new f4583d7 add UT (#2717)
f4583d7 is described below
commit f4583d78e91f71aa80b655b0e510f786aca64399
Author: qiaozhanwei <qi...@outlook.com>
AuthorDate: Thu May 14 17:50:47 2020 +0800
add UT (#2717)
* add LoggerServerTest UT
* add LoggerServerTest UT
* add LoggerServerTest UT
add RemoveTaskLogRequestCommandTest UT
add RemoveTaskLogResponseCommandTest
Co-authored-by: qiaozhanwei <qi...@analysys.com.cn>
---
.../remote/RemoveTaskLogRequestCommandTest.java | 27 +++++++++-------------
.../remote/RemoveTaskLogResponseCommandTest.java | 26 ++++++++-------------
.../server/log/LoggerServerTest.java | 24 ++++++++++++++++++-
dolphinscheduler-service/pom.xml | 22 ++++++++++++++++++
pom.xml | 2 ++
5 files changed, 68 insertions(+), 33 deletions(-)
diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/log/LoggerServerTest.java b/dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/RemoveTaskLogRequestCommandTest.java
similarity index 56%
copy from dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/log/LoggerServerTest.java
copy to dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/RemoveTaskLogRequestCommandTest.java
index f96b68f..37c2106 100644
--- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/log/LoggerServerTest.java
+++ b/dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/RemoveTaskLogRequestCommandTest.java
@@ -15,26 +15,21 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.server.log;
+package org.apache.dolphinscheduler.remote;
-import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.service.log.LogClientService;
+import junit.framework.Assert;
+import org.apache.dolphinscheduler.remote.command.Command;
+import org.apache.dolphinscheduler.remote.command.log.RemoveTaskLogRequestCommand;
+import org.apache.dolphinscheduler.remote.command.log.RemoveTaskLogResponseCommand;
import org.junit.Test;
-public class LoggerServerTest {
+public class RemoveTaskLogRequestCommandTest {
@Test
- public void testLoggerServer(){
- LoggerServer loggerServer = new LoggerServer();
- loggerServer.start();
-
- LogClientService logClientService = new LogClientService();
- logClientService.removeTaskLog("localhost", Constants.RPC_PORT,"/opt/zhangsan");
-
- try {
- Thread.sleep(5000);
- } catch (InterruptedException e) {
-
- }
+ public void testConvert2Command(){
+ RemoveTaskLogResponseCommand removeTaskLogResponseCommand = new RemoveTaskLogResponseCommand();
+ removeTaskLogResponseCommand.setStatus(true);
+ Command command = removeTaskLogResponseCommand.convert2Command(122);
+ Assert.assertNotNull(command);
}
}
diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/log/LoggerServerTest.java b/dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/RemoveTaskLogResponseCommandTest.java
similarity index 59%
copy from dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/log/LoggerServerTest.java
copy to dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/RemoveTaskLogResponseCommandTest.java
index f96b68f..aab0ad3 100644
--- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/log/LoggerServerTest.java
+++ b/dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/RemoveTaskLogResponseCommandTest.java
@@ -15,26 +15,20 @@
* limitations under the License.
*/
-package org.apache.dolphinscheduler.server.log;
+package org.apache.dolphinscheduler.remote;
-import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.service.log.LogClientService;
+import junit.framework.Assert;
+import org.apache.dolphinscheduler.remote.command.Command;
+import org.apache.dolphinscheduler.remote.command.log.RemoveTaskLogRequestCommand;
import org.junit.Test;
-public class LoggerServerTest {
+public class RemoveTaskLogResponseCommandTest {
@Test
- public void testLoggerServer(){
- LoggerServer loggerServer = new LoggerServer();
- loggerServer.start();
-
- LogClientService logClientService = new LogClientService();
- logClientService.removeTaskLog("localhost", Constants.RPC_PORT,"/opt/zhangsan");
-
- try {
- Thread.sleep(5000);
- } catch (InterruptedException e) {
-
- }
+ public void testConvert2Command(){
+ RemoveTaskLogRequestCommand removeTaskLogRequestCommand = new RemoveTaskLogRequestCommand();
+ removeTaskLogRequestCommand.setPath("/opt/zhangsan");
+ Command command = removeTaskLogRequestCommand.convert2Command();
+ Assert.assertNotNull(command);
}
}
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 f96b68f..0da8874 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
@@ -23,8 +23,27 @@ import org.junit.Test;
public class LoggerServerTest {
+
+ @Test
+ public void testRollViewLog(){
+ LoggerServer loggerServer = new LoggerServer();
+ loggerServer.start();
+
+ LogClientService logClientService = new LogClientService();
+ logClientService.rollViewLog("localhost", Constants.RPC_PORT,"/opt/demo.txt",0,1000);
+
+ try {
+ Thread.sleep(5000);
+ } catch (InterruptedException e) {
+
+ }
+
+ loggerServer.stop();
+ logClientService.close();
+ }
+
@Test
- public void testLoggerServer(){
+ public void testRemoveTaskLog(){
LoggerServer loggerServer = new LoggerServer();
loggerServer.start();
@@ -36,5 +55,8 @@ public class LoggerServerTest {
} catch (InterruptedException e) {
}
+
+ loggerServer.stop();
+ logClientService.close();
}
}
diff --git a/dolphinscheduler-service/pom.xml b/dolphinscheduler-service/pom.xml
index c150e83..62b0954 100644
--- a/dolphinscheduler-service/pom.xml
+++ b/dolphinscheduler-service/pom.xml
@@ -72,5 +72,27 @@
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz-jobs</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito2</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index c2b295a..13a4c33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -777,6 +777,8 @@
<include>**/dao/mapper/CommandMapperTest.java</include>
<include>**/dao/mapper/ConnectionFactoryTest.java</include>
<include>**/dao/mapper/DataSourceMapperTest.java</include>
+ <include>**/remote/RemoveTaskLogResponseCommandTest.java</include>
+ <include>**/remote/RemoveTaskLogRequestCommandTest.java</include>
<include>**/remote/FastJsonSerializerTest.java</include>
<include>**/remote/NettyRemotingClientTest.java</include>
<include>**/remote/ResponseFutureTest.java</include>