[jbpm-commits] JBoss JBPM SVN: r1602 - in api/trunk/modules: api/src/main/java/org/jboss/bpm/client and 15 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Sun Jul 13 10:41:11 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-07-13 10:41:10 -0400 (Sun, 13 Jul 2008)
New Revision: 1602
Added:
api/trunk/modules/api/src/test/java/org/jboss/bpm/model/ProcessIntegrityTest.java
api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-jbpm32.xml
api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-jbpm32.xml
api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-jbpm32.xml
Removed:
api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/model/
api/trunk/modules/testsuite/src/test/resources/model/
api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context.xml
api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence.xml
api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task.xml
Modified:
api/trunk/modules/api/src/main/java/org/jboss/bpm/NameNotUniqueException.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/AbstractFlow.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/test/DefaultEngineTestCase.java
api/trunk/modules/api/src/main/java/org/jboss/bpm/util/ProcessMarshaller.java
api/trunk/modules/api/src/test/java/org/jboss/bpm/model/ProcessMarshallerTest.java
api/trunk/modules/api/src/test/java/org/jboss/bpm/pattern/sequence/SequenceTest.java
api/trunk/modules/testsuite/pom.xml
api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/context/ExecutionContextTest.java
api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/engine/EngineShutdownTest.java
api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java
api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java
Log:
Add descriptor dialects
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/NameNotUniqueException.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/NameNotUniqueException.java 2008-07-13 13:29:02 UTC (rev 1601)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/NameNotUniqueException.java 2008-07-13 14:41:10 UTC (rev 1602)
@@ -29,18 +29,17 @@
* @author thomas.diesler at jboss.com
* @since 18-Jun-2008
*/
-public class NameNotUniqueException extends JBPMException {
-
- /**
- *
- */
+public class NameNotUniqueException extends InvalidProcessException
+{
private static final long serialVersionUID = 1L;
- public NameNotUniqueException() {
+ public NameNotUniqueException()
+ {
super();
}
- public NameNotUniqueException(String message) {
+ public NameNotUniqueException(String message)
+ {
super(message);
}
}
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-07-13 13:29:02 UTC (rev 1601)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-07-13 14:41:10 UTC (rev 1602)
@@ -83,7 +83,6 @@
*/
public final Process createProcess(String procDescriptor)
{
- // TODO: test this
if (engine.isPrepareForShutdown())
throw new EngineShutdownException("Cannot create new Process while engine is shutting down");
@@ -97,7 +96,6 @@
*/
public final Process createProcess(URL procURL) throws IOException
{
- // TODO: test this
if (engine.isPrepareForShutdown())
throw new EngineShutdownException("Cannot create new Process while engine is shutting down");
@@ -169,9 +167,12 @@
try
{
File file = new File("target/" + proc.getName() + ".xml").getCanonicalFile();
+ log.debug("Generate: " + file);
+
+ FileWriter writer = new FileWriter(file);
ProcessMarshaller marshaller = new ProcessMarshaller();
- marshaller.marshallProcess(proc, new FileWriter(file));
- log.info("Generated: " + file);
+ marshaller.marshallProcess(proc, writer);
+ writer.close();
}
catch (Exception ex)
{
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/AbstractFlow.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/AbstractFlow.java 2008-07-13 13:29:02 UTC (rev 1601)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/AbstractFlow.java 2008-07-13 14:41:10 UTC (rev 1602)
@@ -24,33 +24,30 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
-
-
// $Id$
/**
- * A Flow is a graphical line connecting two objects in a BPD.
+ * A Flow is a graphical line connecting two objects in a BPD.
*
- * There are two types of Flow: Sequence Flow and Message Flow, each with their own line style.
- * Flow is also used in a generic sense (and lowercase) to describe how Tokens will traverse
- * Sequence Flow from the Start Event to an End Event.
+ * There are two types of Flow: Sequence Flow and Message Flow, each with their own line style. Flow is also used in a generic sense (and lowercase) to describe how
+ * Tokens will traverse Sequence Flow from the Start Event to an End Event.
*
* @author thomas.diesler at jboss.com
* @since 08-Jul-2008
*/
- at XmlType(name="AbstractFlow")
+ at XmlType(name = "AbstractFlow")
abstract class AbstractFlow
{
private String name;
private String targetName;
-
+
/**
* Construct a flow with no target
*/
public AbstractFlow()
{
}
-
+
/**
* Construct a flow with a given target
*/
@@ -66,10 +63,9 @@
{
return name;
}
-
+
/**
- * Set the optional name
- * Note, this MUST NOT leak into the public API.
+ * Set the optional name Note, this MUST NOT leak into the public API.
*/
@XmlAttribute(required = false)
protected void setName(String name)
@@ -86,10 +82,9 @@
}
/**
- * Set the target name
- * Note, this MUST NOT leak into the public API.
+ * Set the target name Note, this MUST NOT leak into the public API.
*/
- @XmlAttribute(required = true)
+ @XmlAttribute(name = "to", required = true)
protected void setTargetName(String targetName)
{
this.targetName = targetName;
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java 2008-07-13 13:29:02 UTC (rev 1601)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java 2008-07-13 14:41:10 UTC (rev 1602)
@@ -24,6 +24,7 @@
import javax.xml.bind.annotation.XmlType;
import org.jboss.bpm.InvalidProcessException;
+import org.jboss.bpm.NameNotUniqueException;
//$Id$
@@ -53,9 +54,21 @@
if (this instanceof NamedFlowObject)
{
- NamedFlowObject nfo = (NamedFlowObject)this;
- if (nfo.getName() == null)
+ // Check required name
+ String name = ((NamedFlowObject)this).getName();
+ if (name == null)
throw new InvalidProcessException("Name is required for: " + this);
+
+ // Check name uniqueness
+ for (FlowObject aux : proc.getFlowObjects())
+ {
+ if (aux != this && aux instanceof NamedFlowObject)
+ {
+ String auxName = ((NamedFlowObject)aux).getName();
+ if (name.equals(auxName))
+ throw new NameNotUniqueException("NamedFlowObject: " + this);
+ }
+ }
}
// Initialize in/out flows
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-07-13 13:29:02 UTC (rev 1601)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-07-13 14:41:10 UTC (rev 1602)
@@ -32,8 +32,8 @@
import javax.xml.bind.annotation.XmlType;
import org.jboss.bpm.InvalidProcessException;
-import org.jboss.bpm.NameNotUniqueException;
import org.jboss.bpm.client.ExecutionManager;
+import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.runtime.Attachments;
/**
@@ -75,13 +75,6 @@
*/
protected void addFlowObject(FlowObject flowObject)
{
- if (flowObject instanceof NamedFlowObject)
- {
- NamedFlowObject nfo = (NamedFlowObject)flowObject;
- if (nfo.getName() != null && findFlowObject(nfo.getName()) != null)
- throw new NameNotUniqueException("NamedFlowObject: " + nfo.getName());
- }
-
flowObjects.add(flowObject);
}
@@ -188,6 +181,13 @@
if (processState != ProcessState.CREATED)
throw new IllegalStateException("Cannot initialize process in state: " + processState);
+ // Set the anonymous default name
+ if (getName() == null)
+ {
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ setName("AnonymousProcess#" + pm.getProcesses().size());
+ }
+
if (getStartEvent() == null)
throw new InvalidProcessException("Process does not have a start event");
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-07-13 13:29:02 UTC (rev 1601)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-07-13 14:41:10 UTC (rev 1602)
@@ -56,7 +56,7 @@
super.setUp();
log.debug("setUp: " + getName());
deployer = new EmbeddedBeansDeployer();
- deployTestBeans(getBeansConfig());
+ deployBeans(getBeansConfig());
signals.clear();
}
@@ -64,19 +64,19 @@
protected void tearDown() throws Exception
{
log.debug("tearDown: " + getName());
- undeployTestBeans(getBeansConfig());
+ undeployBeans(getBeansConfig());
super.tearDown();
}
// Deploy a beans config
- protected void deployTestBeans(String resourceName)
+ protected void deployBeans(String resourceName)
{
URL url = getBeansConfigURL(resourceName);
deployer.deploy(url);
}
// Undeploy a beans config
- protected void undeployTestBeans(String resourceName)
+ protected void undeployBeans(String resourceName)
{
URL url = getBeansConfigURL(resourceName);
deployer.undeploy(url);
@@ -108,7 +108,7 @@
log.debug("catchSignal: " + signal);
}
- public List<Signal> getCaughtSignals()
+ public List<Signal> getSignals()
{
return Collections.unmodifiableList(signals);
}
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/test/DefaultEngineTestCase.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/test/DefaultEngineTestCase.java 2008-07-13 13:29:02 UTC (rev 1601)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/test/DefaultEngineTestCase.java 2008-07-13 14:41:10 UTC (rev 1602)
@@ -32,4 +32,16 @@
{
return ProcessEngine.JBPM_ENGINE_CONFIG;
}
+
+ /**
+ * Get the jBPM descriptor dialect.
+ */
+ protected String getDialect()
+ {
+ String dialect = System.getProperty("jbpm.dialect");
+ if (dialect == null)
+ throw new IllegalStateException ("Cannot obtain jbpm.dialect");
+
+ return dialect;
+ }
}
Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/util/ProcessMarshaller.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/util/ProcessMarshaller.java 2008-07-13 13:29:02 UTC (rev 1601)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/util/ProcessMarshaller.java 2008-07-13 14:41:10 UTC (rev 1602)
@@ -49,12 +49,14 @@
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
+ marshaller.marshal(proc, out);
+
// Add xmlns:xsi to the top level element and remove it from all others
- StringWriter strwr = new StringWriter();
- marshaller.marshal(proc, strwr);
- String str = strwr.toString();
- String xsi = " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"";
- str = new StringBuilder(str.replace(xsi, "")).insert(str.indexOf(">"), xsi).toString();
- out.write(str);
+ //StringWriter strwr = new StringWriter();
+ //marshaller.marshal(proc, strwr);
+ //String str = strwr.toString();
+ //String xsi = " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"";
+ //str = new StringBuilder(str.replace(xsi, "")).insert(str.indexOf(">"), xsi).toString();
+ //out.write(str);
}
}
Added: api/trunk/modules/api/src/test/java/org/jboss/bpm/model/ProcessIntegrityTest.java
===================================================================
--- api/trunk/modules/api/src/test/java/org/jboss/bpm/model/ProcessIntegrityTest.java (rev 0)
+++ api/trunk/modules/api/src/test/java/org/jboss/bpm/model/ProcessIntegrityTest.java 2008-07-13 14:41:10 UTC (rev 1602)
@@ -0,0 +1,146 @@
+/*
+ * 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.model;
+
+// $Id$
+
+import java.util.List;
+
+import org.jboss.bpm.InvalidProcessException;
+import org.jboss.bpm.MockEngineTestCase;
+import org.jboss.bpm.client.ProcessManager;
+
+/**
+ * Test the intergety of various process definitions
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+public class ProcessIntegrityTest extends MockEngineTestCase
+{
+ public void testBasicSequence() throws Exception
+ {
+ String jpdl =
+ "<ns2:process xmlns:ns2='urn:api.bpm.jboss:jpdl-0.1'>" +
+ " <start>" +
+ " <sequence to='taskA' />" +
+ " </start>" +
+ " <task name='taskA'>" +
+ " <sequence to='end' />" +
+ " </task>" +
+ " <end name='end' />" +
+ "</ns2:process>";
+
+ // Create a Process through the ProcessManager
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ Process proc = pm.createProcess(jpdl);
+ 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
+ {
+ String jpdl =
+ "<ns2:process xmlns:ns2='urn:api.bpm.jboss:jpdl-0.1'>" +
+ " <task>" +
+ " <sequence to='taskA' />" +
+ " </task>" +
+ " <task name='taskA'>" +
+ " <sequence to='end' />" +
+ " </task>" +
+ " <end name='end' />" +
+ "</ns2:process>";
+
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ try
+ {
+ pm.createProcess(jpdl);
+ fail("InvalidProcessException expected");
+ }
+ catch (InvalidProcessException ex)
+ {
+ assertTrue("Unexpected message: " + ex.getMessage(), ex.getMessage().indexOf("start event") > 0);
+ }
+ }
+
+ public void testNoEndState() throws Exception
+ {
+ String jpdl =
+ "<ns2:process xmlns:ns2='urn:api.bpm.jboss:jpdl-0.1'>" +
+ " <start>" +
+ " <sequence to='taskA' />" +
+ " </start>" +
+ " <task name='taskA'>" +
+ " <sequence to='end' />" +
+ " </task>" +
+ " <task name='end' />" +
+ "</ns2:process>";
+
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ try
+ {
+ pm.createProcess(jpdl);
+ fail("InvalidProcessException expected");
+ }
+ catch (InvalidProcessException ex)
+ {
+ assertTrue("Unexpected message: " + ex.getMessage(), ex.getMessage().indexOf("end event") > 0);
+ }
+ }
+
+ public void testNodeNameUniqueness() throws Exception
+ {
+ String jpdl =
+ "<ns2:process xmlns:ns2='urn:api.bpm.jboss:jpdl-0.1'>" +
+ " <start>" +
+ " <sequence to='taskA' />" +
+ " </start>" +
+ " <task name='taskA'>" +
+ " <sequence to='end' />" +
+ " </task>" +
+ " <task name='taskA'>" +
+ " <sequence to='end' />" +
+ " </task>" +
+ " <end name='end' />" +
+ "</ns2:process>";
+
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ try
+ {
+ pm.createProcess(jpdl);
+ fail("InvalidProcessException expected");
+ }
+ catch (InvalidProcessException ex)
+ {
+ // expected;
+ }
+ }
+}
Property changes on: api/trunk/modules/api/src/test/java/org/jboss/bpm/model/ProcessIntegrityTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: api/trunk/modules/api/src/test/java/org/jboss/bpm/model/ProcessMarshallerTest.java
===================================================================
--- api/trunk/modules/api/src/test/java/org/jboss/bpm/model/ProcessMarshallerTest.java 2008-07-13 13:29:02 UTC (rev 1601)
+++ api/trunk/modules/api/src/test/java/org/jboss/bpm/model/ProcessMarshallerTest.java 2008-07-13 14:41:10 UTC (rev 1602)
@@ -51,7 +51,7 @@
marshaller.marshallProcess(inProc, strwr);
String xml = strwr.toString();
- System.out.println(xml);
+ //System.out.println(xml);
ProcessUnmarshaller unmarshaller = new ProcessUnmarshaller();
Process outProc = unmarshaller.unmarshallProcess(new StringReader(xml));
Modified: api/trunk/modules/api/src/test/java/org/jboss/bpm/pattern/sequence/SequenceTest.java
===================================================================
--- api/trunk/modules/api/src/test/java/org/jboss/bpm/pattern/sequence/SequenceTest.java 2008-07-13 13:29:02 UTC (rev 1601)
+++ api/trunk/modules/api/src/test/java/org/jboss/bpm/pattern/sequence/SequenceTest.java 2008-07-13 14:41:10 UTC (rev 1602)
@@ -35,7 +35,7 @@
import org.jboss.bpm.model.Signal;
/**
- * Test the basic execution sequence
+ * Test the basic sequence
*
* @author thomas.diesler at jboss.com
* @since 03-Jul-2008
@@ -71,7 +71,7 @@
assertEquals("No attachments expected", 0, result.getAttachments().getAttachmentKeys().size());
// Validate received signals
- List<Signal> signals = getCaughtSignals();
+ List<Signal> signals = getSignals();
assertEquals(Signal.Type.ENTER_PROCESS, signals.get(0).getType());
assertEquals(Signal.Type.ENTER_START_EVENT, signals.get(1).getType());
assertEquals(Signal.Type.EXIT_START_EVENT, signals.get(2).getType());
Modified: api/trunk/modules/testsuite/pom.xml
===================================================================
--- api/trunk/modules/testsuite/pom.xml 2008-07-13 13:29:02 UTC (rev 1601)
+++ api/trunk/modules/testsuite/pom.xml 2008-07-13 14:41:10 UTC (rev 1602)
@@ -116,6 +116,21 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>jbpm.dialect</name>
+ <value>jbpm32</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
</project>
\ No newline at end of file
Modified: api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/context/ExecutionContextTest.java
===================================================================
--- api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/context/ExecutionContextTest.java 2008-07-13 13:29:02 UTC (rev 1601)
+++ api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/context/ExecutionContextTest.java 2008-07-13 14:41:10 UTC (rev 1602)
@@ -48,7 +48,7 @@
protected void setUp() throws Exception
{
super.setUp();
- jpdlURL = getResourceURL("samples/context/basic-context.xml");
+ jpdlURL = getResourceURL("samples/context/basic-context-" + getDialect() + ".xml");
SignalManager em = SignalManager.locateSignalManager();
em.addListener("basic-context", this);
}
Modified: api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/engine/EngineShutdownTest.java
===================================================================
--- api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/engine/EngineShutdownTest.java 2008-07-13 13:29:02 UTC (rev 1601)
+++ api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/engine/EngineShutdownTest.java 2008-07-13 14:41:10 UTC (rev 1602)
@@ -59,9 +59,9 @@
{
// Create a Process through the ProcessManager
ProcessManager pm = ProcessManager.locateProcessManager();
- assertNotNull("ProcessDefinition expected", pm.createProcess(jpdlURL));
+ assertNotNull("Process expected", pm.createProcess(jpdlURL));
- // Try to create a ProcessDefinition during shutdown
+ // Try to create a Process during shutdown
try
{
engine.prepareForShutdown();
Modified: api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java
===================================================================
--- api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java 2008-07-13 13:29:02 UTC (rev 1601)
+++ api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java 2008-07-13 14:41:10 UTC (rev 1602)
@@ -48,7 +48,7 @@
protected void setUp() throws Exception
{
super.setUp();
- jpdlURL = getResourceURL("samples/sequence/basic-sequence.xml");
+ jpdlURL = getResourceURL("samples/sequence/basic-sequence-" + getDialect() + ".xml");
SignalManager em = SignalManager.locateSignalManager();
em.addListener("basic-sequence", this);
}
@@ -71,7 +71,7 @@
assertEquals("No attachments expected", 0, result.getAttachments().getAttachmentKeys().size());
// Validate received signals
- List<Signal> signals = getCaughtSignals();
+ List<Signal> signals = getSignals();
assertEquals(Signal.Type.ENTER_PROCESS, signals.get(0).getType());
assertEquals(Signal.Type.ENTER_START_EVENT, signals.get(1).getType());
assertEquals(Signal.Type.EXIT_START_EVENT, signals.get(2).getType());
Modified: api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java
===================================================================
--- api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java 2008-07-13 13:29:02 UTC (rev 1601)
+++ api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java 2008-07-13 14:41:10 UTC (rev 1602)
@@ -49,7 +49,7 @@
protected void setUp() throws Exception
{
super.setUp();
- jpdlURL = getResourceURL("samples/task/basic-task.xml");
+ jpdlURL = getResourceURL("samples/task/basic-task-" + getDialect() + ".xml");
SignalManager em = SignalManager.locateSignalManager();
em.addListener("basic-task", this);
}
@@ -75,7 +75,7 @@
assertEquals("Task: TaskA", att.getAttachment(String.class));
// Validate received signals
- List<Signal> signals = getCaughtSignals();
+ List<Signal> signals = getSignals();
assertEquals(Signal.Type.ENTER_PROCESS, signals.get(0).getType());
assertEquals(Signal.Type.ENTER_START_EVENT, signals.get(1).getType());
assertEquals(Signal.Type.EXIT_START_EVENT, signals.get(2).getType());
Added: api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-jbpm32.xml
===================================================================
--- api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-jbpm32.xml (rev 0)
+++ api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-jbpm32.xml 2008-07-13 14:41:10 UTC (rev 1602)
@@ -0,0 +1,12 @@
+<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='basic-context'>
+ <start-state>
+ <transition to='stateA' />
+ </start-state>
+ <state name='stateA'>
+ <event type='node-enter'>
+ <action class='org.jboss.bpm.samples.context.TaskA' />
+ </event>
+ <transition to='end' />
+ </state>
+ <end-state name='end' />
+</process-definition>
\ No newline at end of file
Property changes on: api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-jbpm32.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context.xml
===================================================================
--- api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context.xml 2008-07-13 13:29:02 UTC (rev 1601)
+++ api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context.xml 2008-07-13 14:41:10 UTC (rev 1602)
@@ -1,12 +0,0 @@
-<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='basic-context'>
- <start-state>
- <transition to='stateA' />
- </start-state>
- <state name='stateA'>
- <event type='node-enter'>
- <action class='org.jboss.bpm.samples.context.TaskA' />
- </event>
- <transition to='end' />
- </state>
- <end-state name='end' />
-</process-definition>
\ No newline at end of file
Copied: api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-jbpm32.xml (from rev 1598, api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence.xml)
===================================================================
--- api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-jbpm32.xml (rev 0)
+++ api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-jbpm32.xml 2008-07-13 14:41:10 UTC (rev 1602)
@@ -0,0 +1,9 @@
+<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='basic-sequence'>
+ <start-state>
+ <transition to='stateA' />
+ </start-state>
+ <state name='stateA'>
+ <transition to='end' />
+ </state>
+ <end-state name='end' />
+</process-definition>
\ No newline at end of file
Deleted: api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence.xml
===================================================================
--- api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence.xml 2008-07-13 13:29:02 UTC (rev 1601)
+++ api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence.xml 2008-07-13 14:41:10 UTC (rev 1602)
@@ -1,9 +0,0 @@
-<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='basic-sequence'>
- <start-state>
- <transition to='stateA' />
- </start-state>
- <state name='stateA'>
- <transition to='end' />
- </state>
- <end-state name='end' />
-</process-definition>
\ No newline at end of file
Copied: api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-jbpm32.xml (from rev 1598, api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task.xml)
===================================================================
--- api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-jbpm32.xml (rev 0)
+++ api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-jbpm32.xml 2008-07-13 14:41:10 UTC (rev 1602)
@@ -0,0 +1,12 @@
+<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='basic-task'>
+ <start-state>
+ <transition to='stateA' />
+ </start-state>
+ <state name='stateA'>
+ <event type='node-enter'>
+ <action class='org.jboss.bpm.samples.task.TaskA' />
+ </event>
+ <transition to='end' />
+ </state>
+ <end-state name='end' />
+</process-definition>
\ No newline at end of file
Deleted: api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task.xml
===================================================================
--- api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task.xml 2008-07-13 13:29:02 UTC (rev 1601)
+++ api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task.xml 2008-07-13 14:41:10 UTC (rev 1602)
@@ -1,12 +0,0 @@
-<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='basic-task'>
- <start-state>
- <transition to='stateA' />
- </start-state>
- <state name='stateA'>
- <event type='node-enter'>
- <action class='org.jboss.bpm.samples.task.TaskA' />
- </event>
- <transition to='end' />
- </state>
- <end-state name='end' />
-</process-definition>
\ No newline at end of file
More information about the jbpm-commits
mailing list