From 1aef78243a7a596cdc338f80d1d9d64bf0daabce Mon Sep 17 00:00:00 2001 From: "everywhere.z" Date: Thu, 22 Dec 2022 22:02:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E7=94=A8?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liteflow-solon-plugin/pom.xml | 7 ----- .../src/test/java/demo/TestApp.java | 30 ------------------- .../src/test/java/demo/nodes/ACmp.java | 18 ----------- .../src/test/java/demo/nodes/BCmp.java | 19 ------------ .../src/test/java/demo/nodes/CCmp.java | 18 ----------- .../src/test/resources/demo/app.yml | 3 -- .../src/test/resources/demo/flow.xml | 6 ---- .../liteflow-testcase-el-solon/pom.xml | 6 ++++ liteflow-testcase-el/pom.xml | 2 +- 9 files changed, 7 insertions(+), 102 deletions(-) delete mode 100644 liteflow-solon-plugin/src/test/java/demo/TestApp.java delete mode 100644 liteflow-solon-plugin/src/test/java/demo/nodes/ACmp.java delete mode 100644 liteflow-solon-plugin/src/test/java/demo/nodes/BCmp.java delete mode 100644 liteflow-solon-plugin/src/test/java/demo/nodes/CCmp.java delete mode 100644 liteflow-solon-plugin/src/test/resources/demo/app.yml delete mode 100644 liteflow-solon-plugin/src/test/resources/demo/flow.xml diff --git a/liteflow-solon-plugin/pom.xml b/liteflow-solon-plugin/pom.xml index 39698680..81e49ef3 100644 --- a/liteflow-solon-plugin/pom.xml +++ b/liteflow-solon-plugin/pom.xml @@ -27,13 +27,6 @@ liteflow-core ${revision} - - - org.noear - solon-test - ${solon.version} - test - diff --git a/liteflow-solon-plugin/src/test/java/demo/TestApp.java b/liteflow-solon-plugin/src/test/java/demo/TestApp.java deleted file mode 100644 index 8cba950e..00000000 --- a/liteflow-solon-plugin/src/test/java/demo/TestApp.java +++ /dev/null @@ -1,30 +0,0 @@ -package demo; - -import com.yomahub.liteflow.core.FlowExecutor; -import com.yomahub.liteflow.flow.LiteflowResponse; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.noear.snack.ONode; -import org.noear.solon.annotation.Inject; -import org.noear.solon.test.SolonJUnit4ClassRunner; -import org.noear.solon.test.SolonTest; -import org.noear.solon.test.annotation.TestPropertySource; - -/** - * @author noear 2022/9/21 created - */ - -@RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource("classpath:demo/app.yml") -public class TestApp { - @Inject - FlowExecutor flowExecutor; - - @Test - public void test() throws Exception{ - LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); - System.out.println(ONode.stringify(response)); - - assert response.isSuccess(); - } -} diff --git a/liteflow-solon-plugin/src/test/java/demo/nodes/ACmp.java b/liteflow-solon-plugin/src/test/java/demo/nodes/ACmp.java deleted file mode 100644 index 96072bc3..00000000 --- a/liteflow-solon-plugin/src/test/java/demo/nodes/ACmp.java +++ /dev/null @@ -1,18 +0,0 @@ -package demo.nodes; - -import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeComponent; -import org.noear.solon.annotation.Component; - -/** - * @author noear 2022/9/21 created - */ -@Component("a") -public class ACmp extends NodeComponent { - - @Override - public void process() { - //do your business - System.out.println(this.getClass().getName()); - } -} diff --git a/liteflow-solon-plugin/src/test/java/demo/nodes/BCmp.java b/liteflow-solon-plugin/src/test/java/demo/nodes/BCmp.java deleted file mode 100644 index 6fa0e4c4..00000000 --- a/liteflow-solon-plugin/src/test/java/demo/nodes/BCmp.java +++ /dev/null @@ -1,19 +0,0 @@ -package demo.nodes; - -import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeComponent; -import org.noear.solon.annotation.Component; - -/** - * @author noear 2022/9/21 created - */ -@Component("b") -public class BCmp extends NodeComponent { - - @Override - public void process() { - //do your business - System.out.println(this.getClass().getName()); - } -} - diff --git a/liteflow-solon-plugin/src/test/java/demo/nodes/CCmp.java b/liteflow-solon-plugin/src/test/java/demo/nodes/CCmp.java deleted file mode 100644 index 21d4cdf9..00000000 --- a/liteflow-solon-plugin/src/test/java/demo/nodes/CCmp.java +++ /dev/null @@ -1,18 +0,0 @@ -package demo.nodes; - -import com.yomahub.liteflow.annotation.LiteflowComponent; -import com.yomahub.liteflow.core.NodeComponent; -import org.noear.solon.annotation.Component; - -/** - * @author noear 2022/9/21 created - */ -@Component("c") -public class CCmp extends NodeComponent { - - @Override - public void process() { - //do your business - System.out.println(this.getClass().getName()); - } -} diff --git a/liteflow-solon-plugin/src/test/resources/demo/app.yml b/liteflow-solon-plugin/src/test/resources/demo/app.yml deleted file mode 100644 index c261a253..00000000 --- a/liteflow-solon-plugin/src/test/resources/demo/app.yml +++ /dev/null @@ -1,3 +0,0 @@ - - -liteflow.rule-source: "demo/flow.xml" \ No newline at end of file diff --git a/liteflow-solon-plugin/src/test/resources/demo/flow.xml b/liteflow-solon-plugin/src/test/resources/demo/flow.xml deleted file mode 100644 index 049210cf..00000000 --- a/liteflow-solon-plugin/src/test/resources/demo/flow.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - THEN(a, b, c); - - \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/pom.xml b/liteflow-testcase-el/liteflow-testcase-el-solon/pom.xml index f36a7f16..f4ff667b 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/pom.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/pom.xml @@ -24,6 +24,12 @@ solon-test ${solon.version} test + + + junit-jupiter + org.junit.jupiter + + org.aspectj diff --git a/liteflow-testcase-el/pom.xml b/liteflow-testcase-el/pom.xml index 0bd04443..9728d23e 100644 --- a/liteflow-testcase-el/pom.xml +++ b/liteflow-testcase-el/pom.xml @@ -18,7 +18,7 @@ liteflow-testcase-el-springboot liteflow-testcase-el-springnative liteflow-testcase-el-nospring - liteflow-testcase-el-solon + liteflow-testcase-el-declare-springboot liteflow-testcase-el-declare-multi-springboot liteflow-testcase-el-script-groovy-springboot