[jbpm-commits] JBoss JBPM SVN: r6258 - jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/xml.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Apr 15 11:04:30 EDT 2010
Author: alex.guizar at jboss.com
Date: 2010-04-15 11:04:30 -0400 (Thu, 15 Apr 2010)
New Revision: 6258
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/xml/AbstractXmlTestCase.java
jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/xml/NodeXmlTest.java
Log:
JBPM-2091: remove annoying stdout print from NodeXmlTest
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/xml/AbstractXmlTestCase.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/xml/AbstractXmlTestCase.java 2010-04-15 13:46:26 UTC (rev 6257)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/xml/AbstractXmlTestCase.java 2010-04-15 15:04:30 UTC (rev 6258)
@@ -30,28 +30,29 @@
import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
-public abstract class AbstractXmlTestCase extends AbstractJbpmTestCase {
+abstract class AbstractXmlTestCase extends AbstractJbpmTestCase {
- static Element toXmlAndParse(ProcessDefinition processDefinition, String xpathExpression)
- throws Exception {
+ protected static Element toXmlAndParse(ProcessDefinition processDefinition,
+ String xpathExpression) throws Exception {
Element element = toXmlAndParse(processDefinition);
return (Element) element.selectSingleNode(xpathExpression);
}
- static Element toXmlAndParse(ProcessDefinition processDefinition, String xpathExpression,
- String namespace) throws Exception {
+ protected static Element toXmlAndParse(ProcessDefinition processDefinition,
+ String xpathExpression, String namespace) throws Exception {
Element element = toXmlAndParseWithNamespace(processDefinition);
XPath xpath = DocumentHelper.createXPath(xpathExpression);
xpath.setNamespaceURIs(Collections.singletonMap("", namespace));
return (Element) xpath.selectSingleNode(element);
}
- static Element toXmlAndParse(ProcessDefinition processDefinition) throws Exception {
+ protected static Element toXmlAndParse(ProcessDefinition processDefinition) throws Exception {
String xml = JpdlXmlWriter.toString(processDefinition);
return DocumentHelper.parseText(xml).getRootElement();
}
- static Element toXmlAndParseWithNamespace(ProcessDefinition processDefinition) throws Exception {
+ protected static Element toXmlAndParseWithNamespace(ProcessDefinition processDefinition)
+ throws Exception {
StringWriter stringWriter = new StringWriter();
JpdlXmlWriter jpdlWriter = new JpdlXmlWriter(stringWriter);
jpdlWriter.setUseNamespace(true);
@@ -59,8 +60,4 @@
String xml = stringWriter.toString();
return DocumentHelper.parseText(xml).getRootElement();
}
-
- static void printXml(ProcessDefinition processDefinition) {
- System.out.println(JpdlXmlWriter.toString(processDefinition));
- }
}
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/xml/NodeXmlTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/xml/NodeXmlTest.java 2010-04-15 13:46:26 UTC (rev 6257)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/xml/NodeXmlTest.java 2010-04-15 15:04:30 UTC (rev 6258)
@@ -21,6 +21,8 @@
*/
package org.jbpm.jpdl.xml;
+import java.util.List;
+
import org.dom4j.Element;
import org.jbpm.graph.def.Event;
import org.jbpm.graph.def.Node;
@@ -30,97 +32,96 @@
public class NodeXmlTest extends AbstractXmlTestCase {
public void testReadNode() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <node />" +
- "</process-definition>"
- );
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <node />"
+ + "</process-definition>");
assertNotNull(processDefinition.getNodes().get(0));
}
public void testWriteNode() throws Exception {
ProcessDefinition processDefinition = new ProcessDefinition();
processDefinition.addNode(new Node());
- Element element = toXmlAndParse( processDefinition, "/process-definition/node" );
+
+ Element element = toXmlAndParse(processDefinition, "/process-definition/node");
assertNotNull(element);
assertEquals("node", element.getName());
assertEquals(0, element.attributeCount());
}
public void testReadNodeName() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <node name='wash car' />" +
- "</process-definition>"
- );
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <node name='wash car' />"
+ + "</process-definition>");
assertEquals("wash car", processDefinition.getNode("wash car").getName());
}
public void testWriteNodeName() throws Exception {
ProcessDefinition processDefinition = new ProcessDefinition();
processDefinition.addNode(new Node("n"));
- Element element = toXmlAndParse( processDefinition, "/process-definition/node" );
- assertNotNull(element);
+
+ Element element = toXmlAndParse(processDefinition, "/process-definition/node");
assertEquals("n", element.attributeValue("name"));
assertEquals(1, element.attributeCount());
}
-
+
public void testReadNodeEvents() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <node name='n'>" +
- " <event type='node-enter'/>" +
- " <event type='customeventtype' />" +
- " </node>" +
- "</process-definition>"
- );
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <node name='n'>"
+ + " <event type='node-enter'/>"
+ + " <event type='customeventtype' />"
+ + " </node>"
+ + "</process-definition>");
+
Node node = processDefinition.getNode("n");
- assertEquals(2,node.getEvents().size());
- assertEquals("node-enter",node.getEvent("node-enter").getEventType());
- assertEquals("customeventtype",node.getEvent("customeventtype").getEventType());
+ assertEquals(2, node.getEvents().size());
+ assertEquals("node-enter", node.getEvent("node-enter").getEventType());
+ assertEquals("customeventtype", node.getEvent("customeventtype").getEventType());
}
public void testWriteNodeEvents() throws Exception {
- ProcessDefinition processDefinition = new ProcessDefinition();
Node node = new Node("n");
- processDefinition.addNode(node);
node.addEvent(new Event("one"));
node.addEvent(new Event("two"));
node.addEvent(new Event("three"));
- printXml(processDefinition);
- Element element = toXmlAndParse( processDefinition, "/process-definition/node" );
+
+ ProcessDefinition processDefinition = new ProcessDefinition();
+ processDefinition.addNode(node);
+
+ Element element = toXmlAndParse(processDefinition, "/process-definition/node");
assertNotNull(element);
assertEquals(3, element.elements("event").size());
}
-
+
public void testReadNodeTransitions() {
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
- "<process-definition>" +
- " <node name='n'>" +
- " <transition name='one' to='n'/>" +
- " <transition name='two' to='n'/>" +
- " <transition name='three' to='n'/>" +
- " </node>" +
- "</process-definition>"
- );
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>"
+ + " <node name='n'>"
+ + " <transition name='one' to='n'/>"
+ + " <transition name='two' to='n'/>"
+ + " <transition name='three' to='n'/>"
+ + " </node>"
+ + "</process-definition>");
+
Node node = processDefinition.getNode("n");
- assertEquals(3,node.getLeavingTransitionsMap().size());
- assertEquals("one",((Transition)node.getLeavingTransitionsList().get(0)).getName());
- assertEquals("two",((Transition)node.getLeavingTransitionsList().get(1)).getName());
- assertEquals("three",((Transition)node.getLeavingTransitionsList().get(2)).getName());
+ List leavingTransitionsList = node.getLeavingTransitionsList();
+ assertEquals(3, leavingTransitionsList.size());
+ assertEquals("one", ((Transition) leavingTransitionsList.get(0)).getName());
+ assertEquals("two", ((Transition) leavingTransitionsList.get(1)).getName());
+ assertEquals("three", ((Transition) leavingTransitionsList.get(2)).getName());
}
public void testWriteNodeTransitions() throws Exception {
- ProcessDefinition processDefinition = new ProcessDefinition();
Node node = new Node("n");
- processDefinition.addNode(node);
node.addLeavingTransition(new Transition("one"));
node.addLeavingTransition(new Transition("two"));
node.addLeavingTransition(new Transition("three"));
- Element element = toXmlAndParse( processDefinition, "/process-definition/node" );
+
+ ProcessDefinition processDefinition = new ProcessDefinition();
+ processDefinition.addNode(node);
+
+ Element element = toXmlAndParse(processDefinition, "/process-definition/node");
assertEquals(3, element.elements("transition").size());
- assertEquals("one", ((Element)element.elements("transition").get(0)).attributeValue("name"));
- assertEquals("two", ((Element)element.elements("transition").get(1)).attributeValue("name"));
- assertEquals("three", ((Element)element.elements("transition").get(2)).attributeValue("name"));
+ assertEquals("one", ((Element) element.elements("transition").get(0)).attributeValue("name"));
+ assertEquals("two", ((Element) element.elements("transition").get(1)).attributeValue("name"));
+ assertEquals("three", ((Element) element.elements("transition").get(2)).attributeValue("name"));
}
}
More information about the jbpm-commits
mailing list