From do-not-reply at jboss.org Tue Mar 31 22:02:46 2009
Content-Type: multipart/mixed; boundary="===============2348646549342047120=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: jbpm-commits at lists.jboss.org
Subject: [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.
Date: Tue, 31 Mar 2009 22:02:46 -0400
Message-ID: <E1Lopmw-0001mW-9N@committer01.frg.pub.inap.atl.jboss.com>

--===============2348646549342047120==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: alex.guizar(a)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/exe=
cutor/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 th=
reads

Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/=
jbpm983/JBPM983Test.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm98=
3/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/jbpm98=
3/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=3D"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 =3D "<?xml version=3D'1.0' encoding=3D'UTF-=
8'?>"
+  static final String SUBPROCESS_XML =3D "<?xml version=3D'1.0' encoding=
=3D'UTF-8'?>"
       + "<process-definition xmlns=3D'urn:jbpm.org:jpdl-3.2' name=3D'subpr=
ocess'>"
       + "<start-state name=3D'start-state1'>"
       + "   <description>start of the process</description>"
@@ -80,7 +79,7 @@
       + "</end-state>"
       + "</process-definition>";
 =

-  static String PROCESS_XML =3D "<?xml version=3D'1.0' encoding=3D'UTF-8'?=
>"
+  static final String PROCESS_XML =3D "<?xml version=3D'1.0' encoding=3D'U=
TF-8'?>"
       + "<process-definition xmlns=3D'urn:jbpm.org:jpdl-3.2' name=3D'super=
process'>"
       + "<start-state name=3D'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") !=3D -1) =

-    {
-      return;
-    }
-    =

+    if (getHibernateDialect().contains("HSQL")) return;
+
     // create test properties
-    Map testVariables =3D new HashMap();
-    testVariables.put("test", "true");
+    Map testVariables =3D Collections.singletonMap("test", "true");
 =

     final int processCount =3D 10;
     long[] processInstanceIds =3D new long[processCount];
@@ -138,6 +132,7 @@
       processInstance.getContextInstance().addVariables(testVariables);
       processInstance.signal();
       processInstanceIds[i] =3D processInstance.getId();
+
       newTransaction();
     }
 =

@@ -154,7 +149,7 @@
     final int endTimeout =3D 30;
     long startTime =3D 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/job/ex=
ecutor/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/ex=
ecutor/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=3D'end'/>"
         + "</process-definition>");
+    jbpmContext.deployProcessDefinition(processDefinition);
 =

-    jbpmContext.deployProcessDefinition(processDefinition);
+    newTransaction();
   }
 =

   void launchProcesses() {
     for (int i =3D 0; i < nbrOfConcurrentProcessExecutions; i++) {
-      newTransaction();
       ProcessInstance processInstance =3D jbpmContext.newProcessInstanceFo=
rUpdate("bulk messages");
       processInstance.signal();
+
+      newTransaction();
     }
   }
 =


Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/log4=
j.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 @@
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
 =

   <appender name=3D"FILE" class=3D"org.apache.log4j.FileAppender">
-    <param name=3D"File" value=3D"${log4j.output.dir}/test.log"/>
-    <param name=3D"Append" value=3D"false"/>
+    <param name=3D"File" value=3D"${log4j.output.dir}/test.log" />
+    <param name=3D"Append" value=3D"false" />
     <layout class=3D"org.apache.log4j.PatternLayout">
       <!-- The default pattern: Date Priority [Category] Message\n -->
-      <param name=3D"ConversionPattern" value=3D"%d %-5p [%c] %m%n"/>
+      <param name=3D"ConversionPattern" value=3D"%d{ABSOLUTE} %-5p (%t) [%=
c] %m%n" />
     </layout>
   </appender>
-  =

+
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D -->
   <!-- Append messages to the console -->
   <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D -->
@@ -24,7 +24,7 @@
     <param name=3D"Target" value=3D"System.out" />
     <param name=3D"Threshold" value=3D"INFO" />
     <layout class=3D"org.apache.log4j.PatternLayout">
-      <param name=3D"ConversionPattern" value=3D"%d{HH:mm:ss,SSS} %-5p [%c=
{1}] %m%n" />
+      <param name=3D"ConversionPattern" value=3D"%d{ABSOLUTE} %-5p [%c{1}]=
 %m%n" />
     </layout>
   </appender>
 =

@@ -35,13 +35,11 @@
   <category name=3D"org.hibernate">
     <priority value=3D"INFO" />
   </category>
-  =

-  <!-- =

+
   <category name=3D"org.hibernate.SQL">
     <priority value=3D"DEBUG" />
   </category>
-  -->
-  =

+
   <!-- =

   <category name=3D"org.hibernate.connection">
     <priority value=3D"TRACE" />
@@ -54,7 +52,7 @@
 =

   <root>
     <!--appender-ref ref=3D"CONSOLE"/-->
-    <appender-ref ref=3D"FILE"/>
+    <appender-ref ref=3D"FILE" />
   </root>
 =

 </log4j:configuration>


--===============2348646549342047120==--