[jbpm-commits] JBoss JBPM SVN: r3446 - in projects/spec/trunk: modules/api/src/main/java/org/jboss/bpm/api/test and 6 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-12-19 11:48:49 -0500 (Fri, 19 Dec 2008) New Revision: 3446 Added: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessInstanceServiceTest.java projects/spec/trunk/modules/cts/src/test/resources/bpm-spec-jbpm3-beans.xml projects/spec/trunk/modules/cts/src/test/resources/cts/ projects/spec/trunk/modules/cts/src/test/resources/org.jboss.bpm.api.config.ConfigurationProvider Removed: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalog.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalogExt.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessBuilderTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/task/ projects/spec/trunk/modules/cts/src/test/resources/cts/ projects/spec/trunk/modules/dialects/api10/ projects/spec/trunk/modules/dialects/jpdl32/ projects/spec/trunk/modules/dialects/stp/ projects/spec/trunk/modules/dialects/xpdl21/ Modified: projects/spec/trunk/.project projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/APITestCase.java projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/APITestHelper.java projects/spec/trunk/modules/cts/pom.xml projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java projects/spec/trunk/modules/dialects/pom.xml projects/spec/trunk/pom.xml Log: Remove unwanted modules Modified: projects/spec/trunk/.project =================================================================== --- projects/spec/trunk/.project 2008-12-19 13:05:31 UTC (rev 3445) +++ projects/spec/trunk/.project 2008-12-19 16:48:49 UTC (rev 3446) @@ -6,18 +6,12 @@ </projects> <buildSpec> <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> <name>org.maven.ide.eclipse.maven2Builder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> - <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.maven.ide.eclipse.maven2Nature</nature> </natures> </projectDescription> Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/APITestCase.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/APITestCase.java 2008-12-19 13:05:31 UTC (rev 3445) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/APITestCase.java 2008-12-19 16:48:49 UTC (rev 3446) @@ -24,6 +24,8 @@ import java.io.File; import java.net.MalformedURLException; import java.net.URL; +import java.util.HashMap; +import java.util.Map; import javax.management.ObjectName; @@ -31,6 +33,7 @@ import org.jboss.bpm.api.Constants; import org.jboss.bpm.api.config.Configuration; +import org.jboss.bpm.api.config.ConfigurationProvider; import org.jboss.bpm.api.model.builder.ObjectNameFactory; import org.jboss.bpm.api.service.ProcessEngine; import org.slf4j.Logger; @@ -48,14 +51,15 @@ final Logger log = LoggerFactory.getLogger(APITestCase.class); private APITestHelper delegate = new APITestHelper(); - + private static Map<String,ProcessEngine> engineRegistry = new HashMap<String,ProcessEngine>(); + @Override protected void setUp() throws Exception { log.debug("### START " + getLongName()); super.setUp(); } - + @Override protected void tearDown() throws Exception { @@ -69,7 +73,7 @@ shortName = shortName.substring(shortName.lastIndexOf(".") + 1); return shortName; } - + protected String getLongName() { return getClass().getName() + "." + getName(); @@ -78,17 +82,32 @@ public ObjectName getTestID() { String shortName = getShortName(); - shortName = shortName.replace("DescriptorTest", "Test"); - shortName = shortName.replace("MarshallerTest", "Test"); + shortName = shortName.replace("DescriptorTest", "Test"); + shortName = shortName.replace("MarshallerTest", "Test"); return ObjectNameFactory.create(Constants.ID_DOMAIN, "test", shortName); } protected ProcessEngine getProcessEngine() { - return Configuration.getProcessEngine(); + String impl = System.getProperty("bpm.spec.impl", "jbpm3"); + ProcessEngine engine = engineRegistry.get(impl); + if (engine == null) + { + String cfgResource = "bpm-spec-" + impl + "-beans.xml"; + URL cfgURL = getResourceURL(cfgResource); + if (cfgURL == null) + throw new IllegalStateException("Cannot obtain resource: " + cfgResource); + + ConfigurationProvider provider = Configuration.getConfigurationProvider(); + provider.configure(cfgURL); + + engine = provider.getProcessEngine(); + engineRegistry.put(impl, engine); + } + return engine; } - protected URL getResourceURL(String resource) throws MalformedURLException + protected URL getResourceURL(String resource) { return delegate.getResourceURL(resource); } Modified: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/APITestHelper.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/APITestHelper.java 2008-12-19 13:05:31 UTC (rev 3445) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/APITestHelper.java 2008-12-19 16:48:49 UTC (rev 3446) @@ -40,9 +40,19 @@ private static String testArchiveDir; /** Try to discover the URL for the test resource */ - public URL getResourceURL(String resource) throws MalformedURLException + public URL getResourceURL(String resource) { - return getResourceFile(resource).toURI().toURL(); + URL resURL = null; + try + { + File resourceFile = getResourceFile(resource); + resURL = resourceFile.toURI().toURL(); + } + catch (MalformedURLException e) + { + // ignore + } + return resURL; } /** Try to discover the File for the test resource */ Deleted: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalog.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalog.java 2008-12-19 13:05:31 UTC (rev 3445) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalog.java 2008-12-19 16:48:49 UTC (rev 3446) @@ -1,79 +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.jboss.bpm.api.test; - -// $Id: ProcessCatalog.java 2922 2008-11-14 10:11:29Z thomas.diesler(a)jboss.com $ - -import junit.framework.TestCase; - -import org.jboss.bpm.api.model.EndEvent; -import org.jboss.bpm.api.model.ProcessDefinition; -import org.jboss.bpm.api.model.SequenceFlow; -import org.jboss.bpm.api.model.StartEvent; -import org.jboss.bpm.api.model.Task; -import org.jboss.bpm.api.model.builder.ProcessBuilder; -import org.jboss.bpm.api.service.ProcessBuilderService; -import org.jboss.bpm.api.service.ProcessEngine; - -/** - * A catalog of CTS test processes - * - * @author thomas.diesler(a)jboss.com - * @since 24-Sep-2008 - */ -public abstract class ProcessCatalog -{ - public static ProcessDefinition getDefaultProcess(ProcessEngine engine) - { - ProcessBuilderService pbService = engine.getService(ProcessBuilderService.class); - ProcessBuilder builder = pbService.getProcessBuilder(); - builder.addProcess("Proc"); - builder.addStartEvent("Start").addSequenceFlow("Task"); - builder.addTask("Task"); - builder.addSequenceFlow("End").addEndEvent("End"); - return builder.getProcessDefinition(); - } - - public static void validateDefaultProcess(ProcessDefinition procDef) - { - TestCase.assertNotNull("Process not null", procDef); - TestCase.assertEquals("Proc", procDef.getName()); - - StartEvent start = (StartEvent)procDef.getNode("Start"); - Task task = (Task)procDef.getNode("Task"); - EndEvent end = (EndEvent)procDef.getNode("End"); - - TestCase.assertNotNull("Start not null", start); - TestCase.assertNotNull("Task not null", task); - TestCase.assertNotNull("End not null", end); - - SequenceFlow startFlow = start.getOutFlow(); - TestCase.assertNotNull("Start flow not null", startFlow); - TestCase.assertEquals("Task", startFlow.getTargetRef()); - TestCase.assertEquals("Start", startFlow.getSourceRef()); - - SequenceFlow taskFlow = task.getOutFlow(); - TestCase.assertNotNull("Task flow not null", taskFlow); - TestCase.assertEquals("End", taskFlow.getTargetRef()); - TestCase.assertEquals("Task", taskFlow.getSourceRef()); - } -} Deleted: projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalogExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalogExt.java 2008-12-19 13:05:31 UTC (rev 3445) +++ projects/spec/trunk/modules/api/src/main/java/org/jboss/bpm/api/test/ProcessCatalogExt.java 2008-12-19 16:48:49 UTC (rev 3446) @@ -1,108 +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.jboss.bpm.api.test; - -// $Id$ - -import junit.framework.TestCase; - -import org.jboss.bpm.api.model.Expression; -import org.jboss.bpm.api.model.ProcessDefinition; -import org.jboss.bpm.api.model.SequenceFlow; -import org.jboss.bpm.api.service.ProcessBuilderService; -import org.jboss.bpm.api.service.ProcessEngine; -import org.jboss.bpm.incubator.model.Assignment; -import org.jboss.bpm.incubator.model.EndEventExt; -import org.jboss.bpm.incubator.model.Message; -import org.jboss.bpm.incubator.model.ProcessDefinitionExt; -import org.jboss.bpm.incubator.model.StartEventExt; -import org.jboss.bpm.incubator.model.TaskExt; -import org.jboss.bpm.incubator.model.Assignment.AssignTime; -import org.jboss.bpm.incubator.model.builder.ProcessBuilderExt; - -/** - * A catalog of CTS test processes - * - * @author thomas.diesler(a)jboss.com - * @since 24-Sep-2008 - */ -public abstract class ProcessCatalogExt -{ - public static ProcessDefinition getDefaultProcess(ProcessEngine engine) - { - ProcessBuilderService pbService = engine.getService(ProcessBuilderService.class); - ProcessBuilderExt builder = (ProcessBuilderExt)pbService.getProcessBuilder(); - builder.addProcess("Proc"); - builder.addProcessProperty("proP1", "valP1").addProcessProperty("proP2", "valP2"); - builder.addProcessMessage("procMsg").addProperty("msgPropName", "msgPropVal"); - builder.addProcessAssignment(AssignTime.Start, Expression.ExpressionLanguage.MVEL, "foo==true", "fooTrue"); - builder.addStartEventExt("Start").addSequenceFlow("Task"); - builder.addTaskExt("Task").addNodeProperty("proT1", "valT1").addNodeProperty("proT2", "valT2"); - builder.addSequenceFlow("End").addEndEvent("End"); - return builder.getProcessDefinition(); - } - - public static void validateDefaultProcess(ProcessDefinitionExt procDef) - { - TestCase.assertNotNull("Process not null", procDef); - TestCase.assertEquals("Proc", procDef.getName()); - - TestCase.assertEquals("Two proc props", 2, procDef.getPropertyNames().size()); - TestCase.assertEquals("valP1", procDef.getProperty("proP1").getValue()); - TestCase.assertEquals("valP2", procDef.getProperty("proP2").getValue()); - - Message procMsg = procDef.getMessage("procMsg"); - TestCase.assertEquals("One proc message", 1, procDef.getMessages().size()); - TestCase.assertEquals("msgPropVal", procMsg.getProperty("msgPropName").getValue()); - - TestCase.assertEquals("One proc assignment", 1, procDef.getAssignments().size()); - Assignment procAssign = procDef.getAssignments().get(0); - TestCase.assertEquals(AssignTime.Start, procAssign.getAssignTime()); - TestCase.assertEquals("foo==true", procAssign.getFrom().getExpressionBody()); - TestCase.assertEquals("fooTrue", procAssign.getTo().getName()); - - StartEventExt start = (StartEventExt)procDef.getNode("Start"); - TaskExt task = (TaskExt)procDef.getNode("Task"); - EndEventExt end = (EndEventExt)procDef.getNode("End"); - - TestCase.assertNotNull("Start not null", start); - TestCase.assertNotNull("Task not null", task); - TestCase.assertNotNull("End not null", end); - - TestCase.assertEquals("No start props", 0, start.getPropertyNames().size()); - TestCase.assertEquals("Two task props", 2, task.getPropertyNames().size()); - TestCase.assertEquals("No end props", 0, end.getPropertyNames().size()); - - TestCase.assertEquals("valT1", task.getProperty("proT1").getValue()); - TestCase.assertEquals("valT2", task.getProperty("proT2").getValue()); - - SequenceFlow startFlow = start.getOutFlow(); - TestCase.assertNotNull("Start flow not null", startFlow); - TestCase.assertEquals("Task", startFlow.getTargetRef()); - TestCase.assertEquals("Start", startFlow.getSourceRef()); - - SequenceFlow taskFlow = task.getOutFlow(); - TestCase.assertNotNull("Task flow not null", taskFlow); - TestCase.assertEquals("End", taskFlow.getTargetRef()); - TestCase.assertEquals("Task", taskFlow.getSourceRef()); - } -} Modified: projects/spec/trunk/modules/cts/pom.xml =================================================================== --- projects/spec/trunk/modules/cts/pom.xml 2008-12-19 13:05:31 UTC (rev 3445) +++ projects/spec/trunk/modules/cts/pom.xml 2008-12-19 16:48:49 UTC (rev 3446) @@ -37,26 +37,6 @@ <artifactId>jboss-bpm-api</artifactId> <version>${version}</version> </dependency> - - <!-- Test Dependencies --> - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>jboss-bpm-dialect-api10</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>jboss-bpm-dialect-stp</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>jboss-bpm-ri</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> </dependencies> <!-- Plugins --> @@ -113,5 +93,40 @@ </plugin> </plugins> </build> + + <!-- Profiles --> + <profiles> + <!-- + Name: no-impl + Descr: Setup the default impl + --> + <profile> + <id>no-impl</id> + <activation> + <property> + <name>!impl</name> + </property> + </activation> + <properties> + <database>hsqldb</database> + <bpm.spec.impl>jbpm3</bpm.spec.impl> + </properties> + <dependencies> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.7</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-integration-spec</artifactId> + <version>3.3.1-SNAPSHOT</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + </profiles> + </project> Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java 2008-12-19 13:05:31 UTC (rev 3445) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java 2008-12-19 16:48:49 UTC (rev 3446) @@ -1,53 +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.jboss.bpm.test.cts.gateway.exclusive; - -// $Id$ - -import java.io.IOException; - -import org.jboss.bpm.api.model.ProcessDefinition; -import org.jboss.bpm.api.service.ProcessDefinitionService; - - -/** - * Exclusive data-based gateway that has conditional outgoing sequence flows. Only one of the gates is taken. It is an - * error if no gate is applicable. - * - * @author thomas.diesler(a)jboss.com - * @since 06-Aug-2008 - */ -public class ExclusiveGatewaySplitMarshallerTest extends ExclusiveGatewaySplitTest -{ - protected ProcessDefinition getProcessDefinition() throws IOException - { - // Marshall the process to a string - ProcessDefinition procDef = super.getProcessDefinition(); - String procXML = marshallProcess(procDef); - - //System.out.println(procXML); - - // Recreate the ProcessDefinition from the marshalled ProcessDefinition - ProcessDefinitionService pdService = getProcessEngine().getService(ProcessDefinitionService.class); - return pdService.parseProcessDefinition(procXML); - } -} Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-12-19 13:05:31 UTC (rev 3445) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-12-19 16:48:49 UTC (rev 3446) @@ -25,17 +25,12 @@ import java.io.IOException; -import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessDefinition; -import org.jboss.bpm.api.model.Expression.ExpressionLanguage; -import org.jboss.bpm.api.model.Gateway.GatewayType; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus; -import org.jboss.bpm.api.model.builder.GatewayBuilder; -import org.jboss.bpm.api.model.builder.ProcessBuilder; import org.jboss.bpm.api.runtime.BasicAttachments; import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.api.runtime.Token.TokenStatus; -import org.jboss.bpm.api.service.ProcessBuilderService; import org.jboss.bpm.api.test.CTSTestCase; /** @@ -45,7 +40,7 @@ * @author thomas.diesler(a)jboss.com * @since 06-Aug-2008 */ -public class ExclusiveGatewaySplitTest extends CTSTestCase +public abstract class ExclusiveGatewaySplitTest extends CTSTestCase { public void testGateA() throws Exception { @@ -100,15 +95,5 @@ } } - protected ProcessDefinition getProcessDefinition() throws IOException - { - ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class); - ProcessBuilder procBuilder = pbService.getProcessBuilder(); - procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split"); - GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", GatewayType.Exclusive); - gatewayBuilder.addConditionalGate("EndA", ExpressionLanguage.MVEL, "foo < 10"); - gatewayBuilder.addConditionalGate("EndB", ExpressionLanguage.MVEL, "foo > 10"); - procBuilder.addEndEvent("EndA").addEndEvent("EndB"); - return procBuilder.getProcessDefinition(); - } + protected abstract ProcessDefinition getProcessDefinition() throws IOException; } Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessBuilderTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessBuilderTest.java 2008-12-19 13:05:31 UTC (rev 3445) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessBuilderTest.java 2008-12-19 16:48:49 UTC (rev 3446) @@ -1,181 +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.jboss.bpm.test.cts.service.process; - -// $Id$ - -import org.jboss.bpm.api.InvalidProcessException; -import org.jboss.bpm.api.model.ProcessDefinition; -import org.jboss.bpm.api.model.builder.ProcessBuilder; -import org.jboss.bpm.api.service.ProcessBuilderService; -import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.api.test.ProcessCatalog; - -/** - * Test the ProcessBuilder - * - * @author thomas.diesler(a)jboss.com - * @since 24-Sep-2008 - */ -public class ProcessBuilderTest extends CTSTestCase -{ - public void testBasicProcess() throws Exception - { - ProcessDefinition procDef = ProcessCatalog.getDefaultProcess(getProcessEngine()); - ProcessCatalog.validateDefaultProcess(procDef); - } - - public void testNoProcessName() throws Exception - { - try - { - ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class); - ProcessBuilder procBuilder = pbService.getProcessBuilder(); - procBuilder.addProcess(null).addStartEvent("Start").addSequenceFlow("Task"); - procBuilder.addTask("Task").addSequenceFlow("End").addEndEvent("End"); - procBuilder.getProcessDefinition(); - fail("Process name required"); - } - catch (InvalidProcessException e) - { - // expected - } - } - - public void testNoStartName() throws Exception - { - ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class); - ProcessBuilder procBuilder = pbService.getProcessBuilder(); - try - { - procBuilder.addProcess("Proc").addStartEvent(null).addSequenceFlow("Task"); - procBuilder.addTask("Task").addSequenceFlow("End").addEndEvent("End"); - procBuilder.getProcessDefinition(); - fail("StartEvent name required"); - } - catch (InvalidProcessException e) - { - // expected - } - } - - public void testNoTaskName() throws Exception - { - ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class); - ProcessBuilder procBuilder = pbService.getProcessBuilder(); - try - { - procBuilder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("Task"); - procBuilder.addTask(null).addSequenceFlow("End").addEndEvent("End"); - procBuilder.getProcessDefinition(); - fail("Task name required"); - } - catch (InvalidProcessException e) - { - // expected - } - } - - public void testNoEndName() throws Exception - { - ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class); - ProcessBuilder procBuilder = pbService.getProcessBuilder(); - try - { - procBuilder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("Task"); - procBuilder.addTask("Task").addSequenceFlow("End").addEndEvent(null); - procBuilder.getProcessDefinition(); - fail("EndEvent name required"); - } - catch (InvalidProcessException e) - { - // expected - } - } - - public void testNoStartEvent() throws Exception - { - ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class); - ProcessBuilder procBuilder = pbService.getProcessBuilder(); - try - { - procBuilder.addProcess("Proc").addTask("Task").addSequenceFlow("End").addEndEvent("End"); - procBuilder.getProcessDefinition(); - fail("StartEvent required"); - } - catch (InvalidProcessException e) - { - // expected - } - } - - public void testNoEndEvent() throws Exception - { - ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class); - ProcessBuilder procBuilder = pbService.getProcessBuilder(); - try - { - procBuilder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("Task"); - procBuilder.addTask("Task"); - procBuilder.getProcessDefinition(); - fail("EndEvent required"); - } - catch (InvalidProcessException e) - { - // expected - } - } - - public void testUnreachableNode() throws Exception - { - ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class); - ProcessBuilder procBuilder = pbService.getProcessBuilder(); - try - { - procBuilder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("Task1"); - procBuilder.addTask("Task1").addSequenceFlow("End").addTask("Task2").addSequenceFlow("End").addEndEvent("End"); - procBuilder.getProcessDefinition(); - fail("Unreachable node Task2"); - } - catch (InvalidProcessException e) - { - // expected - } - } - - public void testDeadEndNode() throws Exception - { - ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class); - ProcessBuilder procBuilder = pbService.getProcessBuilder(); - try - { - procBuilder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("Task"); - procBuilder.addTask("Task").addEndEvent("End"); - procBuilder.getProcessDefinition(); - fail("Dead end Task"); - } - catch (InvalidProcessException e) - { - // expected - } - } -} Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-12-19 13:05:31 UTC (rev 3445) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-12-19 16:48:49 UTC (rev 3446) @@ -23,17 +23,17 @@ // $Id$ +import java.io.IOException; import java.util.Set; import javax.management.ObjectName; +import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.ProcessInstance; -import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.service.ProcessDefinitionService; import org.jboss.bpm.api.service.ProcessEngine; import org.jboss.bpm.api.service.ProcessInstanceService; import org.jboss.bpm.api.test.CTSTestCase; -import org.jboss.bpm.api.test.ProcessCatalog; /** * Test the ProcessDefinition @@ -41,12 +41,11 @@ * @author thomas.diesler(a)jboss.com * @since 24-Sep-2008 */ -public class ProcessDefinitionServiceTest extends CTSTestCase +public abstract class ProcessDefinitionServiceTest extends CTSTestCase { public void testBasicProcess() throws Exception { - ProcessDefinition procDef = ProcessCatalog.getDefaultProcess(getProcessEngine()); - ProcessCatalog.validateDefaultProcess(procDef); + ProcessDefinition procDef = getProcessDefinition(); ProcessEngine engine = procDef.getProcessEngine(); assertNotNull("ProcessEngine not null", engine); @@ -60,7 +59,7 @@ public void testNewInstance() throws Exception { - ProcessDefinition procDef = ProcessCatalog.getDefaultProcess(getProcessEngine()); + ProcessDefinition procDef = getProcessDefinition(); ProcessEngine engine = procDef.getProcessEngine(); ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class); @@ -74,7 +73,7 @@ public void testRegister() throws Exception { - ProcessDefinition procDef = ProcessCatalog.getDefaultProcess(getProcessEngine()); + ProcessDefinition procDef = getProcessDefinition(); ProcessEngine engine = procDef.getProcessEngine(); ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class); @@ -85,4 +84,6 @@ boolean success = procDefService.unregisterProcessDefinition(procDef.getKey()); assertTrue("ProcessDefinition unregistered", success); } + + protected abstract ProcessDefinition getProcessDefinition() throws IOException; } Copied: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessInstanceServiceTest.java (from rev 3432, projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java) =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessInstanceServiceTest.java (rev 0) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessInstanceServiceTest.java 2008-12-19 16:48:49 UTC (rev 3446) @@ -0,0 +1,93 @@ +/* + * 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.jboss.bpm.test.cts.service.process; + +// $Id$ + +import javax.management.ObjectName; + +import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.ProcessInstance; +import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.service.ProcessDefinitionService; +import org.jboss.bpm.api.service.ProcessInstanceService; +import org.jboss.bpm.api.test.CTSTestCase; + +/** + * Test the ProcessService + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public abstract class ProcessInstanceServiceTest extends CTSTestCase +{ + public void testRegisterProcess() throws Exception + { + ProcessDefinitionService procDefService = getProcessEngine().getService(ProcessDefinitionService.class); + ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class); + + ProcessDefinition procDef = getProcessDefinition(); + ProcessInstance proc = procDef.newInstance(); + + assertNull("ProcessDefinition not registered automatically", procDefService.getProcessDefinition(procDef.getKey())); + assertNull("Process not registered automatically", procService.getInstance(proc.getKey())); + + // Register the process + proc = procService.registerInstance(proc); + assertNotNull("Proc not null", proc); + assertNotNull("ProcessDefinition registered", procDefService.getProcessDefinition(procDef.getKey())); + assertNotNull("Process registered", procService.getInstance(proc.getKey())); + + // Unregister the process + procService.unregisterInstance(proc.getKey()); + assertNull("Process unregistered", procService.getInstance(proc.getKey())); + assertNotNull("ProcessDefinition still registered", procDefService.getProcessDefinition(procDef.getKey())); + + procDefService.unregisterProcessDefinition(procDef.getKey()); + assertNull("ProcessDefinition unregistered", procDefService.getProcessDefinition(procDef.getKey())); + } + + public void testStartProcess() throws Exception + { + ProcessDefinitionService procDefService = getProcessEngine().getService(ProcessDefinitionService.class); + ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class); + + ProcessDefinition procDef = getProcessDefinition(); + ProcessInstance proc = procDef.newInstance(); + + Token token = proc.startProcess(); + assertNotNull("Token not null", token); + + ObjectName procID = proc.getKey(); + assertNotNull("Process registered", procService.getInstance(procID)); + + // Unregister the process + procService.unregisterInstance(procID); + assertNull("Process unregistered", procService.getInstance(procID)); + assertNotNull("ProcessDefinition still registered", procDefService.getProcessDefinition(procDef.getKey())); + + procDefService.unregisterProcessDefinition(procDef.getKey()); + assertNull("ProcessDefinition unregistered", procDefService.getProcessDefinition(procDef.getKey())); + } + + protected abstract ProcessDefinition getProcessDefinition(); +} Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java 2008-12-19 13:05:31 UTC (rev 3445) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessServiceTest.java 2008-12-19 16:48:49 UTC (rev 3446) @@ -1,101 +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.jboss.bpm.test.cts.service.process; - -// $Id$ - -import javax.management.ObjectName; - -import org.jboss.bpm.api.model.ProcessInstance; -import org.jboss.bpm.api.model.ProcessDefinition; -import org.jboss.bpm.api.model.builder.ProcessBuilder; -import org.jboss.bpm.api.runtime.Token; -import org.jboss.bpm.api.service.ProcessBuilderService; -import org.jboss.bpm.api.service.ProcessDefinitionService; -import org.jboss.bpm.api.service.ProcessInstanceService; -import org.jboss.bpm.api.test.CTSTestCase; - -/** - * Test the ProcessService - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public class ProcessServiceTest extends CTSTestCase -{ - public void testRegisterProcess() throws Exception - { - ProcessDefinitionService procDefService = getProcessEngine().getService(ProcessDefinitionService.class); - ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class); - - ProcessDefinition procDef = getProcessDefinition(); - ProcessInstance proc = procDef.newInstance(); - - assertNull("ProcessDefinition not registered automatically", procDefService.getProcessDefinition(procDef.getKey())); - assertNull("Process not registered automatically", procService.getInstance(proc.getKey())); - - // Register the process - proc = procService.registerInstance(proc); - assertNotNull("Proc not null", proc); - assertNotNull("ProcessDefinition registered", procDefService.getProcessDefinition(procDef.getKey())); - assertNotNull("Process registered", procService.getInstance(proc.getKey())); - - // Unregister the process - procService.unregisterInstance(proc.getKey()); - assertNull("Process unregistered", procService.getInstance(proc.getKey())); - assertNotNull("ProcessDefinition still registered", procDefService.getProcessDefinition(procDef.getKey())); - - procDefService.unregisterProcessDefinition(procDef.getKey()); - assertNull("ProcessDefinition unregistered", procDefService.getProcessDefinition(procDef.getKey())); - } - - public void testStartProcess() throws Exception - { - ProcessDefinitionService procDefService = getProcessEngine().getService(ProcessDefinitionService.class); - ProcessInstanceService procService = getProcessEngine().getService(ProcessInstanceService.class); - - ProcessDefinition procDef = getProcessDefinition(); - ProcessInstance proc = procDef.newInstance(); - - Token token = proc.startProcess(); - assertNotNull("Token not null", token); - - ObjectName procID = proc.getKey(); - assertNotNull("Process registered", procService.getInstance(procID)); - - // Unregister the process - procService.unregisterInstance(procID); - assertNull("Process unregistered", procService.getInstance(procID)); - assertNotNull("ProcessDefinition still registered", procDefService.getProcessDefinition(procDef.getKey())); - - procDefService.unregisterProcessDefinition(procDef.getKey()); - assertNull("ProcessDefinition unregistered", procDefService.getProcessDefinition(procDef.getKey())); - } - - private ProcessDefinition getProcessDefinition() - { - ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class); - ProcessBuilder procBuilder = pbService.getProcessBuilder(); - procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Task"); - return procBuilder.addTask("Task").addSequenceFlow("End").addEndEvent("End").getProcessDefinition(); - } -} Added: projects/spec/trunk/modules/cts/src/test/resources/bpm-spec-jbpm3-beans.xml =================================================================== --- projects/spec/trunk/modules/cts/src/test/resources/bpm-spec-jbpm3-beans.xml (rev 0) +++ projects/spec/trunk/modules/cts/src/test/resources/bpm-spec-jbpm3-beans.xml 2008-12-19 16:48:49 UTC (rev 3446) @@ -0,0 +1,60 @@ +<!-- + Note, this uses the bean-deployer-2.0 schema + $Id$ +--> +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- Locate the single instance of the kernel --> + <bean name="BPMKernelLocator" class="org.jboss.bpm.api.config.internal.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> + </bean> + + <!-- The ProcessEngine --> + <bean name="BPMProcessEngine" class="org.jbpm.integration.spec.service.ProcessEngineImpl"> + <property name="services"> + <set elementClass="org.jboss.bpm.api.service.Service"> + <inject bean="BPMDeploymentService"/> + <inject bean="BPMDialectHandlerService"/> + <inject bean="BPMExecutionContextService"/> + <inject bean="BPMExecutionService"/> + <inject bean="BPMIdentityService"/> + <inject bean="BPMProcessBuilderService"/> + <inject bean="BPMProcessDefinitionService"/> + <inject bean="BPMProcessService"/> + <inject bean="BPMTaskService"/> + </set> + </property> + </bean> + + <!-- The PersistenceService --> + <bean name="BPMPersistenceService" class="org.jbpm.integration.spec.service.NoopPersistenceServiceImpl" /> + + <!-- The ProcessService --> + <bean name="BPMProcessService" class="org.jbpm.integration.spec.service.ProcessInstanceServiceImpl"> + <property name="interceptors"> + <list elementClass="java.lang.String"> + <value>org.jbpm.integration.spec.runtime.NodeExecuteInterceptor</value> + </list> + </property> + </bean> + + <!-- The DialectHandlerService --> + <bean name="BPMDialectHandlerService" class="org.jbpm.integration.spec.service.DialectHandlerServiceImpl"> + <property name="dialectHandlers"> + <map keyClass="java.net.URI" valueClass="org.jboss.bpm.api.service.DialectHandler"> + <entry><key>urn:jbpm.org:jpdl-3.2</key><value><inject bean="BPMDialectHandlerJPDL32"/></value></entry> + </map> + </property> + </bean> + <bean name="BPMDialectHandlerJPDL32" class="org.jbpm.integration.spec.jpdl32.DialectHandlerImpl" /> + + <!-- Other Services --> + <bean name="BPMDeploymentService" class="org.jbpm.integration.spec.service.DeploymentServiceImpl" /> + <bean name="BPMExecutionContextService" class="org.jbpm.integration.spec.service.ExecutionContextServiceImpl" /> + <bean name="BPMExecutionService" class="org.jbpm.integration.spec.service.ExecutionServiceImpl" /> + <bean name="BPMIdentityService" class="org.jbpm.integration.spec.service.IdentityServiceImpl" /> + <bean name="BPMProcessBuilderService" class="org.jbpm.integration.spec.service.ProcessBuilderServiceImpl" /> + <bean name="BPMProcessDefinitionService" class="org.jbpm.integration.spec.service.ProcessDefinitionServiceImpl" /> + <bean name="BPMTaskService" class="org.jbpm.integration.spec.service.TaskServiceImpl" /> + +</deployment> Property changes on: projects/spec/trunk/modules/cts/src/test/resources/bpm-spec-jbpm3-beans.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/cts/src/test/resources/org.jboss.bpm.api.config.ConfigurationProvider =================================================================== --- projects/spec/trunk/modules/cts/src/test/resources/org.jboss.bpm.api.config.ConfigurationProvider (rev 0) +++ projects/spec/trunk/modules/cts/src/test/resources/org.jboss.bpm.api.config.ConfigurationProvider 2008-12-19 16:48:49 UTC (rev 3446) @@ -0,0 +1 @@ +org.jboss.bpm.api.config.internal.MicrocontainerConfigurationProvider \ No newline at end of file Modified: projects/spec/trunk/modules/dialects/pom.xml =================================================================== --- projects/spec/trunk/modules/dialects/pom.xml 2008-12-19 13:05:31 UTC (rev 3445) +++ projects/spec/trunk/modules/dialects/pom.xml 2008-12-19 16:48:49 UTC (rev 3446) @@ -27,10 +27,6 @@ <!-- Modules --> <modules> - <module>api10</module> - <module>jpdl32</module> - <module>stp</module> - <module>xpdl21</module> </modules> <!-- Dependencies --> Modified: projects/spec/trunk/pom.xml =================================================================== --- projects/spec/trunk/pom.xml 2008-12-19 13:05:31 UTC (rev 3445) +++ projects/spec/trunk/pom.xml 2008-12-19 16:48:49 UTC (rev 3446) @@ -34,11 +34,8 @@ <!-- Modules --> <modules> <module>modules/api</module> - <module>modules/dialects</module> <module>modules/integration</module> - <module>modules/ri</module> <module>modules/cts</module> - <!-- module>modules/samples/airticket</module --> </modules> <!-- Properties -->