优化测试用例

liteflow-testcase-script-groovy/src/test/resources/json-script/flow.json

@@ -13,6 +13,12 @@
           "name": "条件脚本",
           "type": "cond_script",
           "value": "count = slot.getData(\"count\");if(count > 100){return \"a\";}else{return \"b\";}"
+        },
+        {
+          "id": "s3",
+          "name": "普通脚本2",
+          "type": "script",
+          "value": "def a=30;def b=2;slot.setData(\"s1\",a*b);"
         }
       ]
     },

liteflow-testcase-script-groovy/src/test/resources/xml-script/flow.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <flow>
     <nodes>
-        <node id="s1" name="普通脚本" type="script">
+        <node id="s1" name="普通脚本1" type="script">
             <![CDATA[
                 def a=3;
                 def b=2;
@@ -19,6 +19,15 @@
                 }
             ]]>
         </node>
+
+        <!-- 定义s3的目的是验证在多个脚本节点同时存在情况下的运行情况是否正确，本身s3不会被引用到 -->
+        <node id="s3" name="普通脚本2" type="script">
+            <![CDATA[
+                def a=30;
+                def b=2;
+                slot.setData("s1",a*b);
+            ]]>
+        </node>
     </nodes>
 
     <chain name="chain1">

liteflow-testcase-script-qlexpress/src/test/resources/json-script/flow.json

@@ -13,6 +13,12 @@
           "name": "条件脚本",
           "type": "cond_script",
           "value": "count = slot.getData(\"count\");if(count > 100){return \"a\";}else{return \"b\";}"
+        },
+        {
+          "id": "s3",
+          "name": "普通脚本2",
+          "type": "script",
+          "value": "a=30;b=2;slot.setData(\"s1\",a*b);"
         }
       ]
     },

liteflow-testcase-script-qlexpress/src/test/resources/xml-script/flow.xml

@@ -19,6 +19,15 @@
                 }
             ]]>
         </node>
+
+        <!-- 定义s3的目的是验证在多个脚本节点同时存在情况下的运行情况是否正确，本身s3不会被引用到 -->
+        <node id="s3" name="普通脚本2" type="script">
+            <![CDATA[
+                a=30;
+                b=2;
+                slot.setData("s1",a*b);
+            ]]>
+        </node>
     </nodes>
 
     <chain name="chain1">

liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/CustomNodesSpringbootTest.java

@@ -26,6 +26,7 @@ import javax.annotation.Resource;
 @TestPropertySource(value = "classpath:/customNodes/application.properties")
 @SpringBootTest(classes = CustomNodesSpringbootTest.class)
 @EnableAutoConfiguration
+@ComponentScan({"com.yomahub.liteflow.test.customNodes.domain"})
 public class CustomNodesSpringbootTest extends BaseTest {
 
     private final Logger log = LoggerFactory.getLogger(this.getClass());

liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/ACmp.java

@@ -10,7 +10,6 @@ package com.yomahub.liteflow.test.customNodes.cmp;
 import com.yomahub.liteflow.core.NodeComponent;
 import org.springframework.stereotype.Component;
 
-@Component("a")
 public class ACmp extends NodeComponent {
 
 	@Override

liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/BCmp.java

@@ -8,13 +8,20 @@
 package com.yomahub.liteflow.test.customNodes.cmp;
 
 import com.yomahub.liteflow.core.NodeComponent;
+import com.yomahub.liteflow.test.customNodes.domain.DemoDomain;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-@Component("b")
+import javax.annotation.Resource;
+
 public class BCmp extends NodeComponent {
 
+	@Resource
+	private DemoDomain demoDomain;
+
 	@Override
 	public void process() {
+		demoDomain.sayHi();
 		System.out.println("BCmp executed!");
 	}
 

liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/CCmp.java

@@ -10,7 +10,6 @@ package com.yomahub.liteflow.test.customNodes.cmp;
 import com.yomahub.liteflow.core.NodeComponent;
 import org.springframework.stereotype.Component;
 
-@Component("c")
 public class CCmp extends NodeComponent {
 
 	@Override

liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/DCmp.java

@@ -10,7 +10,6 @@ package com.yomahub.liteflow.test.customNodes.cmp;
 import com.yomahub.liteflow.core.NodeComponent;
 import org.springframework.stereotype.Component;
 
-@Component("d")
 public class DCmp extends NodeComponent {
 
 	@Override

liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/ECmp.java

@@ -8,13 +8,20 @@
 package com.yomahub.liteflow.test.customNodes.cmp;
 
 import com.yomahub.liteflow.core.NodeComponent;
+import com.yomahub.liteflow.test.customNodes.domain.DemoDomain;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-@Component("e")
+import javax.annotation.Resource;
+
 public class ECmp extends NodeComponent {
 
+	@Resource
+	private DemoDomain demoDomain;
+
 	@Override
 	public void process() {
+		demoDomain.sayHi();
 		System.out.println("ECmp executed!");
 	}
 

liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/cmp/FCmp.java

@@ -10,7 +10,6 @@ package com.yomahub.liteflow.test.customNodes.cmp;
 import com.yomahub.liteflow.core.NodeComponent;
 import org.springframework.stereotype.Component;
 
-@Component("f")
 public class FCmp extends NodeComponent {
 
 	@Override

liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/customNodes/domain/DemoDomain.java

@@ -0,0 +1,11 @@
+package com.yomahub.liteflow.test.customNodes.domain;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class DemoDomain {
+
+    public void sayHi(){
+        System.out.println("hi");
+    }
+}

liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/flowmeta/cmp2/DCmp.java

@@ -10,7 +10,6 @@ package com.yomahub.liteflow.test.flowmeta.cmp2;
 import com.yomahub.liteflow.core.NodeComponent;
 import org.springframework.stereotype.Component;
 
-@Component("d")
 public class DCmp extends NodeComponent {
 
 	@Override