Author: robbie
Date: Mon May 12 11:38:45 2014
New Revision: 1593931
URL: http://svn.apache.org/r1593931
Log:
QPIDJMS-18: make order of constructor args consistent
Modified:
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpBytesMessage.java
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpMapMessage.java
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpMessageFactory.java
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpObjectMessage.java
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpSerializedObjectMessage.java
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpTextMessage.java
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/engine/AmqpBytesMessageTest.java
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/engine/AmqpTextMessageTest.java
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/impl/BytesMessageImplTest.java
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/impl/TextMessageImplTest.java
Modified:
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpBytesMessage.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpBytesMessage.java?rev=1593931&r1=1593930&r2=1593931&view=diff
==============================================================================
---
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpBytesMessage.java
(original)
+++
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpBytesMessage.java
Mon May 12 11:38:45 2014
@@ -41,7 +41,7 @@ public class AmqpBytesMessage extends Am
}
//message just received
- public AmqpBytesMessage(Delivery delivery, Message message, AmqpConnection
amqpConnection)
+ public AmqpBytesMessage(Message message, Delivery delivery, AmqpConnection
amqpConnection)
{
super(message, delivery, amqpConnection);
}
Modified:
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpMapMessage.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpMapMessage.java?rev=1593931&r1=1593930&r2=1593931&view=diff
==============================================================================
--- qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpMapMessage.java
(original)
+++ qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpMapMessage.java
Mon May 12 11:38:45 2014
@@ -28,7 +28,7 @@ public class AmqpMapMessage extends Amqp
super();
}
- public AmqpMapMessage(Delivery delivery, Message message, AmqpConnection
amqpConnection)
+ public AmqpMapMessage(Message message, Delivery delivery, AmqpConnection
amqpConnection)
{
super(message, delivery, amqpConnection);
}
Modified:
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpMessageFactory.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpMessageFactory.java?rev=1593931&r1=1593930&r2=1593931&view=diff
==============================================================================
---
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpMessageFactory.java
(original)
+++
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpMessageFactory.java
Mon May 12 11:38:45 2014
@@ -38,7 +38,7 @@ public class AmqpMessageFactory
{
if(isContentType(AmqpTextMessage.CONTENT_TYPE, message))
{
- return new AmqpTextMessage(delivery, message, amqpConnection);
+ return new AmqpTextMessage(message, delivery, amqpConnection);
}
else if(isContentType(AmqpSerializedObjectMessage.CONTENT_TYPE,
message))
{
@@ -46,18 +46,18 @@ public class AmqpMessageFactory
}
else if(isContentType(AmqpBytesMessage.CONTENT_TYPE, message) ||
isContentType(null, message))
{
- return new AmqpBytesMessage(delivery, message, amqpConnection);
+ return new AmqpBytesMessage(message, delivery, amqpConnection);
}
}
else if(body instanceof Data)
{
if(isContentType(AmqpTextMessage.CONTENT_TYPE, message))
{
- return new AmqpTextMessage(delivery, message, amqpConnection);
+ return new AmqpTextMessage(message, delivery, amqpConnection);
}
else if(isContentType(AmqpBytesMessage.CONTENT_TYPE, message) ||
isContentType(null, message))
{
- return new AmqpBytesMessage(delivery, message, amqpConnection);
+ return new AmqpBytesMessage(message, delivery, amqpConnection);
}
else if(isContentType(AmqpSerializedObjectMessage.CONTENT_TYPE,
message))
{
@@ -70,11 +70,11 @@ public class AmqpMessageFactory
if(value == null || value instanceof String)
{
- return new AmqpTextMessage(delivery, message, amqpConnection);
+ return new AmqpTextMessage(message, delivery, amqpConnection);
}
else if(value instanceof Map)
{
- return new AmqpMapMessage(delivery, message, amqpConnection);
+ return new AmqpMapMessage(message, delivery, amqpConnection);
}
else if(value instanceof List)
{
@@ -82,7 +82,7 @@ public class AmqpMessageFactory
}
else if(value instanceof Binary)
{
- return new AmqpBytesMessage(delivery, message, amqpConnection);
+ return new AmqpBytesMessage(message, delivery, amqpConnection);
}
}
else
Modified:
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpObjectMessage.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpObjectMessage.java?rev=1593931&r1=1593930&r2=1593931&view=diff
==============================================================================
---
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpObjectMessage.java
(original)
+++
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpObjectMessage.java
Mon May 12 11:38:45 2014
@@ -31,7 +31,7 @@ public abstract class AmqpObjectMessage
super();
}
- public AmqpObjectMessage(Delivery delivery, Message message,
AmqpConnection amqpConnection)
+ public AmqpObjectMessage(Message message, Delivery delivery,
AmqpConnection amqpConnection)
{
super(message, delivery, amqpConnection);
}
Modified:
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpSerializedObjectMessage.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpSerializedObjectMessage.java?rev=1593931&r1=1593930&r2=1593931&view=diff
==============================================================================
---
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpSerializedObjectMessage.java
(original)
+++
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpSerializedObjectMessage.java
Mon May 12 11:38:45 2014
@@ -45,7 +45,7 @@ public class AmqpSerializedObjectMessage
public AmqpSerializedObjectMessage(Delivery delivery, Message message,
AmqpConnection amqpConnection)
{
- super(delivery, message, amqpConnection);
+ super(message, delivery, amqpConnection);
}
/**
Modified:
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpTextMessage.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpTextMessage.java?rev=1593931&r1=1593930&r2=1593931&view=diff
==============================================================================
---
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpTextMessage.java
(original)
+++
qpid/jms/trunk/src/main/java/org/apache/qpid/jms/engine/AmqpTextMessage.java
Mon May 12 11:38:45 2014
@@ -52,7 +52,7 @@ public class AmqpTextMessage extends Amq
setText(null);
}
- public AmqpTextMessage(Delivery delivery, Message message, AmqpConnection
amqpConnection)
+ public AmqpTextMessage(Message message, Delivery delivery, AmqpConnection
amqpConnection)
{
super(message, delivery, amqpConnection);
}
Modified:
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/engine/AmqpBytesMessageTest.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/engine/AmqpBytesMessageTest.java?rev=1593931&r1=1593930&r2=1593931&view=diff
==============================================================================
---
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/engine/AmqpBytesMessageTest.java
(original)
+++
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/engine/AmqpBytesMessageTest.java
Mon May 12 11:38:45 2014
@@ -76,7 +76,7 @@ public class AmqpBytesMessageTest extend
public void
testGetInputStreamUsingReceivedMessageWithNoBodySectionReturnsEmptyInputStream()
throws Exception
{
Message message = Proton.message();
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
ByteArrayInputStream byteArrayInputStream =
amqpBytesMessage.getByteArrayInputStream();
assertNotNull(byteArrayInputStream);
@@ -126,7 +126,7 @@ public class AmqpBytesMessageTest extend
Message message = Proton.message();
int length = 5;
message.setBody(new Data(new Binary(new byte[length])));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
assertEquals("Message reports unexpected length", length,
amqpBytesMessage.getBytesLength());
}
@@ -137,7 +137,7 @@ public class AmqpBytesMessageTest extend
Message message = Proton.message();
int length = 10;
message.setBody(new AmqpValue(new Binary(new byte[length])));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
assertEquals("Message reports unexpected length", length,
amqpBytesMessage.getBytesLength());
}
@@ -147,7 +147,7 @@ public class AmqpBytesMessageTest extend
{
Message message = Proton.message();
message.setBody(new AmqpValue(null));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
assertEquals("Message reports unexpected length", 0,
amqpBytesMessage.getBytesLength());
}
@@ -160,7 +160,7 @@ public class AmqpBytesMessageTest extend
Message message = Proton.message();
message.setBody(new AmqpValue(new Binary(bytes)));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
ByteArrayInputStream bytesStream =
amqpBytesMessage.getByteArrayInputStream();
//retrieve the expected bytes, check they match
@@ -180,7 +180,7 @@ public class AmqpBytesMessageTest extend
Message message = Proton.message();
message.setBody(new Data(new Binary(bytes)));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
ByteArrayInputStream bytesStream =
amqpBytesMessage.getByteArrayInputStream();
assertNotNull(bytesStream);
@@ -199,7 +199,7 @@ public class AmqpBytesMessageTest extend
Message message = Proton.message();
message.setBody(new Data(null));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
ByteArrayInputStream bytesStream =
amqpBytesMessage.getByteArrayInputStream();
assertNotNull(bytesStream);
@@ -212,7 +212,7 @@ public class AmqpBytesMessageTest extend
{
Message message = Proton.message();
message.setBody(new AmqpSequence(new ArrayList<Object>()));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
try
{
@@ -240,7 +240,7 @@ public class AmqpBytesMessageTest extend
{
Message message = Proton.message();
message.setBody(new AmqpValue(true));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
try
{
@@ -322,7 +322,7 @@ public class AmqpBytesMessageTest extend
Message message = Proton.message();
message.setBody(new Data(new Binary(orig)));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
Message protonMessage = amqpBytesMessage.getMessage();
amqpBytesMessage.setBytes(replacement);
@@ -355,7 +355,7 @@ public class AmqpBytesMessageTest extend
Message message = Proton.message();
message.setBody(new AmqpValue(new Binary(orig)));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
Message protonMessage = amqpBytesMessage.getMessage();
amqpBytesMessage.setBytes(replacement);
@@ -372,7 +372,7 @@ public class AmqpBytesMessageTest extend
public void testConvertBodyToDataSectionIfNecessaryWithNullBody() throws
Exception
{
Message message = Proton.message();
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
Message protonMessage = amqpBytesMessage.getMessage();
assertNull("expected no body", protonMessage.getBody());
@@ -393,7 +393,7 @@ public class AmqpBytesMessageTest extend
{
Message message = Proton.message();
message.setBody(new AmqpValue(null));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
Message protonMessage = amqpBytesMessage.getMessage();
assertNotNull("expected body", protonMessage.getBody());
@@ -416,7 +416,7 @@ public class AmqpBytesMessageTest extend
Message message = Proton.message();
byte[] bytes = "asdjsdadad".getBytes();
message.setBody(new AmqpValue(new Binary(bytes)));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
Message protonMessage = amqpBytesMessage.getMessage();
assertNotNull("expected body", protonMessage.getBody());
@@ -443,7 +443,7 @@ public class AmqpBytesMessageTest extend
Data origBody = new Data(new Binary(bytes));
message.setBody(origBody);
message.setContentType(AmqpBytesMessage.CONTENT_TYPE);
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
Message protonMessage = amqpBytesMessage.getMessage();
amqpBytesMessage.convertBodyToDataSectionIfNecessary();
@@ -462,7 +462,7 @@ public class AmqpBytesMessageTest extend
{
Message message = Proton.message();
message.setBody(new AmqpValue(new ArrayList<Object>()));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
try
{
@@ -484,7 +484,7 @@ public class AmqpBytesMessageTest extend
{
Message message = Proton.message();
message.setBody(new AmqpSequence(new ArrayList<Object>()));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
try
{
Modified:
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/engine/AmqpTextMessageTest.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/engine/AmqpTextMessageTest.java?rev=1593931&r1=1593930&r2=1593931&view=diff
==============================================================================
---
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/engine/AmqpTextMessageTest.java
(original)
+++
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/engine/AmqpTextMessageTest.java
Mon May 12 11:38:45 2014
@@ -92,7 +92,7 @@ public class AmqpTextMessageTest extends
public void testGetTextUsingReceivedMessageWithNoBodySectionReturnsNull()
throws Exception
{
Message message = Proton.message();
- AmqpTextMessage amqpTextMessage = new AmqpTextMessage(_mockDelivery,
message, _mockAmqpConnection);
+ AmqpTextMessage amqpTextMessage = new AmqpTextMessage(message,
_mockDelivery, _mockAmqpConnection);
assertNull("expected null string", amqpTextMessage.getText());
}
@@ -105,7 +105,7 @@ public class AmqpTextMessageTest extends
Message message = Proton.message();
message.setBody(new AmqpValue(text));
- AmqpTextMessage amqpTextMessage = new AmqpTextMessage(_mockDelivery,
message, _mockAmqpConnection);
+ AmqpTextMessage amqpTextMessage = new AmqpTextMessage(message,
_mockDelivery, _mockAmqpConnection);
assertEquals(text, amqpTextMessage.getText());
}
@@ -116,7 +116,7 @@ public class AmqpTextMessageTest extends
Message message = Proton.message();
message.setBody(new AmqpValue(null));
- AmqpTextMessage amqpTextMessage = new AmqpTextMessage(_mockDelivery,
message, _mockAmqpConnection);
+ AmqpTextMessage amqpTextMessage = new AmqpTextMessage(message,
_mockDelivery, _mockAmqpConnection);
assertNull("expected null string", amqpTextMessage.getText());
}
@@ -130,7 +130,7 @@ public class AmqpTextMessageTest extends
//This shouldn't happen with actual received messages, since Data
sections can't really
//have a null value in them, they would have an empty byte array, but
just in case...
- AmqpTextMessage amqpTextMessage = new AmqpTextMessage(_mockDelivery,
message, _mockAmqpConnection);
+ AmqpTextMessage amqpTextMessage = new AmqpTextMessage(message,
_mockDelivery, _mockAmqpConnection);
assertEquals("expected zero-length string", "",
amqpTextMessage.getText());
}
@@ -147,7 +147,7 @@ public class AmqpTextMessageTest extends
Message message = Proton.message();
int decoded = message.decode(b.getArray(), b.getArrayOffset(),
b.getLength());
assertEquals(decoded, b.getLength());
- AmqpTextMessage amqpTextMessage = new AmqpTextMessage(_mockDelivery,
message, _mockAmqpConnection);
+ AmqpTextMessage amqpTextMessage = new AmqpTextMessage(message,
_mockDelivery, _mockAmqpConnection);
assertEquals("expected zero-length string", "",
amqpTextMessage.getText());
}
@@ -167,7 +167,7 @@ public class AmqpTextMessageTest extends
Message message = Proton.message();
int decoded = message.decode(b.getArray(), b.getArrayOffset(),
b.getLength());
assertEquals(decoded, b.getLength());
- AmqpTextMessage amqpTextMessage = new AmqpTextMessage(_mockDelivery,
message, _mockAmqpConnection);
+ AmqpTextMessage amqpTextMessage = new AmqpTextMessage(message,
_mockDelivery, _mockAmqpConnection);
assertEquals(encodedString, amqpTextMessage.getText());
}
@@ -177,7 +177,7 @@ public class AmqpTextMessageTest extends
{
Message message = Proton.message();
message.setBody(new AmqpSequence(new ArrayList<Object>()));
- AmqpTextMessage amqpTextMessage = new AmqpTextMessage(_mockDelivery,
message, _mockAmqpConnection);
+ AmqpTextMessage amqpTextMessage = new AmqpTextMessage(message,
_mockDelivery, _mockAmqpConnection);
try
{
@@ -195,7 +195,7 @@ public class AmqpTextMessageTest extends
{
Message message = Proton.message();
message.setBody(new AmqpValue(true));
- AmqpTextMessage amqpTextMessage = new AmqpTextMessage(_mockDelivery,
message, _mockAmqpConnection);
+ AmqpTextMessage amqpTextMessage = new AmqpTextMessage(message,
_mockDelivery, _mockAmqpConnection);
try
{
Modified:
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/impl/BytesMessageImplTest.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/impl/BytesMessageImplTest.java?rev=1593931&r1=1593930&r2=1593931&view=diff
==============================================================================
---
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/impl/BytesMessageImplTest.java
(original)
+++
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/impl/BytesMessageImplTest.java
Mon May 12 11:38:45 2014
@@ -81,7 +81,7 @@ public class BytesMessageImplTest extend
public void testGetBodyLengthUsingReceivedMessageWithNoBodySection()
throws Exception
{
Message message = Proton.message();
- AmqpBytesMessage testAmqpMessage = new AmqpBytesMessage(_mockDelivery,
message, _mockAmqpConnection);
+ AmqpBytesMessage testAmqpMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
BytesMessageImpl bytesMessageImpl = new
BytesMessageImpl(testAmqpMessage, _mockSessionImpl,_mockConnectionImpl, null);
assertEquals(0, bytesMessageImpl.getBodyLength());
@@ -127,7 +127,7 @@ public class BytesMessageImplTest extend
public void testReadBytesUsingReceivedMessageWithNoBodySectionReturnsEOS()
throws Exception
{
Message message = Proton.message();
- AmqpBytesMessage testAmqpMessage = new AmqpBytesMessage(_mockDelivery,
message, _mockAmqpConnection);
+ AmqpBytesMessage testAmqpMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
BytesMessageImpl bytesMessageImpl = new
BytesMessageImpl(testAmqpMessage, _mockSessionImpl,_mockConnectionImpl, null);
//verify attempting to read bytes returns -1, i.e EOS
@@ -142,7 +142,7 @@ public class BytesMessageImplTest extend
Message message = Proton.message();
message.setBody(new Data(new Binary(bytes)));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
BytesMessageImpl bytesMessageImpl = new
BytesMessageImpl(amqpBytesMessage, _mockSessionImpl,_mockConnectionImpl, null);
//retrieve the expected bytes, check they match
@@ -164,7 +164,7 @@ public class BytesMessageImplTest extend
Message message = Proton.message();
message.setBody(new AmqpValue(new Binary(bytes)));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
BytesMessageImpl bytesMessageImpl = new
BytesMessageImpl(amqpBytesMessage, _mockSessionImpl,_mockConnectionImpl, null);
//retrieve the expected bytes, check they match
@@ -190,7 +190,7 @@ public class BytesMessageImplTest extend
Message message = Proton.message();
message.setBody(new AmqpValue(new Binary(bytes)));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
BytesMessageImpl bytesMessageImpl = new
BytesMessageImpl(amqpBytesMessage, _mockSessionImpl,_mockConnectionImpl, null);
try
@@ -238,7 +238,7 @@ public class BytesMessageImplTest extend
Message message = Proton.message();
message.setBody(new AmqpValue(new Binary(bytes)));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
BytesMessageImpl bytesMessageImpl = new
BytesMessageImpl(amqpBytesMessage, _mockSessionImpl,_mockConnectionImpl, null);
assertFalse("Message should not be writable",
bytesMessageImpl.isBodyWritable());
@@ -260,7 +260,7 @@ public class BytesMessageImplTest extend
Message message = Proton.message();
message.setBody(new AmqpValue(new Binary(bytes)));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
BytesMessageImpl bytesMessageImpl = new
BytesMessageImpl(amqpBytesMessage, _mockSessionImpl,_mockConnectionImpl, null);
assertNotNull("Expected body section but none was present",
message.getBody());
@@ -290,7 +290,7 @@ public class BytesMessageImplTest extend
Message message = Proton.message();
message.setBody(new Data(new Binary(bytes)));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
BytesMessageImpl bytesMessageImpl = new
BytesMessageImpl(amqpBytesMessage, _mockSessionImpl,_mockConnectionImpl, null);
assertEquals("Unexpected message length", bytes.length,
bytesMessageImpl.getBodyLength());
@@ -320,7 +320,7 @@ public class BytesMessageImplTest extend
Message message = Proton.message();
message.setBody(new AmqpValue(new Binary(bytes)));
- AmqpBytesMessage amqpBytesMessage = new
AmqpBytesMessage(_mockDelivery, message, _mockAmqpConnection);
+ AmqpBytesMessage amqpBytesMessage = new AmqpBytesMessage(message,
_mockDelivery, _mockAmqpConnection);
BytesMessageImpl bytesMessageImpl = new
BytesMessageImpl(amqpBytesMessage, _mockSessionImpl,_mockConnectionImpl, null);
//retrieve a few bytes, check they match the first few expected bytes
Modified:
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/impl/TextMessageImplTest.java
URL:
http://svn.apache.org/viewvc/qpid/jms/trunk/src/test/java/org/apache/qpid/jms/impl/TextMessageImplTest.java?rev=1593931&r1=1593930&r2=1593931&view=diff
==============================================================================
---
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/impl/TextMessageImplTest.java
(original)
+++
qpid/jms/trunk/src/test/java/org/apache/qpid/jms/impl/TextMessageImplTest.java
Mon May 12 11:38:45 2014
@@ -85,7 +85,7 @@ public class TextMessageImplTest extends
public void testGetTextWithReceivedMessageNoBodySectionReturnsNull()
throws Exception
{
Message message = Proton.message();
- AmqpTextMessage testAmqpMessage1 = new AmqpTextMessage(_mockDelivery,
message, _mockAmqpConnection);
+ AmqpTextMessage testAmqpMessage1 = new AmqpTextMessage(message,
_mockDelivery, _mockAmqpConnection);
TextMessageImpl textMessageImpl = new
TextMessageImpl(testAmqpMessage1, _mockSessionImpl,_mockConnectionImpl, null);
assertNull("expected null string", textMessageImpl.getText());
@@ -97,7 +97,7 @@ public class TextMessageImplTest extends
Message message = Proton.message();
String value = "myAmqpValueString";
message.setBody(new AmqpValue(value));
- AmqpTextMessage testAmqpMessage1 = new AmqpTextMessage(_mockDelivery,
message, _mockAmqpConnection);
+ AmqpTextMessage testAmqpMessage1 = new AmqpTextMessage(message,
_mockDelivery, _mockAmqpConnection);
TextMessageImpl textMessageImpl = new
TextMessageImpl(testAmqpMessage1, _mockSessionImpl,_mockConnectionImpl, null);
assertEquals(value, textMessageImpl.getText());
@@ -137,7 +137,7 @@ public class TextMessageImplTest extends
Message message = Proton.message();
message.setBody(new AmqpValue("originalContent"));
- AmqpTextMessage amqpTextMessage = new AmqpTextMessage(_mockDelivery,
message, _mockAmqpConnection);
+ AmqpTextMessage amqpTextMessage = new AmqpTextMessage(message,
_mockDelivery, _mockAmqpConnection);
TextMessageImpl textMessageImpl = new TextMessageImpl(amqpTextMessage,
_mockSessionImpl,_mockConnectionImpl, null);
if(clearBody)
@@ -184,7 +184,7 @@ public class TextMessageImplTest extends
message.setBody(new Data(new Binary(encodedBytes)));
message.setContentType(AmqpTextMessage.CONTENT_TYPE);
- AmqpTextMessage amqpTextMessage = new AmqpTextMessage(_mockDelivery,
message, _mockAmqpConnection);
+ AmqpTextMessage amqpTextMessage = new AmqpTextMessage(message,
_mockDelivery, _mockAmqpConnection);
TextMessageImpl textMessageImpl = new TextMessageImpl(amqpTextMessage,
_mockSessionImpl,_mockConnectionImpl, null);
assertEquals("Expected content not returned", messageCotnent,
textMessageImpl.getText());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
