[jbpm-commits] JBoss JBPM SVN: r2902 - in projects/gwt-console/trunk/war/src: main/java/org/jboss/bpm/console/client/util and 1 other directories.

[do-not-reply at jboss.org]

Author: heiko.braun at jboss.com
Date: 2008-11-13 06:37:07 -0500 (Thu, 13 Nov 2008)
New Revision: 2902

Modified:
   projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
   projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/util/JSONWalk.java
   projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestDTOParser.java
Log:
Fix dto parser test case. Pooled actors were missing

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java	2008-11-13 11:17:21 UTC (rev 2901)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java	2008-11-13 11:37:07 UTC (rev 2902)
@@ -87,6 +87,7 @@
 
    public static TaskReference parseTaskReference(JSONObject item)
    {
+      
       long id = JSONWalk.on(item).next("id").asLong();
       long tokenId = JSONWalk.on(item).next("tokenId").asLong();
       long instanceId = JSONWalk.on(item).next("processInstanceId").asLong();

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/util/JSONWalk.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/util/JSONWalk.java	2008-11-13 11:17:21 UTC (rev 2901)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/util/JSONWalk.java	2008-11-13 11:37:07 UTC (rev 2902)
@@ -69,7 +69,10 @@
             match = JSONWalk.on(child).next(name);            
          }
       }
-      
+
+      if(null==match)
+         throw new IllegalArgumentException("No such element '" + name +"'");         
+
       return match;
    }
 

Modified: projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestDTOParser.java
===================================================================
--- projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestDTOParser.java	2008-11-13 11:17:21 UTC (rev 2901)
+++ projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestDTOParser.java	2008-11-13 11:37:07 UTC (rev 2902)
@@ -45,13 +45,12 @@
    }
 
    public void testTaskRefParsing()
-   {
-      //{"tasks":[{"id":14,"tokenId":6,"processInstanceId":4,"processId":2,"name":"manager evaluation","actor":"manager","isBlocking":false,"isSignalling":true,"transitionNames":["reject","approve"]},{"id":15,"tokenId":12,"processInstanceId":10,"processId":3,"name":"submit raise request","actor":"manager","isBlocking":false,"isSignalling":true,"transitionNames":["submit request"]}]}
-
-      String json = "{\"tasks\":[{\"id\":14,\"tokenId\":6,\"processInstanceId\":4,\"processId\":2,\"name\":\"manager evaluation\",\"actor\":\"manager\",\"isBlocking\":false,\"isSignalling\":true,\"transitionNames\":[\"reject\",\"approve\"]},{\"id\":15,\"tokenId\":12,\"processInstanceId\":10,\"processId\":3,\"name\":\"submit raise request\",\"actor\":\"manager\",\"isBlocking\":false,\"isSignalling\":true,\"transitionNames\":[\"submit request\"]}]}";
+   {    
+      String json = "{\"tasks\":[{\"id\":14,\"tokenId\":6,\"processInstanceId\":4,\"processId\":2,\"name\":\"manager evaluation\",\"actor\":\"manager\",\"isBlocking\":false,\"isSignalling\":true,\"transitionNames\":[\"reject\",\"approve\"],\"pooledActors\":[\"hr\",\"sales\"]}]}";
       List<TaskReference> result = DTOParser.parseTaskReferenceList(json);
-      assertTrue("Failed to parse TaskReferenceList", result.size()==2);
+      assertTrue("Failed to parse TaskReferenceList", result.size()==1);
       assertTrue("Failed to parse transitionNames", result.get(0).getTransitionNames().size()==2);
+      assertTrue("Failed to parse pooledActors", result.get(0).hasPooledActors());
 
    }