[jbpm-commits] JBoss JBPM SVN: r5431 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src: test/java/org/jbpm/jpdl/el and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Aug 5 20:18:25 EDT 2009
Author: alex.guizar at jboss.com
Date: 2009-08-05 20:18:25 -0400 (Wed, 05 Aug 2009)
New Revision: 5431
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/Decision.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/el/DecisionExpressionTest.java
Log:
formatting
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/Decision.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/Decision.java 2009-08-05 20:14:06 UTC (rev 5430)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/node/Decision.java 2009-08-06 00:18:25 UTC (rev 5431)
@@ -69,7 +69,6 @@
if (expression != null) {
decisionExpression = expression;
-
}
else if (decisionHandlerElement != null) {
decisionDelegation = new Delegation();
@@ -100,7 +99,6 @@
+ transitionName
+ "'");
}
-
}
else if (decisionExpression != null) {
Object result = JbpmExpressionEvaluator.evaluate(decisionExpression, executionContext);
@@ -118,7 +116,6 @@
+ transitionName
+ "'");
}
-
}
else if (decisionConditions != null && !decisionConditions.isEmpty()) {
// backwards compatible mode based on separate DecisionCondition's
@@ -160,14 +157,11 @@
log.debug("decision didn't select transition, taking default " + transition);
- // since the decision node evaluates condition expressions, the
- // condition of the
- // taken transition will always be met. therefor we can safely turn off
- // the
- // standard condition enforcement in the transitions after a decision
- // node.
+ // since the decision node evaluates condition expressions,
+ // the condition of the taken transition will always be met.
+ // therefore we can safely turn off the standard condition enforcement
+ // in the transitions after a decision node.
transition.removeConditionEnforcement();
-
}
catch (Exception exception) {
raiseException(exception, executionContext);
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/el/DecisionExpressionTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/el/DecisionExpressionTest.java 2009-08-05 20:14:06 UTC (rev 5430)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/el/DecisionExpressionTest.java 2009-08-06 00:18:25 UTC (rev 5431)
@@ -5,45 +5,46 @@
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
-public class DecisionExpressionTest extends AbstractJbpmTestCase
-{
+public class DecisionExpressionTest extends AbstractJbpmTestCase {
- public static class Customer
- {
+ public static class Customer {
String priority;
int number;
- public Customer(String priority)
- {
+ public Customer(String priority) {
this.priority = priority;
}
- public Customer(int number)
- {
+ public Customer(int number) {
this.number = number;
}
- public String getPriority()
- {
+ public String getPriority() {
return priority;
}
- public int getNumber()
- {
+ public int getNumber() {
return number;
}
}
- public ProcessDefinition createCustomerPriorityProcess()
- {
- return ProcessDefinition.parseXmlString("<process-definition>" + " <start-state>" + " <transition to='d'/>" + " </start-state>"
- + " <decision name='d' expression='#{customer.priority}'>" + " <transition name='LOW' to='l' />" + " <transition name='MEDIUM' to='m' />"
- + " <transition name='HIGH' to='h' />" + " </decision>" + " <state name='l' />" + " <state name='m' />" + " <state name='h' />"
+ public ProcessDefinition createCustomerPriorityProcess() {
+ return ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='d'/>"
+ + " </start-state>"
+ + " <decision name='d' expression='#{customer.priority}'>"
+ + " <transition name='LOW' to='l' />"
+ + " <transition name='MEDIUM' to='m' />"
+ + " <transition name='HIGH' to='h' />"
+ + " </decision>"
+ + " <state name='l' />"
+ + " <state name='m' />"
+ + " <state name='h' />"
+ "</process-definition>");
}
- public void testCustomerPriorityLow()
- {
+ public void testCustomerPriorityLow() {
ProcessDefinition processDefinition = createCustomerPriorityProcess();
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.getContextInstance().setVariable("customer", new Customer("LOW"));
@@ -51,8 +52,7 @@
assertEquals("l", processInstance.getRootToken().getNode().getName());
}
- public void testCustomerPriorityMedium()
- {
+ public void testCustomerPriorityMedium() {
ProcessDefinition processDefinition = createCustomerPriorityProcess();
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.getContextInstance().setVariable("customer", new Customer("MEDIUM"));
@@ -60,48 +60,47 @@
assertEquals("m", processInstance.getRootToken().getNode().getName());
}
- public void testCustomerPriorityUndefined()
- {
+ public void testCustomerPriorityUndefined() {
ProcessDefinition processDefinition = createCustomerPriorityProcess();
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.getContextInstance().setVariable("customer", new Customer("UNDEFINED"));
- try
- {
+ try {
processInstance.signal();
fail("expected exception");
}
- catch (JbpmException e)
- {
+ catch (JbpmException e) {
assertTrue(e.getMessage().indexOf("non existing transition") != -1);
}
}
- public void testCustomerPriorityNull()
- {
+ public void testCustomerPriorityNull() {
ProcessDefinition processDefinition = createCustomerPriorityProcess();
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.getContextInstance().setVariable("customer", new Customer(null));
- try
- {
+ try {
processInstance.signal();
fail("expected exception");
}
- catch (JbpmException e)
- {
+ catch (JbpmException e) {
// OK
}
}
- public ProcessDefinition createBooleanExpressionProcess()
- {
- return ProcessDefinition.parseXmlString("<process-definition>" + " <start-state>" + " <transition to='d'/>" + " </start-state>"
- + " <decision name='d' expression='#{customer.number > 5}'>" + " <transition name='true' to='high-numbered-customer' />"
- + " <transition name='false' to='low-numbered-customer' />" + " </decision>" + " <state name='high-numbered-customer' />"
- + " <state name='low-numbered-customer' />" + "</process-definition>");
+ public ProcessDefinition createBooleanExpressionProcess() {
+ return ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='d'/>"
+ + " </start-state>"
+ + " <decision name='d' expression='#{customer.number > 5}'>"
+ + " <transition name='true' to='high-numbered-customer' />"
+ + " <transition name='false' to='low-numbered-customer' />"
+ + " </decision>"
+ + " <state name='high-numbered-customer' />"
+ + " <state name='low-numbered-customer' />"
+ + "</process-definition>");
}
- public void testBooleanExpressionTrue()
- {
+ public void testBooleanExpressionTrue() {
ProcessDefinition processDefinition = createBooleanExpressionProcess();
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.getContextInstance().setVariable("customer", new Customer(9));
@@ -109,8 +108,7 @@
assertEquals("high-numbered-customer", processInstance.getRootToken().getNode().getName());
}
- public void testBooleanExpressionFalse()
- {
+ public void testBooleanExpressionFalse() {
ProcessDefinition processDefinition = createBooleanExpressionProcess();
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.getContextInstance().setVariable("customer", new Customer(3));
@@ -118,17 +116,27 @@
assertEquals("low-numbered-customer", processInstance.getRootToken().getNode().getName());
}
- public ProcessDefinition createConditionProcess()
- {
- return ProcessDefinition.parseXmlString("<process-definition>" + " <start-state>" + " <transition to='d'/>" + " </start-state>" + " <decision name='d'>"
- + " <transition to='low-numbered-customer' />" + " <transition to='high-numbered-customer'>" + " <condition expression='#{customer.number > 5}' />"
- + " </transition>" + " <transition to='medium-numbered-customer'>" + " <condition expression='#{customer.number == 5}' />" + " </transition>"
- + " </decision>" + " <state name='high-numbered-customer' />" + " <state name='medium-numbered-customer' />" + " <state name='low-numbered-customer' />"
+ public ProcessDefinition createConditionProcess() {
+ return ProcessDefinition.parseXmlString("<process-definition>"
+ + " <start-state>"
+ + " <transition to='d'/>"
+ + " </start-state>"
+ + " <decision name='d'>"
+ + " <transition to='high-numbered-customer'>"
+ + " <condition expression='#{customer.number > 5}' />"
+ + " </transition>"
+ + " <transition to='medium-numbered-customer'>"
+ + " <condition expression='#{customer.number == 5}' />"
+ + " </transition>"
+ + " <transition to='low-numbered-customer' />"
+ + " </decision>"
+ + " <state name='high-numbered-customer' />"
+ + " <state name='medium-numbered-customer' />"
+ + " <state name='low-numbered-customer' />"
+ "</process-definition>");
}
- public void testConditionHigh()
- {
+ public void testConditionHigh() {
ProcessDefinition processDefinition = createConditionProcess();
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.getContextInstance().setVariable("customer", new Customer(9));
@@ -136,8 +144,7 @@
assertEquals("high-numbered-customer", processInstance.getRootToken().getNode().getName());
}
- public void testConditionMedium()
- {
+ public void testConditionMedium() {
ProcessDefinition processDefinition = createConditionProcess();
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.getContextInstance().setVariable("customer", new Customer(5));
@@ -145,8 +152,7 @@
assertEquals("medium-numbered-customer", processInstance.getRootToken().getNode().getName());
}
- public void testConditionLow()
- {
+ public void testConditionLow() {
ProcessDefinition processDefinition = createConditionProcess();
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.getContextInstance().setVariable("customer", new Customer(3));
More information about the jbpm-commits
mailing list