Author: thomas.diesler(a)jboss.com Date: 2008-07-30 15:51:25 -0400 (Wed, 30 Jul 2008) New Revision: 1782 Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/engine/ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/engine/EngineShutdownTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java Removed: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/client/ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/model/ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/engine/ Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java Log: WIP Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/engine/EngineShutdownTest.java (from rev 1775, jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/engine/EngineShutdownTest.java) =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/engine/EngineShutdownTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/engine/EngineShutdownTest.java 2008-07-30 19:51:25 UTC (rev 1782) @@ -0,0 +1,75 @@ +/* + * 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.cts.engine; + +// $Id$ + +import java.net.URL; + +import org.jboss.bpm.EngineShutdownException; +import org.jboss.bpm.client.ProcessEngine; +import org.jboss.bpm.client.ProcessEngineLocator; +import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.test.DefaultEngineTestCase; + +/** + * Test the engine shutdown + * + * @author thomas.diesler(a)jboss.com + * @since 03-Jul-2008 + */ +public class EngineShutdownTest extends DefaultEngineTestCase +{ + private ProcessEngine engine; + + private URL jpdlURL; + + @Override + protected void setUp() throws Exception + { + super.setUp(); + jpdlURL = getResourceURL("samples/engine/basic-engine-" + getDialect() + ".xml"); + engine = ProcessEngineLocator.locateProcessEngine(); + engine.cancelShutdown(); + } + + /** + * Try to create a Process during shutdown + */ + public void testCreateProcess() throws Exception + { + // Create a Process through the ProcessManager + ProcessManager pm = ProcessManager.locateProcessManager(); + assertNotNull("Process expected", pm.createProcess(jpdlURL)); + + // Try to create a Process during shutdown + try + { + engine.prepareForShutdown(); + pm.createProcess(jpdlURL); + } + catch (EngineShutdownException ex) + { + assertEquals("Cannot create new Process while engine is shutting down", ex.getMessage()); + } + } +} Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java (from rev 1775, jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/model/ProcessIntegrityTest.java) =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java 2008-07-30 19:51:25 UTC (rev 1782) @@ -0,0 +1,112 @@ +/* + * 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.cts.process; + +// $Id$ + +import java.util.List; + +import org.jboss.bpm.InvalidProcessException; +import org.jboss.bpm.model.EndEvent; +import org.jboss.bpm.model.FlowObject; +import org.jboss.bpm.model.Process; +import org.jboss.bpm.model.ProcessBuilder; +import org.jboss.bpm.model.ProcessBuilderFactory; +import org.jboss.bpm.model.StartEvent; +import org.jboss.bpm.model.Task; +import org.jboss.bpm.model.Task.TaskType; +import org.jboss.bpm.test.DefaultEngineTestCase; + +/** + * Test the intergety of various process definitions + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public class ProcessIntegrityTest extends DefaultEngineTestCase +{ + public void testAnonymousProcess() throws Exception + { + // Create a Process through the ProcessBuilder + ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder(); + Process proc = builder.addProcess(null).addStartEvent().addSequenceFlow("taskA").addTask("taskA", TaskType.None). + addSequenceFlow("end").addEndEvent("end").getProcess(); + assertEquals("AnonymousProcess#0", proc.getName()); + + StartEvent start = proc.getStartEvent(); + assertNotNull("Start expected", start); + + FlowObject nfo = proc.findFlowObject("taskA"); + assertNotNull("FlowObject expected", nfo); + assertTrue("Task expected", nfo instanceof Task); + + List<EndEvent> ends = proc.getEndEvents(); + assertEquals(1, ends.size()); + } + + public void testNoStartState() throws Exception + { + try + { + // Create a Process through the ProcessBuilder + ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder(); + builder.addProcess(null).addTask("taskA", TaskType.None).addSequenceFlow("end").addEndEvent("end").getProcess(); + fail("InvalidProcessException expected"); + } + catch (InvalidProcessException ex) + { + assertTrue("Unexpected message: " + ex.getMessage(), ex.getMessage().indexOf("start event") > 0); + } + } + + public void testNoEndState() throws Exception + { + try + { + // Create a Process through the ProcessBuilder + ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder(); + builder.addProcess(null).addStartEvent().addSequenceFlow("taskA").addTask("taskA", TaskType.None).addSequenceFlow("end").addTask( + "end", TaskType.None).getProcess(); + fail("InvalidProcessException expected"); + } + catch (InvalidProcessException ex) + { + assertTrue("Unexpected message: " + ex.getMessage(), ex.getMessage().indexOf("end event") > 0); + } + } + + public void testNodeNameUniqueness() throws Exception + { + try + { + // Create a Process through the ProcessBuilder + ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder(); + builder.addProcess(null).addStartEvent().addSequenceFlow("taskA").addTask("taskA", TaskType.None).addSequenceFlow("end").addTask( + "taskA", TaskType.None).addSequenceFlow("end").addEndEvent("end").getProcess(); + fail("InvalidProcessException expected"); + } + catch (InvalidProcessException ex) + { + // expected; + } + } +} Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java 2008-07-30 19:51:16 UTC (rev 1781) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java 2008-07-30 19:51:25 UTC (rev 1782) @@ -75,10 +75,6 @@ Process proc = procBuilder.addProcess(getName()).addStartEvent().addSequenceFlow("gateway").addGateway("gateway", GatewayType.Parallel). addSequenceFlow("endA").addSequenceFlow("endB").addEndEvent("endA").addEndEvent("endB").getProcess(); - // Register the Process with the ProcessManager - ProcessManager pm = ProcessManager.locateProcessManager(); - pm.registerProcess(proc); - runProcess(proc); } Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java 2008-07-30 19:51:16 UTC (rev 1781) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java 2008-07-30 19:51:25 UTC (rev 1782) @@ -76,10 +76,6 @@ Process proc = procBuilder.addProcess(getName()).addStartEvent().addSequenceFlow("stateA").addTask("stateA", TaskType.None). addSequenceFlow("end").addEndEvent("end").getProcess(); - // Register the Process with the ProcessManager - ProcessManager pm = ProcessManager.locateProcessManager(); - pm.registerProcess(proc); - runProcess(proc); } Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java 2008-07-30 19:51:16 UTC (rev 1781) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java 2008-07-30 19:51:25 UTC (rev 1782) @@ -76,10 +76,6 @@ Process proc = procBuilder.addProcess(getName()).addStartEvent().addSequenceFlow("stateA").addTask("stateA", TaskType.None). addExecutionHandler(TaskA.class).addSequenceFlow("end").addEndEvent("end").getProcess(); - // Register the Process with the ProcessManager - ProcessManager pm = ProcessManager.locateProcessManager(); - pm.registerProcess(proc); - runProcess(proc); }