[jbpm-commits] JBoss JBPM SVN: r3333 - in projects/gwt-console/trunk: rpc/src/main/java/org/jboss/bpm/console/client/model and 6 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Dec 11 06:32:22 EST 2008


Author: heiko.braun at jboss.com
Date: 2008-12-11 06:32:22 -0500 (Thu, 11 Dec 2008)
New Revision: 3333

Added:
   projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/TaskManagementTest.java
Modified:
   projects/gwt-console/trunk/gwt-parent.iml
   projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java
   projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/TokenReference.java
   projects/gwt-console/trunk/server/gwt-server.iml
   projects/gwt-console/trunk/server/src/main/resources/SampleProcess.par
   projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/BaseTC.java
   projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/ProcessManagementTest.java
   projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java
   projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java
Log:
Improve test coverage

Modified: projects/gwt-console/trunk/gwt-parent.iml
===================================================================
--- projects/gwt-console/trunk/gwt-parent.iml	2008-12-11 11:30:20 UTC (rev 3332)
+++ projects/gwt-console/trunk/gwt-parent.iml	2008-12-11 11:32:22 UTC (rev 3333)
@@ -649,7 +649,7 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test">
+      <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" />
         </CLASSES>
@@ -658,7 +658,7 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:test">
+      <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" />
         </CLASSES>
@@ -667,7 +667,7 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:test">
+      <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
         </CLASSES>
@@ -676,7 +676,7 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:test">
+      <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
         </CLASSES>
@@ -685,7 +685,7 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test">
+      <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" />
         </CLASSES>

Modified: projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java
===================================================================
--- projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java	2008-12-11 11:30:20 UTC (rev 3332)
+++ projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java	2008-12-11 11:32:22 UTC (rev 3333)
@@ -151,6 +151,21 @@
       return transitionNames;
    }
 
+   public void setProcessId(long processId)
+   {
+      this.processId = processId;
+   }
+
+   public void setTransitionNames(List<String> transitionNames)
+   {
+      this.transitionNames = transitionNames;
+   }
+
+   public void setPooledActors(List<String> pooledActors)
+   {
+      this.pooledActors = pooledActors;
+   }
+
    public void addPooledActor(String actorId)
    {
       pooledActors.add(actorId);

Modified: projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/TokenReference.java
===================================================================
--- projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/TokenReference.java	2008-12-11 11:30:20 UTC (rev 3332)
+++ projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/TokenReference.java	2008-12-11 11:32:22 UTC (rev 3333)
@@ -38,7 +38,7 @@
 
    private String currentNodeName;
 
-   private Set<TokenReference> children = new HashSet<TokenReference>();
+   private List<TokenReference> children = new ArrayList<TokenReference>();
    private List<String> availableSignals = new ArrayList<String>();
 
    private boolean canBeSignaled = true;
@@ -54,6 +54,31 @@
       this.currentNodeName = nodeName;
    }
 
+   public void setId(long id)
+   {
+      this.id = id;
+   }
+
+   public void setName(String name)
+   {
+      this.name = name;
+   }
+
+   public void setCurrentNodeName(String currentNodeName)
+   {
+      this.currentNodeName = currentNodeName;
+   }
+
+   public void setChildren(List<TokenReference> children)
+   {
+      this.children = children;
+   }
+
+   public void setAvailableSignals(List<String> availableSignals)
+   {
+      this.availableSignals = availableSignals;
+   }
+
    public long getId()
    {
       return id;
@@ -64,7 +89,7 @@
       return name;
    }
 
-   public Set<TokenReference> getChildren()
+   public List<TokenReference> getChildren()
    {
       return children;
    }

Modified: projects/gwt-console/trunk/server/gwt-server.iml
===================================================================
--- projects/gwt-console/trunk/server/gwt-server.iml	2008-12-11 11:30:20 UTC (rev 3332)
+++ projects/gwt-console/trunk/server/gwt-server.iml	2008-12-11 11:32:22 UTC (rev 3333)
@@ -618,7 +618,7 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test">
+      <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" />
         </CLASSES>
@@ -627,7 +627,7 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:test">
+      <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" />
         </CLASSES>
@@ -636,7 +636,7 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:test">
+      <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" />
         </CLASSES>
@@ -645,7 +645,7 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:test">
+      <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" />
         </CLASSES>
@@ -654,7 +654,7 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test">
+      <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:compile">
         <CLASSES>
           <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" />
         </CLASSES>

Modified: projects/gwt-console/trunk/server/src/main/resources/SampleProcess.par
===================================================================
(Binary files differ)

Modified: projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/BaseTC.java
===================================================================
--- projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/BaseTC.java	2008-12-11 11:30:20 UTC (rev 3332)
+++ projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/BaseTC.java	2008-12-11 11:32:22 UTC (rev 3333)
@@ -31,6 +31,9 @@
 import org.jboss.bpm.console.client.model.jbpm3.*;
 
 import java.io.ByteArrayInputStream;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
 
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>
@@ -46,9 +49,17 @@
    protected void setUp() throws Exception
    {
       super.setUp();
-      setupMorphRegistry();      
+      setupMorphRegistry();
+      deployTestHarness();
    }
 
+
+   protected void tearDown() throws Exception
+   {
+      super.tearDown();
+      undeployTestHarness();
+   }
+
    protected void deployTestHarness()
          throws Exception
    {
@@ -87,6 +98,109 @@
       Morpher token = new BeanMorpher( TokenReference.class, morpherRegistry);
       morpherRegistry.registerMorpher( token );
 
+      Morpher task = new BeanMorpher( TaskRef.class, morpherRegistry);
+      morpherRegistry.registerMorpher( task );
+
       return morpherRegistry;
    }
+
+   protected ProcessDefinitionRefWrapper unmarshallProcessDefinitionList(String response)
+   {
+      JSONObject jsonObject = JSONObject.fromObject( response );
+      ProcessDefinitionRefWrapper dto = (ProcessDefinitionRefWrapper)
+            JSONObject.toBean( jsonObject, ProcessDefinitionRefWrapper.class );
+
+      // --
+      List defs = new ArrayList();
+      for( Iterator i = dto.getDefinitions().iterator(); i.hasNext(); ){
+         defs.add(
+               morpherRegistry.morph( ProcessDefinitionRef.class, i.next() )
+         );
+      }
+      dto.setDefinitions(defs);
+      return dto;
+   }
+
+   protected ProcessInstanceRefWrapper unmarshallProcessInstanceList(String response)
+   {
+      JSONObject jsonObject = JSONObject.fromObject( response );
+      ProcessInstanceRefWrapper dto = (ProcessInstanceRefWrapper)
+            JSONObject.toBean( jsonObject, ProcessInstanceRefWrapper.class );
+
+      // --
+      List instances = new ArrayList();
+      for( Iterator i = dto.getInstances().iterator(); i.hasNext(); ){
+         instances.add(
+               morpherRegistry.morph( ProcessInstanceRef.class, i.next() )
+         );
+      }
+      dto.setInstances(instances);
+
+      return dto;
+   }
+
+   protected ProcessInstanceRef unmarshallProcessInstance(String response)
+   {
+      JSONObject jsonObject = JSONObject.fromObject( response );
+      ProcessInstanceRef dto = (ProcessInstanceRef)
+            JSONObject.toBean( jsonObject, ProcessInstanceRef.class );
+      return dto;
+   }
+
+   protected ProcessInstanceRef createNewProcessInstance()
+         throws Exception
+   {
+      String resource = "/process/definitions/"+testDeploymentRef.getProcessId()+"/instances/new";
+      String response = HTTP.post(SERVER_URL + resource, EMPTY, DEFAULT_CREDENTIALS);
+
+      // ------- New instance
+
+      ProcessInstanceRef newInstanceRef = unmarshallProcessInstance(response);
+      assertTrue(newInstanceRef.getState()==ProcessInstanceRef.STATE.RUNNING);
+      return newInstanceRef;
+   }
+
+   protected ProcessInstanceRefWrapper getInstanceList(ProcessDefinitionRef def)
+   {
+      String listResponse = HTTP.get(
+            SERVER_URL + "/process/definitions/"+def.getProcessId()+"/instances",
+            DEFAULT_CREDENTIALS
+      );
+
+      ProcessInstanceRefWrapper instanceList = unmarshallProcessInstanceList(listResponse);
+      return instanceList;
+   }
+
+   protected ProcessInstanceRef getInstance(ProcessDefinitionRef definitionRef, long instanceId)
+   {
+      ProcessInstanceRef match = null;
+      ProcessInstanceRefWrapper list = getInstanceList(definitionRef);
+
+      for(ProcessInstanceRef i : list.getInstances())
+      {
+         if(i.getInstanceId() == instanceId)
+         {
+            match = i;
+            break;
+         }
+      }
+      return match;
+   }
+
+   protected TaskRefWrapper unmarshallTaskList(String taskListResponse)
+   {
+      JSONObject jsonObject = JSONObject.fromObject( taskListResponse );
+      TaskRefWrapper dto = (TaskRefWrapper)
+            JSONObject.toBean( jsonObject, TaskRefWrapper.class );
+
+      List tasks = new ArrayList();
+      for( Iterator i = dto.getTasks().iterator(); i.hasNext(); ){
+         tasks.add(
+               morpherRegistry.morph( TaskRef.class, i.next() )
+         );
+      }
+      dto.setTasks(tasks);
+
+      return dto;
+   }
 }

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 11:30:20 UTC (rev 3332)
+++ projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/ProcessManagementTest.java	2008-12-11 11:32:22 UTC (rev 3333)
@@ -29,29 +29,22 @@
 import java.util.List;
 
 /**
- * Executes process managemnt tests.
+ * Tests process management functionality.
  * 
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */
 public class ProcessManagementTest extends BaseTC
 {
 
-   protected void setUp() throws Exception
-   {
-      super.setUp();
-      deployTestHarness();
-   }
-
-
-   protected void tearDown() throws Exception
-   {
-      super.tearDown();
-      undeployTestHarness();
-   }
-
    /**
-    * Check the process defintion list after deployment of a new process.
-    * (done in {@link #setUp()})
+    * Checks the following reqiorements:<br>
+    *
+    * <ul>
+    *    <li> Process deployment
+    *    <li> Create instance
+    *    <li> Suspend instance
+    *    <li> End an instance
+    * </ul>
     * 
     * @throws Exception
     */
@@ -75,22 +68,14 @@
    }
 
    /**
-    * Test instance creation, suspend, resume and deletetion.
+    * Test instance creation, suspend, resume and deletion.
     * 
     * @throws Exception
     */
    public void testInstanceOperations() throws Exception
    {
-      String resource = "/process/definitions/"+testDeploymentRef.getProcessId()+"/instances/new";
-      String response = HTTP.post(SERVER_URL + resource, EMPTY, DEFAULT_CREDENTIALS);
+      ProcessInstanceRef newInstanceRef = createNewProcessInstance();
 
-      System.out.println("!!"+response);
-      
-      // ------- New instance
-
-      ProcessInstanceRef newInstanceRef = unmarshallProcessInstance(response);
-      assertTrue(newInstanceRef.getState()==ProcessInstanceRef.STATE.RUNNING);
-
       // ------- Suspend it
 
       newInstanceRef.setState(ProcessInstanceRef.STATE.SUSPENDED);
@@ -101,13 +86,9 @@
 
       // ------- Verify
 
-      String listResponse = HTTP.get(
-            SERVER_URL + "/process/definitions/"+testDeploymentRef.getProcessId()+"/instances",
-            DEFAULT_CREDENTIALS
-      );
-      
-      ProcessInstanceRefWrapper instanceList = unmarshallProcessInstanceList(listResponse);
+      ProcessInstanceRefWrapper instanceList = getInstanceList(testDeploymentRef);
       assertFalse(instanceList.getInstances().isEmpty());
+      assertTrue(instanceList.getTotalCount()==1);
 
       ProcessInstanceRef match = null;
       for(ProcessInstanceRef ref : instanceList.getInstances())
@@ -121,51 +102,20 @@
 
       assertNotNull(match);
       assertEquals(ProcessInstanceRef.STATE.SUSPENDED, match.getState());
-   }
 
-   // ---------------- marshalling --------------
+      // end and verify
+      newInstanceRef.setState(ProcessInstanceRef.STATE.ENDED);
+      HTTP.post(
+            SERVER_URL + "/process/instances/"+newInstanceRef.getInstanceId()+"/state/"+newInstanceRef.getState(),
+            EMPTY, DEFAULT_CREDENTIALS
+      );
 
-   private ProcessDefinitionRefWrapper unmarshallProcessDefinitionList(String response)
-   {
-      JSONObject jsonObject = JSONObject.fromObject( response );
-      ProcessDefinitionRefWrapper dto = (ProcessDefinitionRefWrapper)
-            JSONObject.toBean( jsonObject, ProcessDefinitionRefWrapper.class );
+      // refresh instance list
+      instanceList = getInstanceList(testDeploymentRef);
+      assertTrue(instanceList.getInstances().isEmpty());
 
-      // --
-      List defs = new ArrayList();
-      for( Iterator i = dto.getDefinitions().iterator(); i.hasNext(); ){
-         defs.add(
-               morpherRegistry.morph( ProcessDefinitionRef.class, i.next() )
-         );
-      }
-      dto.setDefinitions(defs);
-      return dto;
-   }
 
-   private ProcessInstanceRefWrapper unmarshallProcessInstanceList(String response)
-   {
-      JSONObject jsonObject = JSONObject.fromObject( response );
-      ProcessInstanceRefWrapper dto = (ProcessInstanceRefWrapper)
-            JSONObject.toBean( jsonObject, ProcessInstanceRefWrapper.class );
 
-      // --
-      List instances = new ArrayList();
-      for( Iterator i = dto.getInstances().iterator(); i.hasNext(); ){
-         instances.add(
-               morpherRegistry.morph( ProcessInstanceRef.class, i.next() )
-         );
-      }
-      dto.setInstances(instances);
-
-      return dto;
    }
 
-   private ProcessInstanceRef unmarshallProcessInstance(String response)
-   {
-      JSONObject jsonObject = JSONObject.fromObject( response );
-      ProcessInstanceRef dto = (ProcessInstanceRef)
-            JSONObject.toBean( jsonObject, ProcessInstanceRef.class );
-      return dto;
-   }
-
 }

Added: projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/TaskManagementTest.java
===================================================================
--- projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/TaskManagementTest.java	                        (rev 0)
+++ projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/TaskManagementTest.java	2008-12-11 11:32:22 UTC (rev 3333)
@@ -0,0 +1,115 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.bpm.console.server;
+
+import org.jboss.bpm.console.client.model.ProcessInstanceRef;
+import org.jboss.bpm.console.client.model.TaskRef;
+import org.jboss.bpm.console.client.model.TaskRefWrapper;
+
+import java.util.List;
+
+/**
+ * Test task related functionality.
+ * 
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class TaskManagementTest extends BaseTC
+{
+   /**
+    * Following reqiorements are covered:<br>
+    *
+    * <ul>
+    *    <li> Signal token
+    *    <li> View task list
+    *    <li> Complete task
+    * </ul>
+    *
+    * @throws Exception
+    */
+   public void testTaskOperations() throws Exception
+   {
+      ProcessInstanceRef newInstanceRef = createNewProcessInstance();
+      long newInstanceId = newInstanceRef.getInstanceId();
+      String previousNodeName = newInstanceRef.getRootToken().getCurrentNodeName();
+      long previousTokenId = newInstanceRef.getRootToken().getId();
+
+      assertEquals(newInstanceRef.getState(), ProcessInstanceRef.STATE.RUNNING);
+
+      // signal it to move to task node
+      String url = "/jbpm3/tokens/"+newInstanceRef.getRootToken().getId()+"/transition/default";
+      HTTP.post(
+            SERVER_URL + url, EMPTY, DEFAULT_CREDENTIALS
+      );
+
+      // refresh instance ref
+      newInstanceRef = getInstance(testDeploymentRef, newInstanceId);
+      assertNotNull(newInstanceRef);
+
+      // same token?
+      assertTrue(previousTokenId == newInstanceRef.getRootToken().getId());
+
+      // did it really move?
+      assertFalse( previousNodeName.equals( newInstanceRef.getRootToken().getCurrentNodeName()));
+
+      // has a task been created?
+      String taskListResponse = HTTP.get(
+            SERVER_URL + "/tasks/actor/admin", DEFAULT_CREDENTIALS // 'user' is the actual actorname
+      );
+
+      TaskRefWrapper taskList = unmarshallTaskList(taskListResponse);
+      assertFalse(taskList.getTasks().isEmpty());
+      assertTrue(taskList.getTotalCount() == 1);     // TODO: shared database may cause problems
+
+      TaskRef match = null;
+      for(TaskRef task : taskList.getTasks())
+      {
+         if(task.getName().equals("example task"))
+         {
+            match = task;
+            break;
+         }
+      }
+
+      assertNotNull(match);
+      List<String> transitions = match.getTransitionNames();
+      assertFalse(transitions.isEmpty());
+      assertTrue(transitions.size()==1);
+      assertEquals("to_end", transitions.get(0));
+
+      // complete the task and make sure the list is empty again 
+      String completionUrl = "/tasks/"+match.getId()+"/close/transition/default";
+      HTTP.post(
+        SERVER_URL + completionUrl, EMPTY, DEFAULT_CREDENTIALS
+      );
+
+      // refresh task list
+      taskListResponse = HTTP.get(
+            SERVER_URL + "/tasks/actor/admin", DEFAULT_CREDENTIALS // 'user' is the actual actorname
+      );
+      taskList = unmarshallTaskList(taskListResponse);
+
+      // make sure it's empty
+      assertTrue(taskList.getTasks().isEmpty());
+
+   }
+
+}

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java	2008-12-11 11:30:20 UTC (rev 3332)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java	2008-12-11 11:32:22 UTC (rev 3333)
@@ -48,7 +48,7 @@
       return getConsoleServerUrl() + "/rs/process/definitions";
    }
 
-   public String getProcessInstanceURL(long processId)
+   public String getProcessInstancesURL(long processId)
    {
       return getConsoleServerUrl() + "/rs/process/definitions/"+processId+"/instances";
    }

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java	2008-12-11 11:30:20 UTC (rev 3332)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java	2008-12-11 11:32:22 UTC (rev 3333)
@@ -251,6 +251,6 @@
 
    private static String getResourceUrl(MainView view, long parentId)
    {
-      return view.getUrlBuilder().getProcessInstanceURL(parentId);
+      return view.getUrlBuilder().getProcessInstancesURL(parentId);
    }
 }




More information about the jbpm-commits mailing list