[jbpm-commits] JBoss JBPM SVN: r3341 - in projects/gwt-console/trunk/server/src: test/java/org/jboss/bpm/console/server and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Dec 11 10:13:58 EST 2008
Author: thomas.diesler at jboss.com
Date: 2008-12-11 10:13:58 -0500 (Thu, 11 Dec 2008)
New Revision: 3341
Modified:
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java
projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/ProcessManagementTest.java
Log:
Fix procInst list with suspended
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java 2008-12-11 15:12:23 UTC (rev 3340)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java 2008-12-11 15:13:58 UTC (rev 3341)
@@ -31,8 +31,8 @@
import org.apache.commons.logging.LogFactory;
import org.jboss.bpm.api.model.Gateway;
import org.jboss.bpm.api.model.Node;
+import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.ProcessInstance;
-import org.jboss.bpm.api.model.ProcessDefinition;
import org.jboss.bpm.api.model.SequenceFlow;
import org.jboss.bpm.api.model.SingleOutFlowSupport;
import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus;
@@ -125,15 +125,19 @@
log.info("getProcessInstances: " + procDef);
ProcessInstanceService procService = getProcessService();
- Iterator<ObjectName> itProc = procService.getInstance(procDef.getKey(), ProcessStatus.Active).iterator();
+ Iterator<ObjectName> itProc = procService.getInstance(procDef.getKey(), null).iterator();
while (itProc.hasNext())
{
ObjectName procID = itProc.next();
ProcessInstance proc = procService.getInstance(procID);
-
+
log.info(proc);
- results.add(adaptProcess(proc));
+ ProcessStatus status = proc.getProcessStatus();
+ if (status == ProcessStatus.Active || status == ProcessStatus.Suspended)
+ {
+ results.add(adaptProcess(proc));
+ }
}
return results;
@@ -261,9 +265,7 @@
Long procDefID = adaptKey(proc.getProcessDefinition().getKey());
Long procID = adaptKey(proc.getKey());
- // The BPM Spec does not (yet) have the notion of a suspended Process
- boolean suspended = false;
-
+ boolean suspended = proc.getProcessStatus() == ProcessStatus.Suspended;
ProcessInstanceRef procRef = new ProcessInstanceRef(procID, procDefID, proc.getStartDate(), proc.getEndDate(), suspended);
Token rootToken = proc.getRootToken();
Modified: projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/ProcessManagementTest.java
===================================================================
--- projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/ProcessManagementTest.java 2008-12-11 15:12:23 UTC (rev 3340)
+++ projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/ProcessManagementTest.java 2008-12-11 15:13:58 UTC (rev 3341)
@@ -21,13 +21,11 @@
*/
package org.jboss.bpm.console.server;
-import net.sf.json.JSONObject;
-import org.jboss.bpm.console.client.model.*;
+import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
+import org.jboss.bpm.console.client.model.ProcessDefinitionRefWrapper;
+import org.jboss.bpm.console.client.model.ProcessInstanceRef;
+import org.jboss.bpm.console.client.model.ProcessInstanceRefWrapper;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
/**
* Tests process management functionality.
*
@@ -35,87 +33,71 @@
*/
public class ProcessManagementTest extends BaseTC
{
+ /*
+ * Checks the following reqiorements:<br>
+ * <ul>
+ * <li> Process deployment
+ * <li> Create instance
+ * <li> Suspend instance
+ * <li> End an instance
+ * </ul>
+ */
+ public void testProcessDefinitionList() throws Exception
+ {
+ String response = HTTP.get(SERVER_URL + "/process/definitions", DEFAULT_CREDENTIALS);
- /**
- * Checks the following reqiorements:<br>
- *
- * <ul>
- * <li> Process deployment
- * <li> Create instance
- * <li> Suspend instance
- * <li> End an instance
- * </ul>
- *
- * @throws Exception
- */
- public void testProcessDefinitionList() throws Exception
- {
- String response = HTTP.get(
- SERVER_URL + "/process/definitions", DEFAULT_CREDENTIALS
- );
+ ProcessDefinitionRefWrapper dto = unmarshallProcessDefinitionList(response);
- ProcessDefinitionRefWrapper dto = unmarshallProcessDefinitionList(response);
+ ProcessDefinitionRef match = null;
+ for (ProcessDefinitionRef def : dto.getDefinitions())
+ {
+ if (def.equals(testDeploymentRef))
+ match = def;
+ }
- ProcessDefinitionRef match = null;
- for(ProcessDefinitionRef def : dto.getDefinitions())
- {
- if(def.equals(testDeploymentRef))
- match = def;
- }
+ assertNotNull(match);
- assertNotNull(match);
+ }
- }
+ /*
+ * Test instance creation, suspend, resume and deletion.
+ */
+ public void testInstanceOperations() throws Exception
+ {
+ ProcessInstanceRef newInstanceRef = createNewProcessInstance();
- /**
- * Test instance creation, suspend, resume and deletion.
- *
- * @throws Exception
- */
- public void testInstanceOperations() throws Exception
- {
- ProcessInstanceRef newInstanceRef = createNewProcessInstance();
+ // ------- Suspend it
- // ------- Suspend it
+ newInstanceRef.setState(ProcessInstanceRef.STATE.SUSPENDED);
+ HTTP.post(SERVER_URL + "/process/instances/" + newInstanceRef.getInstanceId() + "/state/" + newInstanceRef.getState(), EMPTY, DEFAULT_CREDENTIALS);
- newInstanceRef.setState(ProcessInstanceRef.STATE.SUSPENDED);
- HTTP.post(
- SERVER_URL + "/process/instances/"+newInstanceRef.getInstanceId()+"/state/"+newInstanceRef.getState(),
- EMPTY, DEFAULT_CREDENTIALS
- );
+ // ------- Verify
- // ------- Verify
+ ProcessInstanceRefWrapper instanceList = getInstanceList(testDeploymentRef);
+ assertFalse(instanceList.getInstances().isEmpty());
+ assertTrue(instanceList.getTotalCount() == 1);
- ProcessInstanceRefWrapper instanceList = getInstanceList(testDeploymentRef);
- assertFalse(instanceList.getInstances().isEmpty());
- assertTrue(instanceList.getTotalCount()==1);
-
- ProcessInstanceRef match = null;
- for(ProcessInstanceRef ref : instanceList.getInstances())
+ ProcessInstanceRef match = null;
+ for (ProcessInstanceRef ref : instanceList.getInstances())
+ {
+ if (ref.equals(newInstanceRef))
{
- if(ref.equals(newInstanceRef))
- {
- match = ref;
- break;
- }
+ match = ref;
+ break;
}
+ }
- assertNotNull(match);
- assertEquals(ProcessInstanceRef.STATE.SUSPENDED, match.getState());
+ assertNotNull(match);
+ assertEquals(ProcessInstanceRef.STATE.SUSPENDED, match.getState());
- // end and verify
- newInstanceRef.setState(ProcessInstanceRef.STATE.ENDED);
- HTTP.post(
- SERVER_URL + "/process/instances/"+newInstanceRef.getInstanceId()+"/state/"+newInstanceRef.getState(),
- EMPTY, DEFAULT_CREDENTIALS
- );
+ // end and verify
+ newInstanceRef.setState(ProcessInstanceRef.STATE.ENDED);
+ HTTP.post(SERVER_URL + "/process/instances/" + newInstanceRef.getInstanceId() + "/state/" + newInstanceRef.getState(), EMPTY, DEFAULT_CREDENTIALS);
- // refresh instance list
- instanceList = getInstanceList(testDeploymentRef);
- assertTrue(instanceList.getInstances().isEmpty());
+ // refresh instance list
+ instanceList = getInstanceList(testDeploymentRef);
+ assertTrue(instanceList.getInstances().isEmpty());
+ }
-
- }
-
}
More information about the jbpm-commits
mailing list