6:23 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2008-10-29 07:23:10 -0400 (Wed, 29 Oct 2008)
New Revision: 2654
Added:
projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/dialect/
projects/spec/trunk/modules/ri/src/test/resources/dialect/
projects/spec/trunk/modules/ri/src/test/resources/dialect/stp/
projects/spec/trunk/modules/ri/src/test/resources/dialect/stp/sequence/
Removed:
projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/dialect/stp/AbstractSTPDialectTest.java
Modified:
projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/dialect/stp/sequence/SequenceTest.java
projects/spec/trunk/modules/ri/src/test/resources/dialect/stp/sequence/basic-sequence.bpmn
Log:
Resurect STP SequenceTest
Copied: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/dialect (from rev
2651,
projects/spec/tags/jbpm-spec-1.0.0-Alpha1/modules/dialects/stp/src/test/java/org/jboss/bpm/dialect)
Deleted:
projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/dialect/stp/AbstractSTPDialectTest.java
===================================================================
---
projects/spec/tags/jbpm-spec-1.0.0-Alpha1/modules/dialects/stp/src/test/java/org/jboss/bpm/dialect/stp/AbstractSTPDialectTest.java 2008-10-29
09:30:14 UTC (rev 2651)
+++
projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/dialect/stp/AbstractSTPDialectTest.java 2008-10-29
11:23:10 UTC (rev 2654)
@@ -1,50 +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.dialect.stp;
-
-//$Id$
-
-import org.jboss.bpm.test.DefaultEngineTestCase;
-
-/**
- * @author thomas.diesler(a)jboss.com
- * @since 03-Jul-2008
- */
-public abstract class AbstractSTPDialectTest extends DefaultEngineTestCase
-{
- private String dialect;
-
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
- dialect = System.getProperty("jbpm.dialect", "api10");
- System.setProperty("jbpm.dialect", "stp");
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- System.setProperty("jbpm.dialect", dialect);
- super.tearDown();
- }
-}
Modified:
projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/dialect/stp/sequence/SequenceTest.java
===================================================================
---
projects/spec/tags/jbpm-spec-1.0.0-Alpha1/modules/dialects/stp/src/test/java/org/jboss/bpm/dialect/stp/sequence/SequenceTest.java 2008-10-29
09:30:14 UTC (rev 2651)
+++
projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/dialect/stp/sequence/SequenceTest.java 2008-10-29
11:23:10 UTC (rev 2654)
@@ -19,15 +19,15 @@
* 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.dialect.stp.sequence;
+package org.jbpm.test.ri.dialect.stp.sequence;
// $Id$
import java.net.URL;
-import org.jboss.bpm.client.ProcessManager;
-import org.jboss.bpm.model.Process;
-import org.jboss.bpm.test.DefaultEngineTestCase;
+import org.jbpm.api.model.ProcessDefinition;
+import org.jbpm.api.service.ProcessDefinitionService;
+import org.jbpm.api.test.APITestCase;
/**
* Test the basic execution sequence
@@ -35,18 +35,18 @@
* @author thomas.diesler(a)jboss.com
* @since 03-Jul-2008
*/
-public class SequenceTest extends DefaultEngineTestCase
+public class SequenceTest extends APITestCase
{
/**
* Test a basic sequence
*/
public void testBasicSequence() throws Exception
{
- URL procURL = getResourceURL("sequence/basic-sequence.bpmn");
+ URL procURL = getResourceURL("dialect/stp/sequence/basic-sequence.bpmn");
- ProcessManager pm = ProcessManager.locateProcessManager();
- Process proc = pm.createProcess(procURL);
+ ProcessDefinitionService pdService =
ProcessDefinitionService.locateProcessDefinitionService();
+ ProcessDefinition procDef = pdService.createProcessDefinition(procURL);
- assertNotNull(proc);
+ assertNotNull(procDef);
}
}
Copied: projects/spec/trunk/modules/ri/src/test/resources/dialect/stp/sequence (from rev
2651,
projects/spec/tags/jbpm-spec-1.0.0-Alpha1/modules/dialects/stp/src/test/resources/sequence)
Modified:
projects/spec/trunk/modules/ri/src/test/resources/dialect/stp/sequence/basic-sequence.bpmn
===================================================================
---
projects/spec/tags/jbpm-spec-1.0.0-Alpha1/modules/dialects/stp/src/test/resources/sequence/basic-sequence.bpmn 2008-10-29
09:30:14 UTC (rev 2651)
+++
projects/spec/trunk/modules/ri/src/test/resources/dialect/stp/sequence/basic-sequence.bpmn 2008-10-29
11:23:10 UTC (rev 2654)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:BpmnDiagram xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI"
xmlns:bpmn="http://stp.eclipse.org/bpmn"
xmi:id="_UstEIE3nEd2LNJlZf0NQOw" iD="_UspZwE3nEd2LNJlZf0NQOw">
<pools xmi:type="bpmn:Pool" xmi:id="_Ut2ToE3nEd2LNJlZf0NQOw"
iD="_Ut1skE3nEd2LNJlZf0NQOw" name="Pool">
+ <vertices xmi:type="bpmn:Activity"
xmi:id="_aeNvwE3nEd2LNJlZf0NQOw" iD="_aeNIsE3nEd2LNJlZf0NQOw"
outgoingEdges="_bWie4E3nEd2LNJlZf0NQOw"
activityType="EventStartEmpty"/>
<vertices xmi:type="bpmn:Activity"
xmi:id="_UuUNsU3nEd2LNJlZf0NQOw" iD="_UuUNsE3nEd2LNJlZf0NQOw"
outgoingEdges="_c8S7wU3nEd2LNJlZf0NQOw"
incomingEdges="_bWie4E3nEd2LNJlZf0NQOw" name="StateA"
activityType="Task"/>
- <vertices xmi:type="bpmn:Activity"
xmi:id="_aeNvwE3nEd2LNJlZf0NQOw" iD="_aeNIsE3nEd2LNJlZf0NQOw"
outgoingEdges="_bWie4E3nEd2LNJlZf0NQOw"
activityType="EventStartEmpty"/>
<vertices xmi:type="bpmn:Activity"
xmi:id="_cUlbgU3nEd2LNJlZf0NQOw" iD="_cUlbgE3nEd2LNJlZf0NQOw"
incomingEdges="_c8S7wU3nEd2LNJlZf0NQOw"
activityType="EventEndEmpty"/>
<sequenceEdges xmi:type="bpmn:SequenceEdge"
xmi:id="_bWie4E3nEd2LNJlZf0NQOw" iD="_bWh30E3nEd2LNJlZf0NQOw"
source="_aeNvwE3nEd2LNJlZf0NQOw"
target="_UuUNsU3nEd2LNJlZf0NQOw"/>
<sequenceEdges xmi:type="bpmn:SequenceEdge"
xmi:id="_c8S7wU3nEd2LNJlZf0NQOw" iD="_c8S7wE3nEd2LNJlZf0NQOw"
source="_UuUNsU3nEd2LNJlZf0NQOw"
target="_cUlbgU3nEd2LNJlZf0NQOw"/>