Removing drools-persistence-jpa/test-jar from dependencies and using …

…the jbpm-peristence-jpa/test-jar instead

- This commit modifies the jbpm-persistence-jpa test code heavily
  as well as the jbpm-bam, jbpm-bpmn2, and jbpm-test test code
- Given the development of test code in both the dev and QA groups,
  it's just easier to move the marshalling/util code to jbpm for the
  time being.
- The maven property usage has been made more transparent.

.gitignore

@@ -21,6 +21,7 @@ bin/
 /settings*.xml
 /lib-jdbc/
 bitronix-default-config.properties
+*.db
 
 # modules that don't exist in this branch
 /jbpm-human-task-war/

jbpm-bam/pom.xml

@@ -75,16 +75,9 @@
       <artifactId>jbpm-persistence-jpa</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.drools</groupId>
-      <artifactId>drools-persistence-jpa</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.jbpm</groupId>
       <artifactId>jbpm-persistence-jpa</artifactId>
-      <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

jbpm-bam/src/test/filtered-resources/META-INF/persistence.xml

@@ -19,7 +19,7 @@
         <class>org.jbpm.process.audit.NodeInstanceLog</class>
         <class>org.jbpm.process.audit.VariableInstanceLog</class>
 
-        <class>org.drools.marshalling.util.MarshalledData</class>
+        <class>org.jbpm.marshalling.util.MarshalledData</class>
 
 	    <properties>
 	        <property name="hibernate.max_fetch_depth" value="3"/>
@@ -38,4 +38,4 @@
             <property name="hibernate.default_schema" value="${maven.jdbc.schema}" />
 	    </properties>        
     </persistence-unit>
-</persistence>
+</persistence>

jbpm-bam/src/test/filtered-resources/hibernate.cfg.xml

@@ -35,4 +35,4 @@
 
     </session-factory>
 
-</hibernate-configuration>
+</hibernate-configuration>

jbpm-bpmn2/pom.xml

@@ -47,8 +47,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.drools</groupId>
-      <artifactId>drools-persistence-jpa</artifactId>
+      <groupId>org.jbpm</groupId>
+      <artifactId>jbpm-persistence-jpa</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

jbpm-bpmn2/src/test/filtered-resources/META-INF/persistence.xml

@@ -19,7 +19,7 @@
         <class>org.jbpm.process.audit.NodeInstanceLog</class>
         <class>org.jbpm.process.audit.VariableInstanceLog</class>
 
-        <class>org.drools.marshalling.util.MarshalledData</class>
+        <class>org.jbpm.marshalling.util.MarshalledData</class>
 
 	    <properties>
 	        <property name="hibernate.max_fetch_depth" value="3"/>

jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/BoundaryEventWithCancelActivityTest.java

@@ -1,31 +1,23 @@
 package org.jbpm.bpmn2;
 
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import java.io.*;
 
 import org.drools.KnowledgeBase;
-import org.drools.builder.KnowledgeBuilder;
-import org.drools.builder.KnowledgeBuilderFactory;
-import org.drools.builder.ResourceType;
+import org.drools.builder.*;
 import org.drools.core.util.DroolsStreamUtils;
 import org.drools.definition.KnowledgePackage;
-import org.drools.event.process.DefaultProcessEventListener;
-import org.drools.event.process.ProcessNodeLeftEvent;
-import org.drools.event.process.ProcessNodeTriggeredEvent;
 import org.drools.io.ResourceFactory;
 import org.drools.runtime.StatefulKnowledgeSession;
 import org.drools.runtime.process.ProcessInstance;
-import org.jbpm.bpmn2.JbpmBpmn2TestCase.TestWorkItemHandler;
 import org.jbpm.bpmn2.objects.Person;
 import org.jbpm.process.instance.impl.demo.DoNothingWorkItemHandler;
-import org.junit.Test;
 
 public class BoundaryEventWithCancelActivityTest extends JbpmBpmn2TestCase {
 
+    protected void setUp() {
+        persistence = false;
+    }
+
     public void testConditionalBoundaryEventInterrupting() throws Exception {
         KnowledgeBase kbase = readKnowledgeBaseFromDisc("BPMN2-ConditionalBoundaryEventInterrupting.bpmn2");
         StatefulKnowledgeSession ksession = createKnowledgeSession(kbase);

jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/JbpmBpmn2TestCase.java

@@ -1,38 +1,26 @@
 package org.jbpm.bpmn2;
 
-import static org.drools.persistence.util.PersistenceUtil.*;
+import static org.jbpm.persistence.util.PersistenceUtil.*;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import junit.framework.TestCase;
 
 import org.drools.KnowledgeBase;
+import org.drools.SessionConfiguration;
 import org.drools.audit.WorkingMemoryInMemoryLogger;
 import org.drools.audit.event.LogEvent;
 import org.drools.audit.event.RuleFlowNodeLogEvent;
-import org.drools.builder.KnowledgeBuilder;
-import org.drools.builder.KnowledgeBuilderFactory;
-import org.drools.builder.ResourceType;
+import org.drools.builder.*;
 import org.drools.definition.process.Node;
+import org.drools.impl.EnvironmentFactory;
 import org.drools.io.ResourceFactory;
 import org.drools.persistence.jpa.JPAKnowledgeService;
-import org.drools.persistence.util.PersistenceUtil;
-import org.drools.runtime.Environment;
-import org.drools.runtime.KnowledgeSessionConfiguration;
-import org.drools.runtime.StatefulKnowledgeSession;
-import org.drools.runtime.process.NodeInstance;
-import org.drools.runtime.process.NodeInstanceContainer;
-import org.drools.runtime.process.ProcessInstance;
-import org.drools.runtime.process.WorkItem;
-import org.drools.runtime.process.WorkItemHandler;
-import org.drools.runtime.process.WorkItemManager;
-import org.drools.runtime.process.WorkflowProcessInstance;
-import org.jbpm.process.audit.JPAProcessInstanceDbLog;
-import org.jbpm.process.audit.JPAWorkingMemoryDbLogger;
-import org.jbpm.process.audit.NodeInstanceLog;
+import org.drools.runtime.*;
+import org.drools.runtime.process.*;
+import org.jbpm.process.audit.*;
+import org.jbpm.process.instance.event.DefaultSignalManagerFactory;
+import org.jbpm.process.instance.impl.DefaultProcessInstanceManagerFactory;
 import org.jbpm.workflow.instance.impl.WorkflowProcessInstanceImpl;
 
 /**
@@ -54,7 +42,7 @@ public abstract class JbpmBpmn2TestCase extends TestCase {
 	private WorkingMemoryInMemoryLogger logger;
 
 	public JbpmBpmn2TestCase() {
-		this(false);
+		this(true);
 	}
 
 	public JbpmBpmn2TestCase(boolean persistence) {
@@ -74,7 +62,7 @@ protected void setUp() {
 
     protected void tearDown() {
         if(persistence) { 
-            PersistenceUtil.tearDown(context);
+            cleanUp(context);
         }
     }
 
@@ -150,8 +138,13 @@ protected StatefulKnowledgeSession createKnowledgeSession(KnowledgeBase kbase) {
 		    JPAProcessInstanceDbLog.setEnvironment(result.getEnvironment());
 		    return result;
 		} else {
-			StatefulKnowledgeSession result = kbase.newStatefulKnowledgeSession();
-			logger = new WorkingMemoryInMemoryLogger(result);
+		    Properties defaultProps = new Properties();
+		    defaultProps.setProperty("drools.processSignalManagerFactory", DefaultSignalManagerFactory.class.getName());
+		    defaultProps.setProperty("drools.processInstanceManagerFactory", DefaultProcessInstanceManagerFactory.class.getName());
+		    SessionConfiguration sessionConfig = new SessionConfiguration(defaultProps);
+
+		    StatefulKnowledgeSession result = kbase.newStatefulKnowledgeSession(sessionConfig, EnvironmentFactory.newEnvironment());
+		    logger = new WorkingMemoryInMemoryLogger(result);
 			return result;
 		}
 	}

jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/ProcessFactoryTest.java

@@ -27,7 +27,11 @@
 import org.jbpm.ruleflow.core.RuleFlowProcessFactory;
 
 public class ProcessFactoryTest extends JbpmBpmn2TestCase {
-
+
+    public ProcessFactoryTest() {
+        super(false);
+    }
+
 	public void testProcessFactory() {
 		RuleFlowProcessFactory factory = RuleFlowProcessFactory.createProcess("org.jbpm.process");
 		factory
@@ -45,7 +49,7 @@ public void testProcessFactory() {
 		KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
 		kbuilder.add(ResourceFactory.newByteArrayResource(XmlBPMNProcessDumper.INSTANCE.dump(process).getBytes()), ResourceType.BPMN2);
 		KnowledgeBase kbase = kbuilder.newKnowledgeBase();
-		StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
+		StatefulKnowledgeSession ksession = createKnowledgeSession(kbase);
 		ksession.startProcess("org.jbpm.process");
 	}
 

jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/SimpleBPMNProcessTest.java

@@ -16,60 +16,30 @@
 
 package org.jbpm.bpmn2;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import java.io.*;
+import java.util.*;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.*;
 
 import org.drools.KnowledgeBase;
 import org.drools.KnowledgeBaseFactory;
-import org.drools.builder.KnowledgeBuilder;
-import org.drools.builder.KnowledgeBuilderConfiguration;
-import org.drools.builder.KnowledgeBuilderError;
-import org.drools.builder.KnowledgeBuilderFactory;
-import org.drools.builder.ResourceType;
+import org.drools.builder.*;
 import org.drools.compiler.PackageBuilderConfiguration;
 import org.drools.definition.process.Process;
-import org.drools.event.process.DefaultProcessEventListener;
-import org.drools.event.process.ProcessCompletedEvent;
-import org.drools.event.process.ProcessNodeLeftEvent;
-import org.drools.event.process.ProcessNodeTriggeredEvent;
-import org.drools.event.process.ProcessStartedEvent;
-import org.drools.event.process.ProcessVariableChangedEvent;
-import org.drools.event.rule.DebugAgendaEventListener;
-import org.drools.event.rule.DebugWorkingMemoryEventListener;
+import org.drools.event.process.*;
 import org.drools.impl.KnowledgeBaseFactoryServiceImpl;
 import org.drools.io.ResourceFactory;
 import org.drools.process.core.datatype.impl.type.ObjectDataType;
 import org.drools.process.instance.impl.WorkItemImpl;
 import org.drools.runtime.StatefulKnowledgeSession;
-import org.drools.runtime.process.ProcessInstance;
-import org.drools.runtime.process.WorkItem;
-import org.drools.runtime.process.WorkItemHandler;
-import org.drools.runtime.process.WorkItemManager;
-import org.drools.runtime.process.WorkflowProcessInstance;
+import org.drools.runtime.process.*;
 import org.drools.runtime.rule.FactHandle;
-import org.jbpm.bpmn2.core.Association;
-import org.jbpm.bpmn2.core.DataStore;
-import org.jbpm.bpmn2.core.Definitions;
+import org.jbpm.bpmn2.core.*;
 import org.jbpm.bpmn2.handler.ReceiveTaskHandler;
 import org.jbpm.bpmn2.handler.SendTaskHandler;
 import org.jbpm.bpmn2.handler.ServiceTaskHandler;
 import org.jbpm.bpmn2.objects.Person;
-import org.jbpm.bpmn2.xml.BPMNDISemanticModule;
-import org.jbpm.bpmn2.xml.BPMNExtensionsSemanticModule;
-import org.jbpm.bpmn2.xml.BPMNSemanticModule;
-import org.jbpm.bpmn2.xml.XmlBPMNProcessDumper;
+import org.jbpm.bpmn2.xml.*;
 import org.jbpm.compiler.xml.XmlProcessReader;
 import org.jbpm.process.instance.impl.RuleAwareProcessEventLister;
 import org.jbpm.process.instance.impl.demo.DoNothingWorkItemHandler;
@@ -78,22 +48,32 @@
 import org.jbpm.workflow.instance.node.DynamicNodeInstance;
 import org.jbpm.workflow.instance.node.DynamicUtils;
 import org.joda.time.DateTime;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
+import org.w3c.dom.*;
 
 public class SimpleBPMNProcessTest extends JbpmBpmn2TestCase {
 
     private Logger logger = LoggerFactory.getLogger(SimpleBPMNProcessTest.class);
 
     protected void setUp() { 
         String testName = getName();
-        if( testName.startsWith("testEventBasedSplit") || testName.startsWith("testTimerBoundaryEvent") 
-             || testName.startsWith("testIntermediateCatchEventTimer") || testName.startsWith("testTimerStart") ) { 
-            persistence = false;
+        String [] testFailsWithPersistence = { 
+            "testEventBasedSplit", "testTimerBoundaryEvent", "testIntermediateCatchEventTimer", "testTimerStart", 
+            // broken, but should work?!?
+            "testSignalBoundaryEvent", 
+            "testEscalationBoundaryEventOnTask", "testErrorBoundaryEventOnTask",
+            "testBusinessRuleTask",
+            "testNullVariableInScriptTaskProcess",
+            "testConditionalBoundaryEvent",
+            "testMessageBoundaryEventOnTask",
+            "testMessageBoundaryEvent",
+            "testCallActivityWithBoundaryEvent"
+        };
+        for( String testNameBegin : testFailsWithPersistence ) { 
+             if( testName.startsWith(testNameBegin) ) { 
+                 persistence = false;
+             }
         }
         super.setUp();
     }