From b21d1bb215eb8e3dcea03cb0cde9d050e5c33e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E4=BD=B3?= Date: Tue, 6 Apr 2021 18:17:56 +0800 Subject: [PATCH] =?UTF-8?q?support=20#I3CT01=20=E5=B8=AEliteflow=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yomahub/liteflow/test/subflow/ImplicitSubFlowTest.java | 7 +++++-- .../liteflow/test/subflow/SubflowXMLSpringBootTest.java | 3 ++- .../liteflow/test/subflow/SubflowYmlSpringBootTest.java | 6 ++---- .../java/com/yomahub/liteflow/test/subflow/cmp2/FCmp.java | 2 +- .../java/com/yomahub/liteflow/test/subflow/cmp2/GCmp.java | 2 +- .../java/com/yomahub/liteflow/test/subflow/cmp2/HCmp.java | 2 +- .../java/com/yomahub/liteflow/test/subflow/cmp2/MCmp.java | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/ImplicitSubFlowTest.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/ImplicitSubFlowTest.java index d8427bb67..d8c8c1f3a 100644 --- a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/ImplicitSubFlowTest.java +++ b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/ImplicitSubFlowTest.java @@ -3,6 +3,7 @@ package com.yomahub.liteflow.test.subflow; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.entity.data.LiteflowResponse; import com.yomahub.liteflow.entity.data.Slot; +import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -27,11 +28,11 @@ import java.util.Set; @SpringBootTest(classes = ImplicitSubFlowTest.class) @EnableAutoConfiguration @ComponentScan({"com.yomahub.liteflow.test.subflow.cmp2"}) -public class ImplicitSubFlowTest { +public class ImplicitSubFlowTest extends BaseTest { @Resource private FlowExecutor flowExecutor; - public static final Set RUN_TIME_SLOT = new HashSet<>(); + public static final Set RUN_TIME_SLOT = new HashSet<>(); //这里GCmp中隐式的调用chain4，从而执行了h，m @Test @@ -42,5 +43,7 @@ public class ImplicitSubFlowTest { // 传递了slotIndex，则set的size==1 Assert.assertEquals(1, RUN_TIME_SLOT.size()); + // set中第一次设置的requestId和response中的requestId一致 + Assert.assertTrue(RUN_TIME_SLOT.contains(response.getData().getRequestId())); } } 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 9668c7cef..3bced2c2c 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 @@ -3,6 +3,7 @@ package com.yomahub.liteflow.test.subflow; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.entity.data.LiteflowResponse; import com.yomahub.liteflow.entity.data.Slot; +import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,7 +26,7 @@ import javax.annotation.Resource; @SpringBootTest(classes = SubflowXMLSpringBootTest.class) @EnableAutoConfiguration @ComponentScan({"com.yomahub.liteflow.test.subflow.cmp1"}) -public class SubflowXMLSpringBootTest { +public class SubflowXMLSpringBootTest extends BaseTest { @Resource private FlowExecutor flowExecutor; 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 4fb8b70b9..3206e06b4 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 @@ -3,7 +3,7 @@ package com.yomahub.liteflow.test.subflow; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.entity.data.LiteflowResponse; import com.yomahub.liteflow.entity.data.Slot; -import com.yomahub.liteflow.test.parser.LFParserXmlSpringbootTest; +import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -26,7 +26,7 @@ import javax.annotation.Resource; @SpringBootTest(classes = SubflowYmlSpringBootTest.class) @EnableAutoConfiguration @ComponentScan({"com.yomahub.liteflow.test.subflow.cmp1"}) -public class SubflowYmlSpringBootTest { +public class SubflowYmlSpringBootTest extends BaseTest { @Resource private FlowExecutor flowExecutor; @@ -37,6 +37,4 @@ public class SubflowYmlSpringBootTest { Assert.assertTrue(response.isSuccess()); 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/cmp2/FCmp.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/cmp2/FCmp.java index f55e796e9..b9a0d458e 100644 --- a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/cmp2/FCmp.java +++ b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/cmp2/FCmp.java @@ -11,7 +11,7 @@ public class FCmp extends NodeComponent { @Override public void process() throws Exception { - RUN_TIME_SLOT.add(this.getSlotIndex()); + RUN_TIME_SLOT.add(this.getSlot().getRequestId()); System.out.println("Fcomp executed!"); } diff --git a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/cmp2/GCmp.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/cmp2/GCmp.java index 96e0952b8..368825469 100644 --- a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/cmp2/GCmp.java +++ b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/cmp2/GCmp.java @@ -19,7 +19,7 @@ public class GCmp extends NodeComponent { @Override public void process() throws Exception { - RUN_TIME_SLOT.add(this.getSlotIndex()); + RUN_TIME_SLOT.add(this.getSlot().getRequestId()); System.out.println("Gcomp executed!"); diff --git a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/cmp2/HCmp.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/cmp2/HCmp.java index 2f3352eba..ee03a9a23 100644 --- a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/cmp2/HCmp.java +++ b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/cmp2/HCmp.java @@ -11,7 +11,7 @@ public class HCmp extends NodeComponent { @Override public void process() throws Exception { - RUN_TIME_SLOT.add(this.getSlotIndex()); + RUN_TIME_SLOT.add(this.getSlot().getRequestId()); System.out.println("Hcomp executed!"); } diff --git a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/cmp2/MCmp.java b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/cmp2/MCmp.java index 1b185bb7c..e54afd856 100644 --- a/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/cmp2/MCmp.java +++ b/liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/subflow/cmp2/MCmp.java @@ -11,7 +11,7 @@ public class MCmp extends NodeComponent { @Override public void process() throws Exception { - RUN_TIME_SLOT.add(this.getSlotIndex()); + RUN_TIME_SLOT.add(this.getSlot().getRequestId()); System.out.println("Mcomp executed!"); }