[jboss-cvs] JBoss Messaging SVN: r5212 - in branches/Branch_Chunk_CRS2: tests/src/org/jboss/messaging/tests/unit/jms/client and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2008-10-29 17:11:57 -0400 (Wed, 29 Oct 2008)
New Revision: 5212

Modified:
   branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossMessage.java
   branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageConsumerTest.java
   branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java
Log:
Fixing EasyMock tests

Modified: branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossMessage.java
===================================================================
--- branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossMessage.java	2008-10-29 21:01:02 UTC (rev 5211)
+++ branches/Branch_Chunk_CRS2/src/main/org/jboss/messaging/jms/client/JBossMessage.java	2008-10-29 21:11:57 UTC (rev 5212)
@@ -930,7 +930,11 @@
 
    public void doBeforeReceive() throws Exception
    {
-      message.getBody().rewind();
+      MessagingBuffer body = message.getBody();
+      if (body != null)
+      {
+         body.rewind();
+      }
    }
 
    public byte getType()

Modified: branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageConsumerTest.java
===================================================================
--- branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageConsumerTest.java	2008-10-29 21:01:02 UTC (rev 5211)
+++ branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageConsumerTest.java	2008-10-29 21:11:57 UTC (rev 5212)
@@ -366,6 +366,7 @@
       MessagingBuffer body = createStrictMock(MessagingBuffer.class);
       expect(clientMessage.getBody()).andStubReturn(body );
       expect(clientConsumer.receive(0)).andReturn(clientMessage );
+      body.rewind();
 
       replay(session, clientSession, clientConsumer, clientMessage, body);
 

Modified: branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java
===================================================================
--- branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java	2008-10-29 21:01:02 UTC (rev 5211)
+++ branches/Branch_Chunk_CRS2/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java	2008-10-29 21:11:57 UTC (rev 5212)
@@ -131,7 +131,7 @@
       clientSession = createStrictMock(ClientSession.class);
       clientMessage = createStrictMock(ClientMessage.class);
       MessagingBuffer buffer = createStrictMock(MessagingBuffer.class);
-      expect(clientMessage.getBody()).andReturn(buffer);
+      expect(clientMessage.getBody()).andStubReturn(buffer);
       expect(clientMessage.getProperty(JBossMessage.JBM_MESSAGE_ID)).andReturn(
             messageID);
       replay(clientSession, clientMessage, buffer);
@@ -389,7 +389,7 @@
       clientSession = createStrictMock(ClientSession.class);
       clientMessage = createStrictMock(ClientMessage.class);
       MessagingBuffer buffer = createStrictMock(MessagingBuffer.class);
-      expect(clientMessage.getBody()).andReturn(buffer);
+      expect(clientMessage.getBody()).andStubReturn(buffer);
       clientMessage.putStringProperty(JBossMessage.JBM_MESSAGE_ID,
             new SimpleString(messageID));
       replay(clientSession, clientMessage, buffer);
@@ -407,7 +407,7 @@
       clientSession = createStrictMock(ClientSession.class);
       clientMessage = createStrictMock(ClientMessage.class);
       MessagingBuffer buffer = createStrictMock(MessagingBuffer.class);
-      expect(clientMessage.getBody()).andReturn(buffer);
+      expect(clientMessage.getBody()).andStubReturn(buffer);
       replay(clientSession, clientMessage, buffer);
 
       JBossMessage message = new JBossMessage(clientMessage, clientSession);
@@ -430,7 +430,7 @@
       clientSession = createStrictMock(ClientSession.class);
       clientMessage = createStrictMock(ClientMessage.class);
       MessagingBuffer buffer = createStrictMock(MessagingBuffer.class);
-      expect(clientMessage.getBody()).andReturn(buffer);
+      expect(clientMessage.getBody()).andStubReturn(buffer);
       expect(clientMessage.removeProperty(JBossMessage.JBM_MESSAGE_ID))
             .andReturn(null);
       replay(clientSession, clientMessage, buffer);
@@ -1325,7 +1325,7 @@
       clientMessage = createStrictMock(ClientMessage.class);
       clientSession = createStrictMock(ClientSession.class);
       MessagingBuffer buffer = createStrictMock(MessagingBuffer.class);
-      expect(clientMessage.getBody()).andReturn(buffer);
+      expect(clientMessage.getBody()).andStubReturn(buffer);
       clientSession.commit();
       replay(clientMessage, clientSession, buffer);
       
@@ -1340,7 +1340,7 @@
       clientMessage = createStrictMock(ClientMessage.class);
       clientSession = createStrictMock(ClientSession.class);
       MessagingBuffer buffer = createStrictMock(MessagingBuffer.class);
-      expect(clientMessage.getBody()).andReturn(buffer);
+      expect(clientMessage.getBody()).andStubReturn(buffer);
       clientSession.commit();
       EasyMock.expectLastCall().andThrow(new MessagingException());
       replay(clientMessage, clientSession, buffer);
@@ -1378,7 +1378,7 @@
       clientMessage = createStrictMock(ClientMessage.class);
       MessagingBuffer buffer = createStrictMock(MessagingBuffer.class);
       expect(clientMessage.getType()).andReturn(expectedType);
-      expect(clientMessage.getBody()).andReturn(buffer);
+      expect(clientMessage.getBody()).andStubReturn(buffer);
       replay(clientSession, clientMessage, buffer);
 
       JBossMessage message = JBossMessage.createMessage(clientMessage,