[jbpm-commits] JBoss JBPM SVN: r2377 - in jbpm4/trunk/modules: jpdl/src/test/java/org/jbpm/jpdl and 4 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Sep 25 04:26:34 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-09-25 04:26:34 -0400 (Thu, 25 Sep 2008)
New Revision: 2377
Added:
jbpm4/trunk/modules/jpdl/src/test/resources/log4j.xml
Removed:
jbpm4/trunk/modules/jpdl/src/test/resources/logging.properties
Modified:
jbpm4/trunk/modules/jpdl/pom.xml
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/StateTest.java
jbpm4/trunk/modules/pvm/pom.xml
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentFactoryTestSetup.java
Log:
Add jPDL test excludes
Modified: jbpm4/trunk/modules/jpdl/pom.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/pom.xml 2008-09-25 07:53:20 UTC (rev 2376)
+++ jbpm4/trunk/modules/jpdl/pom.xml 2008-09-25 08:26:34 UTC (rev 2377)
@@ -81,6 +81,16 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/jbpm/jpdl/controlflow/DecisionHandlerTest.java</exclude>
+ <exclude>org/jbpm/jpdl/controlflow/StateTest.java</exclude>
+ <exclude>org/jbpm/jpdl/parsing/JpdlSchemaTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java 2008-09-25 07:53:20 UTC (rev 2376)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java 2008-09-25 08:26:34 UTC (rev 2377)
@@ -24,23 +24,22 @@
import org.jbpm.jpdl.xml.JpdlParser;
import org.jbpm.pvm.client.ClientProcessDefinition;
import org.jbpm.pvm.internal.log.Log;
+import org.jbpm.pvm.internal.xml.Parse;
import org.jbpm.pvm.test.base.JbpmTestCase;
-
/**
* @author Tom Baeyens
*/
-public class JpdlTestCase extends JbpmTestCase {
+public abstract class JpdlTestCase extends JbpmTestCase
+{
static protected Log log = Log.getLog(JpdlTestCase.class.getName());
- public ClientProcessDefinition parseJpdl(String xmlString) {
+ public ClientProcessDefinition parseJpdl(String xmlString)
+ {
JpdlParser jpdlParser = new JpdlParser();
- return (ClientProcessDefinition) jpdlParser.createParse()
- .setString(xmlString)
- .execute()
- .checkProblems("process definition xml string")
- .getDocumentObject();
+ Parse result = jpdlParser.createParse().setString(xmlString).execute();
+ return (ClientProcessDefinition)result.checkProblems("process definition xml string").getDocumentObject();
}
}
Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/StateTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/StateTest.java 2008-09-25 07:53:20 UTC (rev 2376)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/controlflow/StateTest.java 2008-09-25 08:26:34 UTC (rev 2377)
@@ -22,11 +22,9 @@
package org.jbpm.jpdl.controlflow;
import org.jbpm.jpdl.JpdlTestCase;
-import org.jbpm.pvm.Execution;
import org.jbpm.pvm.PvmException;
import org.jbpm.pvm.client.ClientExecution;
import org.jbpm.pvm.client.ClientProcessDefinition;
-import org.jbpm.pvm.model.OpenProcessDefinition;
/**
Added: jbpm4/trunk/modules/jpdl/src/test/resources/log4j.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/resources/log4j.xml (rev 0)
+++ jbpm4/trunk/modules/jpdl/src/test/resources/log4j.xml 2008-09-25 08:26:34 UTC (rev 2377)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <appender name="FILE" class="org.apache.log4j.FileAppender">
+ <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"/>
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <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" />
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <!-- Apache HTTP Client -->
+ <category name="org.apache.commons.httpclient">
+ <priority value="INFO" />
+ </category>
+ <category name="httpclient.wire">
+ <priority value="INFO" />
+ </category>
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <!--appender-ref ref="CONSOLE"/-->
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
\ No newline at end of file
Property changes on: jbpm4/trunk/modules/jpdl/src/test/resources/log4j.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: jbpm4/trunk/modules/jpdl/src/test/resources/logging.properties
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/resources/logging.properties 2008-09-25 07:53:20 UTC (rev 2376)
+++ jbpm4/trunk/modules/jpdl/src/test/resources/logging.properties 2008-09-25 08:26:34 UTC (rev 2377)
@@ -1,28 +0,0 @@
-handlers= java.util.logging.ConsoleHandler
-# to add the error triggered file handler
-# handlers= java.util.logging.ConsoleHandler org.jbpm.util.ErrorTriggeredFileHandler
-
-redirect.commons.logging = enabled
-
-java.util.logging.ConsoleHandler.level = FINEST
-java.util.logging.ConsoleHandler.formatter = org.jbpm.pvm.internal.log.LogFormatter
-
-# org.jbpm.util.ErrorTriggeredFileHandler.size = 500
-# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF
-# org.jbpm.util.ErrorTriggeredFileHandler.pattern = %h/jbpm%u.log
-
-# For example, set the com.xyz.foo logger to only log SEVERE messages:
-# com.xyz.foo.level = SEVERE
-
-org.jbpm.level=FINEST
-org.jbpm.pvm.internal.tx.level=FINE
-org.jbpm.pvm.internal.wire.level=FINE
-org.jbpm.pvm.internal.util.level=FINE
-
-org.hibernate.cfg.HbmBinder.level=SEVERE
-org.hibernate.cfg.SettingsFactory.level=SEVERE
-# org.hibernate.level=FINE
-# org.hibernate.SQL.level=FINEST
-# org.hibernate.type.level=FINEST
-# org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST
-# org.hibernate.transaction.level=FINEST
Modified: jbpm4/trunk/modules/pvm/pom.xml
===================================================================
--- jbpm4/trunk/modules/pvm/pom.xml 2008-09-25 07:53:20 UTC (rev 2376)
+++ jbpm4/trunk/modules/pvm/pom.xml 2008-09-25 08:26:34 UTC (rev 2377)
@@ -198,6 +198,7 @@
<exclude>org/jbpm/pvm/internal/db/langext/*Test.java</exclude>
<exclude>org/jbpm/pvm/internal/db/model/HibernateJobDbSessionTest.java</exclude>
<exclude>org/jbpm/pvm/internal/expr/*Test.java</exclude>
+ <exclude>org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java</exclude>
<exclude>org/jbpm/pvm/internal/tx/*Test.java</exclude>
<exclude>org/jbpm/pvm/internal/xml/*Test.java</exclude>
<exclude>org/jbpm/pvm/samples/**/*Test.java</exclude>
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentFactoryTestSetup.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentFactoryTestSetup.java 2008-09-25 07:53:20 UTC (rev 2376)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentFactoryTestSetup.java 2008-09-25 08:26:34 UTC (rev 2377)
@@ -15,7 +15,6 @@
import junit.extensions.TestSetup;
import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
/**
@@ -58,7 +57,7 @@
@Override
protected void tearDown() throws Exception
{
- //EnvironmentFactoryTestCase.closeEnvironmentFactory(configResource);
+ EnvironmentFactoryTestCase.closeEnvironmentFactory(configResource);
super.tearDown();
}
}
More information about the jbpm-commits
mailing list