[jbpm-commits] JBoss JBPM SVN: r4371 - in jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test: java/org/jbpm/job/executor and 1 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Mar 31 22:02:46 EDT 2009


Author: alex.guizar at jboss.com
Date: 2009-03-31 22:02:46 -0400 (Tue, 31 Mar 2009)
New Revision: 4371

Modified:
   jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java
   jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java
   jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/log4j.xml
Log:
minor tweaks to log4j configuration and tests with multiple job executor threads

Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java	2009-04-01 02:00:47 UTC (rev 4370)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java	2009-04-01 02:02:46 UTC (rev 4371)
@@ -1,6 +1,6 @@
 package org.jbpm.jbpm983;
 
-import java.util.HashMap;
+import java.util.Collections;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
@@ -12,10 +12,9 @@
 import org.jbpm.graph.exe.ProcessInstance;
 
 /**
- * Concurrent process execution fails
+ * Concurrent process execution fails.
  * 
- * https://jira.jboss.org/jira/browse/JBPM-983
- * 
+ * @see <a href="https://jira.jboss.org/jira/browse/JBPM-983">JBPM-983</a>
  * @author Tom Baeyens
  */
 public class JBPM983Test extends AbstractDbTestCase {
@@ -38,7 +37,7 @@
 
     newTransaction();
 
-    getJbpmConfiguration().getJobExecutor().setNbrOfThreads(5);
+    getJbpmConfiguration().getJobExecutor().setNbrOfThreads(4);
     startJobExecutor();
   }
 
@@ -47,12 +46,12 @@
     getJbpmConfiguration().getJobExecutor().setNbrOfThreads(1);
 
     graphSession.deleteProcessDefinition(processDefinitionId);
-    graphSession.deleteProcessDefinition(subProcessDefinitionId);      
+    graphSession.deleteProcessDefinition(subProcessDefinitionId);
 
     super.tearDown();
   }
 
-  static String SUBPROCESS_XML = "<?xml version='1.0' encoding='UTF-8'?>"
+  static final String SUBPROCESS_XML = "<?xml version='1.0' encoding='UTF-8'?>"
       + "<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='subprocess'>"
       + "<start-state name='start-state1'>"
       + "   <description>start of the process</description>"
@@ -80,7 +79,7 @@
       + "</end-state>"
       + "</process-definition>";
 
-  static String PROCESS_XML = "<?xml version='1.0' encoding='UTF-8'?>"
+  static final String PROCESS_XML = "<?xml version='1.0' encoding='UTF-8'?>"
       + "<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='superprocess'>"
       + "<start-state name='start-state1'>"
       + "   <description>start of the process</description>"
@@ -119,17 +118,12 @@
       + "</end-state>"
       + "</process-definition>";
 
-  public void testConcurrentJobs() throws Exception 
-  {
+  public void testConcurrentJobs() throws Exception {
     // Won't Fix [JBPM-983] concurrent process execution fails
-    if (getHibernateDialect().indexOf("HSQL") != -1) 
-    {
-      return;
-    }
-    
+    if (getHibernateDialect().contains("HSQL")) return;
+
     // create test properties
-    Map testVariables = new HashMap();
-    testVariables.put("test", "true");
+    Map testVariables = Collections.singletonMap("test", "true");
 
     final int processCount = 10;
     long[] processInstanceIds = new long[processCount];
@@ -138,6 +132,7 @@
       processInstance.getContextInstance().addVariables(testVariables);
       processInstance.signal();
       processInstanceIds[i] = processInstance.getId();
+
       newTransaction();
     }
 
@@ -154,7 +149,7 @@
     final int endTimeout = 30;
     long startTime = System.currentTimeMillis();
 
-    while(!jbpmContext.loadProcessInstance(piId).hasEnded()) {
+    while (!jbpmContext.loadProcessInstance(piId).hasEnded()) {
       if (System.currentTimeMillis() - startTime > endTimeout * 1000) {
         fail("Aborting after " + endTimeout + " seconds.");
         break;

Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java	2009-04-01 02:00:47 UTC (rev 4370)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java	2009-04-01 02:02:46 UTC (rev 4371)
@@ -25,7 +25,7 @@
   protected void setUp() throws Exception {
     super.setUp();
     deployProcess();    
-    getJbpmConfiguration().getJobExecutor().setNbrOfThreads(5);
+    getJbpmConfiguration().getJobExecutor().setNbrOfThreads(4);
   }
 
   @Override
@@ -92,15 +92,17 @@
         + "  </node>"
         + "  <end-state name='end'/>"
         + "</process-definition>");
+    jbpmContext.deployProcessDefinition(processDefinition);
 
-    jbpmContext.deployProcessDefinition(processDefinition);
+    newTransaction();
   }
 
   void launchProcesses() {
     for (int i = 0; i < nbrOfConcurrentProcessExecutions; i++) {
-      newTransaction();
       ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("bulk messages");
       processInstance.signal();
+
+      newTransaction();
     }
   }
 

Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/log4j.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/log4j.xml	2009-04-01 02:00:47 UTC (rev 4370)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/log4j.xml	2009-04-01 02:02:46 UTC (rev 4371)
@@ -8,14 +8,14 @@
   <!-- ================================= -->
 
   <appender name="FILE" class="org.apache.log4j.FileAppender">
-    <param name="File" value="${log4j.output.dir}/test.log"/>
-    <param name="Append" value="false"/>
+    <param name="File" value="${log4j.output.dir}/test.log" />
+    <param name="Append" value="false" />
     <layout class="org.apache.log4j.PatternLayout">
       <!-- The default pattern: Date Priority [Category] Message\n -->
-      <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+      <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p (%t) [%c] %m%n" />
     </layout>
   </appender>
-  
+
   <!-- ============================== -->
   <!-- Append messages to the console -->
   <!-- ============================== -->
@@ -24,7 +24,7 @@
     <param name="Target" value="System.out" />
     <param name="Threshold" value="INFO" />
     <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n" />
+      <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n" />
     </layout>
   </appender>
 
@@ -35,13 +35,11 @@
   <category name="org.hibernate">
     <priority value="INFO" />
   </category>
-  
-  <!-- 
+
   <category name="org.hibernate.SQL">
     <priority value="DEBUG" />
   </category>
-  -->
-  
+
   <!-- 
   <category name="org.hibernate.connection">
     <priority value="TRACE" />
@@ -54,7 +52,7 @@
 
   <root>
     <!--appender-ref ref="CONSOLE"/-->
-    <appender-ref ref="FILE"/>
+    <appender-ref ref="FILE" />
   </root>
 
 </log4j:configuration>




More information about the jbpm-commits mailing list