[jbpm-commits] JBoss JBPM SVN: r5686 - in jbpm3/branches/jbpm-3.2-soa/modules: core/src/test/java/org/jbpm/graph/node and 2 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Oct 5 01:49:48 EDT 2009
Author: alex.guizar at jboss.com
Date: 2009-10-05 01:49:47 -0400 (Mon, 05 Oct 2009)
New Revision: 5686
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableLongIdDbTest.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableStringIdDbTest.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/node/JoinDbTest.java
jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/taskinstance/CustomTaskInstanceTest.java
jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/websale/WebsaleTest.java
Log:
[JBPM-2563] Prevent test suite from continuously recreating database schema -
pay a visit to examples module
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableLongIdDbTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableLongIdDbTest.java 2009-10-05 05:02:22 UTC (rev 5685)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableLongIdDbTest.java 2009-10-05 05:49:47 UTC (rev 5686)
@@ -42,8 +42,10 @@
try {
DbPersistenceServiceFactory persistenceServiceFactory = (DbPersistenceServiceFactory) jbpmContext
.getServiceFactory(Services.SERVICENAME_PERSISTENCE);
+
Configuration configuration = persistenceServiceFactory.getConfiguration();
configuration.addClass(CustomLongClass.class);
+
JbpmSchema jbpmSchema = new JbpmSchema(configuration);
jbpmSchema.updateSchema();
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableStringIdDbTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableStringIdDbTest.java 2009-10-05 05:02:22 UTC (rev 5685)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableStringIdDbTest.java 2009-10-05 05:49:47 UTC (rev 5686)
@@ -42,8 +42,10 @@
try {
DbPersistenceServiceFactory persistenceServiceFactory = (DbPersistenceServiceFactory) jbpmContext
.getServiceFactory(Services.SERVICENAME_PERSISTENCE);
+
Configuration configuration = persistenceServiceFactory.getConfiguration();
configuration.addClass(CustomStringClass.class);
+
JbpmSchema jbpmSchema = new JbpmSchema(configuration);
jbpmSchema.updateSchema();
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/node/JoinDbTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/node/JoinDbTest.java 2009-10-05 05:02:22 UTC (rev 5685)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/node/JoinDbTest.java 2009-10-05 05:49:47 UTC (rev 5686)
@@ -56,9 +56,12 @@
URL cfgResource = getClass().getClassLoader().getResource("hibernate.cfg.xml");
try {
InputStream cfgSource = cfgResource.openStream();
- OutputStream cfgSink = new FileOutputStream(new File(URI.create(cfgResource.toString())
+ OutputStream cfgSink = new FileOutputStream(new File(URI
+ .create(cfgResource.toString())
.resolve("hibernate.join.cfg.xml")));
+
sed("Join\\.hbm\\.xml", "Join.lock.hbm.xml", cfgSource, cfgSink);
+
cfgSource.close();
cfgSink.close();
}
@@ -71,7 +74,9 @@
JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
try {
- DbPersistenceServiceFactory persistenceServiceFactory = (DbPersistenceServiceFactory) jbpmContext.getServiceFactory(Services.SERVICENAME_PERSISTENCE);
+ DbPersistenceServiceFactory persistenceServiceFactory = (DbPersistenceServiceFactory) jbpmContext
+ .getServiceFactory(Services.SERVICENAME_PERSISTENCE);
+
JbpmSchema jbpmSchema = new JbpmSchema(persistenceServiceFactory.getConfiguration());
jbpmSchema.updateSchema();
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/taskinstance/CustomTaskInstanceTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/taskinstance/CustomTaskInstanceTest.java 2009-10-05 05:02:22 UTC (rev 5685)
+++ jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/taskinstance/CustomTaskInstanceTest.java 2009-10-05 05:49:47 UTC (rev 5686)
@@ -29,6 +29,7 @@
import org.jbpm.JbpmConfiguration;
import org.jbpm.context.exe.ContextInstance;
import org.jbpm.db.AbstractDbTestCase;
+import org.jbpm.db.JbpmSchema;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.persistence.db.DbPersistenceServiceFactory;
@@ -58,20 +59,21 @@
// the jbpm.cfg.xml file is modified to add the CustomTaskInstanceFactory
// so we will read in the file from the config directory of this example
jbpmConfiguration = JbpmConfiguration.parseResource("taskinstance/jbpm.cfg.xml");
- DbPersistenceServiceFactory factory = (DbPersistenceServiceFactory) jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE);
+ DbPersistenceServiceFactory factory = (DbPersistenceServiceFactory) jbpmConfiguration
+ .getServiceFactory(Services.SERVICENAME_PERSISTENCE);
Configuration configuration = factory.getConfiguration();
configuration.addResource("taskinstance/CustomTaskInstance.hbm.xml");
- // TODO https://jira.jboss.org/jira/browse/JBPM-1812
- // JbpmSchema jbpmSchema = new JbpmSchema(configuration);
- // jbpmSchema.updateTable("JBPM_TASKINSTANCE");
+ JbpmSchema jbpmSchema = new JbpmSchema(configuration);
+ jbpmSchema.updateSchema();
}
return jbpmConfiguration;
}
void deployProcess() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("taskinstance/processdefinition.xml");
+ ProcessDefinition processDefinition = ProcessDefinition
+ .parseXmlResource("taskinstance/processdefinition.xml");
jbpmContext.deployProcessDefinition(processDefinition);
processDefinitionId = processDefinition.getId();
}
@@ -102,7 +104,8 @@
long createNewProcessInstance() {
String processDefinitionName = "CustomTaskInstance";
- ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate(processDefinitionName);
+ ProcessInstance processInstance = jbpmContext
+ .newProcessInstanceForUpdate(processDefinitionName);
ContextInstance contextInstance = processInstance.getContextInstance();
contextInstance.setVariable("processDefinitionName", processDefinitionName);
@@ -127,13 +130,15 @@
}
void completeTask(long taskInstanceId) {
- CustomTaskInstance taskInstance = (CustomTaskInstance) jbpmContext.getSession()
+ CustomTaskInstance taskInstance = (CustomTaskInstance) jbpmContext
+ .getSession()
.load(CustomTaskInstance.class, new Long(taskInstanceId));
taskInstance.end();
}
List findPooledTaskListByCustomId(String actorId, String customId) {
- return jbpmContext.getSession()
+ return jbpmContext
+ .getSession()
.createCriteria(CustomTaskInstance.class)
.add(Restrictions.isNull("actorId"))
.add(Restrictions.isNull("end"))
Modified: jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/websale/WebsaleTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/websale/WebsaleTest.java 2009-10-05 05:02:22 UTC (rev 5685)
+++ jbpm3/branches/jbpm-3.2-soa/modules/examples/src/test/java/org/jbpm/examples/websale/WebsaleTest.java 2009-10-05 05:49:47 UTC (rev 5686)
@@ -42,6 +42,7 @@
}
protected void tearDown() throws Exception {
+ newTransaction();
graphSession.deleteProcessDefinition(processDefinitionId);
super.tearDown();
}
@@ -65,8 +66,6 @@
TaskInstance taskInstance = createNewProcessInstance();
assertEquals("Create new web sale order", taskInstance.getName());
assertEquals(0, taskInstance.getVariables().size());
-
- newTransaction();
}
public void testPerformWebSaleOrderTask() {
More information about the jbpm-commits
mailing list