make expectation checking and logging deterministic based on order of definition, clean up creation of matchers map
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/017d006d Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/017d006d Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/017d006d Branch: refs/heads/master Commit: 017d006def86cacf08006e64aeed5f88075e303f Parents: c7bee10 Author: Robert Gemmell <[email protected]> Authored: Thu Nov 13 10:59:51 2014 +0000 Committer: Robert Gemmell <[email protected]> Committed: Thu Nov 13 10:59:51 2014 +0000 ---------------------------------------------------------------------- .../AbstractFieldAndDescriptorMatcher.java | 22 ++++++++++++++------ ...ractFrameFieldAndPayloadMatchingHandler.java | 10 +-------- .../FrameWithNoPayloadMatchingHandler.java | 6 +----- .../FrameWithPayloadMatchingHandler.java | 5 +---- .../test/testpeer/matchers/AttachMatcher.java | 2 -- .../test/testpeer/matchers/BeginMatcher.java | 2 -- .../test/testpeer/matchers/CloseMatcher.java | 2 -- .../testpeer/matchers/CoordinatorMatcher.java | 5 ++--- .../test/testpeer/matchers/DetachMatcher.java | 2 -- .../testpeer/matchers/DispositionMatcher.java | 2 -- .../jms/test/testpeer/matchers/EndMatcher.java | 2 -- .../jms/test/testpeer/matchers/FlowMatcher.java | 2 -- .../jms/test/testpeer/matchers/OpenMatcher.java | 2 -- .../testpeer/matchers/SaslChallengeMatcher.java | 2 -- .../test/testpeer/matchers/SaslInitMatcher.java | 2 -- .../matchers/SaslMechanismsMatcher.java | 2 -- .../testpeer/matchers/SaslOutcomeMatcher.java | 2 -- .../testpeer/matchers/SaslResponseMatcher.java | 2 -- .../test/testpeer/matchers/SourceMatcher.java | 5 ++--- .../test/testpeer/matchers/TargetMatcher.java | 5 ++--- .../matchers/TransactionalStateMatcher.java | 5 ++--- .../test/testpeer/matchers/TransferMatcher.java | 2 -- .../testpeer/matchers/generate-matchers.xsl | 7 ++----- 23 files changed, 29 insertions(+), 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFieldAndDescriptorMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFieldAndDescriptorMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFieldAndDescriptorMatcher.java index f008bb0..d2771b6 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFieldAndDescriptorMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFieldAndDescriptorMatcher.java @@ -19,13 +19,12 @@ public abstract class AbstractFieldAndDescriptorMatcher { private final UnsignedLong numericDescriptor; private final Symbol symbolicDescriptor; - protected final Map<Enum<?>, Matcher<?>> fieldMatchers; + protected final Map<Enum<?>, Matcher<?>> fieldMatchers = new LinkedHashMap<>(); private Map<Enum<?>, Object> receivedFields; - public AbstractFieldAndDescriptorMatcher(UnsignedLong numericDescriptor, Symbol symbolicDescriptor, Map<Enum<?>, Matcher<?>> fieldMatchers) { + public AbstractFieldAndDescriptorMatcher(UnsignedLong numericDescriptor, Symbol symbolicDescriptor) { this.numericDescriptor = numericDescriptor; this.symbolicDescriptor = symbolicDescriptor; - this.fieldMatchers = fieldMatchers; } public UnsignedLong getNumericDescriptor() { @@ -40,14 +39,25 @@ public abstract class AbstractFieldAndDescriptorMatcher { return numericDescriptor.equals(descriptor) || symbolicDescriptor.equals(descriptor); } + /** + * A map of field matchers, keyed by enums representing the field to match against. + * + * The enums need to have an ordinal number matching their field order position within + * the frame in the AMQP spec, and should be named according to the spec. + * + * @return the map of matchers + */ public Map<Enum<?>, Matcher<?>> getMatchers() { return fieldMatchers; } /** - * Returns the received values, keyed by enums representing the fields - * (the enums have an ordinal number matching the AMQP spec field order, - * and a sensible name) + * Returns the received values, keyed by enums representing the field. + * + * The enums have an ordinal number matching their field order position within + * the frame in the AMQP spec, and are named according to the spec. + * + * @return the map of received values */ protected Map<Enum<?>, Object> getReceivedFields() { return receivedFields; http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java index 203ea56..fb77fc6 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java @@ -19,13 +19,11 @@ package org.apache.qpid.jms.test.testpeer; import java.util.List; -import java.util.Map; import org.apache.qpid.proton.amqp.Binary; import org.apache.qpid.proton.amqp.DescribedType; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; -import org.hamcrest.Matcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,19 +42,13 @@ public abstract class AbstractFrameFieldAndPayloadMatchingHandler extends Abstra private Runnable _onSuccessAction; private volatile boolean _isComplete; - /** - * @param fieldMatchers a map of field matchers, keyed by enums representing the fields - * (the enums just need to have an ordinal number matching the AMQP spec field order, - * and preferably a sensible name) - */ protected AbstractFrameFieldAndPayloadMatchingHandler(FrameType frameType, int channel, UnsignedLong numericDescriptor, Symbol symbolicDescriptor, - Map<Enum<?>, Matcher<?>> fieldMatchers, Runnable onSuccessAction) { - super(numericDescriptor, symbolicDescriptor, fieldMatchers); + super(numericDescriptor, symbolicDescriptor); _frameType = frameType; _expectedChannel = channel; _onSuccessAction = onSuccessAction; http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java index c6db0c9..84e949f 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java @@ -18,12 +18,9 @@ */ package org.apache.qpid.jms.test.testpeer; -import java.util.Map; - import org.apache.qpid.proton.amqp.Binary; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; -import org.hamcrest.Matcher; public class FrameWithNoPayloadMatchingHandler extends AbstractFrameFieldAndPayloadMatchingHandler { @@ -32,10 +29,9 @@ public class FrameWithNoPayloadMatchingHandler extends AbstractFrameFieldAndPayl int channel, UnsignedLong numericDescriptor, Symbol symbolicDescriptor, - Map<Enum<?>, Matcher<?>> matchers, Runnable onSuccess) { - super(frameType, channel, numericDescriptor, symbolicDescriptor, matchers, onSuccess); + super(frameType, channel, numericDescriptor, symbolicDescriptor, onSuccess); } @Override http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java index 598f088..3aceb8b 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java @@ -20,8 +20,6 @@ package org.apache.qpid.jms.test.testpeer; import static org.hamcrest.MatcherAssert.assertThat; -import java.util.Map; - import org.apache.qpid.proton.amqp.Binary; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; @@ -36,10 +34,9 @@ public class FrameWithPayloadMatchingHandler extends AbstractFrameFieldAndPayloa int channel, UnsignedLong numericDescriptor, Symbol symbolicDescriptor, - Map<Enum<?>, Matcher<?>> matchers, Runnable onSuccess) { - super(frameType, channel, numericDescriptor, symbolicDescriptor, matchers, onSuccess); + super(frameType, channel, numericDescriptor, symbolicDescriptor, onSuccess); } public void setPayloadMatcher(Matcher<Binary> payloadMatcher) http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java index 1606f88..ad51c95 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java @@ -20,7 +20,6 @@ package org.apache.qpid.jms.test.testpeer.matchers; -import java.util.HashMap; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; import org.apache.qpid.jms.test.testpeer.FrameType; @@ -57,7 +56,6 @@ public class AttachMatcher extends FrameWithNoPayloadMatchingHandler ANY_CHANNEL, UnsignedLong.valueOf(0x0000000000000012L), Symbol.valueOf("amqp:attach:list"), - new HashMap<Enum<?>, Matcher<?>>(), null); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java index 3b0e5ec..64616f8 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java @@ -20,7 +20,6 @@ package org.apache.qpid.jms.test.testpeer.matchers; -import java.util.HashMap; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; import org.apache.qpid.jms.test.testpeer.FrameType; @@ -51,7 +50,6 @@ public class BeginMatcher extends FrameWithNoPayloadMatchingHandler ANY_CHANNEL, UnsignedLong.valueOf(0x0000000000000011L), Symbol.valueOf("amqp:begin:list"), - new HashMap<Enum<?>, Matcher<?>>(), null); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java index 7be80fc..9dbcaa1 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java @@ -20,7 +20,6 @@ package org.apache.qpid.jms.test.testpeer.matchers; -import java.util.HashMap; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; import org.apache.qpid.jms.test.testpeer.FrameType; @@ -44,7 +43,6 @@ public class CloseMatcher extends FrameWithNoPayloadMatchingHandler ANY_CHANNEL, UnsignedLong.valueOf(0x0000000000000018L), Symbol.valueOf("amqp:close:list"), - new HashMap<Enum<?>, Matcher<?>>(), null); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CoordinatorMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CoordinatorMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CoordinatorMatcher.java index 029442d..c49bfff 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CoordinatorMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CoordinatorMatcher.java @@ -23,8 +23,8 @@ package org.apache.qpid.jms.test.testpeer.matchers; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; -import java.util.HashMap; import java.util.List; + import org.apache.qpid.proton.amqp.DescribedType; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; @@ -125,8 +125,7 @@ public class CoordinatorMatcher extends TypeSafeMatcher<Object> public CoordinatorMatcherCore() { super(UnsignedLong.valueOf(0x0000000000000030L), - Symbol.valueOf("amqp:coordinator:list"), - new HashMap<Enum<?>, Matcher<?>>()); + Symbol.valueOf("amqp:coordinator:list")); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java index 0f85c2b..2c25964 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java @@ -20,7 +20,6 @@ package org.apache.qpid.jms.test.testpeer.matchers; -import java.util.HashMap; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; import org.apache.qpid.jms.test.testpeer.FrameType; @@ -46,7 +45,6 @@ public class DetachMatcher extends FrameWithNoPayloadMatchingHandler ANY_CHANNEL, UnsignedLong.valueOf(0x0000000000000016L), Symbol.valueOf("amqp:detach:list"), - new HashMap<Enum<?>, Matcher<?>>(), null); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java index 7dc4ce8..efc5d4c 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java @@ -20,7 +20,6 @@ package org.apache.qpid.jms.test.testpeer.matchers; -import java.util.HashMap; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; import org.apache.qpid.jms.test.testpeer.FrameType; @@ -49,7 +48,6 @@ public class DispositionMatcher extends FrameWithNoPayloadMatchingHandler ANY_CHANNEL, UnsignedLong.valueOf(0x0000000000000015L), Symbol.valueOf("amqp:disposition:list"), - new HashMap<Enum<?>, Matcher<?>>(), null); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java index 0429138..9c26638 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java @@ -20,7 +20,6 @@ package org.apache.qpid.jms.test.testpeer.matchers; -import java.util.HashMap; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; import org.apache.qpid.jms.test.testpeer.FrameType; @@ -44,7 +43,6 @@ public class EndMatcher extends FrameWithNoPayloadMatchingHandler ANY_CHANNEL, UnsignedLong.valueOf(0x0000000000000017L), Symbol.valueOf("amqp:end:list"), - new HashMap<Enum<?>, Matcher<?>>(), null); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java index f45c3e6..ddbc1b8 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java @@ -20,7 +20,6 @@ package org.apache.qpid.jms.test.testpeer.matchers; -import java.util.HashMap; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; import org.apache.qpid.jms.test.testpeer.FrameType; @@ -54,7 +53,6 @@ public class FlowMatcher extends FrameWithNoPayloadMatchingHandler ANY_CHANNEL, UnsignedLong.valueOf(0x0000000000000013L), Symbol.valueOf("amqp:flow:list"), - new HashMap<Enum<?>, Matcher<?>>(), null); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java index 8da5992..613c6b7 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java @@ -20,7 +20,6 @@ package org.apache.qpid.jms.test.testpeer.matchers; -import java.util.HashMap; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; import org.apache.qpid.jms.test.testpeer.FrameType; @@ -53,7 +52,6 @@ public class OpenMatcher extends FrameWithNoPayloadMatchingHandler ANY_CHANNEL, UnsignedLong.valueOf(0x0000000000000010L), Symbol.valueOf("amqp:open:list"), - new HashMap<Enum<?>, Matcher<?>>(), null); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java index 991ff39..ba7f7d2 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java @@ -20,7 +20,6 @@ package org.apache.qpid.jms.test.testpeer.matchers; -import java.util.HashMap; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; import org.apache.qpid.jms.test.testpeer.FrameType; @@ -44,7 +43,6 @@ public class SaslChallengeMatcher extends FrameWithNoPayloadMatchingHandler ANY_CHANNEL, UnsignedLong.valueOf(0x0000000000000042L), Symbol.valueOf("amqp:sasl-challenge:list"), - new HashMap<Enum<?>, Matcher<?>>(), null); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java index 56a4980..847b924 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java @@ -20,7 +20,6 @@ package org.apache.qpid.jms.test.testpeer.matchers; -import java.util.HashMap; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; import org.apache.qpid.jms.test.testpeer.FrameType; @@ -46,7 +45,6 @@ public class SaslInitMatcher extends FrameWithNoPayloadMatchingHandler ANY_CHANNEL, UnsignedLong.valueOf(0x0000000000000041L), Symbol.valueOf("amqp:sasl-init:list"), - new HashMap<Enum<?>, Matcher<?>>(), null); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java index 5f18319..e961003 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java @@ -20,7 +20,6 @@ package org.apache.qpid.jms.test.testpeer.matchers; -import java.util.HashMap; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; import org.apache.qpid.jms.test.testpeer.FrameType; @@ -44,7 +43,6 @@ public class SaslMechanismsMatcher extends FrameWithNoPayloadMatchingHandler ANY_CHANNEL, UnsignedLong.valueOf(0x0000000000000040L), Symbol.valueOf("amqp:sasl-mechanisms:list"), - new HashMap<Enum<?>, Matcher<?>>(), null); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java index a2fd656..9b4a821 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java @@ -20,7 +20,6 @@ package org.apache.qpid.jms.test.testpeer.matchers; -import java.util.HashMap; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; import org.apache.qpid.jms.test.testpeer.FrameType; @@ -45,7 +44,6 @@ public class SaslOutcomeMatcher extends FrameWithNoPayloadMatchingHandler ANY_CHANNEL, UnsignedLong.valueOf(0x0000000000000044L), Symbol.valueOf("amqp:sasl-outcome:list"), - new HashMap<Enum<?>, Matcher<?>>(), null); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java index c6beedd..ca7ea2c 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java @@ -20,7 +20,6 @@ package org.apache.qpid.jms.test.testpeer.matchers; -import java.util.HashMap; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; import org.apache.qpid.jms.test.testpeer.FrameType; @@ -44,7 +43,6 @@ public class SaslResponseMatcher extends FrameWithNoPayloadMatchingHandler ANY_CHANNEL, UnsignedLong.valueOf(0x0000000000000043L), Symbol.valueOf("amqp:sasl-response:list"), - new HashMap<Enum<?>, Matcher<?>>(), null); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SourceMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SourceMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SourceMatcher.java index 03f5e79..9007c91 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SourceMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SourceMatcher.java @@ -23,8 +23,8 @@ package org.apache.qpid.jms.test.testpeer.matchers; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; -import java.util.HashMap; import java.util.List; + import org.apache.qpid.proton.amqp.DescribedType; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; @@ -245,8 +245,7 @@ public class SourceMatcher extends TypeSafeMatcher<Object> public SourceMatcherCore() { super(UnsignedLong.valueOf(0x0000000000000028L), - Symbol.valueOf("amqp:source:list"), - new HashMap<Enum<?>, Matcher<?>>()); + Symbol.valueOf("amqp:source:list")); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TargetMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TargetMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TargetMatcher.java index 3c141ed..817dac9 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TargetMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TargetMatcher.java @@ -23,8 +23,8 @@ package org.apache.qpid.jms.test.testpeer.matchers; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; -import java.util.HashMap; import java.util.List; + import org.apache.qpid.proton.amqp.DescribedType; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; @@ -197,8 +197,7 @@ public class TargetMatcher extends TypeSafeMatcher<Object> public TargetMatcherCore() { super(UnsignedLong.valueOf(0x0000000000000029L), - Symbol.valueOf("amqp:target:list"), - new HashMap<Enum<?>, Matcher<?>>()); + Symbol.valueOf("amqp:target:list")); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransactionalStateMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransactionalStateMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransactionalStateMatcher.java index b027fe8..c0839f7 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransactionalStateMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransactionalStateMatcher.java @@ -23,8 +23,8 @@ package org.apache.qpid.jms.test.testpeer.matchers; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; -import java.util.HashMap; import java.util.List; + import org.apache.qpid.proton.amqp.DescribedType; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; @@ -137,8 +137,7 @@ public class TransactionalStateMatcher extends TypeSafeMatcher<Object> public TransactionalStateMatcherCore() { super(UnsignedLong.valueOf(0x0000000000000034L), - Symbol.valueOf("amqp:transactional-state:list"), - new HashMap<Enum<?>, Matcher<?>>()); + Symbol.valueOf("amqp:transactional-state:list")); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java index 2977f4e..2822de4 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java @@ -20,7 +20,6 @@ package org.apache.qpid.jms.test.testpeer.matchers; -import java.util.HashMap; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; import org.apache.qpid.jms.test.testpeer.FrameType; @@ -54,7 +53,6 @@ public class TransferMatcher extends FrameWithPayloadMatchingHandler ANY_CHANNEL, UnsignedLong.valueOf(0x0000000000000014L), Symbol.valueOf("amqp:transfer:list"), - new HashMap<Enum<?>, Matcher<?>>(), null); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/017d006d/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl index 6203607..4a8c422 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl @@ -68,7 +68,6 @@ <xsl:value-of select="$license"/> package org.apache.qpid.jms.test.testpeer.matchers; -import java.util.HashMap; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; import org.apache.qpid.jms.test.testpeer.FrameType; @@ -93,7 +92,6 @@ public class <xsl:value-of select="$classname"/> extends <xsl:value-of select="$ ANY_CHANNEL, UnsignedLong.valueOf(<xsl:value-of select="concat(substring(descendant::node()[name()='descriptor']/@code,1,10),substring(descendant::node()[name()='descriptor']/@code,14))"/>L), Symbol.valueOf("<xsl:value-of select="descendant::node()[name()='descriptor']/@name"/>"), - new HashMap<Enum<?>, Matcher<?>>(), null); } @@ -140,8 +138,8 @@ package org.apache.qpid.jms.test.testpeer.matchers; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; -import java.util.HashMap; import java.util.List; + import org.apache.qpid.proton.amqp.DescribedType; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedLong; @@ -244,8 +242,7 @@ public class <xsl:value-of select="$classname"/> extends TypeSafeMatcher<Obje public <xsl:value-of select="$classname"/>Core() { super(UnsignedLong.valueOf(<xsl:value-of select="concat(substring(descendant::node()[name()='descriptor']/@code,1,10),substring(descendant::node()[name()='descriptor']/@code,14))"/>L), - Symbol.valueOf("<xsl:value-of select="descendant::node()[name()='descriptor']/@name"/>"), - new HashMap<Enum<?>, Matcher<?>>()); + Symbol.valueOf("<xsl:value-of select="descendant::node()[name()='descriptor']/@name"/>")); } <xsl:for-each select="descendant::node()[name()='field']"> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
