From 98683157aaffe32cce41eaeddb3314ef1092b151 Mon Sep 17 00:00:00 2001 From: tangkc <1016771049@qq.com> Date: Tue, 12 Jul 2022 22:33:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E8=B7=AF=E5=BE=84=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{note => comments}/LiteflowNodeELSpringbootTest.java | 6 +++--- .../java/com/yomahub/liteflow/test/comments}/cmp/ACmp.java | 2 +- .../yomahub/liteflow/test/{note => comments}/cmp/BCmp.java | 2 +- .../yomahub/liteflow/test/{note => comments}/cmp/CCmp.java | 2 +- .../com/yomahub/liteflow/test/comments/package-info.java | 4 ++++ .../java/com/yomahub/liteflow/test/note/package-info.java | 4 ---- .../src/test/resources/comments/application.properties | 1 + .../src/test/resources/{note => comments}/flow.el.xml | 0 .../src/test/resources/note/application.properties | 1 - .../liteflow/test/{note => comments}/LiteflowNodeTest.java | 4 ++-- .../yomahub/liteflow/test/{note => comments}/cmp/ACmp.java | 2 +- .../yomahub/liteflow/test/{note => comments}/cmp/BCmp.java | 2 +- .../yomahub/liteflow/test/{note => comments}/cmp/CCmp.java | 2 +- .../com/yomahub/liteflow/test/comments/package-info.java | 4 ++++ .../java/com/yomahub/liteflow/test/note/package-info.java | 4 ---- .../src/test/resources/{note => comments}/flow.el.xml | 6 +++--- .../{note => comments}/LiteflowNodeELSpringbootTest.java | 6 +++--- .../java/com/yomahub/liteflow/test/comments}/cmp/ACmp.java | 2 +- .../yomahub/liteflow/test/{note => comments}/cmp/BCmp.java | 2 +- .../yomahub/liteflow/test/{note => comments}/cmp/CCmp.java | 2 +- .../com/yomahub/liteflow/test/comments/package-info.java | 4 ++++ .../java/com/yomahub/liteflow/test/note/package-info.java | 4 ---- .../src/test/resources/comments/application.properties | 1 + .../src/test/resources/{note => comments}/flow.el.xml | 0 .../src/test/resources/note/application.properties | 1 - .../{note => comments}/LiteflowNodeELSpringbootTest.java | 4 ++-- .../yomahub/liteflow/test/{note => comments}/cmp/ACmp.java | 2 +- .../yomahub/liteflow/test/{note => comments}/cmp/BCmp.java | 2 +- .../yomahub/liteflow/test/{note => comments}/cmp/CCmp.java | 2 +- .../com/yomahub/liteflow/test/comments/package-info.java | 4 ++++ .../java/com/yomahub/liteflow/test/note/package-info.java | 4 ---- .../src/test/resources/{note => comments}/application.xml | 4 ++-- .../src/test/resources/{note => comments}/flow.el.xml | 0 33 files changed, 45 insertions(+), 45 deletions(-) rename liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/{note => comments}/LiteflowNodeELSpringbootTest.java (86%) rename liteflow-testcase-el/{liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/note => liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/comments}/cmp/ACmp.java (92%) rename liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/{note => comments}/cmp/BCmp.java (93%) rename liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/{note => comments}/cmp/CCmp.java (93%) create mode 100644 liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/comments/package-info.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/note/package-info.java create mode 100644 liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/comments/application.properties rename liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/{note => comments}/flow.el.xml (100%) delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/note/application.properties rename liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/{note => comments}/LiteflowNodeTest.java (91%) rename liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/{note => comments}/cmp/ACmp.java (87%) rename liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/{note => comments}/cmp/BCmp.java (87%) rename liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/{note => comments}/cmp/CCmp.java (87%) create mode 100644 liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/comments/package-info.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/note/package-info.java rename liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/{note => comments}/flow.el.xml (61%) rename liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/{note => comments}/LiteflowNodeELSpringbootTest.java (86%) rename liteflow-testcase-el/{liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/note => liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments}/cmp/ACmp.java (92%) rename liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/{note => comments}/cmp/BCmp.java (92%) rename liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/{note => comments}/cmp/CCmp.java (92%) create mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/package-info.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/note/package-info.java create mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/comments/application.properties rename liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/{note => comments}/flow.el.xml (100%) delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/note/application.properties rename liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/{note => comments}/LiteflowNodeELSpringbootTest.java (89%) rename liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/{note => comments}/cmp/ACmp.java (89%) rename liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/{note => comments}/cmp/BCmp.java (89%) rename liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/{note => comments}/cmp/CCmp.java (89%) create mode 100644 liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/comments/package-info.java delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/note/package-info.java rename liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/{note => comments}/application.xml (91%) rename liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/{note => comments}/flow.el.xml (100%) diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/note/LiteflowNodeELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeELSpringbootTest.java similarity index 86% rename from liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/note/LiteflowNodeELSpringbootTest.java rename to liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeELSpringbootTest.java index 701f275d6..cad44ba2d 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/note/LiteflowNodeELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeELSpringbootTest.java @@ -1,4 +1,4 @@ -package com.yomahub.liteflow.test.note; +package com.yomahub.liteflow.test.comments; import cn.hutool.core.collection.ListUtil; import com.yomahub.liteflow.core.FlowExecutor; @@ -16,10 +16,10 @@ import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; @RunWith(SpringRunner.class) -@TestPropertySource(value = "classpath:/note/application.properties") +@TestPropertySource(value = "classpath:/comments/application.properties") @SpringBootTest(classes = LiteflowNodeELSpringbootTest.class) @EnableAutoConfiguration -@ComponentScan({"com.yomahub.liteflow.test.note.cmp"}) +@ComponentScan({"com.yomahub.liteflow.test.comments.cmp"}) public class LiteflowNodeELSpringbootTest extends BaseTest { @Resource diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/note/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/ACmp.java similarity index 92% rename from liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/note/cmp/ACmp.java rename to liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/ACmp.java index 0d7bd2934..49eb7be78 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/note/cmp/ACmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/ACmp.java @@ -5,7 +5,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.note.cmp; +package com.yomahub.liteflow.test.comments.cmp; import com.yomahub.liteflow.annotation.LiteflowCmpDefine; import com.yomahub.liteflow.annotation.LiteflowMethod; diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/note/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/BCmp.java similarity index 93% rename from liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/note/cmp/BCmp.java rename to liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/BCmp.java index 52044a89e..c6e305673 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/note/cmp/BCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/BCmp.java @@ -5,7 +5,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.note.cmp; +package com.yomahub.liteflow.test.comments.cmp; import cn.hutool.core.thread.ThreadUtil; import com.yomahub.liteflow.annotation.LiteflowCmpDefine; diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/note/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/CCmp.java similarity index 93% rename from liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/note/cmp/CCmp.java rename to liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/CCmp.java index f9e1942b3..c6715e6cd 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/note/cmp/CCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/CCmp.java @@ -5,7 +5,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.note.cmp; +package com.yomahub.liteflow.test.comments.cmp; import cn.hutool.core.thread.ThreadUtil; import com.yomahub.liteflow.annotation.LiteflowCmpDefine; diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/comments/package-info.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/comments/package-info.java new file mode 100644 index 000000000..8169c663e --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/comments/package-info.java @@ -0,0 +1,4 @@ +/** + * 测试注释 + */ +package com.yomahub.liteflow.test.comments; \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/note/package-info.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/note/package-info.java deleted file mode 100644 index 6710dee43..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/note/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 测试注释 - */ -package com.yomahub.liteflow.test.note; \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/comments/application.properties b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/comments/application.properties new file mode 100644 index 000000000..83a0815d2 --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/comments/application.properties @@ -0,0 +1 @@ +liteflow.rule-source=comments/flow.el.xml \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/note/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/comments/flow.el.xml similarity index 100% rename from liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/note/flow.el.xml rename to liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/comments/flow.el.xml diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/note/application.properties b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/note/application.properties deleted file mode 100644 index f7a446bb6..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/note/application.properties +++ /dev/null @@ -1 +0,0 @@ -liteflow.rule-source=note/flow.el.xml \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/note/LiteflowNodeTest.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeTest.java similarity index 91% rename from liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/note/LiteflowNodeTest.java rename to liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeTest.java index e554c4b04..4585b5b19 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/note/LiteflowNodeTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeTest.java @@ -1,4 +1,4 @@ -package com.yomahub.liteflow.test.note; +package com.yomahub.liteflow.test.comments; import cn.hutool.core.collection.ListUtil; import com.yomahub.liteflow.core.FlowExecutor; @@ -20,7 +20,7 @@ public class LiteflowNodeTest extends BaseTest { @BeforeClass public static void init(){ LiteflowConfig config = new LiteflowConfig(); - config.setRuleSource("note/flow.el.xml"); + config.setRuleSource("comments/flow.el.xml"); flowExecutor = FlowExecutorHolder.loadInstance(config); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/note/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/comments/cmp/ACmp.java similarity index 87% rename from liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/note/cmp/ACmp.java rename to liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/comments/cmp/ACmp.java index d5b2429a9..c078f3ba9 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/note/cmp/ACmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/comments/cmp/ACmp.java @@ -5,7 +5,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.note.cmp; +package com.yomahub.liteflow.test.comments.cmp; import com.yomahub.liteflow.core.NodeComponent; diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/note/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/comments/cmp/BCmp.java similarity index 87% rename from liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/note/cmp/BCmp.java rename to liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/comments/cmp/BCmp.java index 650f735c2..e129a3a37 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/note/cmp/BCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/comments/cmp/BCmp.java @@ -6,7 +6,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.note.cmp; +package com.yomahub.liteflow.test.comments.cmp; import com.yomahub.liteflow.core.NodeComponent; diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/note/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/comments/cmp/CCmp.java similarity index 87% rename from liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/note/cmp/CCmp.java rename to liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/comments/cmp/CCmp.java index 82307efbc..bc03e2e62 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/note/cmp/CCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/comments/cmp/CCmp.java @@ -6,7 +6,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.note.cmp; +package com.yomahub.liteflow.test.comments.cmp; import com.yomahub.liteflow.core.NodeComponent; diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/comments/package-info.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/comments/package-info.java new file mode 100644 index 000000000..8169c663e --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/comments/package-info.java @@ -0,0 +1,4 @@ +/** + * 测试注释 + */ +package com.yomahub.liteflow.test.comments; \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/note/package-info.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/note/package-info.java deleted file mode 100644 index 6710dee43..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/note/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 测试注释 - */ -package com.yomahub.liteflow.test.note; \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/note/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/comments/flow.el.xml similarity index 61% rename from liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/note/flow.el.xml rename to liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/comments/flow.el.xml index 86434e07a..f84435990 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/note/flow.el.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/comments/flow.el.xml @@ -1,9 +1,9 @@ - - - + + + diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/note/LiteflowNodeELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeELSpringbootTest.java similarity index 86% rename from liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/note/LiteflowNodeELSpringbootTest.java rename to liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeELSpringbootTest.java index 701f275d6..cad44ba2d 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/note/LiteflowNodeELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeELSpringbootTest.java @@ -1,4 +1,4 @@ -package com.yomahub.liteflow.test.note; +package com.yomahub.liteflow.test.comments; import cn.hutool.core.collection.ListUtil; import com.yomahub.liteflow.core.FlowExecutor; @@ -16,10 +16,10 @@ import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; @RunWith(SpringRunner.class) -@TestPropertySource(value = "classpath:/note/application.properties") +@TestPropertySource(value = "classpath:/comments/application.properties") @SpringBootTest(classes = LiteflowNodeELSpringbootTest.class) @EnableAutoConfiguration -@ComponentScan({"com.yomahub.liteflow.test.note.cmp"}) +@ComponentScan({"com.yomahub.liteflow.test.comments.cmp"}) public class LiteflowNodeELSpringbootTest extends BaseTest { @Resource diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/note/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/ACmp.java similarity index 92% rename from liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/note/cmp/ACmp.java rename to liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/ACmp.java index 0d7bd2934..49eb7be78 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/note/cmp/ACmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/ACmp.java @@ -5,7 +5,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.note.cmp; +package com.yomahub.liteflow.test.comments.cmp; import com.yomahub.liteflow.annotation.LiteflowCmpDefine; import com.yomahub.liteflow.annotation.LiteflowMethod; diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/note/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/BCmp.java similarity index 92% rename from liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/note/cmp/BCmp.java rename to liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/BCmp.java index 3887a0d25..f41266973 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/note/cmp/BCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/BCmp.java @@ -5,7 +5,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.note.cmp; +package com.yomahub.liteflow.test.comments.cmp; import com.yomahub.liteflow.annotation.LiteflowCmpDefine; import com.yomahub.liteflow.annotation.LiteflowMethod; diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/note/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/CCmp.java similarity index 92% rename from liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/note/cmp/CCmp.java rename to liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/CCmp.java index 15429fcae..dde9908a7 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/note/cmp/CCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/cmp/CCmp.java @@ -5,7 +5,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.note.cmp; +package com.yomahub.liteflow.test.comments.cmp; import com.yomahub.liteflow.annotation.LiteflowCmpDefine; import com.yomahub.liteflow.annotation.LiteflowMethod; diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/package-info.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/package-info.java new file mode 100644 index 000000000..8169c663e --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/comments/package-info.java @@ -0,0 +1,4 @@ +/** + * 测试注释 + */ +package com.yomahub.liteflow.test.comments; \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/note/package-info.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/note/package-info.java deleted file mode 100644 index 6710dee43..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/note/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 测试注释 - */ -package com.yomahub.liteflow.test.note; \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/comments/application.properties b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/comments/application.properties new file mode 100644 index 000000000..83a0815d2 --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/comments/application.properties @@ -0,0 +1 @@ +liteflow.rule-source=comments/flow.el.xml \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/note/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/comments/flow.el.xml similarity index 100% rename from liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/note/flow.el.xml rename to liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/comments/flow.el.xml diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/note/application.properties b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/note/application.properties deleted file mode 100644 index f7a446bb6..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/note/application.properties +++ /dev/null @@ -1 +0,0 @@ -liteflow.rule-source=note/flow.el.xml \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/note/LiteflowNodeELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeELSpringbootTest.java similarity index 89% rename from liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/note/LiteflowNodeELSpringbootTest.java rename to liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeELSpringbootTest.java index e66aa7568..9cf416984 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/note/LiteflowNodeELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeELSpringbootTest.java @@ -1,4 +1,4 @@ -package com.yomahub.liteflow.test.note; +package com.yomahub.liteflow.test.comments; import cn.hutool.core.collection.ListUtil; import com.yomahub.liteflow.core.FlowExecutor; @@ -13,7 +13,7 @@ import org.springframework.test.context.junit4.SpringRunner; import javax.annotation.Resource; @RunWith(SpringRunner.class) -@ContextConfiguration("classpath:/note/application.xml") +@ContextConfiguration("classpath:/comments/application.xml") public class LiteflowNodeELSpringbootTest extends BaseTest { @Resource diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/note/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/comments/cmp/ACmp.java similarity index 89% rename from liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/note/cmp/ACmp.java rename to liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/comments/cmp/ACmp.java index b74b3cde8..aacacbbbb 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/note/cmp/ACmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/comments/cmp/ACmp.java @@ -5,7 +5,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.note.cmp; +package com.yomahub.liteflow.test.comments.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/note/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/comments/cmp/BCmp.java similarity index 89% rename from liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/note/cmp/BCmp.java rename to liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/comments/cmp/BCmp.java index a78464b02..6a536256b 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/note/cmp/BCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/comments/cmp/BCmp.java @@ -6,7 +6,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.note.cmp; +package com.yomahub.liteflow.test.comments.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/note/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/comments/cmp/CCmp.java similarity index 89% rename from liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/note/cmp/CCmp.java rename to liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/comments/cmp/CCmp.java index 09c2e0c8f..db1d06d22 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/note/cmp/CCmp.java +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/comments/cmp/CCmp.java @@ -6,7 +6,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.note.cmp; +package com.yomahub.liteflow.test.comments.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/comments/package-info.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/comments/package-info.java new file mode 100644 index 000000000..8169c663e --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/comments/package-info.java @@ -0,0 +1,4 @@ +/** + * 测试注释 + */ +package com.yomahub.liteflow.test.comments; \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/note/package-info.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/note/package-info.java deleted file mode 100644 index 6710dee43..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/note/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 测试注释 - */ -package com.yomahub.liteflow.test.note; \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/note/application.xml b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/comments/application.xml similarity index 91% rename from liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/note/application.xml rename to liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/comments/application.xml index f71cff206..39533ce0f 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/note/application.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/comments/application.xml @@ -7,14 +7,14 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd"> - + - + diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/note/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/comments/flow.el.xml similarity index 100% rename from liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/note/flow.el.xml rename to liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/comments/flow.el.xml