Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ-6940 - test fix for AMQ6477 test 

Need to remove the portion of the test that looks at the dispatched list
for TopicSubscription as that class no longer tracks message references

(cherry picked from commit 84126d8a7a)
This commit is contained in:
Christopher L. Shannon (cshannon) 2018-03-30 06:34:36 -04:00
parent a0a240372f
commit 9683ae3f5d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
activemq-unit-tests/src/test/java/org/apache/activemq/usecases/AMQ6477Test.java
View File

@ -77,16 +77,18 @@ public class AMQ6477Test {
private SubType subType;
private boolean persistent;
protected enum SubType {QUEUE, TOPIC, DURABLE};
protected enum SubType {QUEUE, TOPIC, DURABLE}
@Parameters(name="subType={0},isPersistent={1}")
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][] {
{SubType.QUEUE, false},
{SubType.TOPIC, false},
//Can only test PrefetchSubscriptions for now as TopicSubscriptions don't track the message
//references anymore that are dispatched
// {SubType.TOPIC, false},
{SubType.DURABLE, false},
{SubType.QUEUE, true},
{SubType.TOPIC, true},
// {SubType.TOPIC, true},
{SubType.DURABLE, true}
});
}
@ -177,11 +179,9 @@ public class AMQ6477Test {
protected List<MessageReference> getSubscriptionMessages(Subscription sub) throws Exception {
Field dispatchedField = null;
Field dispatchLockField = null;
if (sub instanceof TopicSubscription) {
dispatchedField = TopicSubscription.class.getDeclaredField("dispatched");
dispatchLockField = TopicSubscription.class.getDeclaredField("dispatchLock");
} else {
//Can only test PrefetchSubscriptions for now as TopicSubscriptions don't track the message
//references anymore that are dispatched
if (sub instanceof PrefetchSubscription) {
dispatchedField = PrefetchSubscription.class.getDeclaredField("dispatched");
dispatchLockField = PrefetchSubscription.class.getDeclaredField("dispatchLock");
}