From ee598eb773cfe19b4d72594ea44d07e179458f6f Mon Sep 17 00:00:00 2001
From: Dale Lee <1658850308@qq.com>
Date: Sun, 1 Oct 2023 19:24:27 +0800
Subject: [PATCH] =?UTF-8?q?feature=20#I7YYLE=20=E7=A7=BB=E9=99=A4=E6=9B=BF?=
 =?UTF-8?q?=E8=A1=A5=E7=BB=84=E4=BB=B6=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SubstituteSpringbootTest.java             | 46 -----------------
 .../test/substituteNode/cmp/ACmp.java         | 21 --------
 .../test/substituteNode/cmp/BCmp.java         | 21 --------
 .../test/substituteNode/cmp/CCmp.java         | 21 --------
 .../test/substituteNode/cmp/DCmp.java         | 21 --------
 .../test/substituteNode/cmp/SubCmp.java       | 21 --------
 .../substituteNode/application.properties     |  2 -
 .../test/resources/substituteNode/flow.el.xml | 14 ------
 .../SubstituteSpringbootTest.java             | 50 -------------------
 .../test/substituteNode/cmp/ACmp.java         | 21 --------
 .../test/substituteNode/cmp/BCmp.java         | 21 --------
 .../test/substituteNode/cmp/CCmp.java         | 21 --------
 .../test/substituteNode/cmp/DCmp.java         | 21 --------
 .../test/substituteNode/cmp/SubCmp.java       | 21 --------
 .../substituteNode/application.properties     |  2 -
 .../test/resources/substituteNode/flow.el.xml | 14 ------
 16 files changed, 338 deletions(-)
 delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/SubstituteSpringbootTest.java
 delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/ACmp.java
 delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/BCmp.java
 delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/CCmp.java
 delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/DCmp.java
 delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/SubCmp.java
 delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/substituteNode/application.properties
 delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/substituteNode/flow.el.xml
 delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/SubstituteSpringbootTest.java
 delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/ACmp.java
 delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/BCmp.java
 delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/CCmp.java
 delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/DCmp.java
 delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/SubCmp.java
 delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/substituteNode/application.properties
 delete mode 100644 liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/substituteNode/flow.el.xml

diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/SubstituteSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/SubstituteSpringbootTest.java
deleted file mode 100644
index 623662234..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/SubstituteSpringbootTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.yomahub.liteflow.test.substituteNode;
-
-import com.yomahub.liteflow.core.FlowExecutor;
-import com.yomahub.liteflow.flow.LiteflowResponse;
-import com.yomahub.liteflow.test.BaseTest;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.noear.solon.annotation.Inject;
-import org.noear.solon.test.SolonJUnit5Extension;
-import org.noear.solon.test.annotation.TestPropertySource;
-
-/**
- * springboot环境EL替补节点的测试
- *
- * @author Bryan.Zhang
- */
-@ExtendWith(SolonJUnit5Extension.class)
-@TestPropertySource("classpath:/substituteNode/application.properties")
-public class SubstituteSpringbootTest extends BaseTest {
-
-	@Inject
-	private FlowExecutor flowExecutor;
-
-	// 最简单的情况
-	@Test
-	public void testSub1() throws Exception {
-		LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg");
-		Assertions.assertTrue(response.isSuccess());
-	}
-
-	// 有替补节点
-	@Test
-	public void testSub2() throws Exception {
-		LiteflowResponse response = flowExecutor.execute2Resp("chain2", "arg");
-		Assertions.assertTrue(response.isSuccess());
-	}
-
-	// 测试特殊命名的节点
-	@Test
-	public void testSub3() throws Exception {
-		LiteflowResponse response = flowExecutor.execute2Resp("chain3", "arg");
-		Assertions.assertTrue(response.isSuccess());
-	}
-
-}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/ACmp.java
deleted file mode 100644
index a314cdd38..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/ACmp.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <p>Title: liteflow</p>
- * <p>Description: 轻量级的组件式流程框架</p>
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.substituteNode.cmp;
-
-import com.yomahub.liteflow.core.NodeComponent;
-import org.noear.solon.annotation.Component;
-
-@Component("a")
-public class ACmp extends NodeComponent {
-
-	@Override
-	public void process() {
-		System.out.println("ACmp executed!");
-	}
-
-}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/BCmp.java
deleted file mode 100644
index 7bfec97e7..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/BCmp.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <p>Title: liteflow</p>
- * <p>Description: 轻量级的组件式流程框架</p>
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.substituteNode.cmp;
-
-import com.yomahub.liteflow.core.NodeComponent;
-import org.noear.solon.annotation.Component;
-
-@Component("b")
-public class BCmp extends NodeComponent {
-
-	@Override
-	public void process() {
-		System.out.println("BCmp executed!");
-	}
-
-}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/CCmp.java
deleted file mode 100644
index 040bbcbca..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/CCmp.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <p>Title: liteflow</p>
- * <p>Description: 轻量级的组件式流程框架</p>
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.substituteNode.cmp;
-
-import com.yomahub.liteflow.core.NodeComponent;
-import org.noear.solon.annotation.Component;
-
-@Component("c")
-public class CCmp extends NodeComponent {
-
-	@Override
-	public void process() {
-		System.out.println("CCmp executed!");
-	}
-
-}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/DCmp.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/DCmp.java
deleted file mode 100644
index 14aa20e9c..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/DCmp.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <p>Title: liteflow</p>
- * <p>Description: 轻量级的组件式流程框架</p>
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.substituteNode.cmp;
-
-import com.yomahub.liteflow.core.NodeComponent;
-import org.noear.solon.annotation.Component;
-
-@Component("88-ffc")
-public class DCmp extends NodeComponent {
-
-	@Override
-	public void process() {
-		System.out.println("DCmp executed!");
-	}
-
-}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/SubCmp.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/SubCmp.java
deleted file mode 100644
index 776a5b4cf..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/SubCmp.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <p>Title: liteflow</p>
- * <p>Description: 轻量级的组件式流程框架</p>
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.substituteNode.cmp;
-
-import com.yomahub.liteflow.core.NodeComponent;
-import org.noear.solon.annotation.Component;
-
-@Component("sub")
-public class SubCmp extends NodeComponent {
-
-	@Override
-	public void process() {
-		System.out.println("SubCmp executed!");
-	}
-
-}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/substituteNode/application.properties b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/substituteNode/application.properties
deleted file mode 100644
index 35bdc3a1e..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/substituteNode/application.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-liteflow.rule-source=substituteNode/flow.el.xml
-liteflow.substitute-cmp-class=com.yomahub.liteflow.test.substituteNode.cmp.SubCmp
\ No newline at end of file
diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/substituteNode/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/substituteNode/flow.el.xml
deleted file mode 100644
index 7730921b9..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/substituteNode/flow.el.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<flow>
-    <chain name="chain1">
-        THEN(node("a"), node("b"), node("c"));
-    </chain>
-
-    <chain name="chain2">
-        THEN(node("a"), node("b"), node("93-nodeTEST"));
-    </chain>
-
-    <chain name="chain3">
-        THEN(a, b, node("88-ffc"));
-    </chain>
-</flow>
\ No newline at end of file
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/SubstituteSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/SubstituteSpringbootTest.java
deleted file mode 100644
index 9323de377..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/SubstituteSpringbootTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.yomahub.liteflow.test.substituteNode;
-
-import com.yomahub.liteflow.core.FlowExecutor;
-import com.yomahub.liteflow.flow.LiteflowResponse;
-import com.yomahub.liteflow.test.BaseTest;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.test.context.TestPropertySource;
-
-import javax.annotation.Resource;
-
-/**
- * springboot环境EL替补节点的测试
- *
- * @author Bryan.Zhang
- */
-@TestPropertySource(value = "classpath:/substituteNode/application.properties")
-@SpringBootTest(classes = SubstituteSpringbootTest.class)
-@EnableAutoConfiguration
-@ComponentScan({ "com.yomahub.liteflow.test.substituteNode.cmp" })
-public class SubstituteSpringbootTest extends BaseTest {
-
-	@Resource
-	private FlowExecutor flowExecutor;
-
-	// 最简单的情况
-	@Test
-	public void testSub1() throws Exception {
-		LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg");
-		Assertions.assertTrue(response.isSuccess());
-	}
-
-	// 有替补节点
-	@Test
-	public void testSub2() throws Exception {
-		LiteflowResponse response = flowExecutor.execute2Resp("chain2", "arg");
-		Assertions.assertTrue(response.isSuccess());
-	}
-
-	// 测试特殊命名的节点
-	@Test
-	public void testSub3() throws Exception {
-		LiteflowResponse response = flowExecutor.execute2Resp("chain3", "arg");
-		Assertions.assertTrue(response.isSuccess());
-	}
-
-}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/ACmp.java
deleted file mode 100644
index b6e1d7d80..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/ACmp.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <p>Title: liteflow</p>
- * <p>Description: 轻量级的组件式流程框架</p>
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.substituteNode.cmp;
-
-import com.yomahub.liteflow.core.NodeComponent;
-import org.springframework.stereotype.Component;
-
-@Component("a")
-public class ACmp extends NodeComponent {
-
-	@Override
-	public void process() {
-		System.out.println("ACmp executed!");
-	}
-
-}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/BCmp.java
deleted file mode 100644
index 495db7ac3..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/BCmp.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <p>Title: liteflow</p>
- * <p>Description: 轻量级的组件式流程框架</p>
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.substituteNode.cmp;
-
-import com.yomahub.liteflow.core.NodeComponent;
-import org.springframework.stereotype.Component;
-
-@Component("b")
-public class BCmp extends NodeComponent {
-
-	@Override
-	public void process() {
-		System.out.println("BCmp executed!");
-	}
-
-}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/CCmp.java
deleted file mode 100644
index dca6da62a..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/CCmp.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <p>Title: liteflow</p>
- * <p>Description: 轻量级的组件式流程框架</p>
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.substituteNode.cmp;
-
-import com.yomahub.liteflow.core.NodeComponent;
-import org.springframework.stereotype.Component;
-
-@Component("c")
-public class CCmp extends NodeComponent {
-
-	@Override
-	public void process() {
-		System.out.println("CCmp executed!");
-	}
-
-}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/DCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/DCmp.java
deleted file mode 100644
index 728b48ff9..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/DCmp.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <p>Title: liteflow</p>
- * <p>Description: 轻量级的组件式流程框架</p>
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.substituteNode.cmp;
-
-import com.yomahub.liteflow.core.NodeComponent;
-import org.springframework.stereotype.Component;
-
-@Component("88-ffc")
-public class DCmp extends NodeComponent {
-
-	@Override
-	public void process() {
-		System.out.println("DCmp executed!");
-	}
-
-}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/SubCmp.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/SubCmp.java
deleted file mode 100644
index 620490341..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/substituteNode/cmp/SubCmp.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <p>Title: liteflow</p>
- * <p>Description: 轻量级的组件式流程框架</p>
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.substituteNode.cmp;
-
-import com.yomahub.liteflow.core.NodeComponent;
-import org.springframework.stereotype.Component;
-
-@Component("sub")
-public class SubCmp extends NodeComponent {
-
-	@Override
-	public void process() {
-		System.out.println("SubCmp executed!");
-	}
-
-}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/substituteNode/application.properties b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/substituteNode/application.properties
deleted file mode 100644
index 35bdc3a1e..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/substituteNode/application.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-liteflow.rule-source=substituteNode/flow.el.xml
-liteflow.substitute-cmp-class=com.yomahub.liteflow.test.substituteNode.cmp.SubCmp
\ No newline at end of file
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/substituteNode/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/substituteNode/flow.el.xml
deleted file mode 100644
index 7730921b9..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/substituteNode/flow.el.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<flow>
-    <chain name="chain1">
-        THEN(node("a"), node("b"), node("c"));
-    </chain>
-
-    <chain name="chain2">
-        THEN(node("a"), node("b"), node("93-nodeTEST"));
-    </chain>
-
-    <chain name="chain3">
-        THEN(a, b, node("88-ffc"));
-    </chain>
-</flow>
\ No newline at end of file