[jboss-cvs] JBoss Messaging SVN: r4525 - in trunk: src/main/org/jboss/messaging/jms/server/bridge and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 19 11:32:21 EDT 2008
Author: jmesnil
Date: 2008-06-19 11:32:20 -0400 (Thu, 19 Jun 2008)
New Revision: 4525
Modified:
trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java
trunk/src/main/org/jboss/messaging/jms/client/JMSMessageListenerWrapper.java
trunk/src/main/org/jboss/messaging/jms/server/bridge/Bridge.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/JMSExpirationHeaderTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageConsumerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageProducerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossObjectMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossQueueBrowserTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossSessionTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossTextMessageTest.java
Log:
renamed methods getDelegate() in JBossXXX classes which return ClientXXX object
removed unused methods
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java 2008-06-19 15:18:05 UTC (rev 4524)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java 2008-06-19 15:32:20 UTC (rev 4525)
@@ -321,12 +321,6 @@
JBossSession.TYPE_TOPIC_SESSION, cacheProducers);
}
-
- public ClientConnection getConnection()
- {
- return connection;
- }
-
public String toString()
{
return "JBossConnection->" + connection;
Modified: trunk/src/main/org/jboss/messaging/jms/client/JMSMessageListenerWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JMSMessageListenerWrapper.java 2008-06-19 15:18:05 UTC (rev 4524)
+++ trunk/src/main/org/jboss/messaging/jms/client/JMSMessageListenerWrapper.java 2008-06-19 15:32:20 UTC (rev 4525)
@@ -62,7 +62,7 @@
*/
public void onMessage(final ClientMessage message)
{
- JBossMessage jbm = JBossMessage.createMessage(message, session.getCoreSession());
+ JBossMessage jbm = JBossMessage.createMessage(message, session.getDelegate());
try
{
@@ -79,7 +79,7 @@
{
try
{
- session.getCoreSession().acknowledge();
+ session.getDelegate().acknowledge();
}
catch (MessagingException e)
{
@@ -101,7 +101,7 @@
{
try
{
- session.getCoreSession().rollback();
+ session.getDelegate().rollback();
session.setRecoverCalled(true);
}
@@ -117,9 +117,9 @@
try
{
//We don't want to call this if the connection/session was closed from inside onMessage
- if (!session.getCoreSession().isClosed())
+ if (!session.getDelegate().isClosed())
{
- session.getCoreSession().acknowledge();
+ session.getDelegate().acknowledge();
}
}
catch (MessagingException e)
Modified: trunk/src/main/org/jboss/messaging/jms/server/bridge/Bridge.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/bridge/Bridge.java 2008-06-19 15:18:05 UTC (rev 4524)
+++ trunk/src/main/org/jboss/messaging/jms/server/bridge/Bridge.java 2008-06-19 15:32:20 UTC (rev 4525)
@@ -991,7 +991,7 @@
{
JBossSession jsession = (JBossSession)sourceSession;
- org.jboss.messaging.core.client.ClientSession session = jsession.getCoreSession();
+ org.jboss.messaging.core.client.ClientSession session = jsession.getDelegate();
//session.setTreatAsNonTransactedWhenNotEnlisted(false);
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/JMSExpirationHeaderTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/JMSExpirationHeaderTest.java 2008-06-19 15:18:05 UTC (rev 4524)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/JMSExpirationHeaderTest.java 2008-06-19 15:32:20 UTC (rev 4525)
@@ -193,7 +193,7 @@
JBossMessage jbm = (JBossMessage)m;
- if (!jbm.getCoreMessage().isExpired())
+ if (!jbm.getDelegate().isExpired())
{
log.error("The message " + m + " should have expired");
testFailed = true;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java 2008-06-19 15:18:05 UTC (rev 4524)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java 2008-06-19 15:32:20 UTC (rev 4525)
@@ -113,7 +113,7 @@
boolean value = randomBoolean();
JBossBytesMessage message = new JBossBytesMessage();
- MessagingBuffer body = message.getCoreMessage().getBody();
+ MessagingBuffer body = message.getDelegate().getBody();
body.putBoolean(value);
message.reset();
@@ -147,7 +147,7 @@
byte value = randomByte();
JBossBytesMessage message = new JBossBytesMessage();
- MessagingBuffer body = message.getCoreMessage().getBody();
+ MessagingBuffer body = message.getDelegate().getBody();
body.putByte(value);
message.reset();
@@ -183,7 +183,7 @@
byte[] value = randomBytes();
JBossBytesMessage message = new JBossBytesMessage();
- MessagingBuffer body = message.getCoreMessage().getBody();
+ MessagingBuffer body = message.getDelegate().getBody();
body.putBytes(value);
message.reset();
@@ -218,7 +218,7 @@
short value = randomShort();
JBossBytesMessage message = new JBossBytesMessage();
- MessagingBuffer body = message.getCoreMessage().getBody();
+ MessagingBuffer body = message.getDelegate().getBody();
body.putShort(value);
message.reset();
@@ -252,7 +252,7 @@
char value = randomChar();
JBossBytesMessage message = new JBossBytesMessage();
- MessagingBuffer body = message.getCoreMessage().getBody();
+ MessagingBuffer body = message.getDelegate().getBody();
body.putChar(value);
message.reset();
@@ -286,7 +286,7 @@
int value = randomInt();
JBossBytesMessage message = new JBossBytesMessage();
- MessagingBuffer body = message.getCoreMessage().getBody();
+ MessagingBuffer body = message.getDelegate().getBody();
body.putInt(value);
message.reset();
@@ -320,7 +320,7 @@
long value = randomLong();
JBossBytesMessage message = new JBossBytesMessage();
- MessagingBuffer body = message.getCoreMessage().getBody();
+ MessagingBuffer body = message.getDelegate().getBody();
body.putLong(value);
message.reset();
@@ -354,7 +354,7 @@
float value = randomFloat();
JBossBytesMessage message = new JBossBytesMessage();
- MessagingBuffer body = message.getCoreMessage().getBody();
+ MessagingBuffer body = message.getDelegate().getBody();
body.putFloat(value);
message.reset();
@@ -388,7 +388,7 @@
double value = randomDouble();
JBossBytesMessage message = new JBossBytesMessage();
- MessagingBuffer body = message.getCoreMessage().getBody();
+ MessagingBuffer body = message.getDelegate().getBody();
body.putDouble(value);
message.reset();
@@ -422,7 +422,7 @@
String value = randomString();
JBossBytesMessage message = new JBossBytesMessage();
- MessagingBuffer body = message.getCoreMessage().getBody();
+ MessagingBuffer body = message.getDelegate().getBody();
body.putUTF(value);
message.reset();
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionTest.java 2008-06-19 15:18:05 UTC (rev 4524)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionTest.java 2008-06-19 15:32:20 UTC (rev 4525)
@@ -55,20 +55,6 @@
// Public --------------------------------------------------------
- public void testGetClientConnection() throws Exception
- {
- ClientConnection clientConn = createStrictMock(ClientConnection.class);
- clientConn.setRemotingSessionListener((RemotingSessionListener) EasyMock.anyObject());
- replay(clientConn);
-
- JBossConnection connection = new JBossConnection(clientConn,
- JBossConnection.TYPE_QUEUE_CONNECTION, null, -1);
-
- assertSame(clientConn, connection.getConnection());
- verify(clientConn);
-
- }
-
public void testStart() throws Exception
{
ClientConnection clientConn = createStrictMock(ClientConnection.class);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageConsumerTest.java 2008-06-19 15:18:05 UTC (rev 4524)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageConsumerTest.java 2008-06-19 15:32:20 UTC (rev 4525)
@@ -122,7 +122,7 @@
expect(clientSession.isClosed()).andReturn(true);
- expect(session.getCoreSession()).andReturn(clientSession);
+ expect(session.getDelegate()).andReturn(clientSession);
ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
replay(session, clientSession, clientConsumer);
@@ -149,7 +149,7 @@
ClientSession clientSession = createStrictMock(ClientSession.class);
expect(session.getAcknowledgeMode()).andReturn(Session.AUTO_ACKNOWLEDGE);
expect(clientSession.isClosed()).andReturn(false);
- expect(session.getCoreSession()).andReturn(clientSession);
+ expect(session.getDelegate()).andReturn(clientSession);
ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
replay(session, clientSession, clientConsumer);
@@ -180,23 +180,6 @@
verify(session, clientConsumer);
}
- public void testGetConsumer() throws Exception
- {
- Destination destination = new JBossQueue(randomString());
- JBossSession session = createStrictMock(JBossSession.class);
- expect(session.getAcknowledgeMode()).andReturn(Session.AUTO_ACKNOWLEDGE);
- ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
-
- replay(session, clientConsumer);
-
- JBossMessageConsumer consumer = new JBossMessageConsumer(session,
- clientConsumer, false, destination, null);
-
- assertEquals(clientConsumer, consumer.getConsumer());
-
- verify(session, clientConsumer);
- }
-
public void testGetQueue() throws Exception
{
Destination destination = new JBossQueue(randomString());
@@ -238,7 +221,7 @@
ClientSession clientSession = createStrictMock(ClientSession.class);
expect(session.getAcknowledgeMode()).andReturn(Session.AUTO_ACKNOWLEDGE);
expect(clientSession.isClosed()).andReturn(false);
- expect(session.getCoreSession()).andReturn(clientSession);
+ expect(session.getDelegate()).andReturn(clientSession);
ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
replay(session, clientSession, clientConsumer);
@@ -257,7 +240,7 @@
ClientSession clientSession = createStrictMock(ClientSession.class);
expect(session.getAcknowledgeMode()).andReturn(Session.AUTO_ACKNOWLEDGE);
expect(clientSession.isClosed()).andReturn(false);
- expect(session.getCoreSession()).andReturn(clientSession);
+ expect(session.getDelegate()).andReturn(clientSession);
ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
clientConsumer.setMessageHandler(isA(MessageHandler.class));
MessageListener listener = createStrictMock(MessageListener.class);
@@ -363,7 +346,7 @@
ClientSession clientSession = createStrictMock(ClientSession.class);
expect(session.getAcknowledgeMode()).andReturn(Session.AUTO_ACKNOWLEDGE);
clientSession.acknowledge();
- expect(session.getCoreSession()).andStubReturn(clientSession);
+ expect(session.getDelegate()).andStubReturn(clientSession);
ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
ClientMessage clientMessage = createStrictMock(ClientMessage.class);
expect(clientMessage.getType()).andReturn(JBossMessage.TYPE);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageProducerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageProducerTest.java 2008-06-19 15:18:05 UTC (rev 4524)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageProducerTest.java 2008-06-19 15:32:20 UTC (rev 4525)
@@ -232,20 +232,6 @@
verify(clientProducer);
}
- public void testGetDelegate() throws Exception
- {
- ClientProducer clientProducer = createStrictMock(ClientProducer.class);
- EasyMock.expect(clientProducer.isClosed()).andStubReturn(false);
- replay(clientProducer);
-
- JBossDestination destination = new JBossQueue(randomString());
- JBossMessageProducer producer = new JBossMessageProducer(clientProducer,
- destination);
- assertEquals(clientProducer, producer.getDelegate());
-
- verify(clientProducer);
- }
-
public void testGetTopic() throws Exception
{
ClientProducer clientProducer = createStrictMock(ClientProducer.class);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java 2008-06-19 15:18:05 UTC (rev 4524)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java 2008-06-19 15:32:20 UTC (rev 4525)
@@ -157,7 +157,7 @@
public void testGetJMSDeliveryModeAsPersistent() throws Exception
{
JBossMessage message = new JBossMessage();
- message.getCoreMessage().setDurable(true);
+ message.getDelegate().setDurable(true);
assertEquals(DeliveryMode.PERSISTENT, message.getJMSDeliveryMode());
}
@@ -165,7 +165,7 @@
public void testGetJMSDeliveryModeAsNonPersistent() throws Exception
{
JBossMessage message = new JBossMessage();
- message.getCoreMessage().setDurable(false);
+ message.getDelegate().setDurable(false);
assertEquals(DeliveryMode.NON_PERSISTENT, message.getJMSDeliveryMode());
}
@@ -175,7 +175,7 @@
JBossMessage message = new JBossMessage();
message.setJMSDeliveryMode(DeliveryMode.PERSISTENT);
- assertTrue(message.getCoreMessage().isDurable());
+ assertTrue(message.getDelegate().isDurable());
}
public void testSetJMSDeliveryModeWithNonPersistent() throws Exception
@@ -183,7 +183,7 @@
JBossMessage message = new JBossMessage();
message.setJMSDeliveryMode(DeliveryMode.NON_PERSISTENT);
- assertFalse(message.getCoreMessage().isDurable());
+ assertFalse(message.getDelegate().isDurable());
}
public void testSetJMSDeliveryModeWithInvalidValue() throws Exception
@@ -203,13 +203,13 @@
{
JBossMessage message = new JBossMessage();
- message.getCoreMessage().setDeliveryCount(0);
+ message.getDelegate().setDeliveryCount(0);
assertFalse(message.getJMSRedelivered());
- message.getCoreMessage().setDeliveryCount(1);
+ message.getDelegate().setDeliveryCount(1);
assertFalse(message.getJMSRedelivered());
- message.getCoreMessage().setDeliveryCount(2);
+ message.getDelegate().setDeliveryCount(2);
assertTrue(message.getJMSRedelivered());
}
@@ -218,7 +218,7 @@
JBossMessage message = new JBossMessage();
message.setJMSRedelivered(true);
- assertEquals(2, message.getCoreMessage().getDeliveryCount());
+ assertEquals(2, message.getDelegate().getDeliveryCount());
}
public void testSetJMSRedeliveredToFalse() throws Exception
@@ -226,7 +226,7 @@
JBossMessage message = new JBossMessage();
message.setJMSRedelivered(false);
- assertEquals(1, message.getCoreMessage().getDeliveryCount());
+ assertEquals(1, message.getDelegate().getDeliveryCount());
}
public void testSetJMSType() throws Exception
@@ -235,7 +235,7 @@
JBossMessage message = new JBossMessage();
message.setJMSType(type);
- SimpleString t = (SimpleString) message.getCoreMessage().getProperty(JBossMessage.TYPE_HEADER_NAME);
+ SimpleString t = (SimpleString) message.getDelegate().getProperty(JBossMessage.TYPE_HEADER_NAME);
assertEquals(type, t.toString());
}
@@ -246,7 +246,7 @@
assertNull(message.getJMSType());
- message.getCoreMessage().putStringProperty(JBossMessage.TYPE_HEADER_NAME, new SimpleString(type));
+ message.getDelegate().putStringProperty(JBossMessage.TYPE_HEADER_NAME, new SimpleString(type));
assertEquals(type, message.getJMSType());
}
@@ -256,14 +256,14 @@
JBossMessage message = new JBossMessage();
message.setJMSTimestamp(timestamp);
- assertEquals(timestamp, message.getCoreMessage().getTimestamp());
+ assertEquals(timestamp, message.getDelegate().getTimestamp());
}
public void testGetJMSTimestamp() throws Exception
{
long timestamp = randomLong();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().setTimestamp(timestamp);
+ message.getDelegate().setTimestamp(timestamp);
assertEquals(timestamp, message.getJMSTimestamp());
}
@@ -275,7 +275,7 @@
message.setJMSCorrelationID(correlationID);
- SimpleString value = (SimpleString) message.getCoreMessage().getProperty(JBossMessage.CORRELATIONID_HEADER_NAME);
+ SimpleString value = (SimpleString) message.getDelegate().getProperty(JBossMessage.CORRELATIONID_HEADER_NAME);
assertEquals(correlationID, value.toString());
}
@@ -285,7 +285,7 @@
JBossMessage message = new JBossMessage();
message.setJMSCorrelationID(null);
- assertFalse(message.getCoreMessage().containsProperty(JBossMessage.CORRELATIONID_HEADER_NAME));
+ assertFalse(message.getDelegate().containsProperty(JBossMessage.CORRELATIONID_HEADER_NAME));
}
public void testGetJMSCorrelationID() throws Exception
@@ -293,7 +293,7 @@
String correlationID = randomString();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putStringProperty(JBossMessage.CORRELATIONID_HEADER_NAME, new SimpleString(correlationID));
+ message.getDelegate().putStringProperty(JBossMessage.CORRELATIONID_HEADER_NAME, new SimpleString(correlationID));
assertEquals(correlationID, message.getJMSCorrelationID());
}
@@ -306,7 +306,7 @@
message.setJMSCorrelationIDAsBytes(correlationID);
- byte[] value = (byte[]) message.getCoreMessage().getProperty(JBossMessage.CORRELATIONID_HEADER_NAME);
+ byte[] value = (byte[]) message.getDelegate().getProperty(JBossMessage.CORRELATIONID_HEADER_NAME);
assertEquals(correlationID, value);
}
@@ -316,7 +316,7 @@
byte[] correlationID = randomBytes();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putBytesProperty(JBossMessage.CORRELATIONID_HEADER_NAME, correlationID);
+ message.getDelegate().putBytesProperty(JBossMessage.CORRELATIONID_HEADER_NAME, correlationID);
assertEquals(correlationID, message.getJMSCorrelationIDAsBytes());
}
@@ -327,7 +327,7 @@
JBossMessage message = new JBossMessage();
message.setJMSPriority(priority);
- assertEquals(priority, message.getCoreMessage().getPriority());
+ assertEquals(priority, message.getDelegate().getPriority());
}
public void testSetInvalidPriority() throws Exception
@@ -348,7 +348,7 @@
int priority = 9;
JBossMessage message = new JBossMessage();
- message.getCoreMessage().setPriority((byte) priority);
+ message.getDelegate().setPriority((byte) priority);
assertEquals(priority, message.getJMSPriority());
}
@@ -358,7 +358,7 @@
JBossMessage message = new JBossMessage();
message.setJMSExpiration(expiration);
- assertEquals(expiration, message.getCoreMessage().getExpiration());
+ assertEquals(expiration, message.getDelegate().getExpiration());
}
public void testGetJMSExpiration() throws Exception
@@ -366,7 +366,7 @@
long expiration = randomLong();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().setExpiration(expiration);
+ message.getDelegate().setExpiration(expiration);
assertEquals(expiration, message.getJMSExpiration());
}
@@ -498,7 +498,7 @@
JBossMessage message = new JBossMessage();
message.setBooleanProperty(propertyName, value);
- boolean v = (Boolean) message.getCoreMessage().getProperty(
+ boolean v = (Boolean) message.getDelegate().getProperty(
new SimpleString(propertyName));
assertEquals(value, v);
}
@@ -508,7 +508,7 @@
boolean value = true;
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putBooleanProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putBooleanProperty(new SimpleString(propertyName), value);
boolean v = message.getBooleanProperty(propertyName);
assertEquals(value, v);
@@ -527,7 +527,7 @@
SimpleString value = new SimpleString("true");
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putStringProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putStringProperty(new SimpleString(propertyName), value);
boolean v = message.getBooleanProperty(propertyName);
assertEquals(true, v);
@@ -536,7 +536,7 @@
public void testGetBooleanPropertyWithInvalidType() throws Exception
{
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putFloatProperty(new SimpleString(propertyName), randomFloat());
+ message.getDelegate().putFloatProperty(new SimpleString(propertyName), randomFloat());
try
{
@@ -554,7 +554,7 @@
JBossMessage message = new JBossMessage();
message.setByteProperty(propertyName, value);
- byte v = (Byte) message.getCoreMessage().getProperty(
+ byte v = (Byte) message.getDelegate().getProperty(
new SimpleString(propertyName));
assertEquals(value, v);
}
@@ -564,7 +564,7 @@
byte value = randomByte();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putByteProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putByteProperty(new SimpleString(propertyName), value);
byte v = message.getByteProperty(propertyName);
assertEquals(value, v);
@@ -589,7 +589,7 @@
SimpleString value = new SimpleString(Byte.toString(b));
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putStringProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putStringProperty(new SimpleString(propertyName), value);
byte v = message.getByteProperty(propertyName);
assertEquals(b, v);
@@ -598,7 +598,7 @@
public void testGetBytePropertyWithInvalidType() throws Exception
{
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putFloatProperty(new SimpleString(propertyName), randomFloat());
+ message.getDelegate().putFloatProperty(new SimpleString(propertyName), randomFloat());
try
{
@@ -616,7 +616,7 @@
JBossMessage message = new JBossMessage();
message.setShortProperty(propertyName, value);
- short v = (Short) message.getCoreMessage().getProperty(
+ short v = (Short) message.getDelegate().getProperty(
new SimpleString(propertyName));
assertEquals(value, v);
}
@@ -626,7 +626,7 @@
short value = randomShort();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putShortProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putShortProperty(new SimpleString(propertyName), value);
short v = message.getShortProperty(propertyName);
assertEquals(value, v);
@@ -650,7 +650,7 @@
byte value = randomByte();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putByteProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putByteProperty(new SimpleString(propertyName), value);
short v = message.getShortProperty(propertyName);
assertEquals(value, v);
@@ -662,7 +662,7 @@
SimpleString value = new SimpleString(Short.toString(s));
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putStringProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putStringProperty(new SimpleString(propertyName), value);
short v = message.getShortProperty(propertyName);
assertEquals(s, v);
@@ -671,7 +671,7 @@
public void testGetShortPropertyWithInvalidType() throws Exception
{
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putFloatProperty(new SimpleString(propertyName), randomFloat());
+ message.getDelegate().putFloatProperty(new SimpleString(propertyName), randomFloat());
try
{
@@ -689,7 +689,7 @@
JBossMessage message = new JBossMessage();
message.setIntProperty(propertyName, value);
- int v = (Integer) message.getCoreMessage().getProperty(
+ int v = (Integer) message.getDelegate().getProperty(
new SimpleString(propertyName));
assertEquals(value, v);
}
@@ -699,7 +699,7 @@
int value = randomInt();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putIntProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putIntProperty(new SimpleString(propertyName), value);
int v = message.getIntProperty(propertyName);
assertEquals(value, v);
@@ -710,7 +710,7 @@
int value = randomInt();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().setDeliveryCount(value);
+ message.getDelegate().setDeliveryCount(value);
int v = message.getIntProperty(JBossMessage.JMSXDELIVERYCOUNT);
assertEquals(value, v);
@@ -733,7 +733,7 @@
byte value = randomByte();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putByteProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putByteProperty(new SimpleString(propertyName), value);
int v = message.getIntProperty(propertyName);
assertEquals(value, v);
@@ -744,7 +744,7 @@
short value = randomShort();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putShortProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putShortProperty(new SimpleString(propertyName), value);
int v = message.getIntProperty(propertyName);
assertEquals(value, v);
@@ -756,7 +756,7 @@
SimpleString value = new SimpleString(Integer.toString(i));
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putStringProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putStringProperty(new SimpleString(propertyName), value);
int v = message.getIntProperty(propertyName);
assertEquals(i, v);
@@ -765,7 +765,7 @@
public void testGetIntPropertyWithInvalidType() throws Exception
{
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putFloatProperty(new SimpleString(propertyName), randomFloat());
+ message.getDelegate().putFloatProperty(new SimpleString(propertyName), randomFloat());
try
{
@@ -783,7 +783,7 @@
JBossMessage message = new JBossMessage();
message.setLongProperty(propertyName, value);
- long v = (Long) message.getCoreMessage().getProperty(
+ long v = (Long) message.getDelegate().getProperty(
new SimpleString(propertyName));
assertEquals(value, v);
}
@@ -793,7 +793,7 @@
long value = randomLong();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putLongProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putLongProperty(new SimpleString(propertyName), value);
long v = message.getLongProperty(propertyName);
assertEquals(value, v);
@@ -804,7 +804,7 @@
int value = randomInt();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().setDeliveryCount(value);
+ message.getDelegate().setDeliveryCount(value);
long v = message.getLongProperty(JBossMessage.JMSXDELIVERYCOUNT);
assertEquals(value, v);
@@ -828,7 +828,7 @@
byte value = randomByte();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putByteProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putByteProperty(new SimpleString(propertyName), value);
long v = message.getLongProperty(propertyName);
assertEquals(value, v);
@@ -839,7 +839,7 @@
short value = randomShort();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putShortProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putShortProperty(new SimpleString(propertyName), value);
long v = message.getLongProperty(propertyName);
assertEquals(value, v);
@@ -850,7 +850,7 @@
int value = randomInt();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putIntProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putIntProperty(new SimpleString(propertyName), value);
long v = message.getLongProperty(propertyName);
assertEquals(value, v);
@@ -862,7 +862,7 @@
SimpleString value = new SimpleString(Long.toString(l));
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putStringProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putStringProperty(new SimpleString(propertyName), value);
long v = message.getLongProperty(propertyName);
assertEquals(l, v);
@@ -871,7 +871,7 @@
public void testGetLongPropertyWithInvalidType() throws Exception
{
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putFloatProperty(new SimpleString(propertyName), randomFloat());
+ message.getDelegate().putFloatProperty(new SimpleString(propertyName), randomFloat());
try
{
@@ -889,7 +889,7 @@
JBossMessage message = new JBossMessage();
message.setFloatProperty(propertyName, value);
- float v = (Float) message.getCoreMessage().getProperty(
+ float v = (Float) message.getDelegate().getProperty(
new SimpleString(propertyName));
assertEquals(value, v);
}
@@ -899,7 +899,7 @@
float value = randomFloat();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putFloatProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putFloatProperty(new SimpleString(propertyName), value);
float v = message.getFloatProperty(propertyName);
assertEquals(value, v);
@@ -924,7 +924,7 @@
SimpleString value = new SimpleString(Float.toString(f));
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putStringProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putStringProperty(new SimpleString(propertyName), value);
float v = message.getFloatProperty(propertyName);
assertEquals(f, v);
@@ -933,7 +933,7 @@
public void testGetFloatPropertyWithInvalidType() throws Exception
{
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putBooleanProperty(new SimpleString(propertyName), true);
+ message.getDelegate().putBooleanProperty(new SimpleString(propertyName), true);
try
{
@@ -951,7 +951,7 @@
JBossMessage message = new JBossMessage();
message.setDoubleProperty(propertyName, value);
- double v = (Double) message.getCoreMessage().getProperty(
+ double v = (Double) message.getDelegate().getProperty(
new SimpleString(propertyName));
assertEquals(value, v);
}
@@ -961,7 +961,7 @@
double value = randomDouble();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putDoubleProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putDoubleProperty(new SimpleString(propertyName), value);
double v = message.getDoubleProperty(propertyName);
assertEquals(value, v);
@@ -985,7 +985,7 @@
float value = randomFloat();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putFloatProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putFloatProperty(new SimpleString(propertyName), value);
double v = message.getDoubleProperty(propertyName);
assertEquals(Float.valueOf(value).doubleValue(), v);
@@ -997,7 +997,7 @@
SimpleString value = new SimpleString(Double.toString(d));
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putStringProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putStringProperty(new SimpleString(propertyName), value);
double v = message.getDoubleProperty(propertyName);
assertEquals(d, v);
@@ -1006,7 +1006,7 @@
public void testGetDoublePropertyWithInvalidType() throws Exception
{
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putBooleanProperty(new SimpleString(propertyName), true);
+ message.getDelegate().putBooleanProperty(new SimpleString(propertyName), true);
try
{
@@ -1024,7 +1024,7 @@
JBossMessage message = new JBossMessage();
message.setStringProperty(propertyName, value);
- SimpleString v = (SimpleString) message.getCoreMessage().getProperty(
+ SimpleString v = (SimpleString) message.getDelegate().getProperty(
new SimpleString(propertyName));
assertEquals(value, v.toString());
}
@@ -1034,7 +1034,7 @@
String value = randomString();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putStringProperty(new SimpleString(propertyName), new SimpleString(value));
+ message.getDelegate().putStringProperty(new SimpleString(propertyName), new SimpleString(value));
String v = message.getStringProperty(propertyName);
assertEquals(value, v);
@@ -1045,7 +1045,7 @@
int value = randomInt();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().setDeliveryCount(value);
+ message.getDelegate().setDeliveryCount(value);
String v = message.getStringProperty(JBossMessage.JMSXDELIVERYCOUNT);
assertEquals(Integer.toString(value), v);
@@ -1064,7 +1064,7 @@
boolean value = true;
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putBooleanProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putBooleanProperty(new SimpleString(propertyName), value);
String v = message.getStringProperty(propertyName);
assertEquals(Boolean.toString(value), v);
@@ -1075,7 +1075,7 @@
byte value = randomByte();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putByteProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putByteProperty(new SimpleString(propertyName), value);
String v = message.getStringProperty(propertyName);
assertEquals(Byte.toString(value), v);
@@ -1086,7 +1086,7 @@
short value = randomShort();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putShortProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putShortProperty(new SimpleString(propertyName), value);
String v = message.getStringProperty(propertyName);
assertEquals(Short.toString(value), v);
@@ -1097,7 +1097,7 @@
int value = randomInt();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putIntProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putIntProperty(new SimpleString(propertyName), value);
String v = message.getStringProperty(propertyName);
assertEquals(Integer.toString(value), v);
@@ -1108,7 +1108,7 @@
long value = randomLong();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putLongProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putLongProperty(new SimpleString(propertyName), value);
String v = message.getStringProperty(propertyName);
assertEquals(Long.toString(value), v);
@@ -1119,7 +1119,7 @@
float value = randomFloat();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putFloatProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putFloatProperty(new SimpleString(propertyName), value);
String v = message.getStringProperty(propertyName);
assertEquals(Float.toString(value), v);
@@ -1130,7 +1130,7 @@
double value = randomDouble();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putDoubleProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putDoubleProperty(new SimpleString(propertyName), value);
String v = message.getStringProperty(propertyName);
assertEquals(Double.toString(value), v);
@@ -1143,7 +1143,7 @@
JBossMessage message = new JBossMessage();
message.setObjectProperty(propertyName, value);
- boolean v = (Boolean) message.getCoreMessage().getProperty(
+ boolean v = (Boolean) message.getDelegate().getProperty(
new SimpleString(propertyName));
assertEquals(value, v);
}
@@ -1155,7 +1155,7 @@
JBossMessage message = new JBossMessage();
message.setObjectProperty(propertyName, value);
- byte v = (Byte) message.getCoreMessage().getProperty(
+ byte v = (Byte) message.getDelegate().getProperty(
new SimpleString(propertyName));
assertEquals(value, v);
}
@@ -1167,7 +1167,7 @@
JBossMessage message = new JBossMessage();
message.setObjectProperty(propertyName, value);
- short v = (Short) message.getCoreMessage().getProperty(
+ short v = (Short) message.getDelegate().getProperty(
new SimpleString(propertyName));
assertEquals(value, v);
}
@@ -1179,7 +1179,7 @@
JBossMessage message = new JBossMessage();
message.setObjectProperty(propertyName, value);
- int v = (Integer) message.getCoreMessage().getProperty(
+ int v = (Integer) message.getDelegate().getProperty(
new SimpleString(propertyName));
assertEquals(value, v);
}
@@ -1191,7 +1191,7 @@
JBossMessage message = new JBossMessage();
message.setObjectProperty(propertyName, value);
- long v = (Long) message.getCoreMessage().getProperty(
+ long v = (Long) message.getDelegate().getProperty(
new SimpleString(propertyName));
assertEquals(value, v);
}
@@ -1203,7 +1203,7 @@
JBossMessage message = new JBossMessage();
message.setObjectProperty(propertyName, value);
- float v = (Float) message.getCoreMessage().getProperty(
+ float v = (Float) message.getDelegate().getProperty(
new SimpleString(propertyName));
assertEquals(value, v);
}
@@ -1215,7 +1215,7 @@
JBossMessage message = new JBossMessage();
message.setObjectProperty(propertyName, value);
- double v = (Double) message.getCoreMessage().getProperty(
+ double v = (Double) message.getDelegate().getProperty(
new SimpleString(propertyName));
assertEquals(value, v);
}
@@ -1227,7 +1227,7 @@
JBossMessage message = new JBossMessage();
message.setObjectProperty(propertyName, value);
- SimpleString v = (SimpleString) message.getCoreMessage().getProperty(
+ SimpleString v = (SimpleString) message.getDelegate().getProperty(
new SimpleString(propertyName));
assertEquals(value, v.toString());
}
@@ -1250,7 +1250,7 @@
double value = randomDouble();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putDoubleProperty(new SimpleString(propertyName), value);
+ message.getDelegate().putDoubleProperty(new SimpleString(propertyName), value);
Object v = message.getObjectProperty(propertyName);
assertTrue(v instanceof Double);
@@ -1262,7 +1262,7 @@
String value = randomString();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().putStringProperty(new SimpleString(propertyName), new SimpleString(value));
+ message.getDelegate().putStringProperty(new SimpleString(propertyName), new SimpleString(value));
Object v = message.getObjectProperty(propertyName);
assertTrue(v instanceof String);
@@ -1274,7 +1274,7 @@
int value = randomInt();
JBossMessage message = new JBossMessage();
- message.getCoreMessage().setDeliveryCount(value);
+ message.getDelegate().setDeliveryCount(value);
Object v = message.getObjectProperty(JBossMessage.JMSXDELIVERYCOUNT);
assertTrue(v instanceof String);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossObjectMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossObjectMessageTest.java 2008-06-19 15:18:05 UTC (rev 4524)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossObjectMessageTest.java 2008-06-19 15:32:20 UTC (rev 4525)
@@ -120,7 +120,7 @@
msg.doBeforeSend();
- MessagingBuffer body = msg.getCoreMessage().getBody();
+ MessagingBuffer body = msg.getDelegate().getBody();
assertEquals(data.length, body.getInt());
byte[] bytes = new byte[data.length];
body.getBytes(bytes);
@@ -137,7 +137,7 @@
byte[] data = baos.toByteArray();
JBossObjectMessage message = new JBossObjectMessage();
- MessagingBuffer body = message.getCoreMessage().getBody();
+ MessagingBuffer body = message.getDelegate().getBody();
body.putInt(data.length);
body.putBytes(data);
body.flip();
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossQueueBrowserTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossQueueBrowserTest.java 2008-06-19 15:18:05 UTC (rev 4524)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossQueueBrowserTest.java 2008-06-19 15:32:20 UTC (rev 4525)
@@ -90,19 +90,6 @@
verify(clientBrowser);
}
- public void testGetBrowser() throws Exception
- {
- Queue queue = new JBossQueue(randomString());
- ClientBrowser clientBrowser = createStrictMock(ClientBrowser.class);
- replay(clientBrowser);
-
- JBossQueueBrowser browser = new JBossQueueBrowser(queue, null,
- clientBrowser);
- assertEquals(clientBrowser, browser.getBrowser());
-
- verify(clientBrowser);
- }
-
public void testClose() throws Exception
{
Queue queue = new JBossQueue(randomString());
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossSessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossSessionTest.java 2008-06-19 15:18:05 UTC (rev 4524)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossSessionTest.java 2008-06-19 15:32:20 UTC (rev 4525)
@@ -1887,7 +1887,7 @@
Session.AUTO_ACKNOWLEDGE, mockClientSession,
JBossSession.TYPE_QUEUE_SESSION);
- ClientSession clientSession = session.getCoreSession();
+ ClientSession clientSession = session.getDelegate();
assertNotNull(clientSession);
assertSame(mockClientSession, clientSession);
}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossTextMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossTextMessageTest.java 2008-06-19 15:18:05 UTC (rev 4524)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossTextMessageTest.java 2008-06-19 15:32:20 UTC (rev 4525)
@@ -110,7 +110,7 @@
msg.doBeforeSend();
- MessagingBuffer body = msg.getCoreMessage().getBody();
+ MessagingBuffer body = msg.getDelegate().getBody();
String s = body.getNullableString();
assertEquals(text, s);
}
@@ -119,7 +119,7 @@
{
JBossTextMessage msg = new JBossTextMessage();
assertNull(msg.getText());
- MessagingBuffer body = msg.getCoreMessage().getBody();
+ MessagingBuffer body = msg.getDelegate().getBody();
body.putNullableString(text);
body.flip();
More information about the jboss-cvs-commits
mailing list