[jbpm-commits] JBoss JBPM SVN: r1807 - jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket.

[do-not-reply at jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-08-02 12:48:00 -0400 (Sat, 02 Aug 2008)
New Revision: 1807

Added:
   jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/STPProcessIncludeTest.java
Modified:
   jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/ProcessMarshallerTest.java
Log:
Add BPMN include test

Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/ProcessMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/ProcessMarshallerTest.java	2008-08-02 16:46:28 UTC (rev 1806)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/ProcessMarshallerTest.java	2008-08-02 16:48:00 UTC (rev 1807)
@@ -44,16 +44,21 @@
  */
 public class ProcessMarshallerTest extends DefaultEngineTestCase
 {
+  /**
+   * Build the process through a ProcessBuilder.
+   * Marshall it through the DialectHandler.
+   * Compare the output with expected file content.
+   */
   public void testProcessMarshaller() throws Exception
   {
     AirticketProcessBuilder builder = new AirticketProcessBuilder(getMessageListenerID());
     Process proc = builder.buildProcess();
     
     ProcessManager pm = ProcessManager.locateProcessManager();
-    DialectHandler dialect = pm.getDialectHandler("urn:bpm.jboss:pdl-0.1");
+    DialectHandler dh = pm.getDialectHandler("urn:bpm.jboss:pdl-0.1");
     
     StringWriter strwr = new StringWriter();
-    dialect.marshallProcess(proc, strwr);
+    dh.marshallProcess(proc, strwr);
     String procXML = strwr.toString();
     
     Element wasEl = DOMUtils.parse(new ByteArrayInputStream(procXML.getBytes()));
@@ -63,6 +68,7 @@
     Element expEl = DOMUtils.parse(expURL.openStream());
     String expStr = DOMWriter.printNode(expEl, true);
 
+    // Write the file for debugging
     if (expStr.equals(wasStr) == false)
     {
       FileWriter fileWriter = new FileWriter("airticket-was-api10.xml");
@@ -73,16 +79,20 @@
     assertEquals(expStr, wasStr);
   }
   
+  /**
+   * Build the process through the ProcessManager.
+   * Marshall it through the DialectHandler.
+   * Compare the output with expected file content.
+   */
   public void testProcessUnMarshaller() throws Exception
   {
+    URL expURL = getResourceURL("samples/airticket/airticket-api10.xml");
     ProcessManager pm = ProcessManager.locateProcessManager();
-    DialectHandler dialect = pm.getDialectHandler("urn:bpm.jboss:pdl-0.1");
+    Process proc = pm.createProcess(expURL);
     
-    URL expURL = getResourceURL("samples/airticket/airticket-api10.xml");
-    Process proc = dialect.createProcess(expURL, false);
-    
     StringWriter strwr = new StringWriter();
-    dialect.marshallProcess(proc, strwr);
+    DialectHandler dh = pm.getDialectHandler("urn:bpm.jboss:pdl-0.1");
+    dh.marshallProcess(proc, strwr);
     String procXML = strwr.toString();
     
     Element wasEl = DOMUtils.parse(new ByteArrayInputStream(procXML.getBytes()));

Added: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/STPProcessIncludeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/STPProcessIncludeTest.java	                        (rev 0)
+++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/STPProcessIncludeTest.java	2008-08-02 16:48:00 UTC (rev 1807)
@@ -0,0 +1,72 @@
+/*
+ * 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.samples.airticket;
+
+// $Id$
+
+import java.io.ByteArrayInputStream;
+import java.io.StringWriter;
+import java.net.URL;
+
+import org.jboss.bpm.client.DialectHandler;
+import org.jboss.bpm.client.ProcessManager;
+import org.jboss.bpm.model.Process;
+import org.jboss.bpm.test.DefaultEngineTestCase;
+import org.jboss.util.xml.DOMUtils;
+import org.jboss.util.xml.DOMWriter;
+import org.w3c.dom.Element;
+
+/**
+ * Test the Airticket process marshaller
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 03-Jul-2008
+ */
+public class STPProcessIncludeTest extends DefaultEngineTestCase
+{
+  /**
+   * Build the process through the ProcessManager. Uses an process definition with an include of an STP process.
+   * Marshall it through the DialectHandler. Compare the output with expected file content.
+   */
+  public void testBPMNProcessMerge() throws Exception
+  {
+    URL bpmnURL = getResourceURL("samples/airticket/airticket-stp-api10.xml");
+    ProcessManager pm = ProcessManager.locateProcessManager();
+    Process proc = pm.createProcess(bpmnURL);
+
+    StringWriter strwr = new StringWriter();
+    DialectHandler dh = pm.getDialectHandler("urn:bpm.jboss:pdl-0.1");
+    dh.marshallProcess(proc, strwr);
+    String procXML = strwr.toString();
+
+    Element wasEl = DOMUtils.parse(new ByteArrayInputStream(procXML.getBytes()));
+    String wasStr = DOMWriter.printNode(wasEl, true);
+
+    URL expURL = getResourceURL("samples/airticket/airticket-api10.xml");
+    Element expEl = DOMUtils.parse(expURL.openStream());
+    String expStr = DOMWriter.printNode(expEl, true);
+
+    // System.out.println(expStr);
+    // System.out.println(wasStr);
+    assertEquals(expStr, wasStr);
+  }
+}
\ No newline at end of file


Property changes on: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/STPProcessIncludeTest.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF