RHBPMS-1328 - business rule task supports boundary error event (#797)

Author: Tihomir Surdilovic

jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/ActivityTest.java

@@ -38,6 +38,7 @@
 import org.jbpm.process.instance.impl.demo.DoNothingWorkItemHandler;
 import org.jbpm.process.instance.impl.demo.SystemOutWorkItemHandler;
 import org.jbpm.test.util.CountDownProcessEventListener;
+import org.jbpm.workflow.instance.WorkflowRuntimeException;
 import org.jbpm.workflow.instance.node.DynamicNodeInstance;
 import org.jbpm.workflow.instance.node.DynamicUtils;
 import org.jbpm.workflow.instance.node.WorkItemNodeInstance;
@@ -1923,7 +1924,9 @@ public void testDMNBusinessRuleTaskInvalidExecution()throws Exception {
         try {
             ksession.startProcess("BPMN2-BusinessRuleTask", params);
         } catch (Exception e) {
-            assertTrue(e.getMessage().contains("DMN result errors"));
+            assertTrue(e instanceof WorkflowRuntimeException);
+            assertTrue(e.getCause() instanceof RuntimeException);
+            assertTrue(e.getCause().getMessage().contains("DMN result errors"));
         }
     }
 

jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/ErrorEventTest.java

@@ -26,7 +26,9 @@
 import org.jbpm.bpmn2.handler.SignallingTaskHandlerDecorator;
 import org.jbpm.bpmn2.objects.ExceptionOnPurposeHandler;
 import org.jbpm.bpmn2.objects.MyError;
+import org.jbpm.bpmn2.objects.Person;
 import org.jbpm.bpmn2.objects.TestWorkItemHandler;
+import org.jbpm.process.instance.event.listeners.RuleAwareProcessEventLister;
 import org.jbpm.process.instance.impl.demo.DoNothingWorkItemHandler;
 import org.jbpm.process.instance.impl.demo.SystemOutWorkItemHandler;
 import org.jbpm.workflow.instance.WorkflowProcessInstance;
@@ -295,6 +297,47 @@ public void testErrorBoundaryEventOnServiceTask() throws Exception {
         assertProcessInstanceFinished(processInstance, ksession);
         assertNodeTriggered(processInstance.getId(), "start", "split", "User Task", "Service task error attached", "end0",
                 "Script Task", "error2");
+
+        assertNotNodeTriggered(processInstance.getId(), "end");
+    }
+
+    @Test
+    public void testErrorBoundaryEventOnBusinessRuleTask() throws Exception {
+        KieBase kbase = createKnowledgeBaseWithoutDumper("BPMN2-ErrorBoundaryEventOnBusinessRuleTask.bpmn2",
+                "BPMN2-ErrorBoundaryEventOnBusinessRuleTask.drl");
+        ksession = createKnowledgeSession(kbase);
+        ksession.addEventListener(new RuleAwareProcessEventLister());
+        ProcessInstance processInstance = ksession.startProcess("BPMN2-ErrorBoundaryEventOnBusinessRuleTask");
+
+        assertProcessInstanceFinished(processInstance, ksession);
+        assertNodeTriggered(processInstance.getId(), "start", "business rule task error attached", "error1");
+    }
+
+    @Test
+    public void testMultiErrorBoundaryEventsOnBusinessRuleTask() throws Exception {
+        KieBase kbase = createKnowledgeBaseWithoutDumper("BPMN2-MultiErrorBoundaryEventsOnBusinessRuleTask.bpmn2",
+                "BPMN2-MultiErrorBoundaryEventsOnBusinessRuleTask.drl");
+        ksession = createKnowledgeSession(kbase);
+        ksession.addEventListener(new RuleAwareProcessEventLister());
+
+        Map<String, Object> params = new HashMap<String, Object>();
+        params.put("person", new Person());
+        ProcessInstance processInstance = ksession.startProcess("BPMN2-MultiErrorBoundaryEventeOnBusinessRuleTask", params);
+
+        assertProcessInstanceFinished(processInstance, ksession);
+        assertNodeTriggered(processInstance.getId(), "start", "business rule task error attached",
+                "NPE Script Task", "error1");
+
+        ksession.dispose();
+
+        ksession = createKnowledgeSession(kbase);
+        ksession.addEventListener(new RuleAwareProcessEventLister());
+        params = new HashMap<String, Object>();
+        params.put("person", new Person("unsupported"));
+        ProcessInstance processInstance2 = ksession.startProcess("BPMN2-MultiErrorBoundaryEventeOnBusinessRuleTask", params);
+        assertProcessInstanceFinished(processInstance2, ksession);
+        assertNodeTriggered(processInstance2.getId(), "start", "business rule task error attached",
+                "UOE Script Task", "error2");
     }
 
     @Test

jbpm-bpmn2/src/test/resources/BPMN2-ErrorBoundaryEventOnBusinessRuleTask.bpmn2

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2015 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+package defaultPackge;
+
+import org.kie.api.runtime.process.WorkflowProcessInstance
+
+rule ErrorBoundaryRule
+    ruleflow-group "ErrorBoundaryRuleFlow"
+    when
+        WorkflowProcessInstance()
+    then
+        throw new NullPointerException("error");
+end