Author: rgodfrey
Date: Mon Nov 28 20:50:04 2016
New Revision: 1771811

URL: http://svn.apache.org/viewvc?rev=1771811&view=rev
Log:
QPID-7546 : ExceptionListenerTest

Modified:
    
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java
    qpid/java/trunk/test-profiles/Java10Excludes
    qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes

Modified: 
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java?rev=1771811&r1=1771810&r2=1771811&view=diff
==============================================================================
--- 
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java
 (original)
+++ 
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ExceptionListenerTest.java
 Mon Nov 28 20:50:04 2016
@@ -75,9 +75,12 @@ public class ExceptionListenerTest exten
 
         assertEquals("Unexpected number of exceptions received", 1, 
exceptionCounter.intValue());
         LOGGER.debug("exception was", _lastExceptionListenerException);
-        assertNotNull("Exception should have cause", 
_lastExceptionListenerException.getCause());
-        Class<? extends Exception> expectedExceptionClass = isBroker010() ? 
ConnectionException.class : AMQConnectionClosedException.class;
-        assertEquals(expectedExceptionClass, 
_lastExceptionListenerException.getCause().getClass());
+        if(!isBroker10())
+        {
+            assertNotNull("Exception should have cause", 
_lastExceptionListenerException.getCause());
+            Class<? extends Exception> expectedExceptionClass = isBroker010() 
? ConnectionException.class : AMQConnectionClosedException.class;
+            assertEquals(expectedExceptionClass, 
_lastExceptionListenerException.getCause().getClass());
+        }
     }
 
     /**

Modified: qpid/java/trunk/test-profiles/Java10Excludes
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10Excludes?rev=1771811&r1=1771810&r2=1771811&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10Excludes (original)
+++ qpid/java/trunk/test-profiles/Java10Excludes Mon Nov 28 20:50:04 2016
@@ -123,7 +123,10 @@ org.apache.qpid.server.queue.QueueBindTe
 
org.apache.qpid.test.unit.basic.InvalidDestinationTest#testInvalidDestinationOnMessageProducer
 
org.apache.qpid.test.unit.basic.InvalidDestinationTest#testInvalidDestinationOnMessageProducerURL
 
-// These tests specificall test BURL behaviour
+// Tests the issue of connection exceptions being generated for unroutable 
messages in the 0-x client
+org.apache.qpid.test.unit.client.connection.ExceptionListenerTest#testExceptionListenerConnectionStopDeadlock
+
+// These tests specifically test BURL behaviour
 
org.apache.qpid.server.queue.NodeAutoCreationPolicyTest#testSendingToQueuePatternBURL
 
org.apache.qpid.server.queue.NodeAutoCreationPolicyTest#testSendingToNonMatchingQueuePatternBURL
 

Modified: qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes?rev=1771811&r1=1771810&r2=1771811&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes (original)
+++ qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes Mon Nov 28 
20:50:04 2016
@@ -26,7 +26,6 @@ org.apache.qpid.server.logging.DurableQu
 org.apache.qpid.server.logging.QueueLoggingTest#*
 org.apache.qpid.server.logging.TransientQueueLoggingTest#*
 org.apache.qpid.server.security.auth.manager.ExternalAuthenticationTest#*
-org.apache.qpid.test.unit.client.connection.ExceptionListenerTest#*
 org.apache.qpid.test.unit.client.DynamicQueueExchangeCreateTest#*
 org.apache.qpid.client.prefetch.PrefetchBehaviourTest#*
 org.apache.qpid.client.redelivered.RedeliveredMessageTest#*



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to