优化测试用例

liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/builder/BuilderELDeclSpringbootTest1.java

@@ -1,20 +1,17 @@
 package com.yomahub.liteflow.test.builder;
 
-import com.yomahub.liteflow.builder.LiteFlowChainBuilder;
-import com.yomahub.liteflow.builder.LiteFlowConditionBuilder;
-import com.yomahub.liteflow.builder.LiteFlowNodeBuilder;
 import com.yomahub.liteflow.builder.el.LiteFlowChainELBuilder;
 import com.yomahub.liteflow.core.FlowExecutor;
-import com.yomahub.liteflow.builder.entity.ExecutableEntity;
 import com.yomahub.liteflow.flow.LiteflowResponse;
-import com.yomahub.liteflow.enums.NodeTypeEnum;
 import com.yomahub.liteflow.test.BaseTest;
-import com.yomahub.liteflow.test.builder.cmp1.*;
+import com.yomahub.liteflow.test.base.BaseELDeclSpringbootTest;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 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 org.springframework.test.context.junit4.SpringRunner;
 
 import javax.annotation.Resource;
@@ -25,6 +22,7 @@ import javax.annotation.Resource;
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = BuilderELDeclSpringbootTest1.class)
 @EnableAutoConfiguration
+@ComponentScan({"com.yomahub.liteflow.test.builder.cmp1"})
 public class BuilderELDeclSpringbootTest1 extends BaseTest {
 
     @Resource
@@ -33,43 +31,6 @@ public class BuilderELDeclSpringbootTest1 extends BaseTest {
     //基于普通组件的builder模式测试
     @Test
     public void testBuilder() throws Exception {
-        LiteFlowNodeBuilder.createNode().setId("a")
-                .setName("组件A")
-                .setType(NodeTypeEnum.COMMON)
-                .setClazz("com.yomahub.liteflow.test.builder.cmp1.ACmp")
-                .build();
-        LiteFlowNodeBuilder.createNode().setId("b")
-                .setName("组件B")
-                .setType(NodeTypeEnum.COMMON)
-                .setClazz("com.yomahub.liteflow.test.builder.cmp1.BCmp")
-                .build();
-        LiteFlowNodeBuilder.createNode().setId("c")
-                .setName("组件C")
-                .setType(NodeTypeEnum.COMMON)
-                .setClazz("com.yomahub.liteflow.test.builder.cmp1.CCmp")
-                .build();
-        LiteFlowNodeBuilder.createNode().setId("d")
-                .setName("组件D")
-                .setType(NodeTypeEnum.COMMON)
-                .setClazz("com.yomahub.liteflow.test.builder.cmp1.DCmp")
-                .build();
-        LiteFlowNodeBuilder.createNode().setId("e")
-                .setName("组件E")
-                .setType(NodeTypeEnum.SWITCH)
-                .setClazz("com.yomahub.liteflow.test.builder.cmp1.ECmp")
-                .build();
-        LiteFlowNodeBuilder.createNode().setId("f")
-                .setName("组件F")
-                .setType(NodeTypeEnum.COMMON)
-                .setClazz("com.yomahub.liteflow.test.builder.cmp1.FCmp")
-                .build();
-        LiteFlowNodeBuilder.createNode().setId("g")
-                .setName("组件G")
-                .setType(NodeTypeEnum.COMMON)
-                .setClazz("com.yomahub.liteflow.test.builder.cmp1.GCmp")
-                .build();
-
-
         LiteFlowChainELBuilder.createChain().setChainName("chain2").setEL(
                 "THEN(c, d)"
         ).build();
@@ -80,133 +41,22 @@ public class BuilderELDeclSpringbootTest1 extends BaseTest {
 
         LiteflowResponse response = flowExecutor.execute2Resp("chain1");
         Assert.assertTrue(response.isSuccess());
-        Assert.assertEquals("a[组件A]==>b[组件B]==>e[组件E]==>c[组件C]==>d[组件D]", response.getExecuteStepStr());
+        Assert.assertEquals("a==>b==>e==>c==>d", response.getExecuteStepStrWithoutTime());
     }
 
-    //基于普通组件的builder模式测试
-    @Test
-    public void testBuilderForClassAndCode() throws Exception {
-        LiteFlowNodeBuilder.createNode().setId("a")
-                .setName("组件A")
-                .setType(NodeTypeEnum.COMMON)
-                .setClazz(ACmp.class)
-                .build();
-        LiteFlowNodeBuilder.createNode().setId("b")
-                .setName("组件B")
-                .setType(NodeTypeEnum.COMMON)
-                .setClazz(BCmp.class)
-                .build();
-        LiteFlowNodeBuilder.createNode().setId("c")
-                .setName("组件C")
-                .setType(NodeTypeEnum.COMMON)
-                .setClazz(CCmp.class)
-                .build();
-        LiteFlowNodeBuilder.createNode().setId("d")
-                .setName("组件D")
-                .setType(NodeTypeEnum.COMMON)
-                .setClazz(DCmp.class)
-                .build();
-        LiteFlowNodeBuilder.createNode().setId("e")
-                .setName("组件E")
-                .setType(NodeTypeEnum.SWITCH)
-                .setClazz(ECmp.class)
-                .build();
-        LiteFlowNodeBuilder.createNode().setId("f")
-                .setName("组件F")
-                .setType(NodeTypeEnum.COMMON)
-                .setClazz(FCmp.class)
-                .build();
-        LiteFlowNodeBuilder.createNode().setId("g")
-                .setName("组件G")
-                .setType(NodeTypeEnum.COMMON)
-                .setClazz(GCmp.class)
-                .build();
-
-
-        LiteFlowChainBuilder.createChain().setChainName("chain2").setCondition(
-                LiteFlowConditionBuilder.createThenCondition().setValue("c,d").build()
-        ).build();
-
-        LiteFlowChainBuilder.createChain().setChainName("chain1").setCondition(
-                LiteFlowConditionBuilder
-                        .createThenCondition()
-                        .setValue("a,b").build()
-        ).setCondition(
-                LiteFlowConditionBuilder.createWhenCondition()
-                        .setValue("e(f|g|chain2)").build()
-        ).build();
-
-        LiteflowResponse response = flowExecutor.execute2Resp("chain1");
-        Assert.assertTrue(response.isSuccess());
-        Assert.assertEquals("a[组件A]==>b[组件B]==>e[组件E]==>c[组件C]==>d[组件D]", response.getExecuteStepStr());
-    }
-
-
     //基于普通组件的builder模式测试
     @Test
     public void testBuilderForConditionNode() throws Exception {
-        LiteFlowNodeBuilder.createNode().setId("a")
-                .setName("组件A")
-                .setType(NodeTypeEnum.COMMON)
-                .setClazz(ACmp.class)
-                .build();
-        LiteFlowNodeBuilder.createNode().setId("b")
-                .setName("组件B")
-                .setType(NodeTypeEnum.COMMON)
-                .setClazz(BCmp.class)
-                .build();
-        LiteFlowNodeBuilder.createNode().setId("c")
-                .setName("组件C")
-                .setType(NodeTypeEnum.COMMON)
-                .setClazz(CCmp.class)
-                .build();
-        LiteFlowNodeBuilder.createNode().setId("d")
-                .setName("组件D")
-                .setType(NodeTypeEnum.COMMON)
-                .setClazz(DCmp.class)
-                .build();
-        LiteFlowNodeBuilder.createNode().setId("e")
-                .setName("组件E")
-                .setType(NodeTypeEnum.SWITCH)
-                .setClazz(ECmp.class)
-                .build();
-        LiteFlowNodeBuilder.createNode().setId("f")
-                .setName("组件F")
-                .setType(NodeTypeEnum.COMMON)
-                .setClazz(FCmp.class)
-                .build();
-        LiteFlowNodeBuilder.createNode().setId("g")
-                .setName("组件G")
-                .setType(NodeTypeEnum.COMMON)
-                .setClazz(GCmp.class)
-                .build();
-
-
-        LiteFlowChainBuilder.createChain().setChainName("chain2").setCondition(
-                LiteFlowConditionBuilder.createThenCondition()
-                        .setExecutable(new ExecutableEntity().setId("c"))
-                        .setExecutable(new ExecutableEntity().setId("d"))
-                        .build()
+        LiteFlowChainELBuilder.createChain().setChainName("chain2").setEL(
+                "THEN(c, d)"
         ).build();
 
-        LiteFlowChainBuilder.createChain().setChainName("chain1").setCondition(
-                LiteFlowConditionBuilder
-                        .createThenCondition()
-                        .setExecutable(new ExecutableEntity().setId("a").setTag("hello"))
-                        .setExecutable(new ExecutableEntity().setId("b"))
-                        .build()
-        ).setCondition(
-                LiteFlowConditionBuilder.createWhenCondition()
-                        .setExecutable(
-                                new ExecutableEntity().setId("e")
-                                        .addNodeCondComponent(new ExecutableEntity().setId("f").setTag("FHello"))
-                                        .addNodeCondComponent(new ExecutableEntity().setId("g"))
-                                        .addNodeCondComponent(new ExecutableEntity().setId("chain2")
-                                        )).build()
+        LiteFlowChainELBuilder.createChain().setChainName("chain1").setEL(
+                "THEN(a.tag('hello'), b, WHEN(SWITCH(e).to(f.tag('FHello'), g, chain2)))"
         ).build();
 
         LiteflowResponse response = flowExecutor.execute2Resp("chain1");
         Assert.assertTrue(response.isSuccess());
-        Assert.assertEquals("a[组件A]==>b[组件B]==>e[组件E]==>c[组件C]==>d[组件D]", response.getExecuteStepStr());
+        Assert.assertEquals("a==>b==>e==>c==>d", response.getExecuteStepStr());
     }
 }

liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ACmp.java

@@ -8,10 +8,12 @@
 package com.yomahub.liteflow.test.builder.cmp1;
 
 import com.yomahub.liteflow.annotation.LiteflowCmpDefine;
+import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.annotation.LiteflowMethod;
 import com.yomahub.liteflow.core.NodeComponent;
 import com.yomahub.liteflow.enums.LiteFlowMethodEnum;
 
+@LiteflowComponent("a")
 @LiteflowCmpDefine
 public class ACmp{
 

liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/BCmp.java

@@ -8,10 +8,12 @@
 package com.yomahub.liteflow.test.builder.cmp1;
 
 import com.yomahub.liteflow.annotation.LiteflowCmpDefine;
+import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.annotation.LiteflowMethod;
 import com.yomahub.liteflow.core.NodeComponent;
 import com.yomahub.liteflow.enums.LiteFlowMethodEnum;
 
+@LiteflowComponent("b")
 @LiteflowCmpDefine
 public class BCmp{
 

liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/CCmp.java

@@ -8,10 +8,12 @@
 package com.yomahub.liteflow.test.builder.cmp1;
 
 import com.yomahub.liteflow.annotation.LiteflowCmpDefine;
+import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.annotation.LiteflowMethod;
 import com.yomahub.liteflow.core.NodeComponent;
 import com.yomahub.liteflow.enums.LiteFlowMethodEnum;
 
+@LiteflowComponent("c")
 @LiteflowCmpDefine
 public class CCmp{
 

liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/DCmp.java

@@ -8,10 +8,12 @@
 package com.yomahub.liteflow.test.builder.cmp1;
 
 import com.yomahub.liteflow.annotation.LiteflowCmpDefine;
+import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.annotation.LiteflowMethod;
 import com.yomahub.liteflow.core.NodeComponent;
 import com.yomahub.liteflow.enums.LiteFlowMethodEnum;
 
+@LiteflowComponent("d")
 @LiteflowCmpDefine
 public class DCmp{
 

liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/ECmp.java

@@ -7,11 +7,13 @@
  */
 package com.yomahub.liteflow.test.builder.cmp1;
 
+import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.annotation.LiteflowSwitchCmpDefine;
 import com.yomahub.liteflow.annotation.LiteflowMethod;
 import com.yomahub.liteflow.core.NodeComponent;
 import com.yomahub.liteflow.enums.LiteFlowMethodEnum;
 
+@LiteflowComponent("e")
 @LiteflowSwitchCmpDefine
 public class ECmp{
 

liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/FCmp.java

@@ -8,10 +8,12 @@
 package com.yomahub.liteflow.test.builder.cmp1;
 
 import com.yomahub.liteflow.annotation.LiteflowCmpDefine;
+import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.annotation.LiteflowMethod;
 import com.yomahub.liteflow.core.NodeComponent;
 import com.yomahub.liteflow.enums.LiteFlowMethodEnum;
 
+@LiteflowComponent("f")
 @LiteflowCmpDefine
 public class FCmp{
 

liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/builder/cmp1/GCmp.java

@@ -8,10 +8,12 @@
 package com.yomahub.liteflow.test.builder.cmp1;
 
 import com.yomahub.liteflow.annotation.LiteflowCmpDefine;
+import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.annotation.LiteflowMethod;
 import com.yomahub.liteflow.core.NodeComponent;
 import com.yomahub.liteflow.enums.LiteFlowMethodEnum;
 
+@LiteflowComponent("g")
 @LiteflowCmpDefine
 public class GCmp{