[jbpm-commits] JBoss JBPM SVN: r6935 - in jbpm3/branches/jbpm-3.2-soa/core/src: test/java/org/jbpm/soa2010 and 1 other directory.

[do-not-reply at jboss.org]

Author: marco.rietveld
Date: 2011-05-18 04:03:05 -0400 (Wed, 18 May 2011)
New Revision: 6935

Modified:
   jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java
   jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/soa2010/SOA2010Test.java
Log:
SOA-2010: first commit wasn't compliant with java 1.4. 

Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java	2011-05-17 14:41:32 UTC (rev 6934)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/jpdl/xml/JpdlXmlReader.java	2011-05-18 08:03:05 UTC (rev 6935)
@@ -740,7 +740,8 @@
       if( nodeClass == null) {
         nodeClass = node.getClass();
       }
-      String simpleClassName = nodeClass.getSimpleName().toLowerCase();
+      String simpleClassName = nodeClass.getName();
+      simpleClassName = simpleClassName.substring(simpleClassName.lastIndexOf('.'));
     
       addError("conditions on transitions used leaving a " + simpleClassName
           + ", conditions on transitions only usable leaving decisions." );

Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/soa2010/SOA2010Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/soa2010/SOA2010Test.java	2011-05-17 14:41:32 UTC (rev 6934)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/soa2010/SOA2010Test.java	2011-05-18 08:03:05 UTC (rev 6935)
@@ -21,6 +21,7 @@
  */
 package org.jbpm.soa2010;
 
+import java.util.Iterator;
 import java.util.List;
 
 import org.jbpm.JbpmException;
@@ -59,9 +60,14 @@
       ProcessDefinition.parseXmlResource("org/jbpm/soa2010/procdef_parse_good_simple.xml");
     }
     catch( Exception e) {
-      fail("unexpected exception thrown: " + e.getClass().getSimpleName() + ": " + e.getMessage());
+      fail("unexpected exception thrown: " + getExceptionClassName(e) + ": " + e.getMessage());
     }
   }
+ 
+  private String getExceptionClassName(Exception e) {
+    String className = e.getClass().getName();
+    return className.substring(className.lastIndexOf('.'));
+  }
   
   /**
    * Complexer flow in which there are: 
@@ -73,7 +79,7 @@
       ProcessDefinition.parseXmlResource("org/jbpm/soa2010/procdef_parse_good_complex.xml");
     }
     catch( Exception e) {
-      fail("unexpected exception thrown: " + e.getClass().getSimpleName() + ": " + e.getMessage());
+      fail("unexpected exception thrown: " + getExceptionClassName(e) + ": " + e.getMessage());
     }
   }
   
@@ -85,7 +91,7 @@
       checkJpdlException(je, 3);
     }
     catch( Exception e) {
-      fail("unexpected exception thrown: " + e.getClass().getSimpleName() + ": " + e.getMessage());
+      fail("unexpected exception thrown: " + getExceptionClassName(e) + ": " + e.getMessage());
     }
   }
   
@@ -98,7 +104,7 @@
       checkJpdlException(je, 73);
     }
     catch( Exception e) {
-      fail("unexpected exception thrown: " + e.getClass().getSimpleName() + ": " + e.getMessage());
+      fail("unexpected exception thrown: " + getExceptionClassName(e) + ": " + e.getMessage());
     }
   }
 
@@ -108,11 +114,12 @@
    *  and that all problems
    */
   private void checkJpdlException(JpdlException jpdlException, int expectedNumCondTransProblems ) {
-      List<Problem> problems = jpdlException.getProblems();
+      List problems = jpdlException.getProblems();
       int conditionOnTransitionProblems = 0;
-      for( Problem problem : problems ) {
+      Iterator iter = problems.iterator();
+      for( Problem problem = (Problem) iter.next(); iter.hasNext(); problem = (Problem) iter.next() ) {
         String problemMessage = problem.getDescription();
-        if( problemMessage.contains("conditions on transitions only usable leaving decisions") ) {
+        if( problemMessage.indexOf("conditions on transitions only usable leaving decisions") > -1) {
           ++conditionOnTransitionProblems;
         }
         else {
@@ -149,7 +156,7 @@
       processInstance.signal();
     }
     catch(JbpmException je) {
-      assertTrue("expected exception on condition", je.getMessage().contains("guarding Transition(to false) not met"));
+      assertTrue("expected exception on condition", je.getMessage().indexOf("guarding Transition(to false) not met") > -1);
       exceptionThrown = true;
     }
     assertTrue("expected exception on condition", exceptionThrown);