From 94760b9f2164a692db274978fd6e0ebce7bafd1f Mon Sep 17 00:00:00 2001 From: bryan31 Date: Fri, 10 Dec 2021 19:06:14 +0800 Subject: [PATCH] submit --- .../script/groovy/LiteflowJsonScriptFileGroovyTest.java | 4 ++-- .../script/groovy/LiteflowXmlScriptFileGroovyTest.java | 4 ++-- .../qlexpress/LiteflowJsonScriptFileQLExpressTest.java | 4 ++-- .../qlexpress/LiteflowXmlScriptFileQLExpressTest.java | 4 ++-- .../test/whenTimeOut/WhenTimeOutSpringbootTest.java | 8 ++++++++ .../com/yomahub/liteflow/test/whenTimeOut/cmp/BCmp.java | 2 +- .../com/yomahub/liteflow/test/whenTimeOut/cmp/CCmp.java | 2 +- .../src/test/resources/whenTimeOut/application.properties | 2 +- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/liteflow-testcase-script-groovy/src/test/java/com/yomahub/liteflow/test/script/groovy/LiteflowJsonScriptFileGroovyTest.java b/liteflow-testcase-script-groovy/src/test/java/com/yomahub/liteflow/test/script/groovy/LiteflowJsonScriptFileGroovyTest.java index 1940bda62..7c5844e87 100644 --- a/liteflow-testcase-script-groovy/src/test/java/com/yomahub/liteflow/test/script/groovy/LiteflowJsonScriptFileGroovyTest.java +++ b/liteflow-testcase-script-groovy/src/test/java/com/yomahub/liteflow/test/script/groovy/LiteflowJsonScriptFileGroovyTest.java @@ -73,7 +73,7 @@ public class LiteflowJsonScriptFileGroovyTest extends BaseTest { public void testScript4() throws Exception{ new Thread(() -> { try{ - Thread.sleep(1000L); + Thread.sleep(2000L); //更改规则，重新加载，更改的规则内容从flow_update.xml里读取，这里只是为了模拟下获取新的内容。不一定是从文件中读取 String newContent = ResourceUtil.readUtf8Str("classpath: /json-script-file/flow_update.json"); //进行刷新 @@ -83,7 +83,7 @@ public class LiteflowJsonScriptFileGroovyTest extends BaseTest { } }).start(); - for (int i = 0; i < 500; i++) { + for (int i = 0; i < 300; i++) { LiteflowResponse responseNew = flowExecutor.execute2Resp("chain2", "arg"); Assert.assertTrue(responseNew.isSuccess()); Thread.sleep(10L); diff --git a/liteflow-testcase-script-groovy/src/test/java/com/yomahub/liteflow/test/script/groovy/LiteflowXmlScriptFileGroovyTest.java b/liteflow-testcase-script-groovy/src/test/java/com/yomahub/liteflow/test/script/groovy/LiteflowXmlScriptFileGroovyTest.java index f68de81b9..d1b290a71 100644 --- a/liteflow-testcase-script-groovy/src/test/java/com/yomahub/liteflow/test/script/groovy/LiteflowXmlScriptFileGroovyTest.java +++ b/liteflow-testcase-script-groovy/src/test/java/com/yomahub/liteflow/test/script/groovy/LiteflowXmlScriptFileGroovyTest.java @@ -73,7 +73,7 @@ public class LiteflowXmlScriptFileGroovyTest extends BaseTest { public void testScript4() throws Exception{ new Thread(() -> { try{ - Thread.sleep(1000L); + Thread.sleep(2000L); //更改规则，重新加载，更改的规则内容从flow_update.xml里读取，这里只是为了模拟下获取新的内容。不一定是从文件中读取 String newContent = ResourceUtil.readUtf8Str("classpath: /xml-script-file/flow_update.xml"); //进行刷新 @@ -83,7 +83,7 @@ public class LiteflowXmlScriptFileGroovyTest extends BaseTest { } }).start(); - for (int i = 0; i < 500; i++) { + for (int i = 0; i < 300; i++) { LiteflowResponse responseNew = flowExecutor.execute2Resp("chain2", "arg"); Assert.assertTrue(responseNew.isSuccess()); Thread.sleep(10L); diff --git a/liteflow-testcase-script-qlexpress/src/test/java/com/yomahub/liteflow/test/script/qlexpress/LiteflowJsonScriptFileQLExpressTest.java b/liteflow-testcase-script-qlexpress/src/test/java/com/yomahub/liteflow/test/script/qlexpress/LiteflowJsonScriptFileQLExpressTest.java index d793e6bfb..dea1032c1 100644 --- a/liteflow-testcase-script-qlexpress/src/test/java/com/yomahub/liteflow/test/script/qlexpress/LiteflowJsonScriptFileQLExpressTest.java +++ b/liteflow-testcase-script-qlexpress/src/test/java/com/yomahub/liteflow/test/script/qlexpress/LiteflowJsonScriptFileQLExpressTest.java @@ -72,7 +72,7 @@ public class LiteflowJsonScriptFileQLExpressTest extends BaseTest { public void testScript4() throws Exception{ new Thread(() -> { try{ - Thread.sleep(1000L); + Thread.sleep(2000L); //更改规则，重新加载，更改的规则内容从flow_update.xml里读取，这里只是为了模拟下获取新的内容。不一定是从文件中读取 String newContent = ResourceUtil.readUtf8Str("classpath: /json-script-file/flow_update.json"); //进行刷新 @@ -82,7 +82,7 @@ public class LiteflowJsonScriptFileQLExpressTest extends BaseTest { } }).start(); - for (int i = 0; i < 500; i++) { + for (int i = 0; i < 300; i++) { LiteflowResponse responseNew = flowExecutor.execute2Resp("chain2", "arg"); Assert.assertTrue(responseNew.isSuccess()); Thread.sleep(10L); diff --git a/liteflow-testcase-script-qlexpress/src/test/java/com/yomahub/liteflow/test/script/qlexpress/LiteflowXmlScriptFileQLExpressTest.java b/liteflow-testcase-script-qlexpress/src/test/java/com/yomahub/liteflow/test/script/qlexpress/LiteflowXmlScriptFileQLExpressTest.java index 7328fd927..90950daad 100644 --- a/liteflow-testcase-script-qlexpress/src/test/java/com/yomahub/liteflow/test/script/qlexpress/LiteflowXmlScriptFileQLExpressTest.java +++ b/liteflow-testcase-script-qlexpress/src/test/java/com/yomahub/liteflow/test/script/qlexpress/LiteflowXmlScriptFileQLExpressTest.java @@ -72,7 +72,7 @@ public class LiteflowXmlScriptFileQLExpressTest extends BaseTest { public void testScript4() throws Exception{ new Thread(() -> { try{ - Thread.sleep(1000L); + Thread.sleep(2000L); //更改规则，重新加载，更改的规则内容从flow_update.xml里读取，这里只是为了模拟下获取新的内容。不一定是从文件中读取 String newContent = ResourceUtil.readUtf8Str("classpath: /xml-script-file/flow_update.xml"); //进行刷新 @@ -82,7 +82,7 @@ public class LiteflowXmlScriptFileQLExpressTest extends BaseTest { } }).start(); - for (int i = 0; i < 500; i++) { + for (int i = 0; i < 300; i++) { LiteflowResponse responseNew = flowExecutor.execute2Resp("chain2", "arg"); Assert.assertTrue(responseNew.isSuccess()); Thread.sleep(10L); diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/whenTimeOut/WhenTimeOutSpringbootTest.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/whenTimeOut/WhenTimeOutSpringbootTest.java index c03db0c92..fc6857e95 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/whenTimeOut/WhenTimeOutSpringbootTest.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/whenTimeOut/WhenTimeOutSpringbootTest.java @@ -1,12 +1,15 @@ 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.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; @@ -27,12 +30,17 @@ import javax.annotation.Resource; @ComponentScan({"com.yomahub.liteflow.test.whenTimeOut.cmp"}) public class WhenTimeOutSpringbootTest extends BaseTest { + private final Logger log = LoggerFactory.getLogger(this.getClass()); + @Resource private FlowExecutor flowExecutor; @Test public void testWhenTimeOut() throws Exception{ LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); + if (!response.isSuccess()){ + log.error(response.getMessage(),response.getCause()); + } Assert.assertTrue(response.isSuccess()); } } diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/whenTimeOut/cmp/BCmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/whenTimeOut/cmp/BCmp.java index 41a1d901c..fb8cd2a1c 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/whenTimeOut/cmp/BCmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/whenTimeOut/cmp/BCmp.java @@ -16,7 +16,7 @@ public class BCmp extends NodeComponent { @Override public void process() { try { - Thread.sleep(6000); + Thread.sleep(4000); }catch (Exception ignored){ } diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/whenTimeOut/cmp/CCmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/whenTimeOut/cmp/CCmp.java index d1537b04f..ee9fe9773 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/whenTimeOut/cmp/CCmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/whenTimeOut/cmp/CCmp.java @@ -16,7 +16,7 @@ public class CCmp extends NodeComponent { @Override public void process() { try { - Thread.sleep(8000); + Thread.sleep(3500); }catch (Exception ignored){ } diff --git a/liteflow-testcase-springboot/src/test/resources/whenTimeOut/application.properties b/liteflow-testcase-springboot/src/test/resources/whenTimeOut/application.properties index a35693877..0cd889306 100644 --- a/liteflow-testcase-springboot/src/test/resources/whenTimeOut/application.properties +++ b/liteflow-testcase-springboot/src/test/resources/whenTimeOut/application.properties @@ -1,2 +1,2 @@ liteflow.rule-source=whenTimeOut/flow.xml -liteflow.when-max-wait-seconds=5 \ No newline at end of file +liteflow.when-max-wait-seconds=3 \ No newline at end of file