You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2016/12/06 10:26:05 UTC
svn commit: r1772858 - in /qpid/java/trunk:
systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
test-profiles/Java10BrokenTestsExcludes
Author: kwall
Date: Tue Dec 6 10:26:05 2016
New Revision: 1772858
URL: http://svn.apache.org/viewvc?rev=1772858&view=rev
Log:
QPID-7546 : QueueBrowser tests - remove assumption from tests that getEnumeration returns a separate browser
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java?rev=1772858&r1=1772857&r2=1772858&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java Tue Dec 6 10:26:05 2016
@@ -43,6 +43,7 @@ public class QueueBrowserAutoAckTest ext
protected Queue _queue;
protected static final String MESSAGE_ID_PROPERTY = "MessageIDProperty";
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -55,8 +56,6 @@ public class QueueBrowserAutoAckTest ext
_queue = createTestQueue(_clientSession);
- _clientSession.createConsumer(_queue).close();
-
//Ensure there are no messages on the queue to start with.
checkQueueDepth(0);
}
@@ -66,6 +65,7 @@ public class QueueBrowserAutoAckTest ext
_clientSession = _clientConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
}
+ @Override
public void tearDown() throws Exception
{
if (_clientConnection != null)
@@ -242,8 +242,8 @@ public class QueueBrowserAutoAckTest ext
protected void checkOverlappingMultipleGetEnum(int expectedMessages, int browserEnumerationCount, String selector) throws JMSException
{
- QueueBrowser queueBrowser = selector == null ?
- _clientSession.createBrowser(_queue) : _clientSession.createBrowser(_queue, selector);
+ QueueBrowser[] queueBrowsers = new QueueBrowser[browserEnumerationCount];
+
Enumeration[] msgs = new Enumeration[browserEnumerationCount];
int[] msgCount = new int[browserEnumerationCount];
@@ -251,6 +251,9 @@ public class QueueBrowserAutoAckTest ext
//create Enums
for (int count = 0; count < browserEnumerationCount; count++)
{
+ final QueueBrowser queueBrowser = selector == null ?
+ _clientSession.createBrowser(_queue) : _clientSession.createBrowser(_queue, selector);
+ queueBrowsers[count] = queueBrowser;
msgs[count] = queueBrowser.getEnumeration();
}
@@ -275,7 +278,10 @@ public class QueueBrowserAutoAckTest ext
try
{
- queueBrowser.close();
+ for(QueueBrowser queueBrowser : queueBrowsers)
+ {
+ queueBrowser.close();
+ }
}
catch (JMSException e)
{
Modified: qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes?rev=1772858&r1=1772857&r2=1772858&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes (original)
+++ qpid/java/trunk/test-profiles/Java10BrokenTestsExcludes Tue Dec 6 10:26:05 2016
@@ -76,17 +76,6 @@ org.apache.qpid.test.unit.client.TopicSe
org.apache.qpid.test.unit.client.QueueSessionFactoryTest#testTopicSessionCannotCreateCreateBrowser
-// QueueBrowsers appear to be broken
-org.apache.qpid.test.client.QueueBrowserAutoAckTest#testBrowsingWithSelector
-org.apache.qpid.test.client.QueueBrowserAutoAckTest#testMultipleOverlappingGetEnum
-org.apache.qpid.test.client.QueueBrowserClientAckTest#testBrowsingWithSelector
-org.apache.qpid.test.client.QueueBrowserClientAckTest#testMultipleOverlappingGetEnum
-org.apache.qpid.test.client.QueueBrowserDupsOkTest#testBrowsingWithSelector
-org.apache.qpid.test.client.QueueBrowserDupsOkTest#testMultipleOverlappingGetEnum
-org.apache.qpid.test.client.QueueBrowserTransactedTest#testBrowsingWithSelector
-org.apache.qpid.test.client.QueueBrowserTransactedTest#testMultipleOverlappingGetEnum
-
-
// No exception is thrown when attempting to consume from a deleted temp topic
org.apache.qpid.test.unit.topic.TemporaryTopicTest#testExplicitTemporaryTopicDeletion
// the temporary topic does not display topic like behaviour (only one consumer receives the message)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org