Unverified Commit c2f4b65a authored by Tboy's avatar Tboy Committed by GitHub
Browse files

Merge branch 'dev' into dev

parents 5404ff25 85b8324e
Loading
Loading
Loading
Loading
+43 −0
Original line number Diff line number Diff line
/*
 * 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();
    }
}
+43 −0
Original line number Diff line number Diff line
/*
 * 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.zk;

import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;

/**
 * demo for using zkServer
 */
public class TestZkServer {

    @Before
    public void before(){
        ZKServer.start();
    }

    @Test
    public void test(){
        Assert.assertTrue(ZKServer.isStarted());
    }

    @After
    public void after(){
        ZKServer.stop();
    }
}
+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ public class ZKServer {
     */
    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 +138,8 @@ 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);
        }
+3 −0
Original line number Diff line number Diff line
@@ -613,6 +613,9 @@
				<configuration>
					<includes>
						<include>**/common/utils/*.java</include>
						<include>**/api/utils/CheckUtilsTest.java</include>
						<include>**/api/utils/FileUtilsTest.java</include>

						<include>**/common/graph/*.java</include>
						<include>**/api/utils/CheckUtilsTest.java</include>
						<include>**/api/utils/FileUtilsTest.java</include>