From 85b8324ee33b254a7c462d003e399a6162c072cc Mon Sep 17 00:00:00 2001
From: "dk.technoboy" <guo.jiwei@immomo.com>
Date: Wed, 18 Dec 2019 10:49:55 +0800
Subject: [PATCH] add BaseTaskQueueTest for UT

---
 .../common/queue/BaseTaskQueueTest.java       | 43 +++++++++++++++++++
 .../zk/{TestZk.java => TestZkServer.java}     |  2 +-
 .../dolphinscheduler/common/zk/ZKServer.java  |  3 +-
 3 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/queue/BaseTaskQueueTest.java
 rename dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/zk/{TestZk.java => TestZkServer.java} (97%)

diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/queue/BaseTaskQueueTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/queue/BaseTaskQueueTest.java
new file mode 100644
index 0000000000..0bd4266bb7
--- /dev/null
+++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/queue/BaseTaskQueueTest.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dolphinscheduler.common.queue;
+
+import org.apache.dolphinscheduler.common.zk.ZKServer;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+
+/**
+ * base task queue test for only start zk server once
+ */
+public class BaseTaskQueueTest {
+
+    protected static ITaskQueue tasksQueue = null;
+
+    @BeforeClass
+    public static void setup() {
+        ZKServer.start();
+        tasksQueue = TaskQueueFactory.getTaskQueueInstance();
+        //clear all data
+        tasksQueue.delete();
+    }
+
+    @AfterClass
+    public static void tearDown() {
+        tasksQueue.delete();
+        ZKServer.stop();
+    }
+}
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/zk/TestZk.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/zk/TestZkServer.java
similarity index 97%
rename from dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/zk/TestZk.java
rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/zk/TestZkServer.java
index 5c3db2d5d1..d1a0526309 100644
--- a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/zk/TestZk.java
+++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/zk/TestZkServer.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 /**
  * demo for using zkServer
  */
-public class TestZk {
+public class TestZkServer {
 
     @Before
     public void before(){
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/zk/ZKServer.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/zk/ZKServer.java
index 5aba9fd8a1..34c1807cf5 100644
--- a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/zk/ZKServer.java
+++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/zk/ZKServer.java
@@ -79,7 +79,7 @@ public class ZKServer {
      * @param port The port to listen on
      */
     public static void startLocalZkServer(final int port) {
-        startLocalZkServer(port, org.apache.commons.io.FileUtils.getTempDirectoryPath() + File.separator + "test-" + System.currentTimeMillis());
+        startLocalZkServer(port, org.apache.commons.io.FileUtils.getTempDirectoryPath() + "test-" + System.currentTimeMillis());
     }
 
     /**
@@ -137,6 +137,7 @@ public class ZKServer {
     public static void stop() {
         try {
             stopLocalZkServer(true);
+            logger.info("zk server stopped");
         } catch (Exception e) {
             logger.error("Failed to stop ZK ",e);
         }