Unverified Commit 3a0d4da2 authored by CalvinKirs's avatar CalvinKirs Committed by GitHub
Browse files

[Test][server] Fix Test ContextConfiguration error. (#3304) 

* [FIX_BUG]fix test error

* small change

* add test

* reformat

* fix test no qualifying bean
parent b555d0a0

dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import org.apache.dolphinscheduler.server.zk.SpringZKServer; 
import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;

import org.apache.dolphinscheduler.service.process.ProcessService;

import org.apache.dolphinscheduler.service.queue.TaskPriorityQueue;

import org.apache.dolphinscheduler.service.zk.CuratorZookeeperClient;

import org.apache.dolphinscheduler.service.zk.ZookeeperCachedOperator;

import org.apache.dolphinscheduler.service.zk.ZookeeperConfig;

import org.junit.After;
@@ -52,7 +53,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; 




@RunWith(SpringJUnit4ClassRunner.class)

@ContextConfiguration(classes={DependencyConfig.class, SpringApplicationContext.class, SpringZKServer.class,

@ContextConfiguration(classes={DependencyConfig.class, SpringApplicationContext.class, SpringZKServer.class, CuratorZookeeperClient.class,

        NettyExecutorManager.class, ExecutorDispatcher.class, ZookeeperRegistryCenter.class, TaskPriorityQueueConsumer.class,

        ZookeeperNodeManager.class, ZookeeperCachedOperator.class, ZookeeperConfig.class, MasterConfig.class})

public class TaskPriorityQueueConsumerTest {

dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/registry/ZookeeperNodeManagerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import org.apache.dolphinscheduler.server.master.registry.MasterRegistry; 
import org.apache.dolphinscheduler.server.worker.config.WorkerConfig;

import org.apache.dolphinscheduler.server.worker.registry.WorkerRegistry;

import org.apache.dolphinscheduler.server.zk.SpringZKServer;

import org.apache.dolphinscheduler.service.zk.CuratorZookeeperClient;

import org.apache.dolphinscheduler.service.zk.ZookeeperCachedOperator;

import org.apache.dolphinscheduler.service.zk.ZookeeperConfig;

import org.junit.Assert;
@@ -42,7 +43,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; 
@RunWith(SpringJUnit4ClassRunner.class)

@ContextConfiguration(classes={DependencyConfig.class, SpringZKServer.class, MasterRegistry.class,WorkerRegistry.class,

        ZookeeperRegistryCenter.class, MasterConfig.class, WorkerConfig.class,

        ZookeeperCachedOperator.class, ZookeeperConfig.class, ZookeeperNodeManager.class})

        ZookeeperCachedOperator.class, ZookeeperConfig.class, ZookeeperNodeManager.class, CuratorZookeeperClient.class})

public class ZookeeperNodeManagerTest {



    @Autowired

dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/processor/TaskCallbackServiceTest.java

+3 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import org.apache.dolphinscheduler.server.worker.config.WorkerConfig; 
import org.apache.dolphinscheduler.server.worker.registry.WorkerRegistry;

import org.apache.dolphinscheduler.server.zk.SpringZKServer;

import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;

import org.apache.dolphinscheduler.service.zk.CuratorZookeeperClient;

import org.apache.dolphinscheduler.service.zk.ZookeeperCachedOperator;

import org.apache.dolphinscheduler.service.zk.ZookeeperConfig;

import org.junit.Assert;
@@ -73,7 +74,8 @@ import io.netty.channel.Channel; 
        TaskResponseService.class,

        TaskAckProcessor.class,

        TaskResponseProcessor.class,

        TaskExecuteProcessor.class})

        TaskExecuteProcessor.class,

        CuratorZookeeperClient.class})

public class TaskCallbackServiceTest {



    @Autowired

pom.xml

+3 −3
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ 
                        <!--<include>**/server/log/TaskLogDiscriminatorTest.java</include>-->

                        <include>**/server/log/TaskLogFilterTest.java</include>

                        <include>**/server/log/WorkerLogFilterTest.java</include>

                        <!--<include>**/server/master/consumer/TaskPriorityQueueConsumerTest.java</include>-->

                        <include>**/server/master/consumer/TaskPriorityQueueConsumerTest.java</include>

                        <include>**/server/master/runner/MasterTaskExecThreadTest.java</include>

                        <!--<include>**/server/master/dispatch/executor/NettyExecutorManagerTest.java</include>-->

                        <include>**/server/master/dispatch/host/assign/LowerWeightRoundRobinTest.java</include>
@@ -811,14 +811,14 @@ 
                        <!--<include>**/server/master/ConditionsTaskTest.java</include>-->

                        <include>**/server/master/MasterExecThreadTest.java</include>

                        <include>**/server/master/ParamsTest.java</include>

                        <!--<include>**/server/register/ZookeeperNodeManagerTest.java</include>-->

                        <include>**/server/register/ZookeeperNodeManagerTest.java</include>

                        <include>**/server/utils/DataxUtilsTest.java</include>

                        <include>**/server/utils/ExecutionContextTestUtils.java</include>

                        <!--<include>**/server/utils/FlinkArgsUtilsTest.java</include>-->

                        <include>**/server/utils/ParamUtilsTest.java</include>

                        <include>**/server/utils/ProcessUtilsTest.java</include>

                        <include>**/server/utils/SparkArgsUtilsTest.java</include>

                        <!--<include>**/server/worker/processor/TaskCallbackServiceTest.java</include>-->

                        <include>**/server/worker/processor/TaskCallbackServiceTest.java</include>

                        <include>**/server/worker/registry/WorkerRegistryTest.java</include>

                        <include>**/server/worker/shell/ShellCommandExecutorTest.java</include>

                        <include>**/server/worker/sql/SqlExecutorTest.java</include>