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

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2009-08-26 21:21:04 -0400 (Wed, 26 Aug 2009)
New Revision: 5555

Modified:
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java
Log:
[JBPM-2115] jBPM testsuite hangs when executed with DB2
multiple threads not supported on DB2 < 9.7

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java	2009-08-26 16:52:36 UTC (rev 5554)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java	2009-08-27 01:21:04 UTC (rev 5555)
@@ -40,8 +40,13 @@
 
   protected void setUp() throws Exception {
     super.setUp();
-    jbpmConfiguration.getJobExecutor().setNbrOfThreads(4);
 
+    String dialect = getHibernateDialect();
+    if (dialect.indexOf("DB2") == -1 // [JBPM-2115] multiple threads not supported on DB2 < 9.7
+        && dialect.indexOf("HSQL") == -1) { // multiple threads will not be supported on HSQL
+      jbpmConfiguration.getJobExecutor().setNbrOfThreads(4);
+    }
+
     processDefinition = ProcessDefinition.parseXmlResource("org/jbpm/jbpm2094/processdefinition.xml");
     jbpmContext.deployProcessDefinition(processDefinition);
   }
@@ -54,9 +59,6 @@
   }
 
   public void testJobExecutorDeadlock() {
-    // Won't fix [JBPM-2094] unindexed foreign keys cause deadlocks in oracle
-    if (getHibernateDialect().indexOf("HSQL") != -1) return;
-
     long[] processInstanceIds = new long[INSTANCE_COUNT];
     for (int i = 0; i < INSTANCE_COUNT; i++) {
       newTransaction();

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java	2009-08-26 16:52:36 UTC (rev 5554)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java	2009-08-27 01:21:04 UTC (rev 5555)
@@ -38,13 +38,17 @@
 
     newTransaction();
 
-    getJbpmConfiguration().getJobExecutor().setNbrOfThreads(4);
+    String dialect = getHibernateDialect();
+    if (dialect.indexOf("DB2") == -1 // [JBPM-2115] multiple threads not supported on DB2 < 9.7
+        && dialect.indexOf("HSQL") == -1) { // multiple threads will not be supported on HSQL
+      jbpmConfiguration.getJobExecutor().setNbrOfThreads(4);
+    }
     startJobExecutor();
   }
 
   protected void tearDown() throws Exception {
     stopJobExecutor();
-    getJbpmConfiguration().getJobExecutor().setNbrOfThreads(1);
+    jbpmConfiguration.getJobExecutor().setNbrOfThreads(1);
 
     graphSession.deleteProcessDefinition(processDefinitionId);
     graphSession.deleteProcessDefinition(subProcessDefinitionId);
@@ -120,9 +124,6 @@
       + "</process-definition>";
 
   public void testConcurrentJobs() throws Exception {
-    // Won't Fix [JBPM-983] concurrent process execution fails
-    if (getHibernateDialect().indexOf("HSQL") != -1) return;
-
     // create test properties
     Map testVariables = Collections.singletonMap("test", "true");
 

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java	2009-08-26 16:52:36 UTC (rev 5554)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java	2009-08-27 01:21:04 UTC (rev 5555)
@@ -23,7 +23,11 @@
 
   protected void setUp() throws Exception {
     super.setUp();
-    getJbpmConfiguration().getJobExecutor().setNbrOfThreads(4);
+    String dialect = getHibernateDialect();
+    if (dialect.indexOf("DB2") == -1 // [JBPM-2115] multiple threads not supported on DB2 < 9.7
+        && dialect.indexOf("HSQL") == -1) { // multiple threads will not be supported on HSQL
+      getJbpmConfiguration().getJobExecutor().setNbrOfThreads(4);
+    }
   }
 
   protected void tearDown() throws Exception {
@@ -32,9 +36,6 @@
   }
 
   public void testJobExecutor() {
-    // Won't fix, multiple threads not supported on HSQLDB
-    if (getHibernateDialect().indexOf("HSQL") != -1) return;
-
     deployProcessDefinition();
     try {
       startProcessInstances();