From 664d42c05b50b72224b6682874141f8a13dbd270 Mon Sep 17 00:00:00 2001 From: bryan31 Date: Wed, 19 Jan 2022 13:47:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0springEL=E7=9A=84=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...est.java => JsonParserSpringbootTest.java} | 5 ++- .../parser/SpringELSupportSpringbootTest.java | 32 +++++++++++++++++++ ...Test.java => XmlParserSpringbootTest.java} | 5 ++- ...Test.java => YmlParserSpringbootTest.java} | 5 ++- .../liteflow/test/parser/cmp/ACmp.java | 4 --- .../parser/application-springEL.properties | 1 + .../parser/subFoder1/subFoder2/flow1.xml | 22 +++++++++++++ .../parser/subFoder1/subFoder2/flow2.xml | 9 ++++++ .../parser/subFoder1/subFoder2/flow3.xml | 6 ++++ 9 files changed, 76 insertions(+), 13 deletions(-) rename liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/{LFParserJsonSpringbootTest.java => JsonParserSpringbootTest.java} (87%) create mode 100644 liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/SpringELSupportSpringbootTest.java rename liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/{LFParserXmlSpringbootTest.java => XmlParserSpringbootTest.java} (87%) rename liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/{LFParserYmlSpringbootTest.java => YmlParserSpringbootTest.java} (87%) create mode 100644 liteflow-testcase-springboot/src/test/resources/parser/application-springEL.properties create mode 100644 liteflow-testcase-springboot/src/test/resources/parser/subFoder1/subFoder2/flow1.xml create mode 100644 liteflow-testcase-springboot/src/test/resources/parser/subFoder1/subFoder2/flow2.xml create mode 100644 liteflow-testcase-springboot/src/test/resources/parser/subFoder1/subFoder2/flow3.xml diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/LFParserJsonSpringbootTest.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/JsonParserSpringbootTest.java similarity index 87% rename from liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/LFParserJsonSpringbootTest.java rename to liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/JsonParserSpringbootTest.java index 0edbf4f14..0eb4ce18e 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/LFParserJsonSpringbootTest.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/JsonParserSpringbootTest.java @@ -22,10 +22,9 @@ import javax.annotation.Resource; */ @RunWith(SpringRunner.class) @TestPropertySource(value = "classpath:/parser/application-json.properties") -@SpringBootTest(classes = LFParserJsonSpringbootTest.class) +@SpringBootTest(classes = JsonParserSpringbootTest.class) @EnableAutoConfiguration -@ComponentScan({"com.yomahub.liteflow.test.parser.cmp"}) -public class LFParserJsonSpringbootTest extends BaseTest { +public class JsonParserSpringbootTest extends BaseTest { @Resource private FlowExecutor flowExecutor; diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/SpringELSupportSpringbootTest.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/SpringELSupportSpringbootTest.java new file mode 100644 index 000000000..ec0e2acc7 --- /dev/null +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/SpringELSupportSpringbootTest.java @@ -0,0 +1,32 @@ +package com.yomahub.liteflow.test.parser; + +import com.yomahub.liteflow.core.FlowExecutor; +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.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.junit4.SpringRunner; + +import javax.annotation.Resource; + +@RunWith(SpringRunner.class) +@TestPropertySource(value = "classpath:/parser/application-springEL.properties") +@SpringBootTest(classes = SpringELSupportSpringbootTest.class) +@EnableAutoConfiguration +public class SpringELSupportSpringbootTest extends BaseTest { + + @Resource + private FlowExecutor flowExecutor; + + //测试springEL的解析情况 + @Test + public void testSpringELParser() { + LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); + Assert.assertTrue(response.isSuccess()); + } +} diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/LFParserXmlSpringbootTest.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/XmlParserSpringbootTest.java similarity index 87% rename from liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/LFParserXmlSpringbootTest.java rename to liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/XmlParserSpringbootTest.java index a6adad661..91e0a44d4 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/LFParserXmlSpringbootTest.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/XmlParserSpringbootTest.java @@ -22,10 +22,9 @@ import javax.annotation.Resource; */ @RunWith(SpringRunner.class) @TestPropertySource(value = "classpath:/parser/application-xml.properties") -@SpringBootTest(classes = LFParserXmlSpringbootTest.class) +@SpringBootTest(classes = XmlParserSpringbootTest.class) @EnableAutoConfiguration -@ComponentScan({"com.yomahub.liteflow.test.parser.cmp"}) -public class LFParserXmlSpringbootTest extends BaseTest { +public class XmlParserSpringbootTest extends BaseTest { @Resource private FlowExecutor flowExecutor; diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/LFParserYmlSpringbootTest.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/YmlParserSpringbootTest.java similarity index 87% rename from liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/LFParserYmlSpringbootTest.java rename to liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/YmlParserSpringbootTest.java index 90d5636bf..3b2305e20 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/LFParserYmlSpringbootTest.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/YmlParserSpringbootTest.java @@ -22,10 +22,9 @@ import javax.annotation.Resource; */ @RunWith(SpringRunner.class) @TestPropertySource(value = "classpath:/parser/application-yml.properties") -@SpringBootTest(classes = LFParserYmlSpringbootTest.class) +@SpringBootTest(classes = YmlParserSpringbootTest.class) @EnableAutoConfiguration -@ComponentScan({"com.yomahub.liteflow.test.parser.cmp"}) -public class LFParserYmlSpringbootTest extends BaseTest { +public class YmlParserSpringbootTest extends BaseTest { @Resource private FlowExecutor flowExecutor; diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ACmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ACmp.java index 4aafee9a6..2c6a9ddf4 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ACmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/parser/cmp/ACmp.java @@ -17,10 +17,6 @@ public class ACmp extends NodeComponent { @Override public void process() { - String str = this.getSlot().getRequestData(); - if(StrUtil.isNotBlank(str) && str.equals("exception")) { - throw new FlowSystemException("chain execute execption"); - } System.out.println("ACmp executed!"); } } diff --git a/liteflow-testcase-springboot/src/test/resources/parser/application-springEL.properties b/liteflow-testcase-springboot/src/test/resources/parser/application-springEL.properties new file mode 100644 index 000000000..7db93206b --- /dev/null +++ b/liteflow-testcase-springboot/src/test/resources/parser/application-springEL.properties @@ -0,0 +1 @@ +liteflow.rule-source=parser/**/*.xml \ No newline at end of file diff --git a/liteflow-testcase-springboot/src/test/resources/parser/subFoder1/subFoder2/flow1.xml b/liteflow-testcase-springboot/src/test/resources/parser/subFoder1/subFoder2/flow1.xml new file mode 100644 index 000000000..0775c5ec1 --- /dev/null +++ b/liteflow-testcase-springboot/src/test/resources/parser/subFoder1/subFoder2/flow1.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/liteflow-testcase-springboot/src/test/resources/parser/subFoder1/subFoder2/flow2.xml b/liteflow-testcase-springboot/src/test/resources/parser/subFoder1/subFoder2/flow2.xml new file mode 100644 index 000000000..d739f6b53 --- /dev/null +++ b/liteflow-testcase-springboot/src/test/resources/parser/subFoder1/subFoder2/flow2.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/liteflow-testcase-springboot/src/test/resources/parser/subFoder1/subFoder2/flow3.xml b/liteflow-testcase-springboot/src/test/resources/parser/subFoder1/subFoder2/flow3.xml new file mode 100644 index 000000000..0a898126c --- /dev/null +++ b/liteflow-testcase-springboot/src/test/resources/parser/subFoder1/subFoder2/flow3.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file