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 2018/03/14 11:21:49 UTC
qpid-broker-j git commit: QPID-8123: [Broker-J] [System Tests] Fix
regression in BDBUpgradeTest
Repository: qpid-broker-j
Updated Branches:
refs/heads/master b26e32172 -> 291bccbc5
QPID-8123: [Broker-J] [System Tests] Fix regression in BDBUpgradeTest
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/291bccbc
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/291bccbc
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/291bccbc
Branch: refs/heads/master
Commit: 291bccbc54e04bd199f2897977caabc4cff3e080
Parents: b26e321
Author: Keith Wall <kw...@apache.org>
Authored: Wed Mar 14 11:21:20 2018 +0000
Committer: Keith Wall <kw...@apache.org>
Committed: Wed Mar 14 11:21:20 2018 +0000
----------------------------------------------------------------------
bdbstore/systests/pom.xml | 4 +++
.../server/store/berkeleydb/BDBUpgradeTest.java | 28 ++++++++++----------
2 files changed, 18 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/291bccbc/bdbstore/systests/pom.xml
----------------------------------------------------------------------
diff --git a/bdbstore/systests/pom.xml b/bdbstore/systests/pom.xml
index 9580571..3620718 100644
--- a/bdbstore/systests/pom.xml
+++ b/bdbstore/systests/pom.xml
@@ -143,6 +143,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-client</artifactId>
+ </dependency>
</dependencies>
</profile>
</profiles>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/291bccbc/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
index 92bfce1..bf33786 100644
--- a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
+++ b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
@@ -168,9 +168,9 @@ public class BDBUpgradeTest extends QpidBrokerTestCase
2, getQueueDepth(queue.getQueueName()));
TopicSubscriber durSub = pubSession.createDurableSubscriber(topic, SELECTOR_SUB_NAME,"testprop='true'", false);
- Message m = durSub.receive(2000);
+ Message m = durSub.receive(getReceiveTimeout());
assertNotNull("Failed to receive an expected message", m);
- m = durSub.receive(2000);
+ m = durSub.receive(getReceiveTimeout());
assertNotNull("Failed to receive an expected message", m);
pubSession.commit();
@@ -188,7 +188,7 @@ public class BDBUpgradeTest extends QpidBrokerTestCase
try
{
Session session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
- queue = session.createQueue("BURL:direct:////clientid" + ":" + SELECTOR_SUB_NAME);
+ queue = session.createQueue("BURL:direct:////clientid" + ":" + SUB_NAME);
}
finally
{
@@ -211,9 +211,9 @@ public class BDBUpgradeTest extends QpidBrokerTestCase
2, getQueueDepth(queue.getQueueName()));
TopicSubscriber durSub = session.createDurableSubscriber(topic, SUB_NAME);
- Message m = durSub.receive(2000);
+ Message m = durSub.receive(getReceiveTimeout());
assertNotNull("Failed to receive an expected message", m);
- m = durSub.receive(2000);
+ m = durSub.receive(getReceiveTimeout());
assertNotNull("Failed to receive an expected message", m);
session.commit();
@@ -306,7 +306,7 @@ public class BDBUpgradeTest extends QpidBrokerTestCase
for (int i = 1; i <= 3; i++)
{
- Message message = messageConsumer.receive(1000);
+ Message message = messageConsumer.receive(getReceiveTimeout());
assertNotNull("Message was not migrated!", message);
assertTrue("Unexpected message received!", message instanceof TextMessage);
assertEquals("ID property did not match", i, message.getIntProperty("ID"));
@@ -341,13 +341,13 @@ public class BDBUpgradeTest extends QpidBrokerTestCase
session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageConsumer consumer = session.createConsumer(queue);
- Message msg = consumer.receive(1500);
+ Message msg = consumer.receive(getReceiveTimeout());
assertNotNull("expected message was not received", msg);
assertEquals(3, msg.getIntProperty("msg"));
- msg = consumer.receive(1500);
+ msg = consumer.receive(getReceiveTimeout());
assertNotNull("expected message was not received", msg);
assertEquals(1, msg.getIntProperty("msg"));
- msg = consumer.receive(1500);
+ msg = consumer.receive(getReceiveTimeout());
assertNotNull("expected message was not received", msg);
assertEquals(2, msg.getIntProperty("msg"));
}
@@ -445,7 +445,7 @@ public class BDBUpgradeTest extends QpidBrokerTestCase
// Retrieve the matching message
- Message m = durSub.receive(2000);
+ Message m = durSub.receive(getReceiveTimeout());
assertNotNull("Failed to receive an expected message", m);
if(selector)
{
@@ -473,14 +473,14 @@ public class BDBUpgradeTest extends QpidBrokerTestCase
// Retrieve the initial pre-upgrade messages
for (int i=1; i <= 5 ; i++)
{
- m = consumer.receive(2000);
+ m = consumer.receive(getReceiveTimeout());
assertNotNull("Failed to receive an expected message", m);
assertEquals("ID property did not match", i, m.getIntProperty("ID"));
assertEquals("Message content was not as expected", STRING_1024_256, ((TextMessage)m).getText());
}
for (int i=1; i <= 5 ; i++)
{
- m = consumer.receive(2000);
+ m = consumer.receive(getReceiveTimeout());
assertNotNull("Failed to receive an expected message", m);
assertEquals("ID property did not match", i, m.getIntProperty("ID"));
assertEquals("Message content was not as expected", STRING_1024, ((TextMessage)m).getText());
@@ -489,14 +489,14 @@ public class BDBUpgradeTest extends QpidBrokerTestCase
if(extraMessage)
{
//verify that the extra message is received
- m = consumer.receive(2000);
+ m = consumer.receive(getReceiveTimeout());
assertNotNull("Failed to receive an expected message", m);
assertEquals("ID property did not match", 1, m.getIntProperty("ID"));
assertEquals("Message content was not as expected", STRING_1024_256, ((TextMessage)m).getText());
}
// Verify that no more messages are received
- m = consumer.receive(1000);
+ m = consumer.receive(getReceiveTimeout());
assertNull("No more messages should have been recieved", m);
consumer.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org