From 30c42061fdfc989eea9b2eb1ce71ca240fd328e2 Mon Sep 17 00:00:00 2001
From: zy <953725892@qq.com>
Date: Mon, 9 Oct 2023 20:29:04 +0800
Subject: [PATCH] =?UTF-8?q?test=20#I7SVZF=20=E6=B7=BB=E5=8A=A0=E6=96=B0?=
=?UTF-8?q?=E7=9A=84=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=EF=BC=8C=E7=94=A8?=
=?UTF-8?q?=E4=BA=8E=E6=B5=8B=E8=AF=95=E4=B8=8D=E5=90=8C=E5=90=8D=E7=A7=B0?=
=?UTF-8?q?=E5=8D=A0=E4=BD=8D=E7=AC=A6=E6=98=AF=E5=90=A6=E6=9C=89=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../AbstractChainJsonELDeclMultiSpringBootTest.java | 7 +++++++
.../AbstractChainXmlELDeclMultiSpringbootTest.java | 7 +++++++
.../AbstractChainYmlELDeclMultiSpringBootTest.java | 7 +++++++
.../src/test/resources/abstractChain/flow.el.json | 9 +++++++++
.../src/test/resources/abstractChain/flow.el.xml | 10 ++++++++++
.../src/test/resources/abstractChain/flow.el.yml | 5 +++++
.../AbstractChainJsonELDeclSpringBootTest.java | 7 +++++++
.../AbstractChainXmlELDeclSpringbootTest.java | 7 +++++++
.../AbstractChainYmlELDeclSpringBootTest.java | 7 +++++++
.../src/test/resources/abstractChain/flow.el.json | 9 +++++++++
.../src/test/resources/abstractChain/flow.el.xml | 10 ++++++++++
.../src/test/resources/abstractChain/flow.el.yml | 5 +++++
.../test/abstractChain/AbstractChainJsonELTest.java | 7 +++++++
.../test/abstractChain/AbstractChainXmlELTest.java | 6 ++++++
.../test/abstractChain/AbstractChainYmlELTest.java | 6 ++++++
.../src/test/resources/abstractChain/flow.el.json | 9 +++++++++
.../src/test/resources/abstractChain/flow.el.xml | 10 ++++++++++
.../src/test/resources/abstractChain/flow.el.yml | 6 ++++++
.../AbstractChainJsonELSpringBootTest.java | 7 +++++++
.../AbstractChainXMLELSpringBootTest.java | 7 +++++++
.../AbstractChainYmlELSpringBootTest.java | 7 +++++++
.../src/test/resources/abstractChain/flow.el.json | 9 +++++++++
.../src/test/resources/abstractChain/flow.el.xml | 11 +++++++++++
.../src/test/resources/abstractChain/flow.el.yml | 6 ++++++
.../AbstractChainJsonELSpringBootTest.java | 2 +-
.../AbstractChainYmlELSpringBootTest.java | 7 +++++++
.../src/test/resources/abstractChain/flow.el.json | 9 +++++++++
.../src/test/resources/abstractChain/flow.el.yml | 5 +++++
.../abstractChain/AbstractChainJsonELSpringTest.java | 7 +++++++
.../abstractChain/AbstractChainXMLELSpringTest.java | 7 +++++++
.../abstractChain/AbstractChainYMLELSpringTest.java | 7 +++++++
.../src/test/resources/abstractChain/flow.el.json | 9 +++++++++
.../src/test/resources/abstractChain/flow.el.xml | 12 ++++++++++++
.../src/test/resources/abstractChain/flow.el.yml | 5 +++++
34 files changed, 250 insertions(+), 1 deletion(-)
diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELDeclMultiSpringBootTest.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELDeclMultiSpringBootTest.java
index 07cfe7f04..1ba991570 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELDeclMultiSpringBootTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELDeclMultiSpringBootTest.java
@@ -50,4 +50,11 @@ public class AbstractChainJsonELDeclMultiSpringBootTest extends BaseTest {
Assertions.assertEquals("a==>b==>a==>b==>a==>b==>f==>a==>b", response.getExecuteStepStrWithoutTime());
}
+ @Test
+ public void test4() throws Exception {
+ LiteflowResponse response = flowExecutor.execute2Resp("implD", "arg");
+ Assertions.assertTrue(response.isSuccess());
+ Assertions.assertEquals("a==>b==>a==>b==>j==>k==>c==>d==>f==>j", response.getExecuteStepStrWithoutTime());
+ }
+
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXmlELDeclMultiSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXmlELDeclMultiSpringbootTest.java
index 783ec11f1..d203043c5 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXmlELDeclMultiSpringbootTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXmlELDeclMultiSpringbootTest.java
@@ -52,4 +52,11 @@ public class AbstractChainXmlELDeclMultiSpringbootTest extends BaseTest {
Assertions.assertEquals("a==>b==>a==>b==>a==>b==>f==>a==>b", response.getExecuteStepStrWithoutTime());
}
+ @Test
+ public void test4() throws Exception {
+ LiteflowResponse response = flowExecutor.execute2Resp("implD", "arg");
+ Assertions.assertTrue(response.isSuccess());
+ Assertions.assertEquals("a==>b==>a==>b==>j==>k==>c==>d==>f==>j", response.getExecuteStepStrWithoutTime());
+ }
+
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELDeclMultiSpringBootTest.java b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELDeclMultiSpringBootTest.java
index 42d3f8b0d..7956d963e 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELDeclMultiSpringBootTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELDeclMultiSpringBootTest.java
@@ -51,4 +51,11 @@ public class AbstractChainYmlELDeclMultiSpringBootTest extends BaseTest {
Assertions.assertEquals("a==>b==>a==>b==>a==>b==>f==>a==>b", response.getExecuteStepStrWithoutTime());
}
+ @Test
+ public void test4() throws Exception {
+ LiteflowResponse response = flowExecutor.execute2Resp("implD", "arg");
+ Assertions.assertTrue(response.isSuccess());
+ Assertions.assertEquals("a==>b==>a==>b==>j==>k==>c==>d==>f==>j", response.getExecuteStepStrWithoutTime());
+ }
+
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/abstractChain/flow.el.json b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/abstractChain/flow.el.json
index 453bda2d9..d6faf3c68 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/abstractChain/flow.el.json
+++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/abstractChain/flow.el.json
@@ -26,6 +26,15 @@
"extends": "base",
"abstract": true,
"value": "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);"
+ },
+ {
+ "id": "base3",
+ "value": "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain});"
+ },
+ {
+ "id": "implD",
+ "extends": "base3",
+ "value": "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);"
}
]
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/abstractChain/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/abstractChain/flow.el.xml
index 1994b64c5..a5cfb0552 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/abstractChain/flow.el.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/abstractChain/flow.el.xml
@@ -23,6 +23,16 @@
{0}=THEN(a,b,{3});
{1}=SWITCH(f).to({4},k);
+
+ THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain})
+
+
+ {_pre} = THEN(a,b);
+ {mainChain}=THEN(a,b);
+ {subChain1}=THEN(j,k);
+ {subChain2}=IF(c, d, e);
+ {end_chain}=SWITCH(f).to(j,k);
+
\ No newline at end of file
diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/abstractChain/flow.el.yml b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/abstractChain/flow.el.yml
index b79e458fe..e1ec5e509 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/abstractChain/flow.el.yml
+++ b/liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/abstractChain/flow.el.yml
@@ -16,3 +16,8 @@ flow:
extends: base
abstract: true
value: "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);"
+ - id: base3
+ value: "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain})"
+ - id: implD
+ extends: base3
+ value: "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);"
diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELDeclSpringBootTest.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELDeclSpringBootTest.java
index d7ea03a74..885cf9821 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELDeclSpringBootTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELDeclSpringBootTest.java
@@ -50,4 +50,11 @@ public class AbstractChainJsonELDeclSpringBootTest extends BaseTest {
Assertions.assertEquals("a==>b==>a==>b==>a==>b==>f==>a==>b", response.getExecuteStepStrWithoutTime());
}
+ @Test
+ public void test4() throws Exception {
+ LiteflowResponse response = flowExecutor.execute2Resp("implD", "arg");
+ Assertions.assertTrue(response.isSuccess());
+ Assertions.assertEquals("a==>b==>a==>b==>j==>k==>c==>d==>f==>j", response.getExecuteStepStrWithoutTime());
+ }
+
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXmlELDeclSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXmlELDeclSpringbootTest.java
index 5243dc7e0..e1131c09e 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXmlELDeclSpringbootTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXmlELDeclSpringbootTest.java
@@ -52,4 +52,11 @@ public class AbstractChainXmlELDeclSpringbootTest extends BaseTest {
Assertions.assertEquals("a==>b==>a==>b==>a==>b==>f==>a==>b", response.getExecuteStepStrWithoutTime());
}
+ @Test
+ public void test4() throws Exception {
+ LiteflowResponse response = flowExecutor.execute2Resp("implD", "arg");
+ Assertions.assertTrue(response.isSuccess());
+ Assertions.assertEquals("a==>b==>a==>b==>j==>k==>c==>d==>f==>j", response.getExecuteStepStrWithoutTime());
+ }
+
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELDeclSpringBootTest.java b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELDeclSpringBootTest.java
index f8d482b84..c803b747d 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELDeclSpringBootTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELDeclSpringBootTest.java
@@ -51,4 +51,11 @@ public class AbstractChainYmlELDeclSpringBootTest extends BaseTest {
Assertions.assertEquals("a==>b==>a==>b==>a==>b==>f==>a==>b", response.getExecuteStepStrWithoutTime());
}
+ @Test
+ public void test4() throws Exception {
+ LiteflowResponse response = flowExecutor.execute2Resp("implD", "arg");
+ Assertions.assertTrue(response.isSuccess());
+ Assertions.assertEquals("a==>b==>a==>b==>j==>k==>c==>d==>f==>j", response.getExecuteStepStrWithoutTime());
+ }
+
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.json b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.json
index 453bda2d9..d6faf3c68 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.json
+++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.json
@@ -26,6 +26,15 @@
"extends": "base",
"abstract": true,
"value": "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);"
+ },
+ {
+ "id": "base3",
+ "value": "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain});"
+ },
+ {
+ "id": "implD",
+ "extends": "base3",
+ "value": "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);"
}
]
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.xml
index 1994b64c5..a5cfb0552 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.xml
@@ -23,6 +23,16 @@
{0}=THEN(a,b,{3});
{1}=SWITCH(f).to({4},k);
+
+ THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain})
+
+
+ {_pre} = THEN(a,b);
+ {mainChain}=THEN(a,b);
+ {subChain1}=THEN(j,k);
+ {subChain2}=IF(c, d, e);
+ {end_chain}=SWITCH(f).to(j,k);
+
\ No newline at end of file
diff --git a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.yml b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.yml
index b79e458fe..e1ec5e509 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.yml
+++ b/liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/abstractChain/flow.el.yml
@@ -16,3 +16,8 @@ flow:
extends: base
abstract: true
value: "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);"
+ - id: base3
+ value: "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain})"
+ - id: implD
+ extends: base3
+ value: "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);"
diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELTest.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELTest.java
index 5fa16af04..7b9ed4de0 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELTest.java
@@ -48,4 +48,11 @@ public class AbstractChainJsonELTest extends BaseTest {
Assertions.assertEquals("a==>b==>a==>b==>a==>b==>f==>a==>b", response.getExecuteStepStrWithoutTime());
}
+ @Test
+ public void test4() throws Exception {
+ LiteflowResponse response = flowExecutor.execute2Resp("implD", "arg");
+ Assertions.assertTrue(response.isSuccess());
+ Assertions.assertEquals("a==>b==>a==>b==>j==>k==>c==>d==>f==>j", response.getExecuteStepStrWithoutTime());
+ }
+
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXmlELTest.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXmlELTest.java
index ac3b2f1f6..7255b2ef6 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXmlELTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXmlELTest.java
@@ -47,4 +47,10 @@ public class AbstractChainXmlELTest extends BaseTest {
Assertions.assertEquals("a==>b==>a==>b==>a==>b==>f==>a==>b", response.getExecuteStepStrWithoutTime());
}
+ @Test
+ public void test4() throws Exception {
+ LiteflowResponse response = flowExecutor.execute2Resp("implD", "arg");
+ Assertions.assertTrue(response.isSuccess());
+ Assertions.assertEquals("a==>b==>a==>b==>j==>k==>c==>d==>f==>j", response.getExecuteStepStrWithoutTime());
+ }
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELTest.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELTest.java
index 0c4686341..e9e6f7e18 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELTest.java
@@ -46,4 +46,10 @@ public class AbstractChainYmlELTest extends BaseTest {
Assertions.assertEquals("a==>b==>a==>b==>a==>b==>f==>a==>b", response.getExecuteStepStrWithoutTime());
}
+ @Test
+ public void test4() throws Exception {
+ LiteflowResponse response = flowExecutor.execute2Resp("implD", "arg");
+ Assertions.assertTrue(response.isSuccess());
+ Assertions.assertEquals("a==>b==>a==>b==>j==>k==>c==>d==>f==>j", response.getExecuteStepStrWithoutTime());
+ }
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.json b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.json
index c21c13d09..8be759158 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.json
+++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.json
@@ -62,6 +62,15 @@
"extends": "base",
"abstract": true,
"value": "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);"
+ },
+ {
+ "id": "base3",
+ "value": "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain});"
+ },
+ {
+ "id": "implD",
+ "extends": "base3",
+ "value": "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);"
}
]
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.xml
index 0490583be..7b11ef482 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.xml
@@ -34,6 +34,16 @@
{0}=THEN(a,b,{3});
{1}=SWITCH(f).to({4},k);
+
+ THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain})
+
+
+ {_pre} = THEN(a,b);
+ {mainChain}=THEN(a,b);
+ {subChain1}=THEN(j,k);
+ {subChain2}=IF(c, d, e);
+ {end_chain}=SWITCH(f).to(j,k);
+
\ No newline at end of file
diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.yml b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.yml
index d32f584cb..41c52e573 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.yml
+++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/abstractChain/flow.el.yml
@@ -34,3 +34,9 @@ flow:
extends: base
abstract: true
value: "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);"
+ - id: base3
+ value: "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain})"
+ - id: implD
+ extends: base3
+ value: "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);"
+
diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELSpringBootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELSpringBootTest.java
index 26f9cacaa..d2a6809ae 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELSpringBootTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELSpringBootTest.java
@@ -41,4 +41,11 @@ public class AbstractChainJsonELSpringBootTest extends BaseTest {
Assertions.assertEquals("a==>b==>a==>b==>a==>b==>f==>a==>b", response.getExecuteStepStrWithoutTime());
}
+ @Test
+ public void test4() throws Exception {
+ LiteflowResponse response = flowExecutor.execute2Resp("implD", "arg");
+ Assertions.assertTrue(response.isSuccess());
+ Assertions.assertEquals("a==>b==>a==>b==>j==>k==>c==>d==>f==>j", response.getExecuteStepStrWithoutTime());
+ }
+
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXMLELSpringBootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXMLELSpringBootTest.java
index 0b771dc8e..e4be4203c 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXMLELSpringBootTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXMLELSpringBootTest.java
@@ -46,4 +46,11 @@ public class AbstractChainXMLELSpringBootTest extends BaseTest {
Assertions.assertEquals("a==>b==>a==>b==>a==>b==>f==>a==>b", response.getExecuteStepStrWithoutTime());
}
+ @Test
+ public void test4() throws Exception {
+ LiteflowResponse response = flowExecutor.execute2Resp("implD", "arg");
+ Assertions.assertTrue(response.isSuccess());
+ Assertions.assertEquals("a==>b==>a==>b==>j==>k==>c==>d==>f==>j", response.getExecuteStepStrWithoutTime());
+ }
+
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELSpringBootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELSpringBootTest.java
index 85bc87eca..454011c00 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELSpringBootTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELSpringBootTest.java
@@ -45,4 +45,11 @@ public class AbstractChainYmlELSpringBootTest extends BaseTest {
Assertions.assertEquals("a==>b==>a==>b==>a==>b==>f==>a==>b", response.getExecuteStepStrWithoutTime());
}
+ @Test
+ public void test4() throws Exception {
+ LiteflowResponse response = flowExecutor.execute2Resp("implD", "arg");
+ Assertions.assertTrue(response.isSuccess());
+ Assertions.assertEquals("a==>b==>a==>b==>j==>k==>c==>d==>f==>j", response.getExecuteStepStrWithoutTime());
+ }
+
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/abstractChain/flow.el.json b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/abstractChain/flow.el.json
index 453bda2d9..d6faf3c68 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/abstractChain/flow.el.json
+++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/abstractChain/flow.el.json
@@ -26,6 +26,15 @@
"extends": "base",
"abstract": true,
"value": "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);"
+ },
+ {
+ "id": "base3",
+ "value": "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain});"
+ },
+ {
+ "id": "implD",
+ "extends": "base3",
+ "value": "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);"
}
]
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/abstractChain/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/abstractChain/flow.el.xml
index 1994b64c5..985846f96 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/abstractChain/flow.el.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/abstractChain/flow.el.xml
@@ -23,6 +23,17 @@
{0}=THEN(a,b,{3});
{1}=SWITCH(f).to({4},k);
+
+ THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain})
+
+
+
+ {_pre} = THEN(a,b);
+ {mainChain}=THEN(a,b);
+ {subChain1}=THEN(j,k);
+ {subChain2}=IF(c, d, e);
+ {end_chain}=SWITCH(f).to(j,k);
+
\ No newline at end of file
diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/abstractChain/flow.el.yml b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/abstractChain/flow.el.yml
index b79e458fe..3e4b6edfb 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/abstractChain/flow.el.yml
+++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/abstractChain/flow.el.yml
@@ -16,3 +16,9 @@ flow:
extends: base
abstract: true
value: "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);"
+ - id: base3
+ value: "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain})"
+ - id: implD
+ extends: base3
+ value: "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);"
+
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELSpringBootTest.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELSpringBootTest.java
index 38f2ea997..d907e434c 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELSpringBootTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELSpringBootTest.java
@@ -54,7 +54,7 @@ public class AbstractChainJsonELSpringBootTest extends BaseTest {
public void test4() throws Exception {
LiteflowResponse response = flowExecutor.execute2Resp("implD", "arg");
Assertions.assertTrue(response.isSuccess());
- Assertions.assertEquals("a==>b==>j==>k==>c==>d==>f==>j", response.getExecuteStepStrWithoutTime());
+ Assertions.assertEquals("a==>b==>a==>b==>j==>k==>c==>d==>f==>j", response.getExecuteStepStrWithoutTime());
}
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELSpringBootTest.java b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELSpringBootTest.java
index b6fb89330..139d7fa94 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELSpringBootTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELSpringBootTest.java
@@ -51,4 +51,11 @@ public class AbstractChainYmlELSpringBootTest extends BaseTest {
Assertions.assertEquals("a==>b==>a==>b==>a==>b==>f==>a==>b", response.getExecuteStepStrWithoutTime());
}
+ @Test
+ public void test4() throws Exception {
+ LiteflowResponse response = flowExecutor.execute2Resp("implD", "arg");
+ Assertions.assertTrue(response.isSuccess());
+ Assertions.assertEquals("a==>b==>a==>b==>j==>k==>c==>d==>f==>j", response.getExecuteStepStrWithoutTime());
+ }
+
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.json b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.json
index ea1c3d127..3dda6313c 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.json
+++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.json
@@ -24,6 +24,15 @@
"id": "base2",
"extends": "base",
"value": "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);"
+ },
+ {
+ "id": "base3",
+ "value": "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain});"
+ },
+ {
+ "id": "implD",
+ "extends": "base3",
+ "value": "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);"
}
]
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.yml b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.yml
index 21b5fe2bb..3a9fa1476 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.yml
+++ b/liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/resources/abstractChain/flow.el.yml
@@ -14,3 +14,8 @@ flow:
- id: base2
extends: base
value: "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);"
+ - id: base3
+ value: "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain})"
+ - id: implD
+ extends: base3
+ value: "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);"
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELSpringTest.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELSpringTest.java
index 0fbfb81fc..e369586de 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELSpringTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELSpringTest.java
@@ -42,4 +42,11 @@ public class AbstractChainJsonELSpringTest extends BaseTest {
Assertions.assertEquals("a==>b==>a==>b==>a==>b==>f==>a==>b", response.getExecuteStepStrWithoutTime());
}
+ @Test
+ public void test4() throws Exception {
+ LiteflowResponse response = flowExecutor.execute2Resp("implD", "arg");
+ Assertions.assertTrue(response.isSuccess());
+ Assertions.assertEquals("a==>b==>a==>b==>j==>k==>c==>d==>f==>j", response.getExecuteStepStrWithoutTime());
+ }
+
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXMLELSpringTest.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXMLELSpringTest.java
index b07b2c0ec..5bef9cb05 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXMLELSpringTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXMLELSpringTest.java
@@ -43,4 +43,11 @@ public class AbstractChainXMLELSpringTest extends BaseTest {
Assertions.assertEquals("a==>b==>a==>b==>a==>b==>f==>a==>b", response.getExecuteStepStrWithoutTime());
}
+ @Test
+ public void test4() throws Exception {
+ LiteflowResponse response = flowExecutor.execute2Resp("implD", "arg");
+ Assertions.assertTrue(response.isSuccess());
+ Assertions.assertEquals("a==>b==>a==>b==>j==>k==>c==>d==>f==>j", response.getExecuteStepStrWithoutTime());
+ }
+
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYMLELSpringTest.java b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYMLELSpringTest.java
index adff8b938..71696436a 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYMLELSpringTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYMLELSpringTest.java
@@ -43,4 +43,11 @@ public class AbstractChainYMLELSpringTest extends BaseTest {
Assertions.assertEquals("a==>b==>a==>b==>a==>b==>f==>a==>b", response.getExecuteStepStrWithoutTime());
}
+ @Test
+ public void test4() throws Exception {
+ LiteflowResponse response = flowExecutor.execute2Resp("implD", "arg");
+ Assertions.assertTrue(response.isSuccess());
+ Assertions.assertEquals("a==>b==>a==>b==>j==>k==>c==>d==>f==>j", response.getExecuteStepStrWithoutTime());
+ }
+
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.json b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.json
index 453bda2d9..d6faf3c68 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.json
+++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.json
@@ -26,6 +26,15 @@
"extends": "base",
"abstract": true,
"value": "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);"
+ },
+ {
+ "id": "base3",
+ "value": "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain});"
+ },
+ {
+ "id": "implD",
+ "extends": "base3",
+ "value": "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);"
}
]
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.xml
index 1994b64c5..e75c61b3d 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.xml
@@ -24,5 +24,17 @@
{1}=SWITCH(f).to({4},k);
+
+ THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain})
+
+
+
+ {_pre} = THEN(a,b);
+ {mainChain}=THEN(a,b);
+ {subChain1}=THEN(j,k);
+ {subChain2}=IF(c, d, e);
+ {end_chain}=SWITCH(f).to(j,k);
+
+
\ No newline at end of file
diff --git a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.yml b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.yml
index b79e458fe..e1ec5e509 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.yml
+++ b/liteflow-testcase-el/liteflow-testcase-el-springnative/src/test/resources/abstractChain/flow.el.yml
@@ -16,3 +16,8 @@ flow:
extends: base
abstract: true
value: "{0}=THEN(a,b,{3});\n {1}=SWITCH(f).to({4},k);"
+ - id: base3
+ value: "THEN({_pre},{mainChain}, {subChain1},{subChain2},{end_chain})"
+ - id: implD
+ extends: base3
+ value: "{_pre} = THEN(a,b);\n {mainChain}=THEN(a,b);\n{subChain1}=THEN(j,k);\n{subChain2}=IF(c, d, e);\n{end_chain}=SWITCH(f).to(j,k);"