From aaaef7614239dad15a84c50acc9362793843c35a Mon Sep 17 00:00:00 2001 From: "everywhere.z" Date: Sun, 12 Jun 2022 15:58:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=8F=98liteflowComponent=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B=E5=8C=85=E8=B7=AF=E5=BE=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LiteflowComponentSpringbootTest.java | 6 +++--- .../test/{liteflowcomponent => lfCmpAnno}/cmp/ACmp.java | 2 +- .../java/com/yomahub/liteflow/test/lfCmpAnno}/cmp/BCmp.java | 2 +- .../java/com/yomahub/liteflow/test/lfCmpAnno}/cmp/CCmp.java | 2 +- .../java/com/yomahub/liteflow/test/lfCmpAnno}/cmp/DCmp.java | 2 +- .../src/test/resources/lfCmpAnno/application.properties | 1 + .../resources/{liteflowComponent => lfCmpAnno}/flow.xml | 0 .../test/resources/liteflowComponent/application.properties | 1 - .../LiteflowComponentSpringTest.java | 4 ++-- .../test/{liteflowcomponent => lfCmpAnno}/cmp/ACmp.java | 2 +- .../java/com/yomahub/liteflow/test/lfCmpAnno}/cmp/BCmp.java | 2 +- .../java/com/yomahub/liteflow/test/lfCmpAnno}/cmp/CCmp.java | 2 +- .../java/com/yomahub/liteflow/test/lfCmpAnno}/cmp/DCmp.java | 2 +- .../{liteflowcomponent => lfCmpAnno}/application.xml | 4 ++-- .../resources/{liteflowcomponent => lfCmpAnno}/flow.xml | 0 15 files changed, 16 insertions(+), 16 deletions(-) rename liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/{liteflowcomponent => lfCmpAnno}/LiteflowComponentSpringbootTest.java (86%) rename liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/{liteflowcomponent => lfCmpAnno}/cmp/ACmp.java (88%) rename {liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/liteflowcomponent => liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/lfCmpAnno}/cmp/BCmp.java (88%) rename {liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/liteflowcomponent => liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/lfCmpAnno}/cmp/CCmp.java (88%) rename {liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/liteflowcomponent => liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/lfCmpAnno}/cmp/DCmp.java (87%) create mode 100644 liteflow-testcase-springboot/src/test/resources/lfCmpAnno/application.properties rename liteflow-testcase-springboot/src/test/resources/{liteflowComponent => lfCmpAnno}/flow.xml (100%) delete mode 100644 liteflow-testcase-springboot/src/test/resources/liteflowComponent/application.properties rename liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/{liteflowcomponent => lfCmpAnno}/LiteflowComponentSpringTest.java (89%) rename liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/{liteflowcomponent => lfCmpAnno}/cmp/ACmp.java (88%) rename {liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/liteflowcomponent => liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/lfCmpAnno}/cmp/BCmp.java (88%) rename {liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/liteflowcomponent => liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/lfCmpAnno}/cmp/CCmp.java (88%) rename {liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/liteflowcomponent => liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/lfCmpAnno}/cmp/DCmp.java (87%) rename liteflow-testcase-springnative/src/test/resources/{liteflowcomponent => lfCmpAnno}/application.xml (90%) rename liteflow-testcase-springnative/src/test/resources/{liteflowcomponent => lfCmpAnno}/flow.xml (100%) diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/LiteflowComponentSpringbootTest.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/LiteflowComponentSpringbootTest.java similarity index 86% rename from liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/LiteflowComponentSpringbootTest.java rename to liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/LiteflowComponentSpringbootTest.java index 0409ab133..43fa6a188 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/LiteflowComponentSpringbootTest.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/LiteflowComponentSpringbootTest.java @@ -1,4 +1,4 @@ -package com.yomahub.liteflow.test.liteflowcomponent; +package com.yomahub.liteflow.test.lfCmpAnno; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.flow.LiteflowResponse; @@ -21,10 +21,10 @@ import org.springframework.test.context.junit4.SpringRunner; * @since 2.5.10 */ @RunWith(SpringRunner.class) -@TestPropertySource(value = "classpath:/liteflowComponent/application.properties") +@TestPropertySource(value = "classpath:/lfCmpAnno/application.properties") @SpringBootTest(classes = LiteflowComponentSpringbootTest.class) @EnableAutoConfiguration -@ComponentScan({"com.yomahub.liteflow.test.liteflowcomponent.cmp"}) +@ComponentScan({"com.yomahub.liteflow.test.lfCmpAnno.cmp"}) public class LiteflowComponentSpringbootTest extends BaseTest { @Autowired diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/ACmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/ACmp.java similarity index 88% rename from liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/ACmp.java rename to liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/ACmp.java index 96ec64d8f..6c4fc23ad 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/ACmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/ACmp.java @@ -5,7 +5,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.liteflowcomponent.cmp; +package com.yomahub.liteflow.test.lfCmpAnno.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; diff --git a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/BCmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/BCmp.java similarity index 88% rename from liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/BCmp.java rename to liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/BCmp.java index 9d1c0b233..991003cc4 100644 --- a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/BCmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/BCmp.java @@ -5,7 +5,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.liteflowcomponent.cmp; +package com.yomahub.liteflow.test.lfCmpAnno.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; diff --git a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/CCmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/CCmp.java similarity index 88% rename from liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/CCmp.java rename to liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/CCmp.java index f01e577d6..1fbea2522 100644 --- a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/CCmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/CCmp.java @@ -5,7 +5,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.liteflowcomponent.cmp; +package com.yomahub.liteflow.test.lfCmpAnno.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; diff --git a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/DCmp.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/DCmp.java similarity index 87% rename from liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/DCmp.java rename to liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/DCmp.java index 06d4d268f..42efc228b 100644 --- a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/DCmp.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/DCmp.java @@ -5,7 +5,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.liteflowcomponent.cmp; +package com.yomahub.liteflow.test.lfCmpAnno.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; diff --git a/liteflow-testcase-springboot/src/test/resources/lfCmpAnno/application.properties b/liteflow-testcase-springboot/src/test/resources/lfCmpAnno/application.properties new file mode 100644 index 000000000..1085d3200 --- /dev/null +++ b/liteflow-testcase-springboot/src/test/resources/lfCmpAnno/application.properties @@ -0,0 +1 @@ +liteflow.rule-source=lfCmpAnno/flow.xml \ No newline at end of file diff --git a/liteflow-testcase-springboot/src/test/resources/liteflowComponent/flow.xml b/liteflow-testcase-springboot/src/test/resources/lfCmpAnno/flow.xml similarity index 100% rename from liteflow-testcase-springboot/src/test/resources/liteflowComponent/flow.xml rename to liteflow-testcase-springboot/src/test/resources/lfCmpAnno/flow.xml diff --git a/liteflow-testcase-springboot/src/test/resources/liteflowComponent/application.properties b/liteflow-testcase-springboot/src/test/resources/liteflowComponent/application.properties deleted file mode 100644 index 62a916d4a..000000000 --- a/liteflow-testcase-springboot/src/test/resources/liteflowComponent/application.properties +++ /dev/null @@ -1 +0,0 @@ -liteflow.rule-source=liteflowComponent/flow.xml \ No newline at end of file diff --git a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/LiteflowComponentSpringTest.java b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/LiteflowComponentSpringTest.java similarity index 89% rename from liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/LiteflowComponentSpringTest.java rename to liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/LiteflowComponentSpringTest.java index 5b898e760..fab5b4758 100644 --- a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/LiteflowComponentSpringTest.java +++ b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/LiteflowComponentSpringTest.java @@ -1,4 +1,4 @@ -package com.yomahub.liteflow.test.liteflowcomponent; +package com.yomahub.liteflow.test.lfCmpAnno; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.flow.LiteflowResponse; @@ -18,7 +18,7 @@ import org.springframework.test.context.junit4.SpringRunner; * @since 2.5.10 */ @RunWith(SpringRunner.class) -@ContextConfiguration("classpath:/liteflowcomponent/application.xml") +@ContextConfiguration("classpath:/lfCmpAnno/application.xml") public class LiteflowComponentSpringTest extends BaseTest { @Autowired diff --git a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/ACmp.java b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/ACmp.java similarity index 88% rename from liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/ACmp.java rename to liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/ACmp.java index 96ec64d8f..6c4fc23ad 100644 --- a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/ACmp.java +++ b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/ACmp.java @@ -5,7 +5,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.liteflowcomponent.cmp; +package com.yomahub.liteflow.test.lfCmpAnno.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/BCmp.java b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/BCmp.java similarity index 88% rename from liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/BCmp.java rename to liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/BCmp.java index 9d1c0b233..991003cc4 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/BCmp.java +++ b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/BCmp.java @@ -5,7 +5,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.liteflowcomponent.cmp; +package com.yomahub.liteflow.test.lfCmpAnno.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/CCmp.java b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/CCmp.java similarity index 88% rename from liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/CCmp.java rename to liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/CCmp.java index f01e577d6..1fbea2522 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/CCmp.java +++ b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/CCmp.java @@ -5,7 +5,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.liteflowcomponent.cmp; +package com.yomahub.liteflow.test.lfCmpAnno.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/DCmp.java b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/DCmp.java similarity index 87% rename from liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/DCmp.java rename to liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/DCmp.java index 06d4d268f..42efc228b 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/liteflowcomponent/cmp/DCmp.java +++ b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/cmp/DCmp.java @@ -5,7 +5,7 @@ * @email weenyc31@163.com * @Date 2020/4/1 */ -package com.yomahub.liteflow.test.liteflowcomponent.cmp; +package com.yomahub.liteflow.test.lfCmpAnno.cmp; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; diff --git a/liteflow-testcase-springnative/src/test/resources/liteflowcomponent/application.xml b/liteflow-testcase-springnative/src/test/resources/lfCmpAnno/application.xml similarity index 90% rename from liteflow-testcase-springnative/src/test/resources/liteflowcomponent/application.xml rename to liteflow-testcase-springnative/src/test/resources/lfCmpAnno/application.xml index 1755cf3ac..50dc6c909 100644 --- a/liteflow-testcase-springnative/src/test/resources/liteflowcomponent/application.xml +++ b/liteflow-testcase-springnative/src/test/resources/lfCmpAnno/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-springnative/src/test/resources/liteflowcomponent/flow.xml b/liteflow-testcase-springnative/src/test/resources/lfCmpAnno/flow.xml similarity index 100% rename from liteflow-testcase-springnative/src/test/resources/liteflowcomponent/flow.xml rename to liteflow-testcase-springnative/src/test/resources/lfCmpAnno/flow.xml