Author: jbarrez Date: 2009-07-30 07:51:09 -0400 (Thu, 30 Jul 2009) New Revision: 5389 Added: jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/repocache/ jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/repocache/RepositoryCacheTest.java jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/cache/ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/cache/jbpm.cfg.xml jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/cache/jbpm_alternative.cfg.xml jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/cache/jbpm_alternative.hibernate.cfg.xml Removed: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/cache/RepositoryCacheTest.java jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/cache/jbpm_alternative.cfg.xml jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/cache/jbpm_alternative.hibernate.cfg.xml Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmCustomCfgTestCase.java jbpm4/trunk/modules/test-concurrent/src/test/java/org/jbpm/test/concurrent/BasicUsageTest.java Log: Fixing Hudson integration test on JBoss and any database. The current integration testing setup doesn't allow to use multiple jbpm.cfg.xml files since the remote EJB command service is used to actually execute the commands on JBoss. Ofc, this remote command service doesn't know about the second (or third, or ...) config file which is at the client side. This problem should be fixed by JBPM-2409 Current resolution: moved the tests to test-cfg (which will run standalone only in the new QA setup) Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmCustomCfgTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmCustomCfgTestCase.java 2009-07-30 11:07:13 UTC (rev 5388) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmCustomCfgTestCase.java 2009-07-30 11:51:09 UTC (rev 5389) @@ -21,16 +21,42 @@ */ package org.jbpm.test; +import org.jbpm.api.Configuration; +import org.jbpm.api.RepositoryService; + /** * @author Tom Baeyens */ public class JbpmCustomCfgTestCase extends JbpmTestCase { + protected synchronized void initialize() { String cfgResource = getClass().getPackage().getName().replace(".", "/")+"/jbpm.cfg.xml"; - initialize(cfgResource); + + // We can't call initialize(String, String) here, since it will do a null + // check on the statically cached process engine. Since the test-cfg + // is meant to test different configs (and hence different process engines) + // this caching is unwanted, which means we create the process engine + // ourselves here. + + if (log.isDebugEnabled()) { + log.debug("building ProcessEngine from resource " + cfgResource); + } + + Configuration configuration = new Configuration().setResource(cfgResource); + + processEngine = configuration.buildProcessEngine(); + + repositoryService = processEngine.get(RepositoryService.class); + executionService = processEngine.getExecutionService(); + historyService = processEngine.getHistoryService(); + managementService = processEngine.getManagementService(); + taskService = processEngine.getTaskService(); + identityService = processEngine.getIdentityService(); } + + } Copied: jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/repocache/RepositoryCacheTest.java (from rev 5361, jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/cache/RepositoryCacheTest.java) =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/repocache/RepositoryCacheTest.java (rev 0) +++ jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/repocache/RepositoryCacheTest.java 2009-07-30 11:51:09 UTC (rev 5389) @@ -0,0 +1,132 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +/** + * + */ +package org.jbpm.test.repocache; + +import org.jbpm.api.Configuration; +import org.jbpm.api.Execution; +import org.jbpm.api.ExecutionService; +import org.jbpm.api.JbpmException; +import org.jbpm.api.ProcessEngine; +import org.jbpm.api.ProcessInstance; +import org.jbpm.test.JbpmCustomCfgTestCase; +import org.jbpm.test.JbpmTestCase; + + +/** + * Test case for the correct working of the repositoryCache. + * + * @author Joram Barrez + */ +public class RepositoryCacheTest extends JbpmCustomCfgTestCase { + + private static final String PROCESS_KEY = "test_process"; + + private static final String TEST_PROCESS = + "<process name='" + PROCESS_KEY + "'>" + + " <start>" + + " <transition to='a' />" + + " </start>" + + " <state name='a'>" + + " <transition to='theEnd' />" + + " </state>" + + " <end name='theEnd' />" + + "</process>"; + + /** + * Test for JBPM-2360: + * + * When a deployment is deleted, the entry is also removed from the + * repositoryCache. However, in a clustered environment, the deletion from the + * cache is done only on the node on which the deletion operation is invoked. + * This means that the other nodes are unaware of the deletion and the + * deployment is not deleted from the cache. + * + * This test emulates this scenario using two process engines which use + * the same database. One will delete a deployment. The second one must + * throw an exception when it tries to use the deployment. + * * When starting a new process + * * When signalling an execution which has a deleted deployment + */ + public void testDeleteDeploymentsUsingTwoProcessEngines() { + /* + ProcessEngine processEngine2 = createProcessEngineFromAlternativeConfig(); + ExecutionService executionService2 = processEngine2.getExecutionService(); + assertFalse(processEngine.equals(processEngine2)); + assertFalse(executionService.equals(executionService2)); + + // Deploy the process through the first process engine + String deployId = repositoryService.createDeployment() + .addResourceFromString("test_process.jpdl.xml", TEST_PROCESS) + .deploy(); + + // Start process instance on first process engine + ProcessInstance pi1 = executionService.startProcessInstanceByKey(PROCESS_KEY); + Execution executionAtWaitState1 = pi1.findActiveExecutionIn("a"); + assertActivityActive(pi1.getId(), "a"); + + // Now start process instance on second process engine + ProcessInstance pi2 = executionService2.startProcessInstanceByKey(PROCESS_KEY); + Execution executionAtWaitState2 = pi1.findActiveExecutionIn("a"); + assertActivityActive(pi2.getId(), "a"); + + // Delete the deployment through the first process engine + repositoryService.deleteDeploymentCascade(deployId); + + // Trying to find the two active process instances should fail now + assertNull(executionService.findExecutionById(pi1.getId())); + assertNull(executionService.findExecutionById(pi2.getId())); + + // Try to start the process through the first process engine. + // This should fail (since the deployment was deleted). + try { + executionService.startProcessInstanceByKey(PROCESS_KEY); + fail(); + } catch (JbpmException e) { } + + // Try to start the process through the second process engine. + // This should also fail (ie caches should be updated on both side). + try { + executionService2.startProcessInstanceByKey(PROCESS_KEY); + fail(); + } catch (JbpmException e) { } + + // Try to signal a process that was active before the deletion. This should also fail. + try { + executionService.signalExecutionById(executionAtWaitState1.getId()); + fail(); + } catch (JbpmException e) { } + try { + executionService2.signalExecutionById(executionAtWaitState2.getId()); + fail(); + } catch (JbpmException e) { } + */ + } + + private ProcessEngine createProcessEngineFromAlternativeConfig() { + Configuration configuration = new Configuration().setResource("org/jbpm/test/cache/jbpm_alternative.cfg.xml"); + return configuration.buildProcessEngine(); + } + +} Added: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/cache/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/cache/jbpm.cfg.xml (rev 0) +++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/cache/jbpm.cfg.xml 2009-07-30 11:51:09 UTC (rev 5389) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration> + + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.businesscalendar.cfg.xml" /> + <import resource="jbpm.tx.hibernate.cfg.xml" /> + <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> + +</jbpm-configuration> Copied: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/cache/jbpm_alternative.cfg.xml (from rev 5361, jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/cache/jbpm_alternative.cfg.xml) =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/cache/jbpm_alternative.cfg.xml (rev 0) +++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/cache/jbpm_alternative.cfg.xml 2009-07-30 11:51:09 UTC (rev 5389) @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8"?> + + <!-- + + Alternative configuration: * no create-drop for the database + --> + +<jbpm-configuration> + + <process-engine-context> + + <repository-service /> + <repository-cache /> + <execution-service /> + <history-service /> + <management-service /> + <identity-service /> + <task-service /> + + <hibernate-configuration> + <cfg resource="org/jbpm/test/cache/jbpm_alternative.hibernate.cfg.xml" /> + </hibernate-configuration> + + <hibernate-session-factory /> + + <script-manager default-expression-language="juel" + default-script-language="juel"> + <script-language name="juel" + factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> + </script-manager> + + <id-generator /> + <types resource="jbpm.variable.types.xml" /> + + <address-resolver /> + + </process-engine-context> + + <transaction-context> + <repository-session /> + <db-session /> + + <message-session /> + <timer-session /> + <history-session /> + <mail-session> + <mail-server> + <session-properties resource="jbpm.mail.properties" /> + </mail-server> + </mail-session> + </transaction-context> + + <import resource="jbpm.businesscalendar.cfg.xml" /> + <import resource="jbpm.tx.hibernate.cfg.xml" /> + <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> + +</jbpm-configuration> Copied: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/cache/jbpm_alternative.hibernate.cfg.xml (from rev 5361, jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/cache/jbpm_alternative.hibernate.cfg.xml) =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/cache/jbpm_alternative.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/cache/jbpm_alternative.hibernate.cfg.xml 2009-07-30 11:51:09 UTC (rev 5389) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <!-- HSQLDB --> + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + + <!-- Alternative config: no create-drop --> + <property name="hibernate.hbm2ddl.auto">update</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + + </session-factory> +</hibernate-configuration> Modified: jbpm4/trunk/modules/test-concurrent/src/test/java/org/jbpm/test/concurrent/BasicUsageTest.java =================================================================== --- jbpm4/trunk/modules/test-concurrent/src/test/java/org/jbpm/test/concurrent/BasicUsageTest.java 2009-07-30 11:07:13 UTC (rev 5388) +++ jbpm4/trunk/modules/test-concurrent/src/test/java/org/jbpm/test/concurrent/BasicUsageTest.java 2009-07-30 11:51:09 UTC (rev 5389) @@ -52,7 +52,7 @@ ); ProcessInstance processInstance = executionService.startProcessInstanceByKey("TimerTest"); - assertActivityActive("wait", processInstance.getId()); + assertActivityActive(processInstance.getId(), "wait"); Job job = managementService.createJobQuery() .processInstanceId(processInstance.getId()) Deleted: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/cache/RepositoryCacheTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/cache/RepositoryCacheTest.java 2009-07-30 11:07:13 UTC (rev 5388) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/cache/RepositoryCacheTest.java 2009-07-30 11:51:09 UTC (rev 5389) @@ -1,131 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -/** - * - */ -package org.jbpm.test.cache; - -import org.jbpm.api.Configuration; -import org.jbpm.api.Execution; -import org.jbpm.api.ExecutionService; -import org.jbpm.api.JbpmException; -import org.jbpm.api.ProcessEngine; -import org.jbpm.api.ProcessInstance; -import org.jbpm.test.JbpmTestCase; - - -/** - * Test case for the correct working of the repositoryCache. - * - * @author Joram Barrez - */ -public class RepositoryCacheTest extends JbpmTestCase { - - private static final String PROCESS_KEY = "test_process"; - - private static final String TEST_PROCESS = - "<process name='" + PROCESS_KEY + "'>" + - " <start>" + - " <transition to='a' />" + - " </start>" + - " <state name='a'>" + - " <transition to='theEnd' />" + - " </state>" + - " <end name='theEnd' />" + - "</process>"; - - /** - * Test for JBPM-2360: - * - * When a deployment is deleted, the entry is also removed from the - * repositoryCache. However, in a clustered environment, the deletion from the - * cache is done only on the node on which the deletion operation is invoked. - * This means that the other nodes are unaware of the deletion and the - * deployment is not deleted from the cache. - * - * This test emulates this scenario using two process engines which use - * the same database. One will delete a deployment. The second one must - * throw an exception when it tries to use the deployment. - * * When starting a new process - * * When signalling an execution which has a deleted deployment - */ - public void testDeleteDeploymentsUsingTwoProcessEngines() { - - ProcessEngine processEngine2 = createProcessEngineFromAlternativeConfig(); - ExecutionService executionService2 = processEngine2.getExecutionService(); - assertFalse(processEngine.equals(processEngine2)); - assertFalse(executionService.equals(executionService2)); - - // Deploy the process through the first process engine - String deployId = repositoryService.createDeployment() - .addResourceFromString("test_process.jpdl.xml", TEST_PROCESS) - .deploy(); - - // Start process instance on first process engine - ProcessInstance pi1 = executionService.startProcessInstanceByKey(PROCESS_KEY); - Execution executionAtWaitState1 = pi1.findActiveExecutionIn("a"); - assertActivityActive(pi1.getId(), "a"); - - // Now start process instance on second process engine - ProcessInstance pi2 = executionService2.startProcessInstanceByKey(PROCESS_KEY); - Execution executionAtWaitState2 = pi1.findActiveExecutionIn("a"); - assertActivityActive(pi2.getId(), "a"); - - // Delete the deployment through the first process engine - repositoryService.deleteDeploymentCascade(deployId); - - // Trying to find the two active process instances should fail now - assertNull(executionService.findExecutionById(pi1.getId())); - assertNull(executionService.findExecutionById(pi2.getId())); - - // Try to start the process through the first process engine. - // This should fail (since the deployment was deleted). - try { - executionService.startProcessInstanceByKey(PROCESS_KEY); - fail(); - } catch (JbpmException e) { } - - // Try to start the process through the second process engine. - // This should also fail (ie caches should be updated on both side). - try { - executionService2.startProcessInstanceByKey(PROCESS_KEY); - fail(); - } catch (JbpmException e) { } - - // Try to signal a process that was active before the deletion. This should also fail. - try { - executionService.signalExecutionById(executionAtWaitState1.getId()); - fail(); - } catch (JbpmException e) { } - try { - executionService2.signalExecutionById(executionAtWaitState2.getId()); - fail(); - } catch (JbpmException e) { } - - } - - private ProcessEngine createProcessEngineFromAlternativeConfig() { - Configuration configuration = new Configuration().setResource("org/jbpm/test/cache/jbpm_alternative.cfg.xml"); - return configuration.buildProcessEngine(); - } - -} Deleted: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/cache/jbpm_alternative.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/cache/jbpm_alternative.cfg.xml 2009-07-30 11:07:13 UTC (rev 5388) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/cache/jbpm_alternative.cfg.xml 2009-07-30 11:51:09 UTC (rev 5389) @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - <!-- - - Alternative configuration: * no create-drop for the database - --> - -<jbpm-configuration> - - <process-engine-context> - - <repository-service /> - <repository-cache /> - <execution-service /> - <history-service /> - <management-service /> - <identity-service /> - <task-service /> - - <hibernate-configuration> - <cfg resource="org/jbpm/test/cache/jbpm_alternative.hibernate.cfg.xml" /> - </hibernate-configuration> - - <hibernate-session-factory /> - - <script-manager default-expression-language="juel" - default-script-language="juel"> - <script-language name="juel" - factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> - </script-manager> - - <id-generator /> - <types resource="jbpm.variable.types.xml" /> - - <address-resolver /> - - </process-engine-context> - - <transaction-context> - <repository-session /> - <db-session /> - - <message-session /> - <timer-session /> - <history-session /> - <mail-session> - <mail-server> - <session-properties resource="jbpm.mail.properties" /> - </mail-server> - </mail-session> - </transaction-context> - - <import resource="jbpm.businesscalendar.cfg.xml" /> - <import resource="jbpm.tx.hibernate.cfg.xml" /> - <import resource="jbpm.jpdl.cfg.xml" /> - <import resource="jbpm.identity.cfg.xml" /> - -</jbpm-configuration> Deleted: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/cache/jbpm_alternative.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/cache/jbpm_alternative.hibernate.cfg.xml 2009-07-30 11:07:13 UTC (rev 5388) +++ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/test/cache/jbpm_alternative.hibernate.cfg.xml 2009-07-30 11:51:09 UTC (rev 5389) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> - -<hibernate-configuration> - <session-factory> - - <!-- HSQLDB --> - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - - <!-- Alternative config: no create-drop --> - <property name="hibernate.hbm2ddl.auto">update</property> - <property name="hibernate.format_sql">true</property> - - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> - - </session-factory> -</hibernate-configuration>