From 94713cef79c66473e34b6ef91e9c148df92221f2 Mon Sep 17 00:00:00 2001 From: qiaozhanwei Date: Fri, 3 Apr 2020 15:24:18 +0800 Subject: [PATCH] refactor-worker merge to dev bug fix --- .../worker/task/datax/DataxTaskTest.java | 12 +- .../worker/task/shell/ShellTaskTest.java | 29 +-- .../worker/task/sqoop/SqoopTaskTest.java | 5 +- .../service/queue/BaseTaskQueueTest.java | 49 ---- .../service/queue/TaskQueueZKImplTest.java | 229 ------------------ pom.xml | 176 ++++++++++---- 6 files changed, 145 insertions(+), 355 deletions(-) delete mode 100644 dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/queue/BaseTaskQueueTest.java delete mode 100644 dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/queue/TaskQueueZKImplTest.java diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/datax/DataxTaskTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/datax/DataxTaskTest.java index 99d64d1783..a2a46ef5a5 100644 --- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/datax/DataxTaskTest.java +++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/datax/DataxTaskTest.java @@ -65,11 +65,8 @@ public class DataxTaskTest { private ApplicationContext applicationContext; -<<<<<<< HEAD private TaskExecutionContext taskExecutionContext; -======= private TaskProps props = new TaskProps(); ->>>>>>> remotes/upstream/dev @Before public void before() @@ -82,19 +79,14 @@ public class DataxTaskTest { springApplicationContext.setApplicationContext(applicationContext); Mockito.when(applicationContext.getBean(ProcessService.class)).thenReturn(processService); -<<<<<<< HEAD TaskProps props = new TaskProps(); props.setExecutePath("/tmp"); -======= - props.setTaskDir("/tmp"); ->>>>>>> remotes/upstream/dev props.setTaskAppId(String.valueOf(System.currentTimeMillis())); props.setTaskInstanceId(1); props.setTenantCode("1"); props.setEnvFile(".dolphinscheduler_env.sh"); props.setTaskStartTime(new Date()); props.setTaskTimeout(0); -<<<<<<< HEAD props.setTaskParams( "{\"targetTable\":\"test\",\"postStatements\":[],\"jobSpeedByte\":1024,\"jobSpeedRecord\":1000,\"dtType\":\"MYSQL\",\"datasource\":1,\"dsType\":\"MYSQL\",\"datatarget\":2,\"jobSpeedByte\":0,\"sql\":\"select 1 as test from dual\",\"preStatements\":[\"delete from test\"],\"postStatements\":[\"delete from test\"]}"); @@ -117,10 +109,8 @@ public class DataxTaskTest { dataxTask = PowerMockito.spy(new DataxTask(taskExecutionContext, logger)); dataxTask.init(); -======= props.setCmdTypeIfComplement(START_PROCESS); setTaskParems(0); ->>>>>>> remotes/upstream/dev Mockito.when(processService.findDataSourceById(1)).thenReturn(getDataSource()); Mockito.when(processService.findDataSourceById(2)).thenReturn(getDataSource()); @@ -142,7 +132,7 @@ public class DataxTaskTest { } - dataxTask = PowerMockito.spy(new DataxTask(props, logger)); + dataxTask = PowerMockito.spy(new DataxTask(taskExecutionContext, logger)); dataxTask.init(); } diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/shell/ShellTaskTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/shell/ShellTaskTest.java index 387c7c5e53..c30f33c683 100644 --- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/shell/ShellTaskTest.java +++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/shell/ShellTaskTest.java @@ -21,6 +21,7 @@ import org.apache.dolphinscheduler.common.enums.DbType; import org.apache.dolphinscheduler.common.utils.OSUtils; import org.apache.dolphinscheduler.dao.entity.DataSource; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.server.entity.TaskExecutionContext; import org.apache.dolphinscheduler.server.worker.task.ShellCommandExecutor; import org.apache.dolphinscheduler.server.worker.task.TaskProps; import org.apache.dolphinscheduler.service.bean.SpringApplicationContext; @@ -54,9 +55,12 @@ public class ShellTaskTest { private ShellCommandExecutor shellCommandExecutor; private ApplicationContext applicationContext; + private TaskExecutionContext taskExecutionContext; @Before public void before() throws Exception { + taskExecutionContext = new TaskExecutionContext(); + PowerMockito.mockStatic(OSUtils.class); processService = PowerMockito.mock(ProcessService.class); shellCommandExecutor = PowerMockito.mock(ShellCommandExecutor.class); @@ -67,23 +71,22 @@ public class ShellTaskTest { PowerMockito.when(applicationContext.getBean(ProcessService.class)).thenReturn(processService); TaskProps props = new TaskProps(); - props.setTaskDir("/tmp"); props.setTaskAppId(String.valueOf(System.currentTimeMillis())); - props.setTaskInstId(1); props.setTenantCode("1"); props.setEnvFile(".dolphinscheduler_env.sh"); props.setTaskStartTime(new Date()); props.setTaskTimeout(0); props.setTaskParams("{\"rawScript\": \" echo 'hello world!'\"}"); - shellTask = new ShellTask(props, logger); + shellTask = new ShellTask(taskExecutionContext, logger); shellTask.init(); PowerMockito.when(processService.findDataSourceById(1)).thenReturn(getDataSource()); PowerMockito.when(processService.findDataSourceById(2)).thenReturn(getDataSource()); PowerMockito.when(processService.findProcessInstanceByTaskId(1)).thenReturn(getProcessInstance()); - String fileName = String.format("%s/%s_node.%s", props.getTaskDir(), props.getTaskAppId(), OSUtils.isWindows() ? "bat" : "sh"); - PowerMockito.when(shellCommandExecutor.run(fileName, processService)).thenReturn(0); + String fileName = String.format("%s/%s_node.%s", taskExecutionContext.getExecutePath(), + props.getTaskAppId(), OSUtils.isWindows() ? "bat" : "sh"); + PowerMockito.when(shellCommandExecutor.run("")).thenReturn(null); } private DataSource getDataSource() { @@ -112,11 +115,9 @@ public class ShellTaskTest { public void testShellTask() throws Exception { TaskProps props = new TaskProps(); - props.setTaskDir("/tmp"); props.setTaskAppId(String.valueOf(System.currentTimeMillis())); - props.setTaskInstId(1); props.setTenantCode("1"); - ShellTask shellTaskTest = new ShellTask(props, logger); + ShellTask shellTaskTest = new ShellTask(taskExecutionContext, logger); Assert.assertNotNull(shellTaskTest); } @@ -137,15 +138,13 @@ public class ShellTaskTest { @Test public void testInitException() { TaskProps props = new TaskProps(); - props.setTaskDir("/tmp"); props.setTaskAppId(String.valueOf(System.currentTimeMillis())); - props.setTaskInstId(1); props.setTenantCode("1"); props.setEnvFile(".dolphinscheduler_env.sh"); props.setTaskStartTime(new Date()); props.setTaskTimeout(0); props.setTaskParams("{\"rawScript\": \"\"}"); - ShellTask shellTask = new ShellTask(props, logger); + ShellTask shellTask = new ShellTask(taskExecutionContext, logger); try { shellTask.init(); } catch (Exception e) { @@ -178,9 +177,7 @@ public class ShellTaskTest { try { PowerMockito.when(OSUtils.isWindows()).thenReturn(false); TaskProps props = new TaskProps(); - props.setTaskDir("/tmp"); props.setTaskAppId(String.valueOf(System.currentTimeMillis())); - props.setTaskInstId(1); props.setTenantCode("1"); props.setEnvFile(".dolphinscheduler_env.sh"); props.setTaskStartTime(new Date()); @@ -188,7 +185,7 @@ public class ShellTaskTest { props.setScheduleTime(new Date()); props.setCmdTypeIfComplement(CommandType.START_PROCESS); props.setTaskParams("{\"rawScript\": \" echo ${test}\", \"localParams\": [{\"prop\":\"test\", \"direct\":\"IN\", \"type\":\"VARCHAR\", \"value\":\"123\"}]}"); - ShellTask shellTask1 = new ShellTask(props, logger); + ShellTask shellTask1 = new ShellTask(taskExecutionContext, logger); shellTask1.init(); shellTask1.handle(); Assert.assertTrue(true); @@ -208,9 +205,7 @@ public class ShellTaskTest { try { Assume.assumeTrue(OSUtils.isWindows()); TaskProps props = new TaskProps(); - props.setTaskDir("/tmp"); props.setTaskAppId(String.valueOf(System.currentTimeMillis())); - props.setTaskInstId(1); props.setTenantCode("1"); props.setEnvFile(".dolphinscheduler_env.sh"); props.setTaskStartTime(new Date()); @@ -218,7 +213,7 @@ public class ShellTaskTest { props.setScheduleTime(new Date()); props.setCmdTypeIfComplement(CommandType.START_PROCESS); props.setTaskParams("{\"rawScript\": \" echo ${test}\", \"localParams\": [{\"prop\":\"test\", \"direct\":\"IN\", \"type\":\"VARCHAR\", \"value\":\"123\"}]}"); - ShellTask shellTask1 = new ShellTask(props, logger); + ShellTask shellTask1 = new ShellTask(taskExecutionContext, logger); shellTask1.init(); shellTask1.handle(); Assert.assertTrue(true); diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/sqoop/SqoopTaskTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/sqoop/SqoopTaskTest.java index 5c7afa8155..5694599a38 100644 --- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/sqoop/SqoopTaskTest.java +++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/sqoop/SqoopTaskTest.java @@ -20,6 +20,7 @@ import com.alibaba.fastjson.JSON; import org.apache.dolphinscheduler.common.enums.DbType; import org.apache.dolphinscheduler.common.task.sqoop.SqoopParameters; import org.apache.dolphinscheduler.dao.entity.DataSource; +import org.apache.dolphinscheduler.server.entity.TaskExecutionContext; import org.apache.dolphinscheduler.server.worker.task.TaskProps; import org.apache.dolphinscheduler.server.worker.task.sqoop.generator.SqoopJobGenerator; import org.apache.dolphinscheduler.service.bean.SpringApplicationContext; @@ -58,16 +59,14 @@ public class SqoopTaskTest { Mockito.when(applicationContext.getBean(ProcessService.class)).thenReturn(processService); TaskProps props = new TaskProps(); - props.setTaskDir("/tmp"); props.setTaskAppId(String.valueOf(System.currentTimeMillis())); - props.setTaskInstId(1); props.setTenantCode("1"); props.setEnvFile(".dolphinscheduler_env.sh"); props.setTaskStartTime(new Date()); props.setTaskTimeout(0); props.setTaskParams("{\"concurrency\":1,\"modelType\":\"import\",\"sourceType\":\"MYSQL\",\"targetType\":\"HIVE\",\"sourceParams\":\"{\\\"srcDatasource\\\":2,\\\"srcTable\\\":\\\"person_2\\\",\\\"srcQueryType\\\":\\\"1\\\",\\\"srcQuerySql\\\":\\\"SELECT * FROM person_2\\\",\\\"srcColumnType\\\":\\\"0\\\",\\\"srcColumns\\\":\\\"\\\",\\\"srcConditionList\\\":[],\\\"mapColumnHive\\\":[],\\\"mapColumnJava\\\":[{\\\"prop\\\":\\\"id\\\",\\\"direct\\\":\\\"IN\\\",\\\"type\\\":\\\"VARCHAR\\\",\\\"value\\\":\\\"Integer\\\"}]}\",\"targetParams\":\"{\\\"hiveDatabase\\\":\\\"stg\\\",\\\"hiveTable\\\":\\\"person_internal_2\\\",\\\"createHiveTable\\\":true,\\\"dropDelimiter\\\":false,\\\"hiveOverWrite\\\":true,\\\"replaceDelimiter\\\":\\\"\\\",\\\"hivePartitionKey\\\":\\\"date\\\",\\\"hivePartitionValue\\\":\\\"2020-02-16\\\"}\",\"localParams\":[]}"); - sqoopTask = new SqoopTask(props,logger); + sqoopTask = new SqoopTask(new TaskExecutionContext(),logger); sqoopTask.init(); } diff --git a/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/queue/BaseTaskQueueTest.java b/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/queue/BaseTaskQueueTest.java deleted file mode 100644 index 17e2ae4056..0000000000 --- a/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/queue/BaseTaskQueueTest.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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.service.queue; - -import org.apache.dolphinscheduler.service.queue.ITaskQueue; -import org.apache.dolphinscheduler.service.queue.TaskQueueFactory; -import org.apache.dolphinscheduler.service.zk.ZKServer; -import org.junit.*; - -/** - * base task queue test for only start zk server once - */ -@Ignore -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(); - } - @Test - public void tasksQueueNotNull(){ - Assert.assertNotNull(tasksQueue); - } -} diff --git a/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/queue/TaskQueueZKImplTest.java b/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/queue/TaskQueueZKImplTest.java deleted file mode 100644 index a630c494c5..0000000000 --- a/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/queue/TaskQueueZKImplTest.java +++ /dev/null @@ -1,229 +0,0 @@ -/* - * 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.service.queue; - -import org.apache.dolphinscheduler.common.Constants; -import org.apache.dolphinscheduler.common.utils.IpUtils; -import org.apache.dolphinscheduler.common.utils.OSUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -import java.util.List; -import java.util.Random; - -import static org.junit.Assert.*; - -/** - * task queue test - */ -@Ignore -public class TaskQueueZKImplTest extends BaseTaskQueueTest { - - @Before - public void before(){ - - //clear all data - tasksQueue.delete(); - } - - @After - public void after(){ - //clear all data - tasksQueue.delete(); - } - - /** - * test take out all the elements - */ - @Test - public void getAllTasks(){ - - //add - init(); - // get all - List allTasks = tasksQueue.getAllTasks(Constants.DOLPHINSCHEDULER_TASKS_QUEUE); - assertEquals(2, allTasks.size()); - //delete all - tasksQueue.delete(); - allTasks = tasksQueue.getAllTasks(Constants.DOLPHINSCHEDULER_TASKS_QUEUE); - assertEquals(0, allTasks.size()); - } - @Test - public void hasTask(){ - init(); - boolean hasTask = tasksQueue.hasTask(Constants.DOLPHINSCHEDULER_TASKS_QUEUE); - assertTrue(hasTask); - //delete all - tasksQueue.delete(); - hasTask = tasksQueue.hasTask(Constants.DOLPHINSCHEDULER_TASKS_QUEUE); - assertFalse(hasTask); - } - /** - * test check task exists in the task queue or not - */ - @Test - public void checkTaskExists(){ - - String task= "1_0_1_1_-1"; - //add - init(); - // check Exist true - boolean taskExists = tasksQueue.checkTaskExists(Constants.DOLPHINSCHEDULER_TASKS_QUEUE, task); - assertTrue(taskExists); - - //remove task - tasksQueue.removeNode(Constants.DOLPHINSCHEDULER_TASKS_QUEUE,task); - // check Exist false - taskExists = tasksQueue.checkTaskExists(Constants.DOLPHINSCHEDULER_TASKS_QUEUE, task); - assertFalse(taskExists); - } - - /** - * test add element to the queue - */ - @Test - public void add(){ - - //add - tasksQueue.add(Constants.DOLPHINSCHEDULER_TASKS_QUEUE,"1_0_1_1_-1"); - tasksQueue.add(Constants.DOLPHINSCHEDULER_TASKS_QUEUE,"0_1_1_1_-1"); - tasksQueue.add(Constants.DOLPHINSCHEDULER_TASKS_QUEUE,"0_0_0_1_" + IpUtils.ipToLong(OSUtils.getHost())); - tasksQueue.add(Constants.DOLPHINSCHEDULER_TASKS_QUEUE,"1_2_1_1_" + IpUtils.ipToLong(OSUtils.getHost()) + 10); - - List tasks = tasksQueue.poll(Constants.DOLPHINSCHEDULER_TASKS_QUEUE, 1); - - if(tasks.size() <= 0){ - return; - } - - //pop - String node1 = tasks.get(0); - assertEquals(node1,"0_0_0_1_" + IpUtils.ipToLong(OSUtils.getHost())); - } - - /** - * test element pops out of the queue - */ - @Test - public void poll(){ - - //add - init(); - List taskList = tasksQueue.poll(Constants.DOLPHINSCHEDULER_TASKS_QUEUE, 2); - assertEquals(2, taskList.size()); - - assertEquals("0_1_1_1_-1", taskList.get(0)); - assertEquals("1_0_1_1_-1", taskList.get(1)); - } - - /** - * test remove element from queue - */ - @Test - public void removeNode(){ - String task = "1_0_1_1_-1"; - //add - init(); - tasksQueue.removeNode(Constants.DOLPHINSCHEDULER_TASKS_QUEUE,task); - assertFalse(tasksQueue.checkTaskExists(Constants.DOLPHINSCHEDULER_TASKS_QUEUE,task)); - } - - /** - * test add an element to the set - */ - @Test - public void sadd(){ - - String task = "1_0_1_1_-1"; - tasksQueue.sadd(Constants.DOLPHINSCHEDULER_TASKS_QUEUE,task); - //check size - assertEquals(1, tasksQueue.smembers(Constants.DOLPHINSCHEDULER_TASKS_QUEUE).size()); - } - - - /** - * test delete the value corresponding to the key in the set - */ - @Test - public void srem(){ - - String task = "1_0_1_1_-1"; - tasksQueue.sadd(Constants.DOLPHINSCHEDULER_TASKS_QUEUE,task); - //check size - assertEquals(1, tasksQueue.smembers(Constants.DOLPHINSCHEDULER_TASKS_QUEUE).size()); - //remove and get size - tasksQueue.srem(Constants.DOLPHINSCHEDULER_TASKS_QUEUE,task); - assertEquals(0, tasksQueue.smembers(Constants.DOLPHINSCHEDULER_TASKS_QUEUE).size()); - } - - /** - * test gets all the elements of the set based on the key - */ - @Test - public void smembers(){ - - //first init - assertEquals(0, tasksQueue.smembers(Constants.DOLPHINSCHEDULER_TASKS_QUEUE).size()); - //add - String task = "1_0_1_1_-1"; - tasksQueue.sadd(Constants.DOLPHINSCHEDULER_TASKS_QUEUE,task); - //check size - assertEquals(1, tasksQueue.smembers(Constants.DOLPHINSCHEDULER_TASKS_QUEUE).size()); - //add - task = "0_1_1_1_"; - tasksQueue.sadd(Constants.DOLPHINSCHEDULER_TASKS_QUEUE,task); - //check size - assertEquals(2, tasksQueue.smembers(Constants.DOLPHINSCHEDULER_TASKS_QUEUE).size()); - } - - - /** - * init data - */ - private void init(){ - //add - tasksQueue.add(Constants.DOLPHINSCHEDULER_TASKS_QUEUE,"1_0_1_1_-1"); - tasksQueue.add(Constants.DOLPHINSCHEDULER_TASKS_QUEUE,"0_1_1_1_-1"); - } - - - - /** - * test one million data from zookeeper queue - */ - @Ignore - @Test - public void extremeTest(){ - int total = 30 * 10000; - - for(int i = 0; i < total; i++) { - for(int j = 0; j < total; j++) { - //${processInstancePriority}_${processInstanceId}_${taskInstancePriority}_${taskId} - //format ${processInstancePriority}_${processInstanceId}_${taskInstancePriority}_${taskId} - String formatTask = String.format("%s_%d_%s_%d", i, i + 1, j, j == 0 ? 0 : j + new Random().nextInt(100)); - tasksQueue.add(Constants.DOLPHINSCHEDULER_TASKS_QUEUE, formatTask); - } - } - - String node1 = tasksQueue.poll(Constants.DOLPHINSCHEDULER_TASKS_QUEUE, 1).get(0); - assertEquals("0", node1); - - } - -} diff --git a/pom.xml b/pom.xml index 42ad315220..7a0d3978eb 100644 --- a/pom.xml +++ b/pom.xml @@ -683,53 +683,141 @@ ${maven-surefire-plugin.version} - **/common/utils/*.java - **/common/utils/process/ProcessBuilderForWin32Test.java - **/common/utils/process/ProcessEnvironmentForWin32Test.java - **/common/utils/process/ProcessImplForWin32Test.java - **/common/log/*.java - **/common/threadutils/*.java - **/common/graph/*.java - **/common/queue/*.java - **/common/task/FlinkParametersTest.java - **/common/task/SqoopParameterEntityTest.java - **/api/utils/CheckUtilsTest.java - **/api/utils/FileUtilsTest.java - **/api/utils/FourLetterWordTest.java - **/api/utils/exportprocess/DataSourceParamTest.java - **/api/utils/exportprocess/DependentParamTest.java - **/api/enums/*.java + **/alert/template/AlertTemplateFactoryTest.java + **/alert/template/impl/DefaultHTMLTemplateTest.java + **/alert/utils/EnterpriseWeChatUtilsTest.java + **/alert/utils/ExcelUtilsTest.java + **/alert/utils/FuncUtilsTest.java + **/alert/utils/JSONUtilsTest.java + **/alert/utils/MailUtilsTest.java + **/alert/utils/PropertyUtilsTest.java + **/api/controller/AccessTokenControllerTest.java + **/api/controller/AlertGroupControllerTest.java + **/api/controller/DataAnalysisControllerTest.java **/api/controller/DataSourceControllerTest.java + **/api/controller/ExecutorControllerTest.java + **/api/controller/LoggerControllerTest.java + **/api/controller/LoginControllerTest.java + **/api/controller/MonitorControllerTest.java + **/api/controller/ProcessDefinitionControllerTest.java + **/api/controller/ProcessInstanceControllerTest.java + **/api/controller/ProjectControllerTest.java + **/api/controller/QueueControllerTest.java + **/api/controller/ResourcesControllerTest.java + **/api/controller/SchedulerControllerTest.java + **/api/controller/TaskInstanceControllerTest.java + **/api/controller/TaskRecordControllerTest.java + **/api/controller/TenantControllerTest.java + **/api/controller/UsersControllerTest.java + **/api/controller/WorkerGroupControllerTest.java + **/api/dto/resources/filter/ResourceFilterTest.java + **/api/dto/resources/visitor/ResourceTreeVisitorTest.java + **/api/enums/testGetEnum.java + **/api/enums/StatusTest.java + **/api/interceptor/LoginHandlerInterceptorTest.java + **/api/security/PasswordAuthenticatorTest.java + **/api/security/SecurityConfigTest.java **/api/service/AccessTokenServiceTest.java - **/api/service/QueueServiceTest.java - **/api/service/MonitorServiceTest.java - **/api/service/SessionServiceTest.java - **/api/service/UsersServiceTest.java - **/api/service/TenantServiceTest.java - **/api/service/WorkerGroupServiceTest.java **/api/service/AlertGroupServiceTest.java - **/api/service/UserAlertGroupServiceTest.java - **/api/service/ProjectServiceTest.java - **/api/service/ProcessDefinitionServiceTest.java - **/api/service/UdfFuncServiceTest.java - **/api/service/ResourcesServiceTest.java - **/api/service/ExecutorService2Test.java - **/api/service/BaseServiceTest.java **/api/service/BaseDAGServiceTest.java - **/api/service/LoggerServiceTest.java + **/api/service/BaseServiceTest.java **/api/service/DataAnalysisServiceTest.java + **/api/service/DataSourceServiceTest.java + **/api/service/ExecutorService2Test.java + **/api/service/ExecutorServiceTest.java + **/api/service/LoggerServiceTest.java + **/api/service/MonitorServiceTest.java + **/api/service/ProcessDefinitionServiceTest.java **/api/service/ProcessInstanceServiceTest.java + **/api/service/ProjectServiceTest.java + **/api/service/QueueServiceTest.java + **/api/service/ResourcesServiceTest.java + **/api/service/SchedulerServiceTest.java + **/api/service/SessionServiceTest.java **/api/service/TaskInstanceServiceTest.java - **/alert/utils/ExcelUtilsTest.java - **/alert/utils/FuncUtilsTest.java - **/alert/utils/JSONUtilsTest.java - **/alert/utils/PropertyUtilsTest.java - **/alert/template/AlertTemplateFactoryTest.java - **/alert/template/impl/DefaultHTMLTemplateTest.java + **/api/service/TenantServiceTest.java + **/api/service/UdfFuncServiceTest.java + **/api/service/UserAlertGroupServiceTest.java + **/api/service/UsersServiceTest.java + **/api/service/WorkerGroupServiceTest.java + **/api/utils/exportprocess/DataSourceParamTest.java + **/api/utils/exportprocess/DependentParamTest.java + **/api/utils/CheckUtilsTest.java + **/api/utils/FileUtilsTest.java + **/api/utils/FourLetterWordMainTest.java + **/api/utils/ZookeeperMonitorUtilsTest.java + **/api/utils/CheckUtilsTest.java + **/api/utils/CheckUtilsTest.java + **/api/HttpClientTest.java + **/common/graph/DAGTest.java + **/common/os/OshiTest.java + **/common/os/OSUtilsTest.java + **/common/shell/ShellExecutorTest.java + **/common/task/EntityTestUtils.java + **/common/task/FlinkParametersTest.java + **/common/task/SqoopParameterEntityTest.java + **/common/threadutils/ThreadPoolExecutorsTest.java + **/common/threadutils/ThreadUtilsTest.java + **/common/utils/placeholder/TimePlaceholderUtilsTest.java + **/common/utils/process/ProcessBuilderForWin32Test.java + **/common/utils/process/ProcessEnvironmentForWin32Test.java + **/common/utils/process/ProcessImplForWin32Test.java + **/common/utils/CollectionUtilsTest.java + **/common/utils/CommonUtilsTest.java + **/common/utils/DateUtilsTest.java + **/common/utils/DependentUtilsTest.java + **/common/utils/EncryptionUtilsTest.java + **/common/utils/FileUtilsTest.java + **/common/utils/HadoopUtilsTest.java + **/common/utils/IpUtilsTest.java + **/common/utils/JSONUtilsTest.java + **/common/utils/LoggerUtilsTest.java + **/common/utils/OSUtilsTest.java + **/common/utils/ParameterUtilsTest.java + **/common/utils/PreconditionsTest.java + **/common/utils/PropertyUtilsTest.java + **/common/utils/SchemaUtilsTest.java + **/common/utils/ScriptRunnerTest.java + **/common/utils/SensitiveLogUtilsTest.java + **/common/utils/StringTest.java + **/common/utils/StringUtilsTest.java + **/common/utils/TaskParametersUtilsTest.java + **/common/ConstantsTest.java + + + + + **/dao/mapper/AccessTokenMapperTest.java **/dao/mapper/AlertGroupMapperTest.java **/dao/mapper/AlertMapperTest.java + **/dao/mapper/CommandMapperTest.java + **/dao/mapper/ConnectionFactoryTest.java **/dao/mapper/DataSourceMapperTest.java + **/dao/mapper/DataSourceUserMapperTest.java + **/dao/mapper/ErrorCommandMapperTest.java + **/dao/mapper/ProcessDefinitionMapperTest.java + **/dao/mapper/ProcessInstanceMapMapperTest.java + **/dao/mapper/ProcessInstanceMapperTest.java + **/dao/mapper/ProjectMapperTest.java + **/dao/mapper/ProjectUserMapperTest.java + **/dao/mapper/QueueMapperTest.java + **/dao/mapper/ResourceMapperTest.java + **/dao/mapper/ResourceUserMapperTest.java + **/dao/mapper/ScheduleMapperTest.java + **/dao/mapper/SessionMapperTest.java + **/dao/mapper/TaskInstanceMapperTest.java + **/dao/mapper/TenantMapperTest.java + **/dao/mapper/UdfFuncMapperTest.java + **/dao/mapper/UDFUserMapperTest.java + **/dao/mapper/UserAlertGroupMapperTest.java + **/dao/mapper/UserMapperTest.java + **/dao/mapper/WorkerGroupMapperTest.java + **/dao/utils/DagHelperTest.java + **/dao/AlertDaoTest.java + **/remote/FastJsonSerializerTest.java + **/remote/NettyRemotingClientTest.java + **/remote/ResponseFutureTest.java **/server/log/MasterLogFilterTest.java **/server/log/SensitiveDataConverterTest.java **/server/log/TaskLogDiscriminatorTest.java @@ -761,20 +849,16 @@ **/server/worker/task/dependent/DependentTaskTest.java **/server/worker/task/spark/SparkTaskTest.java **/server/worker/task/EnvFileTest.java - **/dao/mapper/CommandMapperTest.java - **/dao/entity/TaskInstanceTest.java - **/dao/cron/CronUtilsTest.java - **/dao/utils/DagHelperTest.java - **/alert/template/AlertTemplateFactoryTest.java - **/alert/template/impl/DefaultHTMLTemplateTest.java **/server/worker/task/datax/DataxTaskTest.java + **/server/worker/task/dependent/DependentTaskTest.java **/server/worker/task/shell/ShellTaskTest.java + **/server/worker/task/spark/SparkTaskTest.java **/server/worker/task/sqoop/SqoopTaskTest.java - **/server/utils/DataxUtilsTest.java + **/server/worker/EnvFileTest.java + **/service/quartz/cron/CronUtilsTest.java **/service/zk/DefaultEnsembleProviderTest.java - **/dao/datasource/BaseDataSourceTest.java - **/alert/utils/MailUtilsTest.java - **/dao/AlertDaoTest.java + **/service/zk/ZKServerTest.java + **/service/queue/TaskUpdateQueueTest.java -Xmx2048m