qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject [4/4] qpid-broker-j git commit: QPID-6933: [System Tests] Move TemporaryQueueTest into JMS 1.1 system tests
Date Fri, 01 Dec 2017 17:02:43 GMT
QPID-6933: [System Tests] Move TemporaryQueueTest into JMS 1.1 system tests


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/4ad30dd9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/4ad30dd9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/4ad30dd9

Branch: refs/heads/master
Commit: 4ad30dd90280ec0c8d32d2ea957336119dba3504
Parents: f57c6a5
Author: Alex Rudyy <orudyy@apache.org>
Authored: Fri Dec 1 17:01:37 2017 +0000
Committer: Alex Rudyy <orudyy@apache.org>
Committed: Fri Dec 1 17:02:26 2017 +0000

----------------------------------------------------------------------
 .../org/apache/qpid/systests/JmsTestBase.java   |  32 +++
 .../jms_1_1/queue/TemporaryQueueTest.java       | 238 +++++++++++++++++++
 .../jms_1_1/topic/DurableSubscribtionTest.java  |  30 ---
 .../subscription/SharedSubscriptionTest.java    |  20 --
 .../temporaryqueue/TemporaryQueueTest.java      | 207 ----------------
 test-profiles/CPPExcludes                       |   3 -
 6 files changed, 270 insertions(+), 260 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/4ad30dd9/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/JmsTestBase.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/JmsTestBase.java
b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/JmsTestBase.java
index 44ad555..9be3f1c 100644
--- a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/JmsTestBase.java
+++ b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/JmsTestBase.java
@@ -20,7 +20,12 @@
  */
 package org.apache.qpid.systests;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.net.InetSocketAddress;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.Map;
 
 import javax.jms.Connection;
@@ -162,4 +167,31 @@ public abstract class JmsTestBase extends BrokerAdminUsingTestBase
             connection.close();
         }
     }
+
+    protected int getQueueCount() throws Exception
+    {
+        Map<String, Object> statisticsMap = getVirtualHostStatistics("queueCount");
+        return ((Number) statisticsMap.get("queueCount")).intValue();
+    }
+
+    protected long getTotalDepthOfQueuesMessages() throws Exception
+    {
+        Map<String, Object> statisticsMap = getVirtualHostStatistics("totalDepthOfQueuesMessages");
+        return ((Number) statisticsMap.get("totalDepthOfQueuesMessages")).intValue();
+    }
+
+    @SuppressWarnings("unchecked")
+    protected Map<String, Object> getVirtualHostStatistics(final String... statisticsName)
throws Exception
+    {
+        Map<String, Object> arguments = Collections.singletonMap("statistics", Arrays.asList(statisticsName));
+        Object statistics = performOperationUsingAmqpManagement(getVirtualHostName(),
+                                                                "getStatistics",
+                                                                "org.apache.qpid.VirtualHost",
+                                                                arguments);
+
+        assertNotNull("Statistics is null", statistics);
+        assertTrue("Statistics is not map", statistics instanceof Map);
+
+        return (Map<String, Object>) statistics;
+    }
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/4ad30dd9/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/queue/TemporaryQueueTest.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/queue/TemporaryQueueTest.java
b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/queue/TemporaryQueueTest.java
new file mode 100644
index 0000000..73d5b55
--- /dev/null
+++ b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/queue/TemporaryQueueTest.java
@@ -0,0 +1,238 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.systests.jms_1_1.queue;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TemporaryQueue;
+import javax.jms.TextMessage;
+
+import org.junit.Test;
+
+import org.apache.qpid.systests.JmsTestBase;
+
+public class TemporaryQueueTest extends JmsTestBase
+{
+    @Test
+    public void testMessageDeliveryUsingTemporaryQueue() throws Exception
+    {
+        final Connection connection = getConnection();
+        try
+        {
+            final Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            final TemporaryQueue queue = session.createTemporaryQueue();
+            assertNotNull("Temporary queue cannot be null", queue);
+            final MessageProducer producer = session.createProducer(queue);
+            final MessageConsumer consumer = session.createConsumer(queue);
+            connection.start();
+            producer.send(session.createTextMessage("hello"));
+            Message message = consumer.receive(getReceiveTimeout());
+            assertTrue("TextMessage should be received", message instanceof TextMessage);
+            assertEquals("hello", ((TextMessage) message).getText());
+        }
+        finally
+        {
+            connection.close();
+        }
+    }
+
+    @Test
+    public void testConsumeFromAnotherConnectionProhibited() throws Exception
+    {
+        final Connection connection = getConnection();
+        try
+        {
+            final Connection connection2 = getConnection();
+            try
+            {
+                final Session session1 = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+                final Session session2 = connection2.createSession(false, Session.AUTO_ACKNOWLEDGE);
+                final TemporaryQueue queue = session1.createTemporaryQueue();
+                assertNotNull("Temporary queue cannot be null", queue);
+
+                try
+                {
+                    session2.createConsumer(queue);
+                    fail("Expected a JMSException when subscribing to a temporary queue created
on a different session");
+                }
+                catch (JMSException je)
+                {
+                    //pass
+                }
+            }
+            finally
+            {
+                connection2.close();
+            }
+        }
+        finally
+        {
+            connection.close();
+        }
+    }
+
+    @Test
+    public void testPublishFromAnotherConnectionAllowed() throws Exception
+    {
+        final Connection connection = getConnection();
+        try
+        {
+            final Connection connection2 = getConnection();
+            try
+            {
+                final Session session1 = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+                final Session session2 = connection2.createSession(false, Session.AUTO_ACKNOWLEDGE);
+                final TemporaryQueue queue = session1.createTemporaryQueue();
+                assertNotNull("Temporary queue cannot be null", queue);
+
+                MessageProducer producer = session2.createProducer(queue);
+                producer.send(session2.createMessage());
+
+                connection.start();
+                MessageConsumer consumer = session1.createConsumer(queue);
+                Message message = consumer.receive(getReceiveTimeout());
+                assertNotNull("Message not received", message);
+            }
+            finally
+            {
+                connection2.close();
+            }
+        }
+        finally
+        {
+            connection.close();
+        }
+    }
+
+    @Test
+    public void testClosingConsumerDoesNotDeleteQueue() throws Exception
+    {
+        final Connection connection = getConnection();
+        try
+        {
+            final Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            final TemporaryQueue queue = session.createTemporaryQueue();
+            assertNotNull("Temporary queue cannot be null", queue);
+
+            MessageProducer producer = session.createProducer(queue);
+            String messageText = "Hello World!";
+            producer.send(session.createTextMessage(messageText));
+
+            connection.start();
+            session.createConsumer(queue).close();
+
+            MessageConsumer consumer = session.createConsumer(queue);
+            Message message = consumer.receive(getReceiveTimeout());
+            assertTrue("Received message not a text message", message instanceof TextMessage);
+            assertEquals("Incorrect message text", messageText, ((TextMessage) message).getText());
+        }
+        finally
+        {
+            connection.close();
+        }
+    }
+
+    @Test
+    public void testClosingSessionDoesNotDeleteQueue() throws Exception
+    {
+        final Connection connection = getConnection();
+        try
+        {
+            final Session session1 = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            final Session session2 = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            final TemporaryQueue queue = session1.createTemporaryQueue();
+            assertNotNull("Temporary queue cannot be null", queue);
+
+            MessageProducer producer = session1.createProducer(queue);
+            String messageText = "Hello World!";
+            producer.send(session1.createTextMessage(messageText));
+
+            session1.close();
+
+            connection.start();
+            MessageConsumer consumer = session2.createConsumer(queue);
+            Message message = consumer.receive(getReceiveTimeout());
+            assertTrue("Received message not a text message", message instanceof TextMessage);
+            assertEquals("Incorrect message text", messageText, ((TextMessage) message).getText());
+        }
+        finally
+        {
+            connection.close();
+        }
+    }
+
+    @Test
+    public void testExplicitTemporaryQueueDeletion() throws Exception
+    {
+        int numberOfQueuesBeforeTest = getQueueCount();
+        final Connection connection = getConnection();
+        try
+        {
+            final Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            final TemporaryQueue queue = session.createTemporaryQueue();
+            assertNotNull("Temporary queue cannot be null", queue);
+            final MessageConsumer consumer = session.createConsumer(queue);
+            connection.start();
+
+            try
+            {
+                queue.delete();
+                fail("Expected JMSException : should not be able to delete while there are
active consumers");
+            }
+            catch (JMSException je)
+            {
+                //pass
+            }
+
+            int numberOfQueuesAfterQueueDelete = getQueueCount();
+            assertEquals("Unexpected number of queue", 1, numberOfQueuesAfterQueueDelete
- numberOfQueuesBeforeTest);
+
+            consumer.close();
+
+            // Now deletion should succeed.
+            queue.delete();
+
+            try
+            {
+                session.createConsumer(queue);
+                fail("Exception not thrown");
+            }
+            catch (JMSException je)
+            {
+                //pass
+            }
+        }
+        finally
+        {
+            connection.close();
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/4ad30dd9/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/topic/DurableSubscribtionTest.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/topic/DurableSubscribtionTest.java
b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/topic/DurableSubscribtionTest.java
index 1ad4015..249dc18 100644
--- a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/topic/DurableSubscribtionTest.java
+++ b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/topic/DurableSubscribtionTest.java
@@ -19,15 +19,12 @@ package org.apache.qpid.systests.jms_1_1.topic;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeThat;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 import javax.jms.Connection;
 import javax.jms.InvalidDestinationException;
@@ -896,31 +893,4 @@ public class DurableSubscribtionTest extends JmsTestBase
             connection2.close();
         }
     }
-
-    private int getQueueCount() throws Exception
-    {
-        Map<String, Object> statisticsMap = getVirtualHostStatistics("queueCount");
-        return ((Number) statisticsMap.get("queueCount")).intValue();
-    }
-
-    private long getTotalDepthOfQueuesMessages() throws Exception
-    {
-        Map<String, Object> statisticsMap = getVirtualHostStatistics("totalDepthOfQueuesMessages");
-        return ((Number) statisticsMap.get("totalDepthOfQueuesMessages")).intValue();
-    }
-
-    @SuppressWarnings("unchecked")
-    private Map<String, Object> getVirtualHostStatistics(final String... statisticsName)
throws Exception
-    {
-        Map<String, Object> arguments = Collections.singletonMap("statistics", Arrays.asList(statisticsName));
-        Object statistics = performOperationUsingAmqpManagement(getVirtualHostName(),
-                                                                "getStatistics",
-                                                                "org.apache.qpid.VirtualHost",
-                                                                arguments);
-
-        assertNotNull("Statistics is null", statistics);
-        assertTrue("Statistics is not map", statistics instanceof Map);
-
-        return (Map<String, Object>) statistics;
-    }
 }

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/4ad30dd9/systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/subscription/SharedSubscriptionTest.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/subscription/SharedSubscriptionTest.java
b/systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/subscription/SharedSubscriptionTest.java
index f40ded7..acdf4e3 100644
--- a/systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/subscription/SharedSubscriptionTest.java
+++ b/systests/qpid-systests-jms_2.0/src/test/java/org/apache/qpid/systests/jms_2_0/subscription/SharedSubscriptionTest.java
@@ -22,12 +22,8 @@ package org.apache.qpid.systests.jms_2_0.subscription;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.util.Collections;
-import java.util.Map;
-
 import javax.jms.Connection;
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -194,22 +190,6 @@ public class SharedSubscriptionTest extends JmsTestBase
         }
     }
 
-    private int getQueueCount() throws Exception
-    {
-        Map<String, Object> arguments = Collections.singletonMap("statistics",
-                                                                 Collections.singletonList("queueCount"));
-        Object statistics = performOperationUsingAmqpManagement(getVirtualHostName(),
-                                                                "getStatistics",
-                                                                "org.apache.qpid.VirtualHost",
-                                                                arguments);
-
-        assertNotNull("Statistics is null", statistics);
-        assertTrue("Statistics is not map", statistics instanceof Map);
-        @SuppressWarnings("unchecked")
-        Map<String, Object> statisticsMap = (Map<String, Object>) statistics;
-        return ((Number) statisticsMap.get("queueCount")).intValue();
-    }
-
     @Test
     public void testDurableSharedAndNonDurableSharedCanUseTheSameSubscriptionName() throws
Exception
     {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/4ad30dd9/systests/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
----------------------------------------------------------------------
diff --git a/systests/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
b/systests/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
deleted file mode 100644
index 5e53f8a..0000000
--- a/systests/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/TemporaryQueueTest.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.qpid.test.unit.client.temporaryqueue;
-
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TemporaryQueue;
-import javax.jms.TextMessage;
-
-import org.apache.qpid.test.utils.QpidBrokerTestCase;
-
-/**
- * Tests the behaviour of {@link TemporaryQueue}.
- */
-public class TemporaryQueueTest extends QpidBrokerTestCase
-{
-    /**
-     * Tests the basic produce/consume behaviour of a temporary queue.
-     */
-    public void testMessageDeliveryUsingTemporaryQueue() throws Exception
-    {
-        final Connection conn = getConnection();
-        final Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-        final TemporaryQueue queue = session.createTemporaryQueue();
-        assertNotNull(queue);
-        final MessageProducer producer = session.createProducer(queue);
-        final MessageConsumer consumer = session.createConsumer(queue);
-        conn.start();
-        producer.send(session.createTextMessage("hello"));
-        TextMessage tm = (TextMessage) consumer.receive(RECEIVE_TIMEOUT);
-        assertNotNull("Message not received", tm);
-        assertEquals("hello", tm.getText());
-    }
-
-    /**
-     * Tests that a temporary queue cannot be used by a MessageConsumer on another Connection.
-     */
-    public void testConsumeFromAnotherConnectionProhibited() throws Exception
-    {
-        final Connection conn = getConnection();
-        final Connection conn2 = getConnection();
-        final Session session1 = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-        final Session session2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
-        final TemporaryQueue queue = session1.createTemporaryQueue();
-        assertNotNull(queue);
-
-        try
-        {
-            session2.createConsumer(queue);
-            fail("Expected a JMSException when subscribing to a temporary queue created on
a different session");
-        }
-        catch (JMSException je)
-        {
-            //pass
-            assertEquals(isBroker10() ? "Can't consume from a temporary destination created
using another connection" : "Cannot consume from a temporary destination created on another
connection", je.getMessage());
-        }
-    }
-
-    /**
-     * Tests that a temporary queue can be used by a MessageProducer on another Connection.
-     */
-    public void testPublishFromAnotherConnectionAllowed() throws Exception
-    {
-        final Connection conn = getConnection();
-        final Connection conn2 = getConnection();
-        final Session session1 = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-        final Session session2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
-        final TemporaryQueue queue = session1.createTemporaryQueue();
-        assertNotNull(queue);
-
-        MessageProducer producer = session2.createProducer(queue);
-        producer.send(session2.createMessage());
-
-        conn.start();
-        MessageConsumer consumer = session1.createConsumer(queue);
-        Message message = consumer.receive(RECEIVE_TIMEOUT);
-        assertNotNull("Message not received", message);
-    }
-
-
-    public void testClosingConsumerDoesNotDeleteQueue() throws Exception
-    {
-        final Connection conn = getConnection();
-        final Session session1 = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-        final TemporaryQueue queue = session1.createTemporaryQueue();
-        assertNotNull(queue);
-
-        MessageConsumer consumer1 = session1.createConsumer(queue);
-
-        MessageProducer producer = session1.createProducer(queue);
-
-        producer.send(session1.createTextMessage("Hello World!"));
-
-        consumer1.close();
-
-        conn.start();
-
-        MessageConsumer consumer2 = session1.createConsumer(queue);
-
-        Message message = consumer2.receive(RECEIVE_TIMEOUT);
-
-        assertNotNull("Message should have been received", message);
-        assertTrue("Received message not a text message", message instanceof TextMessage);
-        assertEquals("Incorrect message text", "Hello World!",  ((TextMessage)message).getText());
-    }
-
-
-    public void testClosingSessionDoesNotDeleteQueue() throws Exception
-    {
-        final Connection conn = getConnection();
-        final Session session1 = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-        final Session session2 = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-        final TemporaryQueue queue = session1.createTemporaryQueue();
-        assertNotNull(queue);
-
-        MessageConsumer consumer1 = session1.createConsumer(queue);
-
-        MessageProducer producer = session1.createProducer(queue);
-
-        producer.send(session1.createTextMessage("Hello World!"));
-
-        session1.close();
-
-        conn.start();
-
-        MessageConsumer consumer2 = session2.createConsumer(queue);
-
-        Message message = consumer2.receive(RECEIVE_TIMEOUT);
-
-        assertNotNull("Message should have been received", message);
-        assertTrue("Received message not a text message", message instanceof TextMessage);
-        assertEquals("Incorrect message text", "Hello World!",  ((TextMessage)message).getText());
-    }
-
-
-    /**
-     * Tests that the client is able to explicitly delete a temporary queue using
-     * {@link TemporaryQueue#delete()} and is prevented from deleting one that
-     * still has consumers.
-     *
-     */
-    public void testExplictTemporaryQueueDeletion() throws Exception
-    {
-        final Connection conn = getConnection();
-        final Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-        final TemporaryQueue queue = session.createTemporaryQueue();
-        assertNotNull(queue);
-        final MessageConsumer consumer = session.createConsumer(queue);
-        conn.start();
-
-        try
-        {
-            queue.delete();
-            fail("Expected JMSException : should not be able to delete while there are active
consumers");
-        }
-        catch (JMSException je)
-        {
-            //pass
-            if(isBroker10())
-            {
-                assertEquals("A consumer is consuming from the temporary destination", je.getMessage());
-            }
-            else
-            {
-                assertEquals("Temporary Queue has consumers so cannot be deleted", je.getMessage());
-            }
-        }
-        consumer.close();
-
-        // Now deletion should succeed.
-        queue.delete();
-
-        try
-        {
-            session.createConsumer(queue);
-            fail("Exception not thrown");
-        }
-        catch (JMSException je)
-        {
-            //pass
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/4ad30dd9/test-profiles/CPPExcludes
----------------------------------------------------------------------
diff --git a/test-profiles/CPPExcludes b/test-profiles/CPPExcludes
index 7bea664..38b9091 100755
--- a/test-profiles/CPPExcludes
+++ b/test-profiles/CPPExcludes
@@ -216,9 +216,6 @@ org.apache.qpid.test.unit.basic.PropertyValueTest#testOverlyLargeHeaderRejected_
 // QPID-6786 Sending headers larger than [first] transfer/frame size (which is outside the
spec) isn't supported against the C++ broker
 org.apache.qpid.test.unit.basic.PropertyValueTest#testLargeHeader_010_HeadersFillContentHeaderFrame
 
-// QPID-6703 Use of Qpid Broker-J specific queue creation arguments to properly fulfill JMS
TemporaryQueue contract
-org.apache.qpid.test.unit.client.temporaryqueue.TemporaryQueueTest#testClosingSessionDoesNotDeleteQueue
-
 # QPID-7156: Test requires a Broker with a virtualhost
 org.apache.qpid.test.unit.client.connection.BrokerClosesClientConnectionTest#testClientCloseOnVirtualHostStop
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message