You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ph...@apache.org on 2013/08/21 18:05:35 UTC
svn commit: r1516195 [2/2] - in /qpid/jms/trunk: ./
src/main/java/org/apache/qpid/jms/engine/
src/main/java/org/apache/qpid/jms/impl/ src/test/java/org/apache/qpid/jms/
src/test/java/org/apache/qpid/jms/test/testpeer/
src/test/java/org/apache/qpid/jms/...
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java?rev=1516195&r1=1516194&r2=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java Wed Aug 21 16:05:34 2013
@@ -18,10 +18,6 @@
*/
package org.apache.qpid.jms.test.testpeer;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.apache.qpid.proton.amqp.Binary;
@@ -29,10 +25,8 @@ import org.apache.qpid.proton.amqp.Symbo
import org.apache.qpid.proton.amqp.UnsignedLong;
import org.hamcrest.Matcher;
-public class FrameWithNoPayloadMatchingHandler extends FrameMatchingHandler
+public class FrameWithNoPayloadMatchingHandler extends AbstractFrameFieldAndPayloadMatchingHandler
{
- private final Map<Integer, Matcher<?>> _matchers;
- private boolean _isComplete;
protected FrameWithNoPayloadMatchingHandler(FrameType frameType,
int channel,
@@ -41,51 +35,15 @@ public class FrameWithNoPayloadMatchingH
Map<Integer, Matcher<?>> matchers,
Runnable onSuccess)
{
- super(frameType, channel, numericDescriptor, symbolicDescriptor, onSuccess);
- _matchers = matchers;
+ super(frameType, channel, numericDescriptor, symbolicDescriptor, matchers, onSuccess);
}
@Override
- protected void frame(List<Object> described, Binary payload)
+ protected void verifyPayload(Binary payload)
{
- if(payload == null || payload.getLength() == 0)
- {
- int i = 0;
- HashMap<Integer, Object> valueMap = new HashMap<>();
- for(Object value : described)
- {
- valueMap.put(i++, value);
- }
- frame(valueMap);
- }
- else
+ if(payload != null && payload.getLength() > 0)
{
throw new IllegalArgumentException("Expected no payload but received payload of length: " + payload.getLength());
}
}
-
- protected void frame(Map<Integer, Object> valueMap)
- {
- for(Map.Entry<Integer, Matcher<?>> entry : _matchers.entrySet())
- {
- @SuppressWarnings("unchecked")
- Matcher<Object> matcher = (Matcher<Object>) entry.getValue();
- Integer field = entry.getKey();
-
- assertThat("Field value should match", valueMap.get(field), matcher);
- }
- succeeded();
- _isComplete = true;
- }
-
- @Override
- public boolean isComplete()
- {
- return _isComplete;
- }
-
- protected Map<Integer, Matcher<?>> getMatchers()
- {
- return _matchers;
- }
}
\ No newline at end of file
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithNoPayloadMatchingHandler.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java Wed Aug 21 16:05:34 2013
@@ -20,8 +20,6 @@ package org.apache.qpid.jms.test.testpee
import static org.hamcrest.MatcherAssert.assertThat;
-import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.apache.qpid.proton.amqp.Binary;
@@ -29,63 +27,38 @@ import org.apache.qpid.proton.amqp.Symbo
import org.apache.qpid.proton.amqp.UnsignedLong;
import org.hamcrest.Matcher;
-public class FrameWithNoPayloadMatchingHandler extends FrameMatchingHandler
+public class FrameWithPayloadMatchingHandler extends AbstractFrameFieldAndPayloadMatchingHandler
{
- private final Map<Integer, Matcher<?>> _matchers;
- private boolean _isComplete;
+ private Matcher<Binary> _payloadMatcher;
+ private Binary _receivedPayload;
- protected FrameWithNoPayloadMatchingHandler(FrameType frameType,
+ protected FrameWithPayloadMatchingHandler(FrameType frameType,
int channel,
UnsignedLong numericDescriptor,
Symbol symbolicDescriptor,
Map<Integer, Matcher<?>> matchers,
Runnable onSuccess)
{
- super(frameType, channel, numericDescriptor, symbolicDescriptor, onSuccess);
- _matchers = matchers;
+ super(frameType, channel, numericDescriptor, symbolicDescriptor, matchers, onSuccess);
}
- @Override
- protected void frame(List<Object> described, Binary payload)
+ public void setPayloadMatcher(Matcher<Binary> payloadMatcher)
{
- if(payload == null || payload.getLength() == 0)
- {
- int i = 0;
- HashMap<Integer, Object> valueMap = new HashMap<>();
- for(Object value : described)
- {
- valueMap.put(i++, value);
- }
- frame(valueMap);
- }
- else
- {
- throw new IllegalArgumentException("Expected no payload but received payload of length: " + payload.getLength());
- }
+ _payloadMatcher = payloadMatcher;
}
- protected void frame(Map<Integer, Object> valueMap)
+ @Override
+ protected void verifyPayload(Binary payload)
{
- for(Map.Entry<Integer, Matcher<?>> entry : _matchers.entrySet())
+ if(_payloadMatcher != null)
{
- @SuppressWarnings("unchecked")
- Matcher<Object> matcher = (Matcher<Object>) entry.getValue();
- Integer field = entry.getKey();
-
- assertThat("Field value should match", valueMap.get(field), matcher);
+ assertThat("Payload should match", payload, _payloadMatcher);
}
- succeeded();
- _isComplete = true;
- }
-
- @Override
- public boolean isComplete()
- {
- return _isComplete;
+ _receivedPayload = payload;
}
- protected Map<Integer, Matcher<?>> getMatchers()
+ public Binary getReceivedPayload()
{
- return _matchers;
+ return _receivedPayload;
}
}
\ No newline at end of file
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/ListDescribedType.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/Frame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/ListDescribedType.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/ListDescribedType.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/Frame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/Frame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/ListDescribedType.java Wed Aug 21 16:05:34 2013
@@ -21,14 +21,12 @@ package org.apache.qpid.jms.test.testpee
import java.util.Arrays;
import org.apache.qpid.proton.amqp.DescribedType;
-import org.apache.qpid.proton.amqp.Symbol;
-// TODO rename to performative
-public abstract class Frame implements DescribedType
+public abstract class ListDescribedType implements DescribedType
{
private final Object[] _fields;
- public Frame(int numberOfFields)
+ public ListDescribedType(int numberOfFields)
{
_fields = new Object[numberOfFields];
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java?rev=1516195&r1=1516194&r2=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java Wed Aug 21 16:05:34 2013
@@ -20,31 +20,54 @@ package org.apache.qpid.jms.test.testpee
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
-import org.apache.qpid.jms.test.testpeer.frames.CloseFrame;
-import org.apache.qpid.jms.test.testpeer.frames.OpenFrame;
-import org.apache.qpid.jms.test.testpeer.frames.SaslMechanismsFrame;
-import org.apache.qpid.jms.test.testpeer.frames.SaslOutcomeFrame;
+import org.apache.qpid.jms.test.testpeer.describedtypes.Accepted;
+import org.apache.qpid.jms.test.testpeer.describedtypes.AttachFrame;
+import org.apache.qpid.jms.test.testpeer.describedtypes.BeginFrame;
+import org.apache.qpid.jms.test.testpeer.describedtypes.CloseFrame;
+import org.apache.qpid.jms.test.testpeer.describedtypes.DispositionFrame;
+import org.apache.qpid.jms.test.testpeer.describedtypes.FlowFrame;
+import org.apache.qpid.jms.test.testpeer.describedtypes.OpenFrame;
+import org.apache.qpid.jms.test.testpeer.describedtypes.SaslMechanismsFrame;
+import org.apache.qpid.jms.test.testpeer.describedtypes.SaslOutcomeFrame;
+import org.apache.qpid.jms.test.testpeer.matchers.AttachMatcher;
+import org.apache.qpid.jms.test.testpeer.matchers.BeginMatcher;
import org.apache.qpid.jms.test.testpeer.matchers.CloseMatcher;
import org.apache.qpid.jms.test.testpeer.matchers.OpenMatcher;
import org.apache.qpid.jms.test.testpeer.matchers.SaslInitMatcher;
+import org.apache.qpid.jms.test.testpeer.matchers.TransferMatcher;
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.UnsignedByte;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
+import org.apache.qpid.proton.amqp.UnsignedShort;
import org.apache.qpid.proton.engine.impl.AmqpHeader;
+import org.hamcrest.Matcher;
import org.hamcrest.Matchers;
public class TestAmqpPeer implements AutoCloseable
{
+ /** Roles are represented as booleans - see AMQP spec 2.8.1*/
+ private static final boolean SENDER_ROLE = false;
+
+ /** Roles are represented as booleans - see AMQP spec 2.8.1*/
+ private static final boolean RECEIVER_ROLE = true;
+
+ private static final UnsignedByte ATTACH_SND_SETTLE_MODE_UNSETTLED = UnsignedByte.valueOf((byte) 0);
+
+ private static final UnsignedByte ATTACH_RCV_SETTLE_MODE_FIRST = UnsignedByte.valueOf((byte)0);
+
private final TestAmqpPeerRunner _driverRunnable;
private final Thread _driverThread;
- private final List<Handler> _handlers = new ArrayList<>();
+ private final List<Handler> _handlers = Collections.synchronizedList(new ArrayList<Handler>());
public TestAmqpPeer(int port) throws IOException
{
@@ -175,4 +198,118 @@ public class TestAmqpPeer implements Aut
new CloseFrame(),
null)));
}
+
+ public void expectBegin()
+ {
+ final BeginMatcher beginMatcher = new BeginMatcher()
+ .withRemoteChannel(nullValue())
+ .withNextOutgoingId(notNullValue())
+ .withIncomingWindow(notNullValue())
+ .withOutgoingWindow(notNullValue());
+
+ // the response will have its remote channel dynamically set based on incoming value
+ final BeginFrame beginResponse = new BeginFrame()
+ .setNextOutgoingId(UnsignedInteger.valueOf(0))
+ .setIncomingWindow(UnsignedInteger.valueOf(0))
+ .setOutgoingWindow(UnsignedInteger.valueOf(0));
+
+ beginMatcher.onSuccess(
+ new FrameSender(this, FrameType.AMQP, 0, beginResponse, null)
+ .setValueProvider(new ValueProvider()
+ {
+ @Override
+ public void setValues()
+ {
+ beginResponse.setRemoteChannel(
+ UnsignedShort.valueOf((short) beginMatcher.getActualChannel()));
+ }
+ }));
+
+ _handlers.add(beginMatcher);
+ }
+
+ public void expectSenderAttach()
+ {
+ expectAttach(SENDER_ROLE);
+ }
+
+ private void expectAttach(boolean role)
+ {
+ final AttachMatcher attachMatcher = new AttachMatcher()
+ .withName(notNullValue())
+ .withHandle(notNullValue())
+ .withRole(equalTo(role))
+ .withSndSettleMode(equalTo(ATTACH_SND_SETTLE_MODE_UNSETTLED))
+ .withRcvSettleMode(equalTo(ATTACH_RCV_SETTLE_MODE_FIRST))
+ .withSource(notNullValue())
+ .withTarget(notNullValue());
+
+ UnsignedInteger linkHandle = UnsignedInteger.valueOf(101);
+ final AttachFrame attachResponse = new AttachFrame()
+ .setHandle(linkHandle)
+ .setRole(!role)
+ .setSndSettleMode(ATTACH_SND_SETTLE_MODE_UNSETTLED)
+ .setRcvSettleMode(ATTACH_RCV_SETTLE_MODE_FIRST);
+
+ FrameSender attachResponseSender = new FrameSender(this, FrameType.AMQP, 0, attachResponse, null)
+ .setValueProvider(new ValueProvider()
+ {
+ @Override
+ public void setValues()
+ {
+ attachResponse.setName(attachMatcher.getReceivedName());
+ attachResponse.setSource(attachMatcher.getReceivedSource());
+ attachResponse.setTarget(attachMatcher.getReceivedTarget());
+ }
+ });
+
+ final FlowFrame flowFrame = new FlowFrame().setNextIncomingId(UnsignedInteger.valueOf(0))
+ .setIncomingWindow(UnsignedInteger.valueOf(2048))
+ .setNextOutgoingId(UnsignedInteger.valueOf(0))
+ .setOutgoingWindow(UnsignedInteger.valueOf(2048))
+ .setLinkCredit(UnsignedInteger.valueOf(100))
+ .setHandle(linkHandle);
+
+ FrameSender flowFrameSender = new FrameSender(this, FrameType.AMQP, 0, flowFrame, null)
+ .setValueProvider(new ValueProvider()
+ {
+ @Override
+ public void setValues()
+ {
+ flowFrame.setDeliveryCount(attachMatcher.getReceivedInitialDeliveryCount());
+ }
+ });
+
+ CompositeAmqpPeerRunnable composite = new CompositeAmqpPeerRunnable();
+ composite.add(attachResponseSender);
+ composite.add(flowFrameSender);
+
+ attachMatcher.onSuccess(composite);
+
+ _handlers.add(attachMatcher);
+ }
+
+ public void expectTransfer(Matcher<Binary> expectedPayloadMatcher)
+ {
+ final TransferMatcher transferMatcher = new TransferMatcher();
+ transferMatcher.setPayloadMatcher(expectedPayloadMatcher);
+
+ final DispositionFrame dispositionFrame = new DispositionFrame()
+ .setRole(RECEIVER_ROLE)
+ .setSettled(true)
+ .setState(new Accepted());
+
+ FrameSender dispositionFrameSender = new FrameSender(this, FrameType.AMQP, 0, dispositionFrame, null)
+ .setValueProvider(new ValueProvider()
+ {
+ @Override
+ public void setValues()
+ {
+ dispositionFrame.setFirst(transferMatcher.getReceivedDeliveryId());
+ }
+ });
+ transferMatcher.onSuccess(dispositionFrameSender);
+
+ _handlers.add(transferMatcher);
+ }
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeerRunner.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeerRunner.java?rev=1516195&r1=1516194&r2=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeerRunner.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeerRunner.java Wed Aug 21 16:05:34 2013
@@ -63,6 +63,8 @@ class TestAmqpPeerRunner implements Runn
int bytesRead;
byte[] networkInputBytes = new byte[1024];
+
+ _logger.finest("Attempting read");
while((bytesRead = networkInputStream.read(networkInputBytes)) != -1)
{
ByteBuffer networkInputByteBuffer = ByteBuffer.wrap(networkInputBytes, 0, bytesRead);
@@ -70,13 +72,23 @@ class TestAmqpPeerRunner implements Runn
_logger.info("Read: " + new Binary(networkInputBytes, 0, bytesRead));
_testFrameParser.input(networkInputByteBuffer);
+ _logger.finest("Attempting read");
}
+
+ _logger.finest("Exited read loop");
}
catch (Exception e)
{
- _logger.log(Level.SEVERE, "Problem in peer", e);
- e.printStackTrace(); // TODO make this a logger call
- _exception = e;
+ if(!_serverSocket.isClosed())
+ {
+ _logger.log(Level.SEVERE, "Problem in peer", e);
+ e.printStackTrace(); // TODO make this a logger call
+ _exception = e;
+ }
+ else
+ {
+ _logger.log(Level.FINE, "Caught exception, ignoring as socket is closed: " + e);
+ }
}
finally
{
@@ -99,7 +111,10 @@ class TestAmqpPeerRunner implements Runn
}
finally
{
- _clientSocket.close();
+ if(_clientSocket != null)
+ {
+ _clientSocket.close();
+ }
}
}
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/ValueProvider.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/Frame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/ValueProvider.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/ValueProvider.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/Frame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/Frame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/ValueProvider.java Wed Aug 21 16:05:34 2013
@@ -18,29 +18,11 @@
*/
package org.apache.qpid.jms.test.testpeer;
-import java.util.Arrays;
-
-import org.apache.qpid.proton.amqp.DescribedType;
-import org.apache.qpid.proton.amqp.Symbol;
-
-// TODO rename to performative
-public abstract class Frame implements DescribedType
+/**
+ * Typically used by {@link FrameSender} to dynamically set values on the outgoing frame,
+ * based on the values of the incoming one.
+ */
+public interface ValueProvider
{
- private final Object[] _fields;
-
- public Frame(int numberOfFields)
- {
- _fields = new Object[numberOfFields];
- }
-
- @Override
- public Object getDescribed()
- {
- return Arrays.asList(_fields);
- }
-
- protected Object[] getFields()
- {
- return _fields;
- }
-}
\ No newline at end of file
+ void setValues();
+}
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Accepted.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/EndFrame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Accepted.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Accepted.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/EndFrame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/EndFrame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Accepted.java Wed Aug 21 16:05:34 2013
@@ -18,23 +18,22 @@
*
*/
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class EndFrame extends Frame
+public class Accepted extends ListDescribedType
{
- private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:end:list");
+ private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:accepted:list");
- private static final int FIELD_ERROR = 0;
- public EndFrame(Object... fields)
+ public Accepted(Object... fields)
{
- super(1);
+ super(0);
int i = 0;
for(Object field : fields)
{
@@ -48,11 +47,5 @@ public class EndFrame extends Frame
return DESCRIPTOR;
}
- public EndFrame setError(Object o)
- {
- getFields()[FIELD_ERROR] = o;
- return this;
- }
-
}
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/AttachFrame.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/AttachFrame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/AttachFrame.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/AttachFrame.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/AttachFrame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/AttachFrame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/AttachFrame.java Wed Aug 21 16:05:34 2013
@@ -18,15 +18,15 @@
*
*/
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class AttachFrame extends Frame
+public class AttachFrame extends ListDescribedType
{
private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:attach:list");
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/BeginFrame.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/BeginFrame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/BeginFrame.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/BeginFrame.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/BeginFrame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/BeginFrame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/BeginFrame.java Wed Aug 21 16:05:34 2013
@@ -18,15 +18,15 @@
*
*/
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class BeginFrame extends Frame
+public class BeginFrame extends ListDescribedType
{
private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:begin:list");
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/CloseFrame.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/CloseFrame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/CloseFrame.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/CloseFrame.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/CloseFrame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/CloseFrame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/CloseFrame.java Wed Aug 21 16:05:34 2013
@@ -18,15 +18,15 @@
*
*/
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class CloseFrame extends Frame
+public class CloseFrame extends ListDescribedType
{
private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:close:list");
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/DetachFrame.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/DetachFrame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/DetachFrame.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/DetachFrame.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/DetachFrame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/DetachFrame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/DetachFrame.java Wed Aug 21 16:05:34 2013
@@ -18,15 +18,15 @@
*
*/
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class DetachFrame extends Frame
+public class DetachFrame extends ListDescribedType
{
private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:detach:list");
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/DispositionFrame.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/DispositionFrame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/DispositionFrame.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/DispositionFrame.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/DispositionFrame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/DispositionFrame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/DispositionFrame.java Wed Aug 21 16:05:34 2013
@@ -18,15 +18,15 @@
*
*/
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class DispositionFrame extends Frame
+public class DispositionFrame extends ListDescribedType
{
private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:disposition:list");
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/EndFrame.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/EndFrame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/EndFrame.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/EndFrame.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/EndFrame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/EndFrame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/EndFrame.java Wed Aug 21 16:05:34 2013
@@ -18,15 +18,15 @@
*
*/
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class EndFrame extends Frame
+public class EndFrame extends ListDescribedType
{
private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:end:list");
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/FlowFrame.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/FlowFrame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/FlowFrame.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/FlowFrame.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/FlowFrame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/FlowFrame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/FlowFrame.java Wed Aug 21 16:05:34 2013
@@ -18,15 +18,15 @@
*
*/
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class FlowFrame extends Frame
+public class FlowFrame extends ListDescribedType
{
private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:flow:list");
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Modified.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/SaslInitFrame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Modified.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Modified.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/SaslInitFrame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/SaslInitFrame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Modified.java Wed Aug 21 16:05:34 2013
@@ -18,23 +18,23 @@
*
*/
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class SaslInitFrame extends Frame
+public class Modified extends ListDescribedType
{
- private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:sasl-init:list");
+ private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:modified:list");
- private static final int FIELD_MECHANISM = 0;
- private static final int FIELD_INITIAL_RESPONSE = 1;
- private static final int FIELD_HOSTNAME = 2;
+ private static final int FIELD_DELIVERY_FAILED = 0;
+ private static final int FIELD_UNDELIVERABLE_HERE = 1;
+ private static final int FIELD_MESSAGE_ANNOTATIONS = 2;
- public SaslInitFrame(Object... fields)
+ public Modified(Object... fields)
{
super(3);
int i = 0;
@@ -50,21 +50,21 @@ public class SaslInitFrame extends Frame
return DESCRIPTOR;
}
- public SaslInitFrame setMechanism(Object o)
+ public Modified setDeliveryFailed(Object o)
{
- getFields()[FIELD_MECHANISM] = o;
+ getFields()[FIELD_DELIVERY_FAILED] = o;
return this;
}
- public SaslInitFrame setInitialResponse(Object o)
+ public Modified setUndeliverableHere(Object o)
{
- getFields()[FIELD_INITIAL_RESPONSE] = o;
+ getFields()[FIELD_UNDELIVERABLE_HERE] = o;
return this;
}
- public SaslInitFrame setHostname(Object o)
+ public Modified setMessageAnnotations(Object o)
{
- getFields()[FIELD_HOSTNAME] = o;
+ getFields()[FIELD_MESSAGE_ANNOTATIONS] = o;
return this;
}
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/OpenFrame.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/OpenFrame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/OpenFrame.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/OpenFrame.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/OpenFrame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/OpenFrame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/OpenFrame.java Wed Aug 21 16:05:34 2013
@@ -18,15 +18,15 @@
*
*/
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class OpenFrame extends Frame
+public class OpenFrame extends ListDescribedType
{
private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:open:list");
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Rejected.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/EndFrame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Rejected.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Rejected.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/EndFrame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/EndFrame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Rejected.java Wed Aug 21 16:05:34 2013
@@ -18,21 +18,21 @@
*
*/
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class EndFrame extends Frame
+public class Rejected extends ListDescribedType
{
- private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:end:list");
+ private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:rejected:list");
private static final int FIELD_ERROR = 0;
- public EndFrame(Object... fields)
+ public Rejected(Object... fields)
{
super(1);
int i = 0;
@@ -48,7 +48,7 @@ public class EndFrame extends Frame
return DESCRIPTOR;
}
- public EndFrame setError(Object o)
+ public Rejected setError(Object o)
{
getFields()[FIELD_ERROR] = o;
return this;
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Released.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/EndFrame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Released.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Released.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/EndFrame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/EndFrame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Released.java Wed Aug 21 16:05:34 2013
@@ -18,23 +18,22 @@
*
*/
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class EndFrame extends Frame
+public class Released extends ListDescribedType
{
- private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:end:list");
+ private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:released:list");
- private static final int FIELD_ERROR = 0;
- public EndFrame(Object... fields)
+ public Released(Object... fields)
{
- super(1);
+ super(0);
int i = 0;
for(Object field : fields)
{
@@ -48,11 +47,5 @@ public class EndFrame extends Frame
return DESCRIPTOR;
}
- public EndFrame setError(Object o)
- {
- getFields()[FIELD_ERROR] = o;
- return this;
- }
-
}
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslChallengeFrame.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/SaslChallengeFrame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslChallengeFrame.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslChallengeFrame.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/SaslChallengeFrame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/SaslChallengeFrame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslChallengeFrame.java Wed Aug 21 16:05:34 2013
@@ -18,15 +18,15 @@
*
*/
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class SaslChallengeFrame extends Frame
+public class SaslChallengeFrame extends ListDescribedType
{
private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:sasl-challenge:list");
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslInitFrame.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/SaslInitFrame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslInitFrame.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslInitFrame.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/SaslInitFrame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/SaslInitFrame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslInitFrame.java Wed Aug 21 16:05:34 2013
@@ -18,15 +18,15 @@
*
*/
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class SaslInitFrame extends Frame
+public class SaslInitFrame extends ListDescribedType
{
private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:sasl-init:list");
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslMechanismsFrame.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/SaslMechanismsFrame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslMechanismsFrame.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslMechanismsFrame.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/SaslMechanismsFrame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/SaslMechanismsFrame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslMechanismsFrame.java Wed Aug 21 16:05:34 2013
@@ -18,15 +18,15 @@
*
*/
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class SaslMechanismsFrame extends Frame
+public class SaslMechanismsFrame extends ListDescribedType
{
private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:sasl-mechanisms:list");
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslOutcomeFrame.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/SaslOutcomeFrame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslOutcomeFrame.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslOutcomeFrame.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/SaslOutcomeFrame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/SaslOutcomeFrame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslOutcomeFrame.java Wed Aug 21 16:05:34 2013
@@ -18,15 +18,15 @@
*
*/
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class SaslOutcomeFrame extends Frame
+public class SaslOutcomeFrame extends ListDescribedType
{
private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:sasl-outcome:list");
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslResponseFrame.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/SaslResponseFrame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslResponseFrame.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslResponseFrame.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/SaslResponseFrame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/SaslResponseFrame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/SaslResponseFrame.java Wed Aug 21 16:05:34 2013
@@ -18,15 +18,15 @@
*
*/
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class SaslResponseFrame extends Frame
+public class SaslResponseFrame extends ListDescribedType
{
private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:sasl-response:list");
Added: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Source.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Source.java?rev=1516195&view=auto
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Source.java (added)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Source.java Wed Aug 21 16:05:34 2013
@@ -0,0 +1,128 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.jms.test.testpeer.describedtypes;
+
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
+import org.apache.qpid.proton.amqp.Symbol;
+
+/**
+ * Generated by generate-frames.xsl, which resides in this package.
+ */
+public class Source extends ListDescribedType
+{
+ private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:source:list");
+
+ private static final int FIELD_ADDRESS = 0;
+ private static final int FIELD_DURABLE = 1;
+ private static final int FIELD_EXPIRY_POLICY = 2;
+ private static final int FIELD_TIMEOUT = 3;
+ private static final int FIELD_DYNAMIC = 4;
+ private static final int FIELD_DYNAMIC_NODE_PROPERTIES = 5;
+ private static final int FIELD_DISTRIBUTION_MODE = 6;
+ private static final int FIELD_FILTER = 7;
+ private static final int FIELD_DEFAULT_OUTCOME = 8;
+ private static final int FIELD_OUTCOMES = 9;
+ private static final int FIELD_CAPABILITIES = 10;
+
+ public Source(Object... fields)
+ {
+ super(11);
+ int i = 0;
+ for(Object field : fields)
+ {
+ getFields()[i++] = field;
+ }
+ }
+
+ @Override
+ public Symbol getDescriptor()
+ {
+ return DESCRIPTOR;
+ }
+
+ public Source setAddress(Object o)
+ {
+ getFields()[FIELD_ADDRESS] = o;
+ return this;
+ }
+
+ public Source setDurable(Object o)
+ {
+ getFields()[FIELD_DURABLE] = o;
+ return this;
+ }
+
+ public Source setExpiryPolicy(Object o)
+ {
+ getFields()[FIELD_EXPIRY_POLICY] = o;
+ return this;
+ }
+
+ public Source setTimeout(Object o)
+ {
+ getFields()[FIELD_TIMEOUT] = o;
+ return this;
+ }
+
+ public Source setDynamic(Object o)
+ {
+ getFields()[FIELD_DYNAMIC] = o;
+ return this;
+ }
+
+ public Source setDynamicNodeProperties(Object o)
+ {
+ getFields()[FIELD_DYNAMIC_NODE_PROPERTIES] = o;
+ return this;
+ }
+
+ public Source setDistributionMode(Object o)
+ {
+ getFields()[FIELD_DISTRIBUTION_MODE] = o;
+ return this;
+ }
+
+ public Source setFilter(Object o)
+ {
+ getFields()[FIELD_FILTER] = o;
+ return this;
+ }
+
+ public Source setDefaultOutcome(Object o)
+ {
+ getFields()[FIELD_DEFAULT_OUTCOME] = o;
+ return this;
+ }
+
+ public Source setOutcomes(Object o)
+ {
+ getFields()[FIELD_OUTCOMES] = o;
+ return this;
+ }
+
+ public Source setCapabilities(Object o)
+ {
+ getFields()[FIELD_CAPABILITIES] = o;
+ return this;
+ }
+
+}
+
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Target.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/DispositionFrame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Target.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Target.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/DispositionFrame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/DispositionFrame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/Target.java Wed Aug 21 16:05:34 2013
@@ -18,28 +18,29 @@
*
*/
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class DispositionFrame extends Frame
+public class Target extends ListDescribedType
{
- private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:disposition:list");
+ private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:target:list");
- private static final int FIELD_ROLE = 0;
- private static final int FIELD_FIRST = 1;
- private static final int FIELD_LAST = 2;
- private static final int FIELD_SETTLED = 3;
- private static final int FIELD_STATE = 4;
- private static final int FIELD_BATCHABLE = 5;
+ private static final int FIELD_ADDRESS = 0;
+ private static final int FIELD_DURABLE = 1;
+ private static final int FIELD_EXPIRY_POLICY = 2;
+ private static final int FIELD_TIMEOUT = 3;
+ private static final int FIELD_DYNAMIC = 4;
+ private static final int FIELD_DYNAMIC_NODE_PROPERTIES = 5;
+ private static final int FIELD_CAPABILITIES = 6;
- public DispositionFrame(Object... fields)
+ public Target(Object... fields)
{
- super(6);
+ super(7);
int i = 0;
for(Object field : fields)
{
@@ -53,39 +54,45 @@ public class DispositionFrame extends Fr
return DESCRIPTOR;
}
- public DispositionFrame setRole(Object o)
+ public Target setAddress(Object o)
{
- getFields()[FIELD_ROLE] = o;
+ getFields()[FIELD_ADDRESS] = o;
return this;
}
- public DispositionFrame setFirst(Object o)
+ public Target setDurable(Object o)
{
- getFields()[FIELD_FIRST] = o;
+ getFields()[FIELD_DURABLE] = o;
return this;
}
- public DispositionFrame setLast(Object o)
+ public Target setExpiryPolicy(Object o)
{
- getFields()[FIELD_LAST] = o;
+ getFields()[FIELD_EXPIRY_POLICY] = o;
return this;
}
- public DispositionFrame setSettled(Object o)
+ public Target setTimeout(Object o)
{
- getFields()[FIELD_SETTLED] = o;
+ getFields()[FIELD_TIMEOUT] = o;
return this;
}
- public DispositionFrame setState(Object o)
+ public Target setDynamic(Object o)
{
- getFields()[FIELD_STATE] = o;
+ getFields()[FIELD_DYNAMIC] = o;
return this;
}
- public DispositionFrame setBatchable(Object o)
+ public Target setDynamicNodeProperties(Object o)
{
- getFields()[FIELD_BATCHABLE] = o;
+ getFields()[FIELD_DYNAMIC_NODE_PROPERTIES] = o;
+ return this;
+ }
+
+ public Target setCapabilities(Object o)
+ {
+ getFields()[FIELD_CAPABILITIES] = o;
return this;
}
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/TransferFrame.java (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/TransferFrame.java)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/TransferFrame.java?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/TransferFrame.java&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/TransferFrame.java&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/TransferFrame.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/TransferFrame.java Wed Aug 21 16:05:34 2013
@@ -18,15 +18,15 @@
*
*/
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class TransferFrame extends Frame
+public class TransferFrame extends ListDescribedType
{
private static final Symbol DESCRIPTOR = Symbol.valueOf("amqp:transfer:list");
Copied: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/generate-frames.xsl (from r1511290, qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/generate-frames.xsl)
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/generate-frames.xsl?p2=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/generate-frames.xsl&p1=qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/generate-frames.xsl&r1=1511290&r2=1516195&rev=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/frames/generate-frames.xsl (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/describedtypes/generate-frames.xsl Wed Aug 21 16:05:34 2013
@@ -30,15 +30,24 @@
</xsl:variable>
<xsl:for-each select="descendant-or-self::node()[name()='type']">
- <xsl:variable name="classname"><xsl:call-template name="dashToCamel"><xsl:with-param name="input" select="@name"/></xsl:call-template>Frame</xsl:variable>
<xsl:if test="@provides = 'frame' or @provides = 'sasl-frame'">
+ <xsl:variable name="classname"><xsl:call-template name="dashToCamel"><xsl:with-param name="input" select="@name"/></xsl:call-template>Frame</xsl:variable>
+
<xsl:call-template name="typeClass">
<xsl:with-param name="license" select="$license"/>
<xsl:with-param name="classname" select="$classname"/>
</xsl:call-template>
</xsl:if>
+ <xsl:if test="@provides = 'delivery-state, outcome' or @provides = 'source' or @provides = 'target'">
+ <xsl:variable name="classname"><xsl:call-template name="dashToCamel"><xsl:with-param name="input" select="@name"/></xsl:call-template></xsl:variable>
+
+ <xsl:call-template name="typeClass">
+ <xsl:with-param name="license" select="$license"/>
+ <xsl:with-param name="classname" select="$classname"/>
+ </xsl:call-template>
+ </xsl:if>
</xsl:for-each>
</xsl:template>
@@ -50,15 +59,15 @@
<xsl:param name="classname"/>
<exsl:document href="{$classname}.java" method="text">
<xsl:value-of select="$license"/>
-package org.apache.qpid.jms.test.testpeer.frames;
+package org.apache.qpid.jms.test.testpeer.describedtypes;
-import org.apache.qpid.jms.test.testpeer.Frame;
+import org.apache.qpid.jms.test.testpeer.ListDescribedType;
import org.apache.qpid.proton.amqp.Symbol;
/**
* Generated by generate-frames.xsl, which resides in this package.
*/
-public class <xsl:value-of select="$classname"/> extends Frame
+public class <xsl:value-of select="$classname"/> extends ListDescribedType
{
private static final Symbol DESCRIPTOR = Symbol.valueOf("<xsl:value-of select="descendant::node()[name()='descriptor']/@name"/>");
<xsl:for-each select="descendant::node()[name()='field']">
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java?rev=1516195&r1=1516194&r2=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java Wed Aug 21 16:05:34 2013
@@ -149,5 +149,75 @@ public class AttachMatcher extends Frame
return this;
}
+ public Object getReceivedName()
+ {
+ return getReceivedFields().get(FIELD_NAME);
+ }
+
+ public Object getReceivedHandle()
+ {
+ return getReceivedFields().get(FIELD_HANDLE);
+ }
+
+ public Object getReceivedRole()
+ {
+ return getReceivedFields().get(FIELD_ROLE);
+ }
+
+ public Object getReceivedSndSettleMode()
+ {
+ return getReceivedFields().get(FIELD_SND_SETTLE_MODE);
+ }
+
+ public Object getReceivedRcvSettleMode()
+ {
+ return getReceivedFields().get(FIELD_RCV_SETTLE_MODE);
+ }
+
+ public Object getReceivedSource()
+ {
+ return getReceivedFields().get(FIELD_SOURCE);
+ }
+
+ public Object getReceivedTarget()
+ {
+ return getReceivedFields().get(FIELD_TARGET);
+ }
+
+ public Object getReceivedUnsettled()
+ {
+ return getReceivedFields().get(FIELD_UNSETTLED);
+ }
+
+ public Object getReceivedIncompleteUnsettled()
+ {
+ return getReceivedFields().get(FIELD_INCOMPLETE_UNSETTLED);
+ }
+
+ public Object getReceivedInitialDeliveryCount()
+ {
+ return getReceivedFields().get(FIELD_INITIAL_DELIVERY_COUNT);
+ }
+
+ public Object getReceivedMaxMessageSize()
+ {
+ return getReceivedFields().get(FIELD_MAX_MESSAGE_SIZE);
+ }
+
+ public Object getReceivedOfferedCapabilities()
+ {
+ return getReceivedFields().get(FIELD_OFFERED_CAPABILITIES);
+ }
+
+ public Object getReceivedDesiredCapabilities()
+ {
+ return getReceivedFields().get(FIELD_DESIRED_CAPABILITIES);
+ }
+
+ public Object getReceivedProperties()
+ {
+ return getReceivedFields().get(FIELD_PROPERTIES);
+ }
+
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java?rev=1516195&r1=1516194&r2=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java Wed Aug 21 16:05:34 2013
@@ -107,5 +107,45 @@ public class BeginMatcher extends FrameW
return this;
}
+ public Object getReceivedRemoteChannel()
+ {
+ return getReceivedFields().get(FIELD_REMOTE_CHANNEL);
+ }
+
+ public Object getReceivedNextOutgoingId()
+ {
+ return getReceivedFields().get(FIELD_NEXT_OUTGOING_ID);
+ }
+
+ public Object getReceivedIncomingWindow()
+ {
+ return getReceivedFields().get(FIELD_INCOMING_WINDOW);
+ }
+
+ public Object getReceivedOutgoingWindow()
+ {
+ return getReceivedFields().get(FIELD_OUTGOING_WINDOW);
+ }
+
+ public Object getReceivedHandleMax()
+ {
+ return getReceivedFields().get(FIELD_HANDLE_MAX);
+ }
+
+ public Object getReceivedOfferedCapabilities()
+ {
+ return getReceivedFields().get(FIELD_OFFERED_CAPABILITIES);
+ }
+
+ public Object getReceivedDesiredCapabilities()
+ {
+ return getReceivedFields().get(FIELD_DESIRED_CAPABILITIES);
+ }
+
+ public Object getReceivedProperties()
+ {
+ return getReceivedFields().get(FIELD_PROPERTIES);
+ }
+
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java?rev=1516195&r1=1516194&r2=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java Wed Aug 21 16:05:34 2013
@@ -58,5 +58,10 @@ public class CloseMatcher extends FrameW
return this;
}
+ public Object getReceivedError()
+ {
+ return getReceivedFields().get(FIELD_ERROR);
+ }
+
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java?rev=1516195&r1=1516194&r2=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java Wed Aug 21 16:05:34 2013
@@ -72,5 +72,20 @@ public class DetachMatcher extends Frame
return this;
}
+ public Object getReceivedHandle()
+ {
+ return getReceivedFields().get(FIELD_HANDLE);
+ }
+
+ public Object getReceivedClosed()
+ {
+ return getReceivedFields().get(FIELD_CLOSED);
+ }
+
+ public Object getReceivedError()
+ {
+ return getReceivedFields().get(FIELD_ERROR);
+ }
+
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java?rev=1516195&r1=1516194&r2=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java Wed Aug 21 16:05:34 2013
@@ -93,5 +93,35 @@ public class DispositionMatcher extends
return this;
}
+ public Object getReceivedRole()
+ {
+ return getReceivedFields().get(FIELD_ROLE);
+ }
+
+ public Object getReceivedFirst()
+ {
+ return getReceivedFields().get(FIELD_FIRST);
+ }
+
+ public Object getReceivedLast()
+ {
+ return getReceivedFields().get(FIELD_LAST);
+ }
+
+ public Object getReceivedSettled()
+ {
+ return getReceivedFields().get(FIELD_SETTLED);
+ }
+
+ public Object getReceivedState()
+ {
+ return getReceivedFields().get(FIELD_STATE);
+ }
+
+ public Object getReceivedBatchable()
+ {
+ return getReceivedFields().get(FIELD_BATCHABLE);
+ }
+
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java?rev=1516195&r1=1516194&r2=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java Wed Aug 21 16:05:34 2013
@@ -58,5 +58,10 @@ public class EndMatcher extends FrameWit
return this;
}
+ public Object getReceivedError()
+ {
+ return getReceivedFields().get(FIELD_ERROR);
+ }
+
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java?rev=1516195&r1=1516194&r2=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java Wed Aug 21 16:05:34 2013
@@ -128,5 +128,60 @@ public class FlowMatcher extends FrameWi
return this;
}
+ public Object getReceivedNextIncomingId()
+ {
+ return getReceivedFields().get(FIELD_NEXT_INCOMING_ID);
+ }
+
+ public Object getReceivedIncomingWindow()
+ {
+ return getReceivedFields().get(FIELD_INCOMING_WINDOW);
+ }
+
+ public Object getReceivedNextOutgoingId()
+ {
+ return getReceivedFields().get(FIELD_NEXT_OUTGOING_ID);
+ }
+
+ public Object getReceivedOutgoingWindow()
+ {
+ return getReceivedFields().get(FIELD_OUTGOING_WINDOW);
+ }
+
+ public Object getReceivedHandle()
+ {
+ return getReceivedFields().get(FIELD_HANDLE);
+ }
+
+ public Object getReceivedDeliveryCount()
+ {
+ return getReceivedFields().get(FIELD_DELIVERY_COUNT);
+ }
+
+ public Object getReceivedLinkCredit()
+ {
+ return getReceivedFields().get(FIELD_LINK_CREDIT);
+ }
+
+ public Object getReceivedAvailable()
+ {
+ return getReceivedFields().get(FIELD_AVAILABLE);
+ }
+
+ public Object getReceivedDrain()
+ {
+ return getReceivedFields().get(FIELD_DRAIN);
+ }
+
+ public Object getReceivedEcho()
+ {
+ return getReceivedFields().get(FIELD_ECHO);
+ }
+
+ public Object getReceivedProperties()
+ {
+ return getReceivedFields().get(FIELD_PROPERTIES);
+ }
+
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java?rev=1516195&r1=1516194&r2=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java Wed Aug 21 16:05:34 2013
@@ -121,5 +121,55 @@ public class OpenMatcher extends FrameWi
return this;
}
+ public Object getReceivedContainerId()
+ {
+ return getReceivedFields().get(FIELD_CONTAINER_ID);
+ }
+
+ public Object getReceivedHostname()
+ {
+ return getReceivedFields().get(FIELD_HOSTNAME);
+ }
+
+ public Object getReceivedMaxFrameSize()
+ {
+ return getReceivedFields().get(FIELD_MAX_FRAME_SIZE);
+ }
+
+ public Object getReceivedChannelMax()
+ {
+ return getReceivedFields().get(FIELD_CHANNEL_MAX);
+ }
+
+ public Object getReceivedIdleTimeOut()
+ {
+ return getReceivedFields().get(FIELD_IDLE_TIME_OUT);
+ }
+
+ public Object getReceivedOutgoingLocales()
+ {
+ return getReceivedFields().get(FIELD_OUTGOING_LOCALES);
+ }
+
+ public Object getReceivedIncomingLocales()
+ {
+ return getReceivedFields().get(FIELD_INCOMING_LOCALES);
+ }
+
+ public Object getReceivedOfferedCapabilities()
+ {
+ return getReceivedFields().get(FIELD_OFFERED_CAPABILITIES);
+ }
+
+ public Object getReceivedDesiredCapabilities()
+ {
+ return getReceivedFields().get(FIELD_DESIRED_CAPABILITIES);
+ }
+
+ public Object getReceivedProperties()
+ {
+ return getReceivedFields().get(FIELD_PROPERTIES);
+ }
+
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java?rev=1516195&r1=1516194&r2=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java Wed Aug 21 16:05:34 2013
@@ -58,5 +58,10 @@ public class SaslChallengeMatcher extend
return this;
}
+ public Object getReceivedChallenge()
+ {
+ return getReceivedFields().get(FIELD_CHALLENGE);
+ }
+
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java?rev=1516195&r1=1516194&r2=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java Wed Aug 21 16:05:34 2013
@@ -72,5 +72,20 @@ public class SaslInitMatcher extends Fra
return this;
}
+ public Object getReceivedMechanism()
+ {
+ return getReceivedFields().get(FIELD_MECHANISM);
+ }
+
+ public Object getReceivedInitialResponse()
+ {
+ return getReceivedFields().get(FIELD_INITIAL_RESPONSE);
+ }
+
+ public Object getReceivedHostname()
+ {
+ return getReceivedFields().get(FIELD_HOSTNAME);
+ }
+
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java?rev=1516195&r1=1516194&r2=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java Wed Aug 21 16:05:34 2013
@@ -58,5 +58,10 @@ public class SaslMechanismsMatcher exten
return this;
}
+ public Object getReceivedSaslServerMechanisms()
+ {
+ return getReceivedFields().get(FIELD_SASL_SERVER_MECHANISMS);
+ }
+
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java?rev=1516195&r1=1516194&r2=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java Wed Aug 21 16:05:34 2013
@@ -65,5 +65,15 @@ public class SaslOutcomeMatcher extends
return this;
}
+ public Object getReceivedCode()
+ {
+ return getReceivedFields().get(FIELD_CODE);
+ }
+
+ public Object getReceivedAdditionalData()
+ {
+ return getReceivedFields().get(FIELD_ADDITIONAL_DATA);
+ }
+
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java?rev=1516195&r1=1516194&r2=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java Wed Aug 21 16:05:34 2013
@@ -58,5 +58,10 @@ public class SaslResponseMatcher extends
return this;
}
+ public Object getReceivedResponse()
+ {
+ return getReceivedFields().get(FIELD_RESPONSE);
+ }
+
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java?rev=1516195&r1=1516194&r2=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java Wed Aug 21 16:05:34 2013
@@ -24,13 +24,13 @@ 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;
-import org.apache.qpid.jms.test.testpeer.FrameWithNoPayloadMatchingHandler;
+import org.apache.qpid.jms.test.testpeer.FrameWithPayloadMatchingHandler;
import org.hamcrest.Matcher;
/**
* Generated by generate-matchers.xsl, which resides in this package.
*/
-public class TransferMatcher extends FrameWithNoPayloadMatchingHandler
+public class TransferMatcher extends FrameWithPayloadMatchingHandler
{
private static final int FIELD_HANDLE = 0;
@@ -128,5 +128,60 @@ public class TransferMatcher extends Fra
return this;
}
+ public Object getReceivedHandle()
+ {
+ return getReceivedFields().get(FIELD_HANDLE);
+ }
+
+ public Object getReceivedDeliveryId()
+ {
+ return getReceivedFields().get(FIELD_DELIVERY_ID);
+ }
+
+ public Object getReceivedDeliveryTag()
+ {
+ return getReceivedFields().get(FIELD_DELIVERY_TAG);
+ }
+
+ public Object getReceivedMessageFormat()
+ {
+ return getReceivedFields().get(FIELD_MESSAGE_FORMAT);
+ }
+
+ public Object getReceivedSettled()
+ {
+ return getReceivedFields().get(FIELD_SETTLED);
+ }
+
+ public Object getReceivedMore()
+ {
+ return getReceivedFields().get(FIELD_MORE);
+ }
+
+ public Object getReceivedRcvSettleMode()
+ {
+ return getReceivedFields().get(FIELD_RCV_SETTLE_MODE);
+ }
+
+ public Object getReceivedState()
+ {
+ return getReceivedFields().get(FIELD_STATE);
+ }
+
+ public Object getReceivedResume()
+ {
+ return getReceivedFields().get(FIELD_RESUME);
+ }
+
+ public Object getReceivedAborted()
+ {
+ return getReceivedFields().get(FIELD_ABORTED);
+ }
+
+ public Object getReceivedBatchable()
+ {
+ return getReceivedFields().get(FIELD_BATCHABLE);
+ }
+
}
Modified: qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl
URL: http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl?rev=1516195&r1=1516194&r2=1516195&view=diff
==============================================================================
--- qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl (original)
+++ qpid/jms/trunk/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl Wed Aug 21 16:05:34 2013
@@ -31,11 +31,18 @@
<xsl:for-each select="descendant-or-self::node()[name()='type']">
<xsl:variable name="classname"><xsl:call-template name="dashToCamel"><xsl:with-param name="input" select="@name"/></xsl:call-template>Matcher</xsl:variable>
+ <xsl:variable name="superclass">
+ <xsl:choose>
+ <xsl:when test="@name = 'transfer'">FrameWithPayloadMatchingHandler</xsl:when>
+ <xsl:otherwise>FrameWithNoPayloadMatchingHandler</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
<xsl:if test="@provides = 'frame' or @provides = 'sasl-frame'">
<xsl:call-template name="typeClass">
<xsl:with-param name="license" select="$license"/>
<xsl:with-param name="classname" select="$classname"/>
+ <xsl:with-param name="superclass" select="$superclass"/>
</xsl:call-template>
</xsl:if>
@@ -48,6 +55,7 @@
<xsl:template name="typeClass">
<xsl:param name="license"/>
<xsl:param name="classname"/>
+ <xsl:param name="superclass"/>
<exsl:document href="{$classname}.java" method="text">
<xsl:value-of select="$license"/>
package org.apache.qpid.jms.test.testpeer.matchers;
@@ -56,13 +64,13 @@ 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;
-import org.apache.qpid.jms.test.testpeer.FrameWithNoPayloadMatchingHandler;
+import org.apache.qpid.jms.test.testpeer.<xsl:value-of select="$superclass"/>;
import org.hamcrest.Matcher;
/**
* Generated by generate-matchers.xsl, which resides in this package.
*/
-public class <xsl:value-of select="$classname"/> extends FrameWithNoPayloadMatchingHandler
+public class <xsl:value-of select="$classname"/> extends <xsl:value-of select="$superclass"/>
{
<xsl:for-each select="descendant::node()[name()='field']">
private static final int FIELD_<xsl:call-template name="toUpperDashToUnderscore"><xsl:with-param name="input" select="@name"/></xsl:call-template> = <xsl:value-of select="count(preceding-sibling::node()[name()='field'])"/>;</xsl:for-each>
@@ -90,6 +98,12 @@ public class <xsl:value-of select="$clas
return this;
}
</xsl:for-each>
+<xsl:for-each select="descendant::node()[name()='field']">
+ public Object getReceived<xsl:call-template name="dashToCamel"><xsl:with-param name="input" select="@name"/></xsl:call-template>()
+ {
+ return getReceivedFields().get(FIELD_<xsl:call-template name="toUpperDashToUnderscore"><xsl:with-param name="input" select="@name"/></xsl:call-template>);
+ }
+</xsl:for-each>
}
</exsl:document>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org