Repository: activemq Updated Branches: refs/heads/trunk 3ba129561 -> aa2dfb60a
https://issues.apache.org/jira/browse/AMQ-5160 - fix XBeanConfigTest test Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/aa2dfb60 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/aa2dfb60 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/aa2dfb60 Branch: refs/heads/trunk Commit: aa2dfb60aa1a48fb81f317cf7ad1eca525a89fb8 Parents: 3ba1295 Author: Dejan Bosanac <[email protected]> Authored: Mon Jun 2 17:50:28 2014 +0200 Committer: Dejan Bosanac <[email protected]> Committed: Mon Jun 2 17:50:28 2014 +0200 ---------------------------------------------------------------------- .../policy/RetainedMessageSubscriptionRecoveryPolicy.java | 3 +++ .../java/org/apache/activemq/xbean/XBeanConfigTest.java | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/aa2dfb60/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RetainedMessageSubscriptionRecoveryPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RetainedMessageSubscriptionRecoveryPolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RetainedMessageSubscriptionRecoveryPolicy.java index 019d37a..c2e08c2 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RetainedMessageSubscriptionRecoveryPolicy.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RetainedMessageSubscriptionRecoveryPolicy.java @@ -129,4 +129,7 @@ public class RetainedMessageSubscriptionRecoveryPolicy implements SubscriptionRe this.wrapped = wrapped; } + public SubscriptionRecoveryPolicy getWrapped() { + return wrapped; + } } http://git-wip-us.apache.org/repos/asf/activemq/blob/aa2dfb60/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java index 5ac1bb4..c29a08c 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/xbean/XBeanConfigTest.java @@ -25,12 +25,7 @@ import org.apache.activemq.broker.BrokerFactory; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.ConnectionContext; import org.apache.activemq.broker.region.Topic; -import org.apache.activemq.broker.region.policy.DispatchPolicy; -import org.apache.activemq.broker.region.policy.LastImageSubscriptionRecoveryPolicy; -import org.apache.activemq.broker.region.policy.RoundRobinDispatchPolicy; -import org.apache.activemq.broker.region.policy.StrictOrderDispatchPolicy; -import org.apache.activemq.broker.region.policy.SubscriptionRecoveryPolicy; -import org.apache.activemq.broker.region.policy.TimedSubscriptionRecoveryPolicy; +import org.apache.activemq.broker.region.policy.*; import org.apache.activemq.command.ActiveMQTopic; import org.apache.activemq.command.ConnectionId; import org.apache.activemq.command.ConnectionInfo; @@ -59,6 +54,8 @@ public class XBeanConfigTest extends TestCase { assertTrue("dispatchPolicy should be RoundRobinDispatchPolicy: " + dispatchPolicy, dispatchPolicy instanceof RoundRobinDispatchPolicy); SubscriptionRecoveryPolicy subscriptionRecoveryPolicy = topic.getSubscriptionRecoveryPolicy(); + subscriptionRecoveryPolicy = ((RetainedMessageSubscriptionRecoveryPolicy)subscriptionRecoveryPolicy).getWrapped(); + assertTrue("subscriptionRecoveryPolicy should be LastImageSubscriptionRecoveryPolicy: " + subscriptionRecoveryPolicy, subscriptionRecoveryPolicy instanceof LastImageSubscriptionRecoveryPolicy); @@ -71,6 +68,7 @@ public class XBeanConfigTest extends TestCase { assertTrue("dispatchPolicy should be StrictOrderDispatchPolicy: " + dispatchPolicy, dispatchPolicy instanceof StrictOrderDispatchPolicy); subscriptionRecoveryPolicy = topic.getSubscriptionRecoveryPolicy(); + subscriptionRecoveryPolicy = ((RetainedMessageSubscriptionRecoveryPolicy)subscriptionRecoveryPolicy).getWrapped(); assertTrue("subscriptionRecoveryPolicy should be TimedSubscriptionRecoveryPolicy: " + subscriptionRecoveryPolicy, subscriptionRecoveryPolicy instanceof TimedSubscriptionRecoveryPolicy); TimedSubscriptionRecoveryPolicy timedSubscriptionPolicy = (TimedSubscriptionRecoveryPolicy)subscriptionRecoveryPolicy;
