1 files changed, 46 insertions, 9 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
index 1e48f34f99..ec96f778f6 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
@@ -20,6 +20,16 @@
  */
 package org.apache.qpid.server.logging;
 
+import java.io.IOException;
+import java.util.List;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQSession_0_10;
 import org.apache.qpid.framing.AMQFrame;
@@ -28,13 +38,6 @@ import org.apache.qpid.framing.ExchangeDeleteBody;
 import org.apache.qpid.framing.ExchangeDeleteOkBody;
 import org.apache.qpid.framing.amqp_8_0.MethodRegistry_8_0;
 
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.Queue;
-import javax.jms.Session;
-import java.io.IOException;
-import java.util.List;
-
 /**
  * Exchange
  *
@@ -122,7 +125,7 @@ public class ExchangeLoggingTest extends AbstractTestLogging
     public void testExchangeCreate() throws JMSException, IOException
     {
         //Ignore broker startup messages
-        _monitor.reset();
+        _monitor.markDiscardPoint();
 
         _session.createConsumer(_queue);
         // Ensure we have received the EXH log msg.
@@ -176,7 +179,7 @@ public class ExchangeLoggingTest extends AbstractTestLogging
     public void testExchangeDelete() throws Exception, IOException
     {
         //Ignore broker startup messages
-        _monitor.reset();
+        _monitor.markDiscardPoint();
 
         //create the exchange by creating a consumer
         _session.createConsumer(_queue);
@@ -214,4 +217,38 @@ public class ExchangeLoggingTest extends AbstractTestLogging
 
     }
 
+    public void testDiscardedMessage() throws Exception
+    {
+        //Ignore broker startup messages
+        _monitor.markDiscardPoint();
+
+        if (!isBroker010())
+        {
+            // Default 0-8..-0-9-1 behaviour is for messages to be rejected (returned to client).
+            setTestClientSystemProperty("qpid.default_mandatory", "false");
+        }
+
+        _session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+        // Do not create consumer so queue is not created and message will be discarded.
+        final MessageProducer producer = _session.createProducer(_queue);
+
+        // Sending message
+        final TextMessage msg = _session.createTextMessage("msg");
+        producer.send(msg);
+
+        final String expectedMessageBody = "Discarded Message : Name: " + _name + " Routing Key: " + _queue.getQueueName();
+
+        // Ensure we have received the EXH log msg.
+        waitForMessage("EXH-1003");
+
+        List<String> results = findMatches(EXH_PREFIX);
+        assertEquals("Result set larger than expected.", 2, results.size());
+
+        final String log = getLogMessage(results, 1);
+        validateMessageID("EXH-1003", log);
+
+        final String message = getMessageString(fromMessage(log));
+        assertEquals("Log Message not as expected", expectedMessageBody, message);
+    }
 }