[jboss-svn-commits] JBL Code SVN: r11201 - in labs/jbossesb/trunk/product: services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions and 1 other directory.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sat Apr 21 19:11:18 EDT 2007


Author: estebanschifman
Date: 2007-04-21 19:11:18 -0400 (Sat, 21 Apr 2007)
New Revision: 11201

Added:
   labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/JbpmTestUtil.java
Removed:
   labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/JbpmTestUtil.java
Modified:
   labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/quickstart/jbpm_simple1/test/TestCommandMessages.java
Log:
Fix jbpm simple1 quickstart

Modified: labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/quickstart/jbpm_simple1/test/TestCommandMessages.java
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/quickstart/jbpm_simple1/test/TestCommandMessages.java	2007-04-21 23:05:56 UTC (rev 11200)
+++ labs/jbossesb/trunk/product/samples/quickstarts/jbpm_simple1/src/quickstart/jbpm_simple1/test/TestCommandMessages.java	2007-04-21 23:11:18 UTC (rev 11201)
@@ -26,6 +26,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
+import java.io.PrintStream;
 
 import org.apache.log4j.Logger;
 import org.jboss.soa.esb.common.Environment;
@@ -33,13 +34,13 @@
 import org.jboss.soa.esb.listeners.message.Invoker;
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.services.jbpm.Constants;
-import org.jboss.soa.esb.services.jbpm.actions.JbpmTestUtil;
 import org.jboss.soa.esb.services.jbpm.util.Helper;
 import org.jbpm.graph.exe.Token;
 
 import com.arjuna.common.util.propertyservice.PropertyManager;
 
-public class TestCommandMessages {
+public class TestCommandMessages 
+{
 
 	static Logger		_logger = Logger.getLogger(TestCommandMessages.class);
 
@@ -75,10 +76,10 @@
 	     	request = Helper.commandMessageTemplate();
 	     	Helper.setStringValue(request, Constants.COMMAND_CODE, opCode);
 	     	Helper.setStringValue(request, Constants.PROCESS_DEFINITION_XML
-	     			, JbpmTestUtil.stringFromFile("process_01.xml"));
+	     			, getProcessDefinitionXml("process_01.xml"));
 	
 	     	response = invokeJbpm(request);
-	 		_logger.info(JbpmTestUtil.dumpResponse(response, opCode));
+	 		_logger.info(dumpResponse(response, opCode));
 	 		assertTrue(Constants.RETCODE_OK.equals(Helper.getStringValue(response, Constants.RETURN_CODE)));
 	     	
 	     	opCode	= Constants.OpCode.NewProcessInstanceCommand;
@@ -86,7 +87,7 @@
 	     	Helper.setStringValue(request, Constants.COMMAND_CODE, opCode);
 	     	Helper.setStringValue(request, Constants.PROCESS_DEFINITION_NAME, TEST_PROCESS_NAME);
 	     	response = invokeJbpm(request);
-	 		_logger.info(JbpmTestUtil.dumpResponse(response, opCode));
+	 		_logger.info(dumpResponse(response, opCode));
 	 		assertTrue(Constants.RETCODE_OK.equals(Helper.getStringValue(response, Constants.RETURN_CODE)));	    	
 	
 		     	instanceId	= Helper.getLongValue(response,Constants.PROCESS_INSTANCE_ID);
@@ -107,7 +108,7 @@
 					signalToken = ! signalToken;
 	
 		 	     	if (null!=response)
-			    		_logger.info(JbpmTestUtil.dumpResponse(response, opCode));
+			    		_logger.info(dumpResponse(response, opCode));
 					else
 						_logger.info("Response was not received");			
 		        	assertTrue(Constants.RETCODE_OK.equals(Helper.getObjectValue(response, Constants.RETURN_CODE)));
@@ -167,5 +168,40 @@
 			if (iQ>0)	out.write(ba,0,iQ);
 		return out.toString();
 	}
+
+	public static String dumpResponse(Message message, Constants.OpCode opCode)
+	{
+		StringBuilder sb = new StringBuilder("\nInvoked: ").append(opCode.toString()).append("\n");
+		if (null==message)
+			return sb.append(" - No response received").toString();
+		sb.append(getObject(message,Constants.RETURN_CODE));
+		sb.append(getObject(message,Constants.ERROR_MESSAGE));
+		sb.append(getObject(message,Constants.EXCEPTION));
+		sb.append(getObject(message,Constants.ACTOR_ID));
+		sb.append(getObject(message,Constants.ACTOR_LIST));
+		sb.append(getObject(message,Constants.CURRENT_NODE_NAME));
+		sb.append(getObject(message,Constants.JBPM_RETURN_OBJECT));
+		sb.append(getObject(message,Constants.PROCESS_DEFINITION_NAME));
+		sb.append(getObject(message,Constants.PROCESS_DEFINITION_VERSION));
+		sb.append(getObject(message,Constants.PROCESS_INSTANCE_ID));
+		sb.append(getObject(message,Constants.TASK_INSTANCE_ID));
+		sb.append(getObject(message,Constants.TOKEN_ID));
+		sb.append(getObject(message,Constants.PROCESS_HAS_ENDED));
+		return sb.append("_______________________________________________________________________")
+			.toString();		
+	}
 	
+	public static String getObject(Message message, String key)
+	{
+		Object obj = message.getBody().get(key);
+		if (null==obj)
+			return "";
+		if (!(obj instanceof Exception))
+		 return key+" = "+obj.toString()+"\n";
+		ByteArrayOutputStream ba = new ByteArrayOutputStream();
+		((Exception)obj).printStackTrace(new PrintStream(ba));
+		return key+" = "+obj.toString()+"\n"+ba.toString();
+	}
+	
+	
 }

Deleted: labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/JbpmTestUtil.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/JbpmTestUtil.java	2007-04-21 23:05:56 UTC (rev 11200)
+++ labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/JbpmTestUtil.java	2007-04-21 23:11:18 UTC (rev 11201)
@@ -1,89 +0,0 @@
-package org.jboss.soa.esb.services.jbpm.actions;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.net.URISyntaxException;
-
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.services.jbpm.Constants;
-
-public class JbpmTestUtil 
-{
-	private static final Class thisClass = JbpmTestUtil.class;
-
-	public static String stringFromFile(String pFileName) throws IOException
-	{
-	    InputStream in = thisClass.getResourceAsStream(pFileName);
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		byte[]ba = new byte[1000];
-		int iQ = -1;
-		while (-1<(iQ=in.read(ba)))
-			if (iQ>0)	out.write(ba,0,iQ);
-		in.close();
-		return out.toString();
-	}
-	
-	public static void copyFile(String resource, File target) throws IOException
-	{
-	    InputStream in = thisClass.getResourceAsStream(resource);
-		FileOutputStream out = new FileOutputStream(target);
-		byte[]ba = new byte[1000];
-		int iQ = -1;
-		while (-1<(iQ=in.read(ba)))
-			if (iQ>0)	out.write(ba,0,iQ);
-		out.close();
-		in.close();
-	}
-	
-	public static File copyHibernateCfgToRootCP()
-		throws URISyntaxException, IOException
-	{
-		String configName = "hibernate.cfg.xml";
-		File localHibernateXml = new File(thisClass.getResource(configName).toURI());
-		String path = localHibernateXml.toString();
-		int i = path.indexOf("org/jboss/soa/esb/services/jbpm/actions");
-		File classRoot = new File(path.substring(0,i-1));
-		File target = new File(classRoot,configName);
-		copyFile(configName, target);
-		return target;
-	}
-	
-	public static String dumpResponse(Message message, Constants.OpCode opCode)
-	{
-		StringBuilder sb = new StringBuilder("\nInvoked: ").append(opCode.toString()).append("\n");
-		if (null==message)
-			return sb.append(" - No response received").toString();
-		sb.append(getObject(message,Constants.RETURN_CODE));
-		sb.append(getObject(message,Constants.ERROR_MESSAGE));
-		sb.append(getObject(message,Constants.EXCEPTION));
-		sb.append(getObject(message,Constants.ACTOR_ID));
-		sb.append(getObject(message,Constants.ACTOR_LIST));
-		sb.append(getObject(message,Constants.CURRENT_NODE_NAME));
-		sb.append(getObject(message,Constants.JBPM_RETURN_OBJECT));
-		sb.append(getObject(message,Constants.PROCESS_DEFINITION_NAME));
-		sb.append(getObject(message,Constants.PROCESS_DEFINITION_VERSION));
-		sb.append(getObject(message,Constants.PROCESS_INSTANCE_ID));
-		sb.append(getObject(message,Constants.TASK_INSTANCE_ID));
-		sb.append(getObject(message,Constants.TOKEN_ID));
-		sb.append(getObject(message,Constants.PROCESS_HAS_ENDED));
-		return sb.append("_______________________________________________________________________")
-			.toString();		
-	}
-	
-	public static String getObject(Message message, String key)
-	{
-		Object obj = message.getBody().get(key);
-		if (null==obj)
-			return "";
-		if (!(obj instanceof Exception))
-		 return key+" = "+obj.toString()+"\n";
-		ByteArrayOutputStream ba = new ByteArrayOutputStream();
-		((Exception)obj).printStackTrace(new PrintStream(ba));
-		return key+" = "+obj.toString()+"\n"+ba.toString();
-	}
-	
-}

Added: labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/JbpmTestUtil.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/JbpmTestUtil.java	                        (rev 0)
+++ labs/jbossesb/trunk/product/services/jbpm/src/test/java/org/jboss/soa/esb/services/jbpm/actions/JbpmTestUtil.java	2007-04-21 23:11:18 UTC (rev 11201)
@@ -0,0 +1,111 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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.soa.esb.services.jbpm.actions;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.net.URISyntaxException;
+
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.services.jbpm.Constants;
+
+public class JbpmTestUtil 
+{
+	private static final Class thisClass = JbpmTestUtil.class;
+
+	public static String stringFromFile(String pFileName) throws IOException
+	{
+	    InputStream in = thisClass.getResourceAsStream(pFileName);
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
+		byte[]ba = new byte[1000];
+		int iQ = -1;
+		while (-1<(iQ=in.read(ba)))
+			if (iQ>0)	out.write(ba,0,iQ);
+		in.close();
+		return out.toString();
+	}
+	
+	public static void copyFile(String resource, File target) throws IOException
+	{
+	    InputStream in = thisClass.getResourceAsStream(resource);
+		FileOutputStream out = new FileOutputStream(target);
+		byte[]ba = new byte[1000];
+		int iQ = -1;
+		while (-1<(iQ=in.read(ba)))
+			if (iQ>0)	out.write(ba,0,iQ);
+		out.close();
+		in.close();
+	}
+	
+	public static File copyHibernateCfgToRootCP()
+		throws URISyntaxException, IOException
+	{
+		String configName = "hibernate.cfg.xml";
+		File localHibernateXml = new File(thisClass.getResource(configName).toURI());
+		String path = localHibernateXml.toString();
+		int i = path.indexOf("org/jboss/soa/esb/services/jbpm/actions");
+		File classRoot = new File(path.substring(0,i-1));
+		File target = new File(classRoot,configName);
+		copyFile(configName, target);
+		return target;
+	}
+	
+	public static String dumpResponse(Message message, Constants.OpCode opCode)
+	{
+		StringBuilder sb = new StringBuilder("\nInvoked: ").append(opCode.toString()).append("\n");
+		if (null==message)
+			return sb.append(" - No response received").toString();
+		sb.append(getObject(message,Constants.RETURN_CODE));
+		sb.append(getObject(message,Constants.ERROR_MESSAGE));
+		sb.append(getObject(message,Constants.EXCEPTION));
+		sb.append(getObject(message,Constants.ACTOR_ID));
+		sb.append(getObject(message,Constants.ACTOR_LIST));
+		sb.append(getObject(message,Constants.CURRENT_NODE_NAME));
+		sb.append(getObject(message,Constants.JBPM_RETURN_OBJECT));
+		sb.append(getObject(message,Constants.PROCESS_DEFINITION_NAME));
+		sb.append(getObject(message,Constants.PROCESS_DEFINITION_VERSION));
+		sb.append(getObject(message,Constants.PROCESS_INSTANCE_ID));
+		sb.append(getObject(message,Constants.TASK_INSTANCE_ID));
+		sb.append(getObject(message,Constants.TOKEN_ID));
+		sb.append(getObject(message,Constants.PROCESS_HAS_ENDED));
+		return sb.append("_______________________________________________________________________")
+			.toString();		
+	}
+	
+	public static String getObject(Message message, String key)
+	{
+		Object obj = message.getBody().get(key);
+		if (null==obj)
+			return "";
+		if (!(obj instanceof Exception))
+		 return key+" = "+obj.toString()+"\n";
+		ByteArrayOutputStream ba = new ByteArrayOutputStream();
+		((Exception)obj).printStackTrace(new PrintStream(ba));
+		return key+" = "+obj.toString()+"\n"+ba.toString();
+	}
+	
+}




More information about the jboss-svn-commits mailing list