add ut

dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/shell/ShellTaskTest.java

@@ -14,227 +14,101 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.dolphinscheduler.server.worker.task.shell;
 
-import org.apache.dolphinscheduler.common.enums.CommandType;
+import static org.mockito.ArgumentMatchers.anyString;
-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.CommandExecuteResult;
 import org.apache.dolphinscheduler.server.worker.task.ShellCommandExecutor;
-import org.apache.dolphinscheduler.server.worker.task.TaskProps;
+
-import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
+import java.nio.file.Files;
-import org.apache.dolphinscheduler.service.process.ProcessService;
+import java.nio.file.Paths;
-import org.junit.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Before;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.context.ApplicationContext;
-
-import java.util.Date;
 
 /**
- *  shell task test
+ * shell task test.
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest(OSUtils.class)
+@PrepareForTest({ShellTask.class})
-@PowerMockIgnore({"javax.management.*"})
 public class ShellTaskTest {
 
     private static final Logger logger = LoggerFactory.getLogger(ShellTaskTest.class);
 
     private ShellTask shellTask;
-
-    private ProcessService processService;
-
     private ShellCommandExecutor shellCommandExecutor;
-
-    private ApplicationContext applicationContext;
     private TaskExecutionContext taskExecutionContext;
+    private CommandExecuteResult commandExecuteResult;
 
     @Before
     public void before() throws Exception {
-        taskExecutionContext = new TaskExecutionContext();
+        System.setProperty("log4j2.disable.jmx", Boolean.TRUE.toString());
-
-        PowerMockito.mockStatic(OSUtils.class);
-        processService = PowerMockito.mock(ProcessService.class);
         shellCommandExecutor = PowerMockito.mock(ShellCommandExecutor.class);
-
+        PowerMockito.whenNew(ShellCommandExecutor.class).withAnyArguments().thenReturn(shellCommandExecutor);
-        applicationContext = PowerMockito.mock(ApplicationContext.class);
+        taskExecutionContext = new TaskExecutionContext();
-        SpringApplicationContext springApplicationContext = new SpringApplicationContext();
+        taskExecutionContext.setTaskInstanceId(1);
-        springApplicationContext.setApplicationContext(applicationContext);
+        taskExecutionContext.setTaskName("kris test");
-        PowerMockito.when(applicationContext.getBean(ProcessService.class)).thenReturn(processService);
+        taskExecutionContext.setTaskType("SHELL");
-
+        taskExecutionContext.setHost("127.0.0.1:1234");
-        TaskProps props = new TaskProps();
+        taskExecutionContext.setExecutePath("/tmp");
-        props.setTaskAppId(String.valueOf(System.currentTimeMillis()));
+        taskExecutionContext.setLogPath("/log");
-        props.setTenantCode("1");
+        taskExecutionContext.setTaskJson(
-        props.setEnvFile(".dolphinscheduler_env.sh");
+            "{\"conditionResult\":\"{\\\"successNode\\\":[\\\"\\\"],\\\"failedNode\\\":[\\\"\\\"]}\",\"conditionsTask\":false,\"depList\":[],\"dependence\":\"{}\",\"forbidden\":false,\"id\":\""
-        props.setTaskStartTime(new Date());
+                +
-        props.setTaskTimeout(0);
+                "tasks-16849\",\"maxRetryTimes\":0,\"name\":\"shell test 001\",\"params\":\"{\\\"rawScript\\\":\\\"#!/bin/sh\\\\necho $[yyyy-MM-dd HH:mm:ss +3]\\\\necho \\\\\\\" ?? "
-        props.setTaskParams("{\"rawScript\": \" echo 'hello world!'\"}");
+                + "${time1} \\\\\\\"\\\\necho \\\\\\\" ????? ${time2}\\\\\\\"\\\\n\\\",\\\"localParams\\\":[{\\\"prop\\\":\\\"time1\\\",\\\"direct\\\":\\\"IN\\\",\\\"type\\\":"
-        shellTask = new ShellTask(taskExecutionContext, logger);
+                + "\\\"VARCHAR\\\",\\\"value\\\":\\\"$[yyyy-MM-dd HH:mm:ss]\\\"},{\\\"prop\\\":\\\"time2\\\",\\\"direct\\\":\\\"IN\\\",\\\"type\\\":\\\"VARCHAR\\\",\\\"value\\\":\\\"${time_gb}\\\"}"
-        shellTask.init();
+                + "],\\\"resourceList\\\":[]}\",\"preTasks\":\"[]\",\"retryInterval\":1,\"runFlag\":\"NORMAL\",\"taskInstancePriority\":\"MEDIUM\",\"taskTimeoutParameter\":"
-
+                + "{\"enable\":false,\"interval\":0},\"timeout\":\"{\\\"enable\\\":false,\\\"strategy\\\":\\\"\\\"}\",\"type\":\"SHELL\",\"workerGroup\":\"default\"}");
-        PowerMockito.when(processService.findDataSourceById(1)).thenReturn(getDataSource());
+        taskExecutionContext.setProcessInstanceId(1);
-        PowerMockito.when(processService.findDataSourceById(2)).thenReturn(getDataSource());
+        taskExecutionContext.setGlobalParams("[{\"direct\":\"IN\",\"prop\":\"time_gb\",\"type\":\"VARCHAR\",\"value\":\"2020-12-16 17:18:33\"}]");
-        PowerMockito.when(processService.findProcessInstanceByTaskId(1)).thenReturn(getProcessInstance());
+        taskExecutionContext.setExecutorId(1);
-
+        taskExecutionContext.setCmdTypeIfComplement(5);
-        String fileName = String.format("%s/%s_node.%s", taskExecutionContext.getExecutePath(),
+        taskExecutionContext.setTenantCode("roo");
-                props.getTaskAppId(), OSUtils.isWindows() ? "bat" : "sh");
+        taskExecutionContext.setScheduleTime(new Date());
-        PowerMockito.when(shellCommandExecutor.run("")).thenReturn(null);
+        taskExecutionContext.setQueue("default");
-    }
+        taskExecutionContext.setTaskParams(
-
+            "{\"rawScript\":\"#!/bin/sh\\necho $[yyyy-MM-dd HH:mm:ss +3]\\necho \\\" ?? ${time1} \\\"\\necho \\\" ????? ${time2}\\\"\\n\",\"localParams\":"
-    private DataSource getDataSource() {
+                +
-        DataSource dataSource = new DataSource();
+                "[{\"prop\":\"time1\",\"direct\":\"IN\",\"type\":\"VARCHAR\",\"value\":\"$[yyyy-MM-dd HH:mm:ss]\"},{\"prop\":\"time2\",\"direct\":\"IN\",\"type\":\"VARCHAR"
-        dataSource.setType(DbType.MYSQL);
+                + "\",\"value\":\"${time_gb}\"}],\"resourceList\":[]}");
-        dataSource.setConnectionParams(
+        Map<String, String> definedParams = new HashMap<>();
-                "{\"user\":\"root\",\"password\":\"123456\",\"address\":\"jdbc:mysql://127.0.0.1:3306\",\"database\":\"test\",\"jdbcUrl\":\"jdbc:mysql://127.0.0.1:3306/test\"}");
+        definedParams.put("time_gb", "2020-12-16 00:00:00");
-        dataSource.setUserId(1);
+        taskExecutionContext.setDefinedParams(definedParams);
-        return dataSource;
+        PowerMockito.mockStatic(Files.class);
-    }
+        PowerMockito.when(Files.exists(Paths.get(anyString()))).thenReturn(true);
-
+        commandExecuteResult = new CommandExecuteResult();
-    private ProcessInstance getProcessInstance() {
+        commandExecuteResult.setAppIds("appId");
-        ProcessInstance processInstance = new ProcessInstance();
+        commandExecuteResult.setExitStatusCode(0);
-        processInstance.setCommandType(CommandType.START_PROCESS);
+        commandExecuteResult.setProcessId(1);
-        processInstance.setScheduleTime(new Date());
-        return processInstance;
-    }
-
-    @After
-    public void after() {}
-
-    /**
-     * Method: ShellTask()
-     */
-    @Test
-    public void testShellTask()
-            throws Exception {
-        TaskProps props = new TaskProps();
-        props.setTaskAppId(String.valueOf(System.currentTimeMillis()));
-        props.setTenantCode("1");
-        ShellTask shellTaskTest = new ShellTask(taskExecutionContext, logger);
-        Assert.assertNotNull(shellTaskTest);
-    }
-
-    /**
-     * Method: init for Unix-like
-     */
-    @Test
-    public void testInitForUnix() {
-        try {
-            PowerMockito.when(OSUtils.isWindows()).thenReturn(false);
-            shellTask.init();
-            Assert.assertTrue(true);
-        } catch (Error | Exception e) {
-            logger.error(e.getMessage());
-        }
     }
 
     @Test
-    public void testInitException() {
+    public void testComplementData() throws Exception {
-        TaskProps props = new TaskProps();
+        shellTask = new ShellTask(taskExecutionContext, logger);
-        props.setTaskAppId(String.valueOf(System.currentTimeMillis()));
-        props.setTenantCode("1");
-        props.setEnvFile(".dolphinscheduler_env.sh");
-        props.setTaskStartTime(new Date());
-        props.setTaskTimeout(0);
-        props.setTaskParams("{\"rawScript\": \"\"}");
-        ShellTask shellTask = new ShellTask(taskExecutionContext, logger);
-        try {
         shellTask.init();
-        } catch (Exception e) {
+        PowerMockito.when(shellCommandExecutor.run(anyString())).thenReturn(commandExecuteResult);
-            logger.info(e.getMessage(), e);
+        shellTask.handle();
-            if (e.getMessage().contains("shell task params is not valid")) {
-                Assert.assertTrue(true);
-            }
-        }
     }
 
-    /**
-     * Method: init for Windows
-     */
     @Test
-    public void testInitForWindows() {
+    public void testStartProcess() throws Exception {
-        try {
+        taskExecutionContext.setCmdTypeIfComplement(0);
-            PowerMockito.when(OSUtils.isWindows()).thenReturn(true);
+        shellTask = new ShellTask(taskExecutionContext, logger);
         shellTask.init();
-            Assert.assertTrue(true);
+        PowerMockito.when(shellCommandExecutor.run(anyString())).thenReturn(commandExecuteResult);
-        } catch (Error | Exception e) {
+        shellTask.handle();
-            logger.error(e.getMessage());
-        }
-    }
-
-    /**
-     * Method: handle() for Unix-like
-     */
-    @Test
-    public void testHandleForUnix() throws Exception {
-        try {
-            PowerMockito.when(OSUtils.isWindows()).thenReturn(false);
-            TaskProps props = new TaskProps();
-            props.setTaskAppId(String.valueOf(System.currentTimeMillis()));
-            props.setTenantCode("1");
-            props.setEnvFile(".dolphinscheduler_env.sh");
-            props.setTaskStartTime(new Date());
-            props.setTaskTimeout(0);
-            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(taskExecutionContext, logger);
-            shellTask1.init();
-            shellTask1.handle();
-            Assert.assertTrue(true);
-        } catch (Error | Exception e) {
-            if (!e.getMessage().contains("process error . exitCode is :  -1")
-                    && !System.getProperty("os.name").startsWith("Windows")) {
-                logger.error(e.getMessage());
     }
 }
-    }
-
-    /**
-     * Method: handle() for Windows
-     */
-    @Test
-    public void testHandleForWindows() throws Exception {
-        try {
-            Assume.assumeTrue(OSUtils.isWindows());
-            TaskProps props = new TaskProps();
-            props.setTaskAppId(String.valueOf(System.currentTimeMillis()));
-            props.setTenantCode("1");
-            props.setEnvFile(".dolphinscheduler_env.sh");
-            props.setTaskStartTime(new Date());
-            props.setTaskTimeout(0);
-            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(taskExecutionContext, logger);
-            shellTask1.init();
-            shellTask1.handle();
-            Assert.assertTrue(true);
-        } catch (Error | Exception e) {
-            if (!e.getMessage().contains("process error . exitCode is :  -1")) {
-                logger.error(e.getMessage());
-            }
-        }
-    }
-
-    /**
-     * Method: cancelApplication()
-     */
-    @Test
-    public void testCancelApplication() throws Exception {
-        try {
-            shellTask.cancelApplication(true);
-            Assert.assertTrue(true);
-        } catch (Error | Exception e) {
-            logger.error(e.getMessage());
-        }
-    }
-
-}

pom.xml

@@ -853,6 +853,7 @@
                         <!--<include>**/server/worker/task/datax/DataxTaskTest.java</include>-->
                         <!--<include>**/server/worker/task/http/HttpTaskTest.java</include>-->
                         <include>**/server/worker/task/sqoop/SqoopTaskTest.java</include>
+                        <include>**/server/worker/task/shell/ShellTaskTest.java</include>
                         <include>**/server/worker/task/TaskManagerTest.java</include>
                         <include>**/server/worker/EnvFileTest.java</include>
                         <include>**/server/worker/runner/TaskExecuteThreadTest.java</include>