bug #I4QOP6 when超时时抛出的错是NPT

liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/whenTimeOut/WhenTimeOutSpringbootTest1.java

@@ -0,0 +1,45 @@
+package com.yomahub.liteflow.test.whenTimeOut;
+
+import com.yomahub.liteflow.core.FlowExecutor;
+import com.yomahub.liteflow.entity.data.DefaultSlot;
+import com.yomahub.liteflow.entity.data.LiteflowResponse;
+import com.yomahub.liteflow.exception.WhenTimeoutException;
+import com.yomahub.liteflow.test.BaseTest;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.annotation.Resource;
+
+/**
+ * springboot环境下异步线程超时日志打印测试
+ * @author Bryan.Zhang
+ * @since 2.6.4
+ */
+@RunWith(SpringRunner.class)
+@TestPropertySource(value = "classpath:/whenTimeOut/application1.properties")
+@SpringBootTest(classes = WhenTimeOutSpringbootTest1.class)
+@EnableAutoConfiguration
+@ComponentScan({"com.yomahub.liteflow.test.whenTimeOut.cmp"})
+public class WhenTimeOutSpringbootTest1 extends BaseTest {
+
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Resource
+    private FlowExecutor flowExecutor;
+
+    //其中b和c在when情况下超时，所以抛出了WhenTimeoutException这个错
+    @Test
+    public void testWhenTimeOut() throws Exception{
+        LiteflowResponse<DefaultSlot> response = flowExecutor.execute2Resp("chain1", "arg");
+        Assert.assertFalse(response.isSuccess());
+        Assert.assertEquals(WhenTimeoutException.class, response.getCause().getClass());
+    }
+}

liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/whenTimeOut/WhenTimeOutSpringbootTest2.java

@@ -1,9 +1,9 @@
 package com.yomahub.liteflow.test.whenTimeOut;
 
 import com.yomahub.liteflow.core.FlowExecutor;
-import com.yomahub.liteflow.core.NodeComponent;
 import com.yomahub.liteflow.entity.data.DefaultSlot;
 import com.yomahub.liteflow.entity.data.LiteflowResponse;
+import com.yomahub.liteflow.exception.WhenTimeoutException;
 import com.yomahub.liteflow.test.BaseTest;
 import org.junit.Assert;
 import org.junit.Test;
@@ -24,23 +24,21 @@ import javax.annotation.Resource;
  * @since 2.6.4
  */
 @RunWith(SpringRunner.class)
-@TestPropertySource(value = "classpath:/whenTimeOut/application.properties")
-@SpringBootTest(classes = WhenTimeOutSpringbootTest.class)
+@TestPropertySource(value = "classpath:/whenTimeOut/application2.properties")
+@SpringBootTest(classes = WhenTimeOutSpringbootTest2.class)
 @EnableAutoConfiguration
 @ComponentScan({"com.yomahub.liteflow.test.whenTimeOut.cmp"})
-public class WhenTimeOutSpringbootTest extends BaseTest {
+public class WhenTimeOutSpringbootTest2 extends BaseTest {
 
     private final Logger log = LoggerFactory.getLogger(this.getClass());
 
     @Resource
     private FlowExecutor flowExecutor;
 
+    //其中d,e,f都sleep 4秒，其中def是不同的组，超时设置5秒
     @Test
     public void testWhenTimeOut() throws Exception{
         LiteflowResponse<DefaultSlot> response = flowExecutor.execute2Resp("chain1", "arg");
-        if (!response.isSuccess()){
-            log.error(response.getMessage(),response.getCause());
-        }
         Assert.assertTrue(response.isSuccess());
     }
 }

liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/whenTimeOut/cmp/DCmp.java

@@ -0,0 +1,26 @@
+/**
+ * <p>Title: liteflow</p>
+ * <p>Description: 轻量级的组件式流程框架</p>
+ * @author Bryan.Zhang
+ * @email weenyc31@163.com
+ * @Date 2020/4/1
+ */
+package com.yomahub.liteflow.test.whenTimeOut.cmp;
+
+import com.yomahub.liteflow.core.NodeComponent;
+import org.springframework.stereotype.Component;
+
+@Component("d")
+public class DCmp extends NodeComponent {
+
+	@Override
+	public void process() {
+		try {
+			Thread.sleep(4000);
+		}catch (Exception ignored){
+
+		}
+		System.out.println("DCmp executed!");
+	}
+
+}

liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/whenTimeOut/cmp/ECmp.java

@@ -0,0 +1,26 @@
+/**
+ * <p>Title: liteflow</p>
+ * <p>Description: 轻量级的组件式流程框架</p>
+ * @author Bryan.Zhang
+ * @email weenyc31@163.com
+ * @Date 2020/4/1
+ */
+package com.yomahub.liteflow.test.whenTimeOut.cmp;
+
+import com.yomahub.liteflow.core.NodeComponent;
+import org.springframework.stereotype.Component;
+
+@Component("e")
+public class ECmp extends NodeComponent {
+
+	@Override
+	public void process() {
+		try {
+			Thread.sleep(4000);
+		}catch (Exception ignored){
+
+		}
+		System.out.println("ECmp executed!");
+	}
+
+}

liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/whenTimeOut/cmp/FCmp.java

@@ -0,0 +1,26 @@
+/**
+ * <p>Title: liteflow</p>
+ * <p>Description: 轻量级的组件式流程框架</p>
+ * @author Bryan.Zhang
+ * @email weenyc31@163.com
+ * @Date 2020/4/1
+ */
+package com.yomahub.liteflow.test.whenTimeOut.cmp;
+
+import com.yomahub.liteflow.core.NodeComponent;
+import org.springframework.stereotype.Component;
+
+@Component("f")
+public class FCmp extends NodeComponent {
+
+	@Override
+	public void process() {
+		try {
+			Thread.sleep(4000);
+		}catch (Exception ignored){
+
+		}
+		System.out.println("FCmp executed!");
+	}
+
+}

liteflow-testcase-springboot/src/test/resources/whenTimeOut/application.properties

@@ -1,2 +0,0 @@
-liteflow.rule-source=whenTimeOut/flow.xml
-liteflow.when-max-wait-seconds=3

liteflow-testcase-springboot/src/test/resources/whenTimeOut/application1.properties

@@ -0,0 +1,2 @@
+liteflow.rule-source=whenTimeOut/flow1.xml
+liteflow.when-max-wait-seconds=3

liteflow-testcase-springboot/src/test/resources/whenTimeOut/application2.properties

@@ -0,0 +1,2 @@
+liteflow.rule-source=whenTimeOut/flow2.xml
+liteflow.when-max-wait-seconds=5

liteflow-testcase-springboot/src/test/resources/whenTimeOut/flow1.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <flow>
     <chain name="chain1">
-        <when value="a,b,c" errorResume="true"/>
+        <when value="a,b,c"/>
     </chain>
 </flow>

liteflow-testcase-springboot/src/test/resources/whenTimeOut/flow2.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<flow>
+    <chain name="chain1">
+        <when value="d" group="1"/>
+        <when value="e" group="2"/>
+        <when value="f" group="3"/>
+    </chain>
+</flow>