fix a bug of branchGraph cache with test_case

Author: lvcangquan.lcq

scripts/bash-buddy

@@ -539,7 +539,8 @@ private List<TransitionNode> buildGatewayFollowingNodes(TransitionNode flowNode)
     }
 
     private List<TransitionNode> buildBranchNodes(TransitionNode branchNode) {
-        if (branchGraph.containsKey(branchNode.getId())) {
+        if (branchGraph.containsKey(branchNode.getId()) &&
+            !branchNode.getIncomingNodes().stream().anyMatch(incomingNode -> incomingNode instanceof GatewayElement)) {
             return branchGraph.get(branchNode.getId());
         }
 

src/main/java/com/alibaba/compileflow/engine/runtime/impl/AbstractProcessRuntime.java

@@ -42,6 +42,19 @@ public void testProcessEngine() {
         System.out.println(processEngine.execute(code, context));
     }
 
+    @Test
+    public void testBranchGraph() {
+        final String code = "bpm.om.branchGraph";
+        Map<String, Object> context = new HashMap<String, Object>();
+        Integer input = 16;
+        Integer compareNumber = 18;
+        context.put("input", input);
+        final ProcessEngine processEngine = ProcessEngineFactory.getProcessEngine();
+        Map<String, Object> result = processEngine.execute(code, context);
+        Integer finalResult = (Integer) result.get("finalResult");
+        assert (finalResult == compareNumber);
+    }
+
     @Test
     public void testProcessEngineBpmn20() {
         final String code = "bpmn20.ktv.ktvExample";

src/test/java/com/allibaba/compileflow/test/ProcessEngineTest.java

@@ -0,0 +1,15 @@
+package com.allibaba.compileflow.test.om.branch_graph.calculate;
+
+public class InputCheckOp {
+    public InputCheckOp() {
+    }
+
+    public Boolean process(Integer input) {
+        Integer compareNumber = 20;
+        if (input > compareNumber) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+}

src/test/java/com/allibaba/compileflow/test/om/branch_graph/calculate/InputCheckOp.java

@@ -0,0 +1,12 @@
+package com.allibaba.compileflow.test.om.branch_graph.calculate;
+
+public class OnlinePreProcessOp {
+    public OnlinePreProcessOp() {
+    }
+
+    public Integer process(Integer sqrtResult) {
+        Integer addNumber = 2;
+        Integer onlineInput = sqrtResult + addNumber;
+        return onlineInput;
+    }
+}

src/test/java/com/allibaba/compileflow/test/om/branch_graph/calculate/OnlinePreProcessOp.java

@@ -0,0 +1,12 @@
+package com.allibaba.compileflow.test.om.branch_graph.calculate;
+
+public class OnlineSolveOp {
+    public OnlineSolveOp() {
+    }
+
+    public Integer process(Integer onlineInput) {
+        Integer addNumber = 2;
+        Integer onlineResult = onlineInput + addNumber;
+        return onlineResult;
+    }
+}

src/test/java/com/allibaba/compileflow/test/om/branch_graph/calculate/OnlineSolveOp.java

@@ -0,0 +1,15 @@
+package com.allibaba.compileflow.test.om.branch_graph.calculate;
+
+import java.math.BigInteger;
+
+public class PreProcessOp {
+    public PreProcessOp() {
+    }
+
+    public void process(Integer input) {
+        int compareNumber = 10;
+        if (input < compareNumber) {
+            System.out.println("input is smaller than 10");
+        }
+    }
+}

src/test/java/com/allibaba/compileflow/test/om/branch_graph/calculate/PreProcessOp.java

@@ -0,0 +1,10 @@
+package com.allibaba.compileflow.test.om.branch_graph.calculate;
+
+public class RandomOp {
+    public RandomOp() {
+    }
+
+    public void process(Integer result) {
+        System.out.println("Random process is finished " + result);
+    }
+}

src/test/java/com/allibaba/compileflow/test/om/branch_graph/calculate/RandomOp.java

@@ -0,0 +1,14 @@
+package com.allibaba.compileflow.test.om.branch_graph.calculate;
+
+public class ResultCheckOp {
+    public ResultCheckOp() {
+    }
+
+    public Boolean process(Integer result) {
+        Integer compareNumber = 10;
+        if (result < compareNumber) {
+            return true;
+        }
+        return false;
+    }
+}

src/test/java/com/allibaba/compileflow/test/om/branch_graph/calculate/ResultCheckOp.java

@@ -0,0 +1,12 @@
+package com.allibaba.compileflow.test.om.branch_graph.calculate;
+
+public class ResultPostProcessOp {
+    public ResultPostProcessOp() {
+    }
+
+    public Integer process(Integer result) {
+        Integer addNumber = 10;
+        Integer finalResult = result + addNumber;
+        return finalResult;
+    }
+}

src/test/java/com/allibaba/compileflow/test/om/branch_graph/calculate/ResultPostProcessOp.java

@@ -0,0 +1,11 @@
+package com.allibaba.compileflow.test.om.branch_graph.calculate;
+
+public class ScaleOp {
+    public ScaleOp() {
+    }
+
+    public void process(Integer input) {
+        System.out.printf("%d enter proportion process", input);
+    }
+
+}

src/test/java/com/allibaba/compileflow/test/om/branch_graph/calculate/ScaleOp.java

@@ -0,0 +1,16 @@
+package com.allibaba.compileflow.test.om.branch_graph.calculate;
+
+public class SqrtProcessOp {
+    public SqrtProcessOp() {
+    }
+
+    public Integer process(Integer input) {
+        try {
+            double sqrtResult = Math.sqrt(input);
+            return (int)sqrtResult;
+        } catch (Exception e) {
+            System.out.println("SqrtProcessOp is failed");
+            return 0;
+        }
+    }
+}

src/test/java/com/allibaba/compileflow/test/om/branch_graph/calculate/SqrtProcessOp.java

@@ -0,0 +1,13 @@
+package com.allibaba.compileflow.test.om.branch_graph.calculate;
+
+import com.allibaba.compileflow.test.om.branch_graph.common.TypeInfo;
+import com.allibaba.compileflow.test.om.branch_graph.common.TypeEnum;
+
+public class TypeCheckOp {
+    public TypeCheckOp() {
+    }
+
+    public TypeEnum process(TypeInfo typeInfo) {
+        return typeInfo.getCalculateType();
+    }
+}

src/test/java/com/allibaba/compileflow/test/om/branch_graph/calculate/TypeCheckOp.java

@@ -0,0 +1,13 @@
+package com.allibaba.compileflow.test.om.branch_graph.calculate;
+
+import com.allibaba.compileflow.test.om.branch_graph.common.TypeInfo;
+import com.allibaba.compileflow.test.om.branch_graph.common.TypeEnum;
+
+public class TypeOp {
+    public TypeOp() {
+    }
+
+    public TypeEnum process(TypeInfo typeInfo) {
+        return typeInfo.getCalculateType();
+    }
+}

src/test/java/com/allibaba/compileflow/test/om/branch_graph/calculate/TypeOp.java

@@ -0,0 +1,23 @@
+package com.allibaba.compileflow.test.om.branch_graph.calculate;
+
+import com.allibaba.compileflow.test.om.branch_graph.common.TypeInfo;
+import com.allibaba.compileflow.test.om.branch_graph.common.TypeEnum;
+
+public class TypeProcessOp {
+    public TypeProcessOp() {
+    }
+
+    public TypeInfo process(Integer sqrtResult) {
+        Integer compareNumber1 = 5;
+        Integer compareNumber2 = 100;
+        TypeInfo typeInfo = new TypeInfo();
+        if (sqrtResult < compareNumber1) {
+            typeInfo.setCalculateType(TypeEnum.ONLINE_SOLVE);
+        } else if (sqrtResult > compareNumber2) {
+            typeInfo.setCalculateType(TypeEnum.OFFLINE_SOLVE);
+        } else {
+            typeInfo.setCalculateType(TypeEnum.SCALE_SOLVE);
+        }
+        return typeInfo;
+    }
+}

src/test/java/com/allibaba/compileflow/test/om/branch_graph/calculate/TypeProcessOp.java

@@ -0,0 +1,14 @@
+package com.allibaba.compileflow.test.om.branch_graph.calculate;
+
+import com.allibaba.compileflow.test.om.branch_graph.common.TypeEnum;
+
+public class TypeReadOp {
+    public TypeReadOp() {
+    }
+
+    public void process(TypeEnum type) {
+        if (type == TypeEnum.ONLINE_SOLVE || type == TypeEnum.OFFLINE_SOLVE) {
+            System.out.println("TypeReadOp is processed");
+        }
+    }
+}

src/test/java/com/allibaba/compileflow/test/om/branch_graph/calculate/TypeReadOp.java

@@ -0,0 +1,12 @@
+package com.allibaba.compileflow.test.om.branch_graph.calculate;
+
+public class offlinePreProcessOp {
+    public offlinePreProcessOp() {
+    }
+
+    public Integer process(Integer sqrtResult) {
+        Integer addNumber = 100;
+        Integer rayInput = sqrtResult + addNumber;
+        return rayInput;
+    }
+}

src/test/java/com/allibaba/compileflow/test/om/branch_graph/calculate/offlinePreProcessOp.java

@@ -0,0 +1,12 @@
+package com.allibaba.compileflow.test.om.branch_graph.calculate;
+
+public class offlineSolveOp {
+    public offlineSolveOp() {
+    }
+
+    public Integer process(Integer offlineInput) {
+        Integer addNumber = 200;
+        Integer rayResult = offlineInput + addNumber;
+        return rayResult;
+    }
+}

src/test/java/com/allibaba/compileflow/test/om/branch_graph/calculate/offlineSolveOp.java

@@ -0,0 +1,10 @@
+package com.allibaba.compileflow.test.om.branch_graph.common;
+
+public enum TypeEnum {
+    SCALE_SOLVE,
+    ONLINE_SOLVE,
+    OFFLINE_SOLVE;
+
+    private TypeEnum() {
+    }
+}

src/test/java/com/allibaba/compileflow/test/om/branch_graph/common/TypeEnum.java

@@ -0,0 +1,18 @@
+package com.allibaba.compileflow.test.om.branch_graph.common;
+
+import com.allibaba.compileflow.test.om.branch_graph.common.TypeEnum;
+
+public class TypeInfo {
+    private TypeEnum calculateType;
+
+    public TypeInfo() {
+    }
+
+    public void setCalculateType(TypeEnum type) {
+        calculateType = type;
+    }
+
+    public TypeEnum getCalculateType() {
+        return calculateType;
+    }
+}