[Improvement-16725][Master] Add more workflow Integration test cases in master.

dolphinscheduler-api/src/main/resources/application.yaml

@@ -32,7 +32,7 @@ server:
 
 spring:
   profiles:
-    active: postgresql
+    active: mysql
   banner:
     charset: UTF-8
   jackson:
@@ -45,12 +45,12 @@ spring:
   messages:
     basename: i18n/messages
   datasource:
-    driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
-    username: root
-    password: root
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    username: dolphinscheduler_user
+    password: StrongPassword123!
     hikari:
-      connection-test-query: select 1
+      connection-test-query: SELECT 1
       pool-name: DolphinScheduler
   quartz:
     auto-startup: false
@@ -68,14 +68,20 @@ spring:
       org.quartz.jobStore.useProperties: false
       org.quartz.jobStore.misfireThreshold: 60000
       org.quartz.scheduler.makeSchedulerThreadDaemon: true
-      org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
+      # Set this to MySQLDelegate if using MySQL
+      org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
       org.quartz.jobStore.clusterCheckinInterval: 5000
       org.quartz.scheduler.batchTriggerAcquisitionMaxCount: 1
   mvc:
     pathmatch:
       matching-strategy: ANT_PATH_MATCHER
     static-path-pattern: /static/**
-  cloud.discovery.client.composite-indicator.enabled: false
+  cloud:
+    discovery:
+      client:
+        composite-indicator:
+          enabled: false
+
 
 springdoc:
   swagger-ui:
@@ -235,15 +241,15 @@ casdoor:
 # Override by profile
 
 ---
-spring:
-  config:
-    activate:
-      on-profile: mysql
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler
-    username: root
-    password: root
-  quartz:
-    properties:
-      org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+#spring:
+#  config:
+#    activate:
+#      on-profile: mysql
+#  datasource:
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+#    url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8
+#    username: dolphinscheduler_user
+#    password: StrongPassword123!
+#  quartz:
+#    properties:
+#      org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate

dolphinscheduler-dao-plugin/dolphinscheduler-dao-mysql/pom.xml

@@ -35,6 +35,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/runnable/WorkflowExecutionRunnable.java

@@ -30,13 +30,12 @@
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
+@Getter
 @Slf4j
 public class WorkflowExecutionRunnable implements IWorkflowExecutionRunnable {
 
-    @Getter
     private final IWorkflowExecuteContext workflowExecuteContext;
 
-    @Getter
     private final List<IWorkflowLifecycleListener> workflowInstanceLifecycleListeners;
 
     public WorkflowExecutionRunnable(WorkflowExecutionRunnableBuilder workflowExecutionRunnableBuilder) {

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/switchtask/SwitchLogicTask.java

@@ -56,6 +56,7 @@ public SwitchLogicTask(IWorkflowExecutionRunnable workflowExecutionRunnable,
                 taskExecutionContext,
                 JSONUtils.parseObject(taskExecutionContext.getTaskParams(), new TypeReference<SwitchParameters>() {
                 }));
+
         this.workflowExecutionRunnable = workflowExecutionRunnable;
         this.taskInstance = workflowExecutionRunnable
                 .getWorkflowExecuteContext()

dolphinscheduler-master/src/main/resources/application.yaml

@@ -16,19 +16,19 @@
 #
 spring:
   profiles:
-    active: postgresql
+    active: mysql
   banner:
     charset: UTF-8
   jackson:
     time-zone: UTC
     date-format: "yyyy-MM-dd HH:mm:ss"
   datasource:
-    driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
-    username: root
-    password: root
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    username: dolphinscheduler_user
+    password: StrongPassword123!
     hikari:
-      connection-test-query: select 1
+      connection-test-query: SELECT 1
       pool-name: DolphinScheduler
   quartz:
     job-store-type: jdbc
@@ -49,7 +49,8 @@ spring:
       org.quartz.jobStore.misfireThreshold: 60000
       org.quartz.scheduler.batchTriggerAcquisitionMaxCount: 1
       org.quartz.scheduler.makeSchedulerThreadDaemon: true
-      org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
+      # Use StdJDBCDelegate for MySQL
+      org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
       org.quartz.jobStore.clusterCheckinInterval: 5000
   cloud.discovery.client.composite-indicator.enabled: false
 
@@ -149,15 +150,15 @@ metrics:
 # Override by profile
 
 ---
-spring:
-  config:
-    activate:
-      on-profile: mysql
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler
-    username: root
-    password: root
-  quartz:
-    properties:
-      org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+#spring:
+#  config:
+#    activate:
+#      on-profile: mysql
+#  datasource:
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+#    url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8
+#    username: dolphinscheduler_user
+#    password: StrongPassword123!
+#  quartz:
+#    properties:
+#      org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate

dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/runner/task/switchtask/SwitchLogicTaskTest.java

@@ -0,0 +1,140 @@
+package org.apache.dolphinscheduler.server.master.runner.task.switchtask;
+
+import org.apache.dolphinscheduler.dao.entity.TaskInstance;
+
+import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext;
+import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus;
+import org.apache.dolphinscheduler.plugin.task.api.model.Property;
+import org.apache.dolphinscheduler.plugin.task.api.model.SwitchResultVo;
+import org.apache.dolphinscheduler.plugin.task.api.parameters.SwitchParameters;
+import org.apache.dolphinscheduler.server.master.engine.graph.IWorkflowExecutionGraph;
+import org.apache.dolphinscheduler.server.master.engine.graph.IWorkflowGraph;
+import org.apache.dolphinscheduler.server.master.engine.task.runnable.ITaskExecutionRunnable;
+import org.apache.dolphinscheduler.server.master.engine.workflow.runnable.IWorkflowExecutionRunnable;
+import org.apache.dolphinscheduler.server.master.engine.workflow.runnable.WorkflowExecutionRunnable;
+import org.apache.dolphinscheduler.server.master.exception.MasterTaskExecuteException;
+import org.apache.dolphinscheduler.server.master.runner.IWorkflowExecuteContext;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.then;
+import static org.mockito.Mockito.*;
+
+class SwitchLogicTaskTest {
+
+    @Mock
+    private TaskExecutionContext taskExecutionContext;
+
+    @Mock
+    private IWorkflowGraph workflowGraph;
+
+    @Mock
+    private IWorkflowExecutionRunnable workflowExecutionRunnable;
+
+    private SwitchLogicTask switchLogicTask;
+
+    private SwitchParameters switchParameters;
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.openMocks(this);
+
+        // Mocking WorkflowExecutionContext and Graph
+        IWorkflowExecuteContext mockContext = mock(IWorkflowExecuteContext.class);
+        IWorkflowExecutionGraph mockGraph = mock(IWorkflowExecutionGraph.class);
+        given(mockContext.getWorkflowExecutionGraph()).willReturn(mockGraph);
+
+        workflowExecutionRunnable = mock(WorkflowExecutionRunnable.class);
+        given(workflowExecutionRunnable.getWorkflowExecuteContext()).willReturn(mockContext);
+
+        // Initializing taskExecutionContext and setting expected behaviors
+        taskExecutionContext = mock(TaskExecutionContext.class);
+        given(taskExecutionContext.getTaskParams()).willReturn("{}");
+        given(taskExecutionContext.getPrepareParamsMap()).willReturn(new HashMap<>());
+
+        // Mocking task execution runnable and task instance
+        ITaskExecutionRunnable mockTaskExecutionRunnable = mock(ITaskExecutionRunnable.class);
+        TaskInstance mockTaskInstance = mock(TaskInstance.class);
+        given(mockTaskExecutionRunnable.getTaskInstance()).willReturn(mockTaskInstance);
+        given(mockGraph.getTaskExecutionRunnableById(anyInt())).willReturn(mockTaskExecutionRunnable);
+
+        // Mock SwitchParameters and set up a basic SwitchResult
+        switchParameters = mock(SwitchParameters.class);
+        List<SwitchResultVo> switchResultVoList = new ArrayList<>();
+        switchResultVoList.add(new SwitchResultVo("someCondition", 123L));
+        SwitchParameters.SwitchResult switchResult = new SwitchParameters.SwitchResult(switchResultVoList, 999L);
+        given(switchParameters.getSwitchResult()).willReturn(switchResult);
+
+        // Initializing the SwitchLogicTask
+        switchLogicTask = new SwitchLogicTask(workflowExecutionRunnable, taskExecutionContext);
+//        switchLogicTask.setSwitchParameters(switchParameters);  // Ensure switchParameters is set
+    }
+
+
+    @Test
+    void testHandle_ShouldReturnSuccess_WhenConditionMatches() throws MasterTaskExecuteException {
+        // Given
+        List<SwitchResultVo> switchResultVoList = new ArrayList<>();
+        SwitchResultVo switchResultVo = new SwitchResultVo("true", 123L);
+        switchResultVoList.add(switchResultVo);
+        switchParameters.setSwitchResult(new SwitchParameters.SwitchResult(switchResultVoList, 999L));
+
+        Map<String, Property> globalParams = new HashMap<>();
+        given(taskExecutionContext.getPrepareParamsMap()).willReturn(globalParams);
+
+        // When
+        switchLogicTask.handle();
+
+        // Then
+        then(taskExecutionContext).should().setCurrentExecutionStatus(TaskExecutionStatus.SUCCESS);
+    }
+
+    @Test
+    void testHandle_DefaultBranch_WhenNoConditionMatches() throws MasterTaskExecuteException {
+        // Given
+        List<SwitchResultVo> switchResultVoList = new ArrayList<>();
+        SwitchResultVo switchResultVo = new SwitchResultVo("false", 123L);
+        switchResultVoList.add(switchResultVo);
+        switchParameters.setSwitchResult(new SwitchParameters.SwitchResult(switchResultVoList, 999L));
+
+        // When
+        switchLogicTask.handle();
+
+        // Then
+        then(taskExecutionContext).should().setCurrentExecutionStatus(TaskExecutionStatus.SUCCESS);
+        assertThat(switchParameters.getNextBranch()).isEqualTo(999L); // Default branch should be selected
+    }
+
+//    @Test
+//    void testHandle_ThrowsException_WhenBranchDoesNotExist() {
+//        // Given
+//        given(workflowGraph.getTaskNodeByCode(anyLong())).willReturn(null);
+//
+//        // When/Then
+//        assertThatThrownBy(() -> switchLogicTask.handle())
+//                .isInstanceOf(MasterTaskExecuteException.class)
+//                .hasMessageContaining("please check the switch task configuration");
+//    }
+//
+//    @Test
+//    void testHandle_ThrowsException_WhenDefaultBranchIsMissing() {
+//        // Given
+//        switchParameters.setSwitchResult(new SwitchParameters.SwitchResult(new ArrayList<>(), null));
+//
+//        // When/Then
+//        assertThatThrownBy(() -> switchLogicTask.handle())
+//                .isInstanceOf(IllegalArgumentException.class)
+//                .hasMessageContaining("please check the switch task configuration");
+//    }
+}

dolphinscheduler-standalone-server/src/main/resources/application.yaml

@@ -17,7 +17,7 @@
 
 spring:
   profiles:
-    active: h2
+    active: mysql
   jackson:
     time-zone: UTC
     date-format: "yyyy-MM-dd HH:mm:ss"
@@ -26,12 +26,12 @@ spring:
     location: classpath:standalone-banner.txt
   sql:
     init:
-      schema-locations: classpath:sql/dolphinscheduler_h2.sql
+      schema-locations: classpath:sql/dolphinscheduler_mysql.sql
   datasource:
-      driver-class-name: org.h2.Driver
-      url: jdbc:h2:mem:dolphinscheduler;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true
-      username: sa
-      password: ""
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    username: dolphinscheduler_user
+    password: StrongPassword123!
   quartz:
     job-store-type: jdbc
     jdbc:

pom.xml

@@ -308,11 +308,11 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.dolphinscheduler</groupId>
-                <artifactId>dolphinscheduler-dao-h2</artifactId>
-                <version>${project.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>org.apache.dolphinscheduler</groupId>-->
+<!--                <artifactId>dolphinscheduler-dao-h2</artifactId>-->
+<!--                <version>${project.version}</version>-->
+<!--            </dependency>-->
 
             <dependency>
                 <groupId>org.apache.dolphinscheduler</groupId>