[jbpm-commits] JBoss JBPM SVN: r6407 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src: test/java/org/jbpm/jbpm2630 and 1 other directories.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-06-11 23:14:46 -0400 (Fri, 11 Jun 2010)
New Revision: 6407

Modified:
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2630/JBPM2630Test.java
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2691/JBPM2691Test.java
Log:
SOA-2100: fix JBPM-2691 test, times out with larger jbpm.job.retries values

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java	2010-06-12 02:26:05 UTC (rev 6406)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java	2010-06-12 03:14:46 UTC (rev 6407)
@@ -101,7 +101,8 @@
   }
 
   private void ensureCleanDatabase() {
-    DbPersistenceServiceFactory persistenceServiceFactory = (DbPersistenceServiceFactory) getJbpmConfiguration().getServiceFactory("persistence");
+    DbPersistenceServiceFactory persistenceServiceFactory =
+      (DbPersistenceServiceFactory) getJbpmConfiguration().getServiceFactory("persistence");
     if (persistenceServiceFactory == null) return;
 
     boolean hasLeftOvers = false;
@@ -113,8 +114,7 @@
       Long count = (Long) entry.getValue();
       if (count.intValue() != 0) {
         hasLeftOvers = true;
-        System.err.println("FIXME: " + getClass().getName() + "." + getName() + " left "
-          + count + " records in " + entry.getKey());
+        log.error(getName() + " left " + count + " records in " + entry.getKey());
       }
     }
 

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2630/JBPM2630Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2630/JBPM2630Test.java	2010-06-12 02:26:05 UTC (rev 6406)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2630/JBPM2630Test.java	2010-06-12 03:14:46 UTC (rev 6407)
@@ -41,7 +41,7 @@
   protected void setUp() throws Exception {
     super.setUp();
     testConfiguration = JbpmConfiguration.getInstance();
-    noLogConfiguration = JbpmConfiguration.getInstance("org/jbpm/jbpm2630/jbpm.nolog.cfg.xml");
+    noLogConfiguration = JbpmConfiguration.parseResource("org/jbpm/jbpm2630/jbpm.nolog.cfg.xml");
   }
 
   protected void tearDown() throws Exception {

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2691/JBPM2691Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2691/JBPM2691Test.java	2010-06-12 02:26:05 UTC (rev 6406)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2691/JBPM2691Test.java	2010-06-12 03:14:46 UTC (rev 6407)
@@ -23,6 +23,7 @@
 
 import java.util.List;
 
+import org.jbpm.JbpmConfiguration;
 import org.jbpm.db.AbstractDbTestCase;
 import org.jbpm.graph.def.ProcessDefinition;
 import org.jbpm.graph.exe.ProcessInstance;
@@ -37,12 +38,26 @@
  */
 public class JBPM2691Test extends AbstractDbTestCase {
 
+  protected JbpmConfiguration getJbpmConfiguration() {
+    if (jbpmConfiguration == null) {
+      jbpmConfiguration = JbpmConfiguration.parseXmlString("<jbpm-configuration>"
+        + "  <int name='jbpm.job.retries' value='1' />"
+        + "</jbpm-configuration>");
+    }
+    return jbpmConfiguration;
+  }
+
   protected void setUp() throws Exception {
     super.setUp();
     ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("org/jbpm/jbpm2691/processdefinition.xml");
     deployProcessDefinition(processDefinition);
   }
 
+  protected void tearDown() throws Exception {
+    super.tearDown();
+    jbpmConfiguration.close();
+  }
+
   public void testSaveExceptionInSeparateTx() {
     ProcessInstance processInstance = jbpmContext.newProcessInstance("jobex");
     processInstance.signal();