Author: robbie
Date: Mon Sep 23 23:43:06 2013
New Revision: 1525739
URL: http://svn.apache.org/r1525739
Log:
QPID-5161: update CloseOnNoRouteForMandatoryMessageTest to account for an
additional exception scenario
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java?rev=1525739&r1=1525738&r2=1525739&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java
Mon Sep 23 23:43:06 2013
@@ -23,12 +23,14 @@ import java.util.Map;
import javax.jms.Connection;
import javax.jms.Destination;
+import javax.jms.IllegalStateException;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.naming.NamingException;
+import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
import org.apache.qpid.client.AMQQueue;
import org.apache.qpid.client.AMQSession;
@@ -46,6 +48,8 @@ import org.apache.qpid.url.URLSyntaxExce
*/
public class CloseOnNoRouteForMandatoryMessageTest extends QpidBrokerTestCase
{
+ private static final Logger _logger =
Logger.getLogger(CloseOnNoRouteForMandatoryMessageTest.class);
+
private Connection _connection;
private UnroutableMessageTestExceptionListener _testExceptionListener =
new UnroutableMessageTestExceptionListener();
@@ -73,8 +77,15 @@ public class CloseOnNoRouteForMandatoryM
transactedSession.commit();
fail("Expected exception not thrown");
}
+ catch (IllegalStateException ise)
+ {
+ _logger.debug("Caught exception", ise);
+ //The session was marked closed even before we had a chance to
call commit on it
+ assertTrue("ISE did not indicate closure",
ise.getMessage().contains("closed"));
+ }
catch(JMSException e)
{
+ _logger.debug("Caught exception", e);
_testExceptionListener.assertNoRoute(e, testQueueName);
}
_testExceptionListener.assertReceivedNoRoute(testQueueName);
@@ -106,8 +117,15 @@ public class CloseOnNoRouteForMandatoryM
transactedSession.commit();
fail("Expected exception not thrown");
}
+ catch (IllegalStateException ise)
+ {
+ _logger.debug("Caught exception", ise);
+ //The session was marked closed even before we had a chance to
call commit on it
+ assertTrue("ISE did not indicate closure",
ise.getMessage().contains("closed"));
+ }
catch (JMSException e)
{
+ _logger.debug("Caught exception", e);
AMQException noRouteException = (AMQException)
e.getLinkedException();
assertNotNull("AMQException should be linked to JMSException",
noRouteException);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
