diff --git a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/SubflowJsonSpringBootTest.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/SubflowJsonSpringBootTest.java index 99977abc4..bf70613a5 100644 --- a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/SubflowJsonSpringBootTest.java +++ b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/SubflowJsonSpringBootTest.java @@ -34,6 +34,6 @@ public class SubflowJsonSpringBootTest { public void testExplicitSubFlow() throws Exception { LiteflowResponse response = flowExecutor.execute("chain1", "it's a request"); Assert.assertTrue(response.isSuccess()); - Assert.assertEquals("a==>b==>c==>b==>a", response.getData().printStep()); + Assert.assertEquals("a==>b==>c==>b==>a==>e==>d", response.getData().printStep()); } } diff --git a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/SubflowXMLSpringBootTest.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/SubflowXMLSpringBootTest.java index b1aa6723a..9668c7cef 100644 --- a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/SubflowXMLSpringBootTest.java +++ b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/SubflowXMLSpringBootTest.java @@ -34,6 +34,6 @@ public class SubflowXMLSpringBootTest { public void testExplicitSubFlow() throws Exception { LiteflowResponse response = flowExecutor.execute("chain1", "it's a request"); Assert.assertTrue(response.isSuccess()); - Assert.assertEquals("a==>b==>c==>b==>a", response.getData().printStep()); + Assert.assertEquals("a==>b==>c==>b==>a==>e==>d", response.getData().printStep()); } } diff --git a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/SubflowYmlSpringBootTest.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/SubflowYmlSpringBootTest.java index 32468a423..4fb8b70b9 100644 --- a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/SubflowYmlSpringBootTest.java +++ b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/SubflowYmlSpringBootTest.java @@ -35,7 +35,7 @@ public class SubflowYmlSpringBootTest { public void testExplicitSubFlowYml() throws Exception { LiteflowResponse response = flowExecutor.execute("chain1", "it's a request"); Assert.assertTrue(response.isSuccess()); - Assert.assertEquals("a==>b==>c==>b==>a", response.getData().printStep()); + Assert.assertEquals("a==>b==>c==>b==>a==>e==>d", response.getData().printStep()); } diff --git a/liteflow-spring-boot-starter/src/test/resources/subflow/flow-implicit.xml b/liteflow-spring-boot-starter/src/test/resources/subflow/flow-implicit.xml index 51a2b0925..5baca7072 100644 --- a/liteflow-spring-boot-starter/src/test/resources/subflow/flow-implicit.xml +++ b/liteflow-spring-boot-starter/src/test/resources/subflow/flow-implicit.xml @@ -1,7 +1,7 @@ - + diff --git a/liteflow-spring-boot-starter/src/test/resources/subflow/flow.json b/liteflow-spring-boot-starter/src/test/resources/subflow/flow.json index 43e6344fb..143589315 100644 --- a/liteflow-spring-boot-starter/src/test/resources/subflow/flow.json +++ b/liteflow-spring-boot-starter/src/test/resources/subflow/flow.json @@ -1,10 +1,17 @@ { "flow": { "chain": [ + { + "name": "chain3", + "condition": [ + {"type": "then", "value": "e,d"} + ] + }, { "name": "chain2", "condition": [ - {"type": "then", "value": "b,a"} + {"type": "then", "value": "b,a"}, + {"type": "then", "value": "chain3"} ] }, { diff --git a/liteflow-spring-boot-starter/src/test/resources/subflow/flow.xml b/liteflow-spring-boot-starter/src/test/resources/subflow/flow.xml index 937ce0313..03cf81299 100644 --- a/liteflow-spring-boot-starter/src/test/resources/subflow/flow.xml +++ b/liteflow-spring-boot-starter/src/test/resources/subflow/flow.xml @@ -12,6 +12,11 @@ + - + + + + + \ No newline at end of file diff --git a/liteflow-spring-boot-starter/src/test/resources/subflow/flow.yml b/liteflow-spring-boot-starter/src/test/resources/subflow/flow.yml index 030f2e008..cdd8de74b 100644 --- a/liteflow-spring-boot-starter/src/test/resources/subflow/flow.yml +++ b/liteflow-spring-boot-starter/src/test/resources/subflow/flow.yml @@ -1,5 +1,9 @@ flow: chain: + - name: chain3 + condition: + - type: then + value: 'e,d' - name: chain1 condition: - type: then @@ -15,4 +19,6 @@ flow: - name: chain2 condition: - type: then - value: 'b,a' \ No newline at end of file + value: 'b,a' + - type: then + value: 'chain3' \ No newline at end of file