[jbpm-commits] JBoss JBPM SVN: r3150 - in jbpm4/trunk/modules: api/src/main/resources and 6 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Nov 28 10:30:25 EST 2008


Author: tom.baeyens at jboss.com
Date: 2008-11-28 10:30:25 -0500 (Fri, 28 Nov 2008)
New Revision: 3150

Added:
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java
Removed:
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java
Modified:
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Condition.java
   jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/DecisionHandler.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/CreateTimerActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/EndActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveConditionActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveExpressionActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveHandlerActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlExternalActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StartActivity.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StateActivity.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionHandlerTest.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlSchemaTest.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/NodeParsingTest.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/ConfigurationTest.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/StateTest.java
Log:
reverted from JpdlExecution to ActivityExecution in jpdl activity base class

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Condition.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Condition.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/Condition.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -23,8 +23,6 @@
 
 import java.io.Serializable;
 
-import org.jbpm.listener.EventListenerExecution;
-
 /** user code that reflects a runtime calculation of a boolean value.
  * Used for {@link Transition#getCondition() transition guard conditions} and 
  * {@link Transition#getWaitCondition() transition wait states}.
@@ -36,5 +34,5 @@
 public interface Condition extends Serializable {
 
   /** evaluates this condition in the context of the given execution. */ 
-  boolean evaluate(EventListenerExecution execution);
+  boolean evaluate(OpenExecution execution);
 }

Modified: jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd
===================================================================
--- jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd	2008-11-28 15:30:25 UTC (rev 3150)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
-        targetNamespace="http://jbpm.org/xsd/jpdl"
-        xmlns:tns="http://jbpm.org/xsd/jpdl"
+        targetNamespace="http://jbpm.org/jpdl4"
+        xmlns:tns="http://jbpm.org/jpdl4"
         elementFormDefault="qualified"
         attributeFormDefault="qualified">
         

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/DecisionHandler.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/DecisionHandler.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/DecisionHandler.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -21,12 +21,14 @@
  */
 package org.jbpm.jpdl;
 
+import org.jbpm.model.OpenExecution;
 
+
 /**
  * @author Tom Baeyens
  */
 public interface DecisionHandler {
 
   /** the name of the selected outgoing transition */ 
-  String decide(JpdlExecution execution);
+  String decide(OpenExecution execution);
 }

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/CreateTimerActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/CreateTimerActivity.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/CreateTimerActivity.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.jpdl.activity;
 
-import org.jbpm.jpdl.JpdlExecution;
+import org.jbpm.activity.ActivityExecution;
 
 
 /**
@@ -33,6 +33,6 @@
   
   
 
-  public void execute(JpdlExecution execution) {
+  public void execute(ActivityExecution execution) {
   }
 }

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/EndActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/EndActivity.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/EndActivity.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.jpdl.activity;
 
-import org.jbpm.jpdl.JpdlExecution;
+import org.jbpm.activity.ActivityExecution;
 
 
 /**
@@ -31,7 +31,7 @@
 
   private static final long serialVersionUID = 1L;
 
-  public void execute(JpdlExecution execution) throws Exception {
+  public void execute(ActivityExecution execution) {
     execution.stop();
   }
 }

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveConditionActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveConditionActivity.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveConditionActivity.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -23,6 +23,7 @@
 
 import java.util.List;
 
+import org.jbpm.activity.ActivityExecution;
 import org.jbpm.jpdl.JpdlException;
 import org.jbpm.jpdl.JpdlExecution;
 import org.jbpm.model.Condition;
@@ -37,7 +38,7 @@
 
   private static final long serialVersionUID = 1L;
 
-  public void execute(JpdlExecution execution) throws Exception {
+  public void execute(ActivityExecution execution) {
     Transition transition = findTransition(execution);
     if (transition==null) {
       throw new JpdlException("no outgoing transition condition evaluated to true for exclusive "+execution.getNode());
@@ -45,7 +46,7 @@
     execution.take(transition);
   }
 
-  private Transition findTransition(JpdlExecution execution) {
+  private Transition findTransition(ActivityExecution execution) {
     Node node = execution.getNode();
     List<Transition> outgoingTransitions = node.getOutgoingTransitions();
     for (Transition transition : outgoingTransitions) {

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveExpressionActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveExpressionActivity.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveExpressionActivity.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -22,10 +22,10 @@
 package org.jbpm.jpdl.activity;
 
 import org.jbpm.JbpmException;
+import org.jbpm.activity.ActivityExecution;
 import org.jbpm.env.EnvironmentHelper;
-import org.jbpm.jpdl.JpdlExecution;
+import org.jbpm.model.Node;
 import org.jbpm.model.Transition;
-import org.jbpm.pvm.internal.model.NodeImpl;
 import org.jbpm.pvm.internal.script.ScriptManager;
 
 /**
@@ -38,8 +38,8 @@
   protected String expr;
   protected String lang;
 
-  public void execute(JpdlExecution execution) throws Exception {
-    NodeImpl node = execution.getNode();
+  public void execute(ActivityExecution execution) throws Exception {
+    Node node = execution.getNode();
     String transitionName = null;
 
     ScriptManager scriptManager = EnvironmentHelper.get(ScriptManager.class);

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveHandlerActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveHandlerActivity.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveHandlerActivity.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -22,12 +22,12 @@
 package org.jbpm.jpdl.activity;
 
 import org.jbpm.JbpmException;
+import org.jbpm.activity.ActivityExecution;
 import org.jbpm.env.Environment;
 import org.jbpm.jpdl.DecisionHandler;
 import org.jbpm.jpdl.JpdlException;
-import org.jbpm.jpdl.JpdlExecution;
+import org.jbpm.model.Node;
 import org.jbpm.model.Transition;
-import org.jbpm.pvm.internal.model.NodeImpl;
 import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.internal.wire.WireContext;
 
@@ -41,8 +41,8 @@
   protected String decisionHandlerName;
   protected Descriptor decisionHandlerDescriptor;
 
-  public void execute(JpdlExecution execution) throws Exception {
-    NodeImpl node = execution.getNode();
+  public void execute(ActivityExecution execution) throws Exception {
+    Node node = execution.getNode();
     String transitionName = null;
 
     Object object = null; 

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlActivity.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlActivity.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -22,8 +22,6 @@
 package org.jbpm.jpdl.activity;
 
 import org.jbpm.activity.Activity;
-import org.jbpm.activity.ActivityExecution;
-import org.jbpm.jpdl.JpdlExecution;
 
 /**
  * @author Tom Baeyens
@@ -34,9 +32,4 @@
 
   protected long dbid;
 
-  public void execute(ActivityExecution execution) throws Exception {
-    execute((JpdlExecution) execution);
-  }
-
-  public abstract void execute(JpdlExecution execution) throws Exception;
 }

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlExternalActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlExternalActivity.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/JpdlExternalActivity.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -21,22 +21,11 @@
  */
 package org.jbpm.jpdl.activity;
 
-import java.util.Map;
-
-import org.jbpm.Execution;
-import org.jbpm.activity.ActivityExecution;
 import org.jbpm.activity.ExternalActivity;
-import org.jbpm.jpdl.JpdlExecution;
 
 /**
  * @author Tom Baeyens
  */
 public abstract class JpdlExternalActivity extends JpdlActivity implements ExternalActivity {
 
-  public void signal(ActivityExecution execution, String signalName, Map<String, Object> parameters) throws Exception {
-    signal((JpdlExecution) execution, signalName, parameters);
-  }
-
-  public abstract void signal(JpdlExecution execution, String signalName, Map<String, Object> parameters) throws Exception;
-
 }

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StartActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StartActivity.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StartActivity.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -21,7 +21,7 @@
  */
 package org.jbpm.jpdl.activity;
 
-import org.jbpm.jpdl.JpdlExecution;
+import org.jbpm.activity.ActivityExecution;
 
 
 /**
@@ -31,6 +31,6 @@
 
   private static final long serialVersionUID = 1L;
 
-  public void execute(JpdlExecution execution) {
+  public void execute(ActivityExecution execution) {
   }
 }

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StateActivity.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StateActivity.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/StateActivity.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -23,7 +23,9 @@
 
 import java.util.Map;
 
-import org.jbpm.jpdl.JpdlExecution;
+import org.jbpm.activity.ActivityExecution;
+import org.jbpm.model.Node;
+import org.jbpm.model.Transition;
 
 /**
  * @author Tom Baeyens
@@ -32,14 +34,24 @@
 
   private static final long serialVersionUID = 1L;
   
-  public void execute(JpdlExecution execution) {
+  public void execute(ActivityExecution execution) {
     execution.waitForSignal();
   }
 
-  public void signal(JpdlExecution execution, String signalName, Map<String, Object> parameters) {
+  public void signal(ActivityExecution execution, String signalName, Map<String, Object> parameters) {
+    Node node = execution.getNode();
+    
     if (parameters!=null) {
       execution.setVariables(parameters);
     }
-    execution.take(signalName);
+    
+    execution.fire(signalName, node);
+    
+    Transition transition = node.findOutgoingTransition(signalName);
+    if (transition!=null) {
+      execution.take(transition);
+    } else {
+      execution.waitForSignal();
+    }
   }
 }

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionHandlerTest.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/DecisionHandlerTest.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -24,8 +24,8 @@
 import org.jbpm.client.ClientExecution;
 import org.jbpm.client.ClientProcessDefinition;
 import org.jbpm.jpdl.DecisionHandler;
-import org.jbpm.jpdl.JpdlExecution;
 import org.jbpm.jpdl.JpdlTestCase;
+import org.jbpm.model.OpenExecution;
 
 
 /**
@@ -35,7 +35,7 @@
   
   public static class GpsDecisionHandler implements DecisionHandler {
     String theWayToGo;
-    public String decide(JpdlExecution execution) {
+    public String decide(OpenExecution execution) {
       return theWayToGo;
     }
   }

Copied: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java (from rev 3147, jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java)
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java	                        (rev 0)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.jpdl.parsing;
+
+import java.util.List;
+
+import org.jbpm.Problem;
+import org.jbpm.client.ClientProcessDefinition;
+import org.jbpm.jpdl.xml.JpdlParser;
+import org.jbpm.test.JbpmTestCase;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public abstract class JpdlParseTestCase extends JbpmTestCase {
+
+  static JpdlParser jpdlParser = new JpdlParser();
+
+  public List<Problem> parseProblems(String xmlString) {
+    List<Problem> problems = jpdlParser.createParse()
+               .setString(xmlString)
+               .execute()
+               .getProblems();
+    if ( (problems==null)
+         || (problems.isEmpty())
+       ) {
+      fail("expected problems during parse");
+    }
+    return problems;
+  }
+  
+  public ClientProcessDefinition parse(String xmlString) {
+    JpdlParser jpdlParser = new JpdlParser();
+    return (ClientProcessDefinition) jpdlParser.createParse()
+               .setString(xmlString)
+               .execute()
+               .checkProblems("process definition xml string")
+               .getDocumentObject();
+  }
+
+}


Property changes on: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + LF

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlSchemaTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlSchemaTest.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlSchemaTest.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -29,7 +29,7 @@
 /**
  * @author Tom Baeyents
  */
-public class JpdlSchemaTest extends ParsingTestCase {
+public class JpdlSchemaTest extends JpdlParseTestCase {
 
   public void testSimplestValidProcess() {
     List<Problem> problems = parseProblems(

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/NodeParsingTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/NodeParsingTest.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/NodeParsingTest.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -29,7 +29,7 @@
 /**
  * @author Tom Baeyens
  */
-public class NodeParsingTest extends ParsingTestCase {
+public class NodeParsingTest extends JpdlParseTestCase {
 
   public void testInvalidNodeName() {
     List<Problem> problems = parseProblems(

Deleted: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.jpdl.parsing;
-
-import java.util.List;
-
-import org.jbpm.Problem;
-import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.jpdl.xml.JpdlParser;
-import org.jbpm.test.JbpmTestCase;
-
-
-/**
- * @author Tom Baeyens
- */
-public abstract class ParsingTestCase extends JbpmTestCase {
-
-  public List<Problem> parseProblems(String xmlString) {
-    JpdlParser jpdlParser = new JpdlParser();
-    List<Problem> problems = jpdlParser.createParse()
-               .setString(xmlString)
-               .execute()
-               .getProblems();
-    if ( (problems==null)
-         || (problems.isEmpty())
-       ) {
-      fail("expected problems during parse");
-    }
-    return problems;
-  }
-  
-  public ClientProcessDefinition parse(String xmlString) {
-    JpdlParser jpdlParser = new JpdlParser();
-    return (ClientProcessDefinition) jpdlParser.createParse()
-               .setString(xmlString)
-               .execute()
-               .checkProblems("process definition xml string")
-               .getDocumentObject();
-  }
-
-}

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -29,7 +29,7 @@
 /**
  * @author Tom Baeyens
  */
-public class ProcessParsingTest extends ParsingTestCase {
+public class ProcessParsingTest extends JpdlParseTestCase {
 
   public void testSimplestValidProcess() {
     ClientProcessDefinition processDefinition = parse(

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/TransitionParsingTest.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -32,7 +32,7 @@
 /**
  * @author Tom Baeyens
  */
-public class TransitionParsingTest extends ParsingTestCase {
+public class TransitionParsingTest extends JpdlParseTestCase {
 
   public void testTransition() {
     ClientProcessDefinition processDefinition = parse(

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -28,8 +28,8 @@
 import org.jbpm.activity.ExternalActivity;
 import org.jbpm.client.ClientExecution;
 import org.jbpm.client.ClientProcessDefinition;
-import org.jbpm.listener.EventListenerExecution;
 import org.jbpm.model.Condition;
+import org.jbpm.model.OpenExecution;
 import org.jbpm.pvm.model.ProcessFactory;
 import org.jbpm.test.JbpmTestCase;
 
@@ -43,7 +43,7 @@
 
   public static class AlwaysTrue implements Condition {
     private static final long serialVersionUID = 1L;
-    public boolean evaluate(EventListenerExecution execution) {
+    public boolean evaluate(OpenExecution execution) {
       return true;
     }
   };

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/ConfigurationTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/ConfigurationTest.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/ConfigurationTest.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -36,15 +36,6 @@
     assertNotNull(processEngine);
   }
 
-  /*
-  public void testResourceConfiguration() {
-    ProcessEngine processEngine = new Configuration()
-        .setResource("my-jbpm-configuration.xml")
-        .buildProcessEngine();
-    assertNotNull(processEngine);
-  }
-  */
-
   public void testMinimalConfiguration() {
     ProcessEngine processEngine = new Configuration()
         .setXmlString("<jbpm-configuration />")

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/StateTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/StateTest.java	2008-11-28 15:12:12 UTC (rev 3149)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/StateTest.java	2008-11-28 15:30:25 UTC (rev 3150)
@@ -114,14 +114,16 @@
     }
   }
 
-  /*
   public void testNamedSignalWithoutMatchingTransition() {
-    ClientProcessDefinition processDefinition = parseJpdl(
-      "<process initial='a' name='p'>" +
+    deployJpdlXmlString(
+      "<process name='p'>" +
+      "  <start>" +
+      "    <flow to='a' />" +
+      "  </start>" +
       "  <state name='a'>" +
-      "    <transition name='left'   to='b' />" +
-      "    <transition name='middle' to='c' />" +
-      "    <transition name='right'  to='d' />" +
+      "    <flow name='left'   to='b' />" +
+      "    <flow name='middle' to='c' />" +
+      "    <flow name='right'  to='d' />" +
       "  </state>" +
       "  <state name='b' />" +
       "  <state name='c' />" +
@@ -129,27 +131,23 @@
       "</process>"
     );
 
-    ClientExecution execution = processDefinition.startProcessInstance();
-    try {
-      execution.signal("up");
-    } catch (PvmException e) {
-      assertTextPresent("no matching transition or event for signal 'up' in state(a)", e.getMessage());
-    }
+    executionService.startExecution("p:1", "one");
+    Execution execution = executionService.signalExecution("p:1/one", "up");
+    assertEquals("a", execution.getNodeName());
   }
 
   public void testDefaultSignalWithoutTransitions() {
-    ClientProcessDefinition processDefinition = parseJpdl(
-      "<process initial='a' name='p'>" +
+    deployJpdlXmlString(
+      "<process name='p'>" +
+      "  <start>" +
+      "    <flow to='a' />" +
+      "  </start>" +
       "  <state name='a' />" +
       "</process>"
     );
 
-    ClientExecution execution = processDefinition.startProcessInstance();
-    try {
-      execution.signal();
-    } catch (PvmException e) {
-      assertTextPresent("no matching transition or event for default signal in state(a)", e.getMessage());
-    }
+    executionService.startExecution("p:1", "one");
+    Execution execution = executionService.signalExecution("p:1/one");
+    assertEquals("a", execution.getNodeName());
   }
-  */
 }




More information about the jbpm-commits mailing list