[jboss-cvs] JBoss Messaging SVN: r2397 - in projects/jms-integration: src/main/org/jboss/test/jms/integration/mdb and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 22 16:45:45 EST 2007
Author: clebert.suconic at jboss.com
Date: 2007-02-22 16:45:44 -0500 (Thu, 22 Feb 2007)
New Revision: 2397
Modified:
projects/jms-integration/build-thirdparty.xml
projects/jms-integration/build.xml
projects/jms-integration/src/main/org/jboss/test/jms/integration/mdb/SimpleMDBTest.java
projects/jms-integration/src/main/org/jboss/test/jms/integration/support/ejb20/TestMessageDriven.java
Log:
Adding test with exception + few other tweaks
Modified: projects/jms-integration/build-thirdparty.xml
===================================================================
--- projects/jms-integration/build-thirdparty.xml 2007-02-22 15:30:13 UTC (rev 2396)
+++ projects/jms-integration/build-thirdparty.xml 2007-02-22 21:45:44 UTC (rev 2397)
@@ -86,7 +86,6 @@
Dependencies required to build the project.
-->
<componentref name="retrotranslator" version="0.9.6jboss"/>
- <componentref name="sun-javacc" version="3.2"/>
<componentref name="oswego-concurrent" version="1.3.4"/>
<componentref name="apache-log4j" version="1.2.8"/>
<componentref name="javassist" version="3.3.0.GA"/>
@@ -102,6 +101,7 @@
<componentref name="jboss/test14" version="snapshot"/>
<componentref name="jboss/jbossretro-rt" version="1.0.4.GA"/>
<componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
+ <componentref name="jboss/messaging" version="1.2.0.CR1"/>
<!-- Need this otherwise project doesn't build in Eclipse -->
<componentref name="apache-logging" version="1.0.4.1jboss"/>
@@ -111,12 +111,7 @@
Dependencies required to test the project.
-->
<componentref name="junit" version="3.8.1"/>
- <componentref name="hsqldb" version="1.8.0.2"/>
- <componentref name="dom4j" version="1.6"/>
<componentref name="apache-xerces" version="2.7.1"/> <!-- needed by org.jboss.logging.Log4jLoggerPlugin -->
- <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
- <componentref name="jboss/jbossxb" version="1.0.0.CR6"/>
-
</build>
<synchronizeinfo/>
Modified: projects/jms-integration/build.xml
===================================================================
--- projects/jms-integration/build.xml 2007-02-22 15:30:13 UTC (rev 2396)
+++ projects/jms-integration/build.xml 2007-02-22 21:45:44 UTC (rev 2397)
@@ -108,7 +108,7 @@
<path refid="jboss.jbossts.classpath"/>
<path refid="junit.junit.classpath"/>
- <path refid="dom4j.dom4j.classpath"/>
+ <!-- <path refid="dom4j.dom4j.classpath"/> -->
<path refid="apache.log4j.classpath"/>
<path refid="apache.logging.classpath"/>
<path refid="apache.xerces.classpath"/>
@@ -192,6 +192,7 @@
<property name="integration.test.mdb20.durable" value="integration-mdb20-durable.jar"/>
<property name="integration.test.mdb20.userTransaction" value="integration-mdb20-userTransaction.jar"/>
<property name="integration.test.mdb20.userTransactionDups" value="integration-mdb20-userTransactionDups.jar"/>
+ <property name="integration.test.jar" value="jms-integration-tests.jar"/>
<target name="integration-ejb20-jar" depends="compile">
<mkdir dir="${build.tests.lib}"/>
@@ -243,11 +244,17 @@
</jar>
</target>
- <target name="tests-jar" depends="compile, integration-ejb20-jar, integration-ejb20-selector-jar, integration-ejb20-durable, integration-ejb20-userTransaction, integration-ejb20-userTransactionDups"/>
+ <target name="test-jar" depends="compile, integration-ejb20-jar, integration-ejb20-selector-jar, integration-ejb20-durable, integration-ejb20-userTransaction, integration-ejb20-userTransactionDups">
+ <mkdir dir="${build.tests.lib}"/>
+ <echo message="${build.tests.lib}/${integration.test.jar} and ${build.tests.classes}"/>
+ <jar jarfile="${build.tests.lib}/${integration.test.jar}">
+ <fileset dir="${build.tests.classes}"/>
+ </jar>
+ </target>
<target name="integration-tests"
- depends="tests-jar, integration-ejb20-jar"
+ depends="test-jar, integration-ejb20-jar"
description="Runs the clustering tests">
<!--
Modified: projects/jms-integration/src/main/org/jboss/test/jms/integration/mdb/SimpleMDBTest.java
===================================================================
--- projects/jms-integration/src/main/org/jboss/test/jms/integration/mdb/SimpleMDBTest.java 2007-02-22 15:30:13 UTC (rev 2396)
+++ projects/jms-integration/src/main/org/jboss/test/jms/integration/mdb/SimpleMDBTest.java 2007-02-22 21:45:44 UTC (rev 2397)
@@ -32,9 +32,9 @@
/**
* @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
- * @version <tt>$Revision$</tt>
+ * @version <tt>$Revision:2392 $</tt>
*
- * $Id$
+ * $Id:SimpleMDBTest.java 2392 2007-02-21 23:25:21Z clebert.suconic at jboss.com $
*/
public class SimpleMDBTest extends MDBTestBase
{
@@ -73,6 +73,9 @@
assertNotNull(messageResponse);
System.out.println("Received message " + messageResponse.getText());
assertEquals(message.toString(), messageResponse.getStringProperty("toStringOnMessage"));
+
+ messageResponse = (TextMessage)consumer.receive(1000);
+ assertNull(messageResponse);
}
finally
{
@@ -84,6 +87,40 @@
}
+ public void testSimpleWithExceptionOnMDB() throws Exception
+ {
+ Connection conn = cf.createConnection();
+ conn.start();
+ Session sess = null;
+
+ try
+ {
+ sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ MessageProducer producer = sess.createProducer(queueDestination);
+ MessageConsumer consumer = sess.createConsumer(responseDestination);
+ TextMessage message = sess.createTextMessage("Message " + random.nextLong());
+ message.setJMSReplyTo(responseDestination);
+ message.setBooleanProperty("throwException", true);
+ producer.send(message);
+
+ TextMessage messageResponse = (TextMessage)consumer.receive(10000);
+ assertNotNull(messageResponse);
+ System.out.println("Received message " + messageResponse.getText());
+ assertEquals(message.toString(), messageResponse.getStringProperty("toStringOnMessage"));
+
+ messageResponse = (TextMessage)consumer.receive(1000);
+ assertNull(messageResponse);
+ }
+ finally
+ {
+ if (conn!=null)
+ {
+ conn.close();
+ }
+ }
+
+ }
+
public static Test suite() throws Exception
{
// This is from JBoss testsuite framework.. it will deploy the MDB before running the test
Modified: projects/jms-integration/src/main/org/jboss/test/jms/integration/support/ejb20/TestMessageDriven.java
===================================================================
--- projects/jms-integration/src/main/org/jboss/test/jms/integration/support/ejb20/TestMessageDriven.java 2007-02-22 15:30:13 UTC (rev 2396)
+++ projects/jms-integration/src/main/org/jboss/test/jms/integration/support/ejb20/TestMessageDriven.java 2007-02-22 21:45:44 UTC (rev 2397)
@@ -152,6 +152,12 @@
}
producer.send(reply);
+
+ if (message.getBooleanProperty("throwException") && !message.getJMSRedelivered())
+ {
+ throw new RuntimeException("Requested Exception");
+ }
+
}
finally
{
More information about the jboss-cvs-commits
mailing list