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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Mar 23 05:52:30 EDT 2009


Author: ataylor
Date: 2009-03-23 05:52:29 -0400 (Mon, 23 Mar 2009)
New Revision: 6134

Removed:
   trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTemporaryQueueTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTemporaryTopicTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionFactoryTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionMetaDataTest.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:
deleted jms easymock tests - these are covered by Joram and integration tests

Deleted: trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTemporaryQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTemporaryQueueTest.java	2009-03-23 09:48:00 UTC (rev 6133)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTemporaryQueueTest.java	2009-03-23 09:52:29 UTC (rev 6134)
@@ -1,87 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */ 
-
-package org.jboss.messaging.tests.unit.jms;
-
-import static org.easymock.EasyMock.isA;
-import static org.easymock.classextension.EasyMock.createStrictMock;
-import static org.easymock.classextension.EasyMock.replay;
-import static org.easymock.classextension.EasyMock.verify;
-import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-
-import org.jboss.messaging.jms.JBossTemporaryQueue;
-import org.jboss.messaging.jms.client.JBossSession;
-import org.jboss.messaging.tests.util.UnitTestCase;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * 
- * @version <tt>$Revision$</tt>
- * 
- */
-public class JBossTemporaryQueueTest extends UnitTestCase
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   public void testIsTemporary() throws Exception
-   {
-      String queueName = randomString();
-      JBossSession session = createStrictMock(JBossSession.class);
-      replay(session);
-
-      JBossTemporaryQueue tempQueue = new JBossTemporaryQueue(session,
-            queueName);
-      assertEquals(true, tempQueue.isTemporary());
-
-      verify(session);
-   }
-
-   public void testDelete() throws Exception
-   {
-      String queueName = randomString();
-      JBossSession session = createStrictMock(JBossSession.class);
-      session.deleteTemporaryQueue(isA(JBossTemporaryQueue.class));
-      replay(session);
-
-      JBossTemporaryQueue tempQueue = new JBossTemporaryQueue(session,
-            queueName);
-      tempQueue.delete();
-
-      verify(session);
-   }
-   
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}

Deleted: trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTemporaryTopicTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTemporaryTopicTest.java	2009-03-23 09:48:00 UTC (rev 6133)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/JBossTemporaryTopicTest.java	2009-03-23 09:52:29 UTC (rev 6134)
@@ -1,101 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */ 
-
-package org.jboss.messaging.tests.unit.jms;
-
-import org.easymock.EasyMock;
-import org.jboss.messaging.core.client.ClientSession;
-import org.jboss.messaging.core.client.ClientSessionFactory;
-import org.jboss.messaging.jms.JBossTemporaryTopic;
-import org.jboss.messaging.jms.client.JBossConnection;
-import org.jboss.messaging.jms.client.JBossSession;
-import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-import org.jboss.messaging.tests.util.UnitTestCase;
-
-import javax.jms.Session;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * 
- * @version <tt>$Revision$</tt>
- * 
- */
-public class JBossTemporaryTopicTest extends UnitTestCase
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   public void testIsTemporary() throws Exception
-   {
-      String topicName = randomString();
-      JBossConnection connection = new JBossConnection("username", "password", 
-            JBossConnection.TYPE_TOPIC_CONNECTION, null, 0, 0, EasyMock.createMock(ClientSessionFactory.class));
-
-      JBossSession session = new JBossSession(connection, false, false,
-            Session.AUTO_ACKNOWLEDGE, EasyMock.createMock(ClientSession.class),
-            JBossSession.TYPE_TOPIC_SESSION);
-      JBossTemporaryTopic tempTopic = new JBossTemporaryTopic(session,
-            topicName);
-      assertEquals(true, tempTopic.isTemporary());
-   }
-
-//   public void testDelete() throws Exception
-//   {
-//      String topicName = randomString();
-//      SimpleString topicAddress = new SimpleString(
-//            JBossTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX + topicName);
-//
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      SessionBindingQueryResponseMessage resp = new SessionBindingQueryResponseMessage(
-//            true, new ArrayList<SimpleString>());
-//      expect(clientSession.bindingQuery(topicAddress)).andReturn(resp);
-//      clientSession.removeDestination(topicAddress, false);
-//
-//      replay(clientSession);
-//
-//      JBossConnection connection = new JBossConnection("username", "password",
-//            JBossConnection.TYPE_TOPIC_CONNECTION, null, 0, 0, EasyMock.createMock(ClientSessionFactory.class));
-//      JBossSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, clientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//      JBossTemporaryTopic tempTopic = new JBossTemporaryTopic(session,
-//            topicName);
-//      tempTopic.delete();
-//
-//      verify(clientSession);
-//   }
-   
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}

Deleted: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java	2009-03-23 09:48:00 UTC (rev 6133)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossBytesMessageTest.java	2009-03-23 09:52:29 UTC (rev 6134)
@@ -1,636 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.messaging.tests.unit.jms.client;
-
-import static org.easymock.EasyMock.expect;
-import static org.jboss.messaging.tests.util.RandomUtil.randomBoolean;
-import static org.jboss.messaging.tests.util.RandomUtil.randomByte;
-import static org.jboss.messaging.tests.util.RandomUtil.randomBytes;
-import static org.jboss.messaging.tests.util.RandomUtil.randomChar;
-import static org.jboss.messaging.tests.util.RandomUtil.randomDouble;
-import static org.jboss.messaging.tests.util.RandomUtil.randomFloat;
-import static org.jboss.messaging.tests.util.RandomUtil.randomInt;
-import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
-import static org.jboss.messaging.tests.util.RandomUtil.randomShort;
-import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-
-import java.util.ArrayList;
-
-import javax.jms.MessageEOFException;
-import javax.jms.MessageFormatException;
-
-import org.easymock.EasyMock;
-import org.jboss.messaging.core.buffers.ChannelBuffers;
-import org.jboss.messaging.core.client.ClientMessage;
-import org.jboss.messaging.core.client.ClientSession;
-import org.jboss.messaging.core.client.impl.ClientMessageImpl;
-import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
-import org.jboss.messaging.jms.client.JBossBytesMessage;
-import org.jboss.messaging.tests.util.UnitTestCase;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * 
- * @version <tt>$Revision$</tt>
- * 
- */
-public class JBossBytesMessageTest extends UnitTestCase
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   public void testForeignBytesMessage() throws Exception
-   {
-      ClientSession session = EasyMock.createNiceMock(ClientSession.class);
-      MessagingBuffer body = ChannelBuffers.dynamicBuffer(3000); 
-      ClientMessage clientMessage = new ClientMessageImpl(JBossBytesMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
-      MessagingBuffer body2 = ChannelBuffers.dynamicBuffer(3000); 
-      ClientMessage clientMessage2 = new ClientMessageImpl(JBossBytesMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body2);
-      expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
-      expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage2);
-      EasyMock.replay(session);
-      byte[] foreignBytes = randomBytes(3000);
-      JBossBytesMessage foreignMessage = new JBossBytesMessage(session);
-      foreignMessage.writeBytes(foreignBytes);
-      foreignMessage.reset();
-      JBossBytesMessage message = new JBossBytesMessage(foreignMessage, session);
-      byte[] b = new byte[(int) foreignMessage.getBodyLength()];
-      message.reset();
-
-      message.readBytes(b);
-
-      assertEqualsByteArrays(foreignBytes, b);
-      EasyMock.verify(session);
-   }
-   
-   public void testGetType() throws Exception
-   {
-      JBossBytesMessage message = new JBossBytesMessage();
-      assertEquals(JBossBytesMessage.TYPE, message.getType());
-   }
-
-   public void testGetBodyLength() throws Exception
-   {
-      byte[] value = randomBytes(1023);
-
-      JBossBytesMessage message = new JBossBytesMessage();
-      message.writeBytes(value);
-      message.reset();
-
-      assertEquals(1023, message.getBodyLength());
-
-   }
-   
-   public void testClearBody() throws Exception
-   {
-      byte[] value = randomBytes();
-
-      JBossBytesMessage message = new JBossBytesMessage();
-      message.writeBytes(value);
-      message.reset();
-
-      assertTrue(message.getBodyLength() > 0);
-      
-      message.clearBody();
-      message.reset();
-      assertEquals(0, message.getBodyLength());
-   }
-
-
-   public void testWriteBoolean() throws Exception
-   {
-      boolean value = randomBoolean();
-      JBossBytesMessage message = new JBossBytesMessage();
-      message.writeBoolean(value);
-
-      message.reset();
-
-      assertEquals(value, message.readBoolean());
-   }
-
-   public void testReadBoolean() throws Exception
-   {
-      boolean value = randomBoolean();
-      JBossBytesMessage message = new JBossBytesMessage();
-
-      MessagingBuffer body = message.getCoreMessage().getBody();
-      body.writeBoolean(value);
-      message.reset();
-
-      assertEquals(value, message.readBoolean());
-   }
-
-   public void testReadBooleanFromEmptyMessage() throws Exception
-   {
-      doReadFromEmptyMessage(new TypeReader()
-      {
-         public Object readType(JBossBytesMessage message) throws Exception
-         {
-            return message.readBoolean();
-         }
-      });
-   }
-
-   public void testWriteByte() throws Exception
-   {
-      byte value = randomByte();
-      JBossBytesMessage message = new JBossBytesMessage();
-      message.writeByte(value);
-
-      message.reset();
-
-      assertEquals(value, message.readByte());
-   }
-
-   public void testReadByte() throws Exception
-   {
-      byte value = randomByte();
-      JBossBytesMessage message = new JBossBytesMessage();
-
-      MessagingBuffer body = message.getCoreMessage().getBody();
-      body.writeByte(value);
-      message.reset();
-
-      assertEquals(value, message.readByte());
-   }
-
-   public void testReadByteFromEmptyMessage() throws Exception
-   {
-      doReadFromEmptyMessage(new TypeReader()
-      {
-         public Object readType(JBossBytesMessage message) throws Exception
-         {
-            return message.readByte();
-         }
-      });
-   }
-
-   public void testWriteBytes() throws Exception
-   {
-      byte[] value = randomBytes();
-      JBossBytesMessage message = new JBossBytesMessage();
-      message.writeBytes(value);
-
-      message.reset();
-
-      byte[] v = new byte[value.length];
-      message.readBytes(v);
-      assertEqualsByteArrays(value, v);
-   }
-
-   public void testReadBytes() throws Exception
-   {
-      byte[] value = randomBytes();
-      JBossBytesMessage message = new JBossBytesMessage();
-
-      MessagingBuffer body = message.getCoreMessage().getBody();
-      body.writeBytes(value);
-      message.reset();
-
-      byte[] v = new byte[value.length];
-      message.readBytes(v);
-      assertEqualsByteArrays(value, v);
-   }
-
-   public void testReadBytesFromEmptyMessage() throws Exception
-   {
-      JBossBytesMessage message = new JBossBytesMessage();
-      message.reset();
-
-      byte[] v = new byte[1];
-      int read = message.readBytes(v);
-      assertEquals(-1, read);
-   }
-
-   public void testWriteShort() throws Exception
-   {
-      short value = randomShort();
-      JBossBytesMessage message = new JBossBytesMessage();
-      message.writeShort(value);
-
-      message.reset();
-
-      assertEquals(value, message.readShort());
-   }
-
-   public void testReadShort() throws Exception
-   {
-      short value = randomShort();
-      JBossBytesMessage message = new JBossBytesMessage();
-
-      MessagingBuffer body = message.getCoreMessage().getBody();
-      body.writeShort(value);
-      message.reset();
-
-      assertEquals(value, message.readShort());
-   }
-
-   public void testReadShortFromEmptyMessage() throws Exception
-   {
-      doReadFromEmptyMessage(new TypeReader()
-      {
-         public Object readType(JBossBytesMessage message) throws Exception
-         {
-            return message.readShort();
-         }
-      });
-   }
-
-   public void testWriteChar() throws Exception
-   {
-      char value = randomChar();
-      JBossBytesMessage message = new JBossBytesMessage();
-      message.writeChar(value);
-
-      message.reset();
-
-      assertEquals(value, message.readChar());
-   }
-
-   public void testReadChar() throws Exception
-   {
-      char value = randomChar();
-      JBossBytesMessage message = new JBossBytesMessage();
-
-      MessagingBuffer body = message.getCoreMessage().getBody();
-      body.writeChar(value);
-      message.reset();
-
-      assertEquals(value, message.readChar());
-   }
-
-   public void testReadCharFromEmptyMessage() throws Exception
-   {
-      doReadFromEmptyMessage(new TypeReader()
-      {
-         public Object readType(JBossBytesMessage message) throws Exception
-         {
-            return message.readChar();
-         }
-      });
-   }
-
-   public void testWriteInt() throws Exception
-   {
-      int value = randomInt();
-      JBossBytesMessage message = new JBossBytesMessage();
-      message.writeInt(value);
-
-      message.reset();
-
-      assertEquals(value, message.readInt());
-   }
-
-   public void testReadInt() throws Exception
-   {
-      int value = randomInt();
-      JBossBytesMessage message = new JBossBytesMessage();
-
-      MessagingBuffer body = message.getCoreMessage().getBody();
-      body.writeInt(value);
-      message.reset();
-
-      assertEquals(value, message.readInt());
-   }
-
-   public void testReadIntFromEmptyMessage() throws Exception
-   {
-      doReadFromEmptyMessage(new TypeReader()
-      {
-         public Object readType(JBossBytesMessage message) throws Exception
-         {
-            return message.readInt();
-         }
-      });
-   }
-
-   public void testWriteLong() throws Exception
-   {
-      long value = randomLong();
-      JBossBytesMessage message = new JBossBytesMessage();
-      message.writeLong(value);
-
-      message.reset();
-
-      assertEquals(value, message.readLong());
-   }
-
-   public void testReadLong() throws Exception
-   {
-      long value = randomLong();
-      JBossBytesMessage message = new JBossBytesMessage();
-
-      MessagingBuffer body = message.getCoreMessage().getBody();
-      body.writeLong(value);
-      message.reset();
-
-      assertEquals(value, message.readLong());
-   }
-
-   public void testReadLongFromEmptyMessage() throws Exception
-   {
-      doReadFromEmptyMessage(new TypeReader()
-      {
-         public Object readType(JBossBytesMessage message) throws Exception
-         {
-            return message.readLong();
-         }
-      });
-   }
-
-   public void testWriteFloat() throws Exception
-   {
-      float value = randomFloat();
-      JBossBytesMessage message = new JBossBytesMessage();
-      message.writeFloat(value);
-
-      message.reset();
-
-      assertEquals(value, message.readFloat());
-   }
-
-   public void testReadFloat() throws Exception
-   {
-      float value = randomFloat();
-      JBossBytesMessage message = new JBossBytesMessage();
-
-      MessagingBuffer body = message.getCoreMessage().getBody();
-      body.writeFloat(value);
-      message.reset();
-
-      assertEquals(value, message.readFloat());
-   }
-
-   public void testReadFloatFromEmptyMessage() throws Exception
-   {
-      doReadFromEmptyMessage(new TypeReader()
-      {
-         public Object readType(JBossBytesMessage message) throws Exception
-         {
-            return message.readFloat();
-         }
-      });
-   }
-
-   public void testWriteDouble() throws Exception
-   {
-      double value = randomDouble();
-      JBossBytesMessage message = new JBossBytesMessage();
-      message.writeDouble(value);
-
-      message.reset();
-
-      assertEquals(value, message.readDouble());
-   }
-
-   public void testReadDouble() throws Exception
-   {
-      double value = randomDouble();
-      JBossBytesMessage message = new JBossBytesMessage();
-
-      MessagingBuffer body = message.getCoreMessage().getBody();
-      body.writeDouble(value);
-      message.reset();
-
-      assertEquals(value, message.readDouble());
-   }
-
-   public void testReadDoubleFromEmptyMessage() throws Exception
-   {
-      doReadFromEmptyMessage(new TypeReader()
-      {
-         public Object readType(JBossBytesMessage message) throws Exception
-         {
-            return message.readDouble();
-         }
-      });
-   }
-
-   public void testWriteUTF() throws Exception
-   {
-      String value = randomString();
-      JBossBytesMessage message = new JBossBytesMessage();
-      message.writeUTF(value);
-
-      message.reset();
-
-      assertEquals(value, message.readUTF());
-   }
-
-   public void testReadUTF() throws Exception
-   {
-      String value = randomString();
-      JBossBytesMessage message = new JBossBytesMessage();
-
-      MessagingBuffer body = message.getCoreMessage().getBody();
-      body.writeUTF(value);
-      message.reset();
-
-      assertEquals(value, message.readUTF());
-   }
-
-   public void testReadUTFFromEmptyMessage() throws Exception
-   {
-      doReadFromEmptyMessage(new TypeReader()
-      {
-         public Object readType(JBossBytesMessage message) throws Exception
-         {
-            return message.readUTF();
-         }
-      });
-   }
-
-   public void testWriteObjectWithNull() throws Exception
-   {
-      JBossBytesMessage message = new JBossBytesMessage();
-
-      try
-      {
-         message.writeObject(null);
-         fail("NullPointerException");
-      } catch (NullPointerException e)
-      {
-      }
-   }
-
-   public void testWriteObjectWithString() throws Exception
-   {
-      doWriteObjectWithType(randomString(), new TypeReader()
-      {
-         public Object readType(JBossBytesMessage message) throws Exception
-         {
-            return message.readUTF();
-         }
-      });
-   }
-
-   public void testWriteObjectWithBoolean() throws Exception
-   {
-      doWriteObjectWithType(randomBoolean(), new TypeReader()
-      {
-         public Object readType(JBossBytesMessage message) throws Exception
-         {
-            return message.readBoolean();
-         }
-      });
-   }
-
-   public void testWriteObjectWithByte() throws Exception
-   {
-      doWriteObjectWithType(randomByte(), new TypeReader()
-      {
-         public Object readType(JBossBytesMessage message) throws Exception
-         {
-            return message.readByte();
-         }
-      });
-   }
-
-   public void testWriteObjectWithBytes() throws Exception
-   {
-      doWriteObjectWithType(randomBytes(), new TypeReader()
-      {
-         public Object readType(JBossBytesMessage message) throws Exception
-         {
-            byte[] bytes = new byte[(int) message.getBodyLength()];
-            message.readBytes(bytes);
-            return bytes;
-         }
-      });
-   }
-
-   public void testWriteObjectWithShort() throws Exception
-   {
-      doWriteObjectWithType(randomShort(), new TypeReader()
-      {
-         public Object readType(JBossBytesMessage message) throws Exception
-         {
-            return message.readShort();
-         }
-      });
-   }
-
-   public void testWriteObjectWithChar() throws Exception
-   {
-      doWriteObjectWithType(randomChar(), new TypeReader()
-      {
-         public Object readType(JBossBytesMessage message) throws Exception
-         {
-            return message.readChar();
-         }
-      });
-   }
-
-   public void testWriteObjectWithInt() throws Exception
-   {
-      doWriteObjectWithType(randomInt(), new TypeReader()
-      {
-         public Object readType(JBossBytesMessage message) throws Exception
-         {
-            return message.readInt();
-         }
-      });
-   }
-
-   public void testWriteObjectWithLong() throws Exception
-   {
-      doWriteObjectWithType(randomLong(), new TypeReader()
-      {
-         public Object readType(JBossBytesMessage message) throws Exception
-         {
-            return message.readLong();
-         }
-      });
-   }
-
-   public void testWriteObjectWithFloat() throws Exception
-   {
-      doWriteObjectWithType(randomFloat(), new TypeReader()
-      {
-         public Object readType(JBossBytesMessage message) throws Exception
-         {
-            return message.readFloat();
-         }
-      });
-   }
-
-   public void testWriteObjectWithDouble() throws Exception
-   {
-      doWriteObjectWithType(randomDouble(), new TypeReader()
-      {
-         public Object readType(JBossBytesMessage message) throws Exception
-         {
-            return message.readDouble();
-         }
-      });
-   }
-
-   public void testWriteObjectWithInvalidType() throws Exception
-   {
-      JBossBytesMessage message = new JBossBytesMessage();
-
-      try
-      {
-         message.writeObject(new ArrayList());
-         fail("MessageFormatException");
-      } catch (MessageFormatException e)
-      {
-      }
-   }
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   private void doReadFromEmptyMessage(TypeReader reader) throws Exception
-   {
-      JBossBytesMessage message = new JBossBytesMessage();
-      message.reset();
-
-      try
-      {
-         reader.readType(message);
-         fail("must throw a MessageEOFException");
-      } catch (MessageEOFException e)
-      {
-      }
-   }
-
-   private void doWriteObjectWithType(Object value, TypeReader reader)
-         throws Exception
-   {
-      JBossBytesMessage message = new JBossBytesMessage();
-
-      message.writeObject(value);
-      message.reset();
-
-      Object v = reader.readType(message);
-      if (v instanceof byte[])
-      {
-         assertEqualsByteArrays((byte[]) value, (byte[]) v);
-      } else
-      {
-         assertEquals(value, v);
-      }
-   }
-
-   // Inner classes -------------------------------------------------
-
-   private interface TypeReader
-   {
-      Object readType(JBossBytesMessage message) throws Exception;
-   }
-}

Deleted: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionFactoryTest.java	2009-03-23 09:48:00 UTC (rev 6133)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionFactoryTest.java	2009-03-23 09:52:29 UTC (rev 6134)
@@ -1,280 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.messaging.tests.unit.jms.client;
-
-import javax.jms.Connection;
-
-import org.jboss.messaging.jms.client.JBossConnectionFactory;
-import org.jboss.messaging.tests.util.UnitTestCase;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * 
- * @version <tt>$Revision$</tt>
- * 
- */
-public class JBossConnectionFactoryTest extends UnitTestCase
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-   
-   public void testDummy()
-   {      
-   }
-//
-//   public void testCreateConnection() throws Exception
-//   {
-//      doCreateConnection(Connection.class, new ConnectionCreation()
-//      {
-//         Connection createConnection(JBossConnectionFactory factory)
-//               throws Exception
-//         {
-//            return factory.createConnection();
-//         }
-//      });
-//   }
-//
-////   public void testCreateConnectionWithCredentials() throws Exception
-////   {
-////      doCreateConnectionWithCredentials(Connection.class, randomString(),
-////            randomString(), new ConnectionCreation()
-////            {
-////               Connection createConnection(JBossConnectionFactory factory,
-////                     String user, String password) throws Exception
-////               {
-////                  return factory.createConnection(user, password);
-////               }
-////            });
-////   }
-//
-//   public void testCreateQueueConnection() throws Exception
-//   {
-//      doCreateConnection(QueueConnection.class, new ConnectionCreation()
-//      {
-//         public Connection createConnection(JBossConnectionFactory factory)
-//               throws Exception
-//         {
-//            return factory.createQueueConnection();
-//         }
-//      });
-//   }
-//
-////   public void testCreateQueueConnectionWithCredentials() throws Exception
-////   {
-////      doCreateConnectionWithCredentials(QueueConnection.class, randomString(),
-////            randomString(), new ConnectionCreation()
-////            {
-////               Connection createConnection(JBossConnectionFactory factory,
-////                     String user, String password) throws Exception
-////               {
-////                  return factory.createQueueConnection(user, password);
-////               }
-////            });
-////   }
-//
-//   public void testCreateTopicConnection() throws Exception
-//   {
-//      doCreateConnection(TopicConnection.class, new ConnectionCreation()
-//      {
-//         public Connection createConnection(JBossConnectionFactory factory)
-//               throws Exception
-//         {
-//            return factory.createTopicConnection();
-//         }
-//      });
-//   }
-//
-////   public void testCreateTopicConnectionWithUserPassword() throws Exception
-////   {
-////      doCreateConnectionWithCredentials(TopicConnection.class, randomString(),
-////            randomString(), new ConnectionCreation()
-////            {
-////               Connection createConnection(JBossConnectionFactory factory,
-////                     String user, String password) throws Exception
-////               {
-////                  return factory.createTopicConnection(user, password);
-////               }
-////            });
-////   }
-//
-//   public void testCreateXAConnection() throws Exception
-//   {
-//      doCreateConnection(XAConnection.class, new ConnectionCreation()
-//      {
-//         Connection createConnection(JBossConnectionFactory factory)
-//               throws Exception
-//         {
-//            return factory.createXAConnection();
-//         }
-//      });
-//   }
-//
-////   public void testCreateXAConnectionWithCredentials() throws Exception
-////   {
-////      doCreateConnectionWithCredentials(XAConnection.class, randomString(),
-////            randomString(), new ConnectionCreation()
-////            {
-////               Connection createConnection(JBossConnectionFactory factory,
-////                     String user, String password) throws Exception
-////               {
-////                  return factory.createXAConnection(user, password);
-////               }
-////            });
-////   }
-//
-//   public void testCreateXAQueueConnection() throws Exception
-//   {
-//      doCreateConnection(XAQueueConnection.class, new ConnectionCreation()
-//      {
-//         public Connection createConnection(JBossConnectionFactory factory)
-//               throws Exception
-//         {
-//            return factory.createXAQueueConnection();
-//         }
-//      });
-//   }
-//
-////   public void testCreateXAQueueConnectionWithCredentials() throws Exception
-////   {
-////      doCreateConnectionWithCredentials(XAQueueConnection.class,
-////            randomString(), randomString(), new ConnectionCreation()
-////            {
-////               Connection createConnection(JBossConnectionFactory factory,
-////                     String user, String password) throws Exception
-////               {
-////                  return factory.createXAQueueConnection(user, password);
-////               }
-////            });
-////   }
-//
-//   public void testCreateXATopicConnection() throws Exception
-//   {
-//      doCreateConnection(XATopicConnection.class, new ConnectionCreation()
-//      {
-//         public Connection createConnection(JBossConnectionFactory factory)
-//               throws Exception
-//         {
-//            return factory.createXATopicConnection();
-//         }
-//      });
-//   }
-//
-////   public void testCreateXATopicConnectionWithUserPassword() throws Exception
-////   {
-////      doCreateConnectionWithCredentials(XATopicConnection.class,
-////            randomString(), randomString(), new ConnectionCreation()
-////            {
-////               Connection createConnection(JBossConnectionFactory factory,
-////                     String user, String password) throws Exception
-////               {
-////                  return factory.createXATopicConnection(user, password);
-////               }
-////            });
-////   }
-//
-//   // Package protected ---------------------------------------------
-//
-//   // Protected -----------------------------------------------------
-//
-//   // Private -------------------------------------------------------
-//
-////   private void doCreateConnection(Class expectedInterface,
-////         ConnectionCreation creation) throws Exception
-////   {
-////      final ConnectorFactory cf = EasyMock.createMock(ConnectorFactory.class);
-////      final Map<String, Object> params = new HashMap<String, Object>();
-////      final long pingPeriod = 12987213;
-////      final long callTimeout = 27237;
-////      final String clientID = "kajsakjs";
-////      final int dupsOKBatchSize = 12344;
-////      final int defaultConsumerWindowSize = 1212;
-////      final int defaultConsumerMaxRate = 5656;
-////      final int defaultProducerWindowSize = 2323;
-////      final int defaultProducerMaxRate = 988;
-////      final boolean defaultBlockOnAcknowledge = true;
-////      final boolean defaultSendNonPersistentMessagesBlocking = true;
-////      final boolean defaultSendPersistentMessagesBlocking = true;
-////      
-////      JBossConnectionFactory factory = new JBossConnectionFactory(cf, params,
-////               pingPeriod, callTimeout, clientID, dupsOKBatchSize,
-////               defaultConsumerWindowSize, defaultConsumerMaxRate,
-////               defaultProducerWindowSize, defaultProducerMaxRate, defaultBlockOnAcknowledge,
-////               defaultSendNonPersistentMessagesBlocking, defaultSendPersistentMessagesBlocking);
-////      Object connection = creation.createConnection(factory);
-////      assertNotNull(connection);
-////      assertTrue(expectedInterface.isAssignableFrom(connection.getClass()));
-////   }
-////
-////   private void doCreateConnectionWithCredentials(Class expectedInterface, String username, String password,
-////            ConnectionCreation creation) throws Exception
-////   {
-////      final ConnectorFactory cf = EasyMock.createMock(ConnectorFactory.class);
-////      final Map<String, Object> params = new HashMap<String, Object>();
-////      final long pingPeriod = 12987213;
-////      final long callTimeout = 27237;
-////      final String clientID = "kajsakjs";
-////      final int dupsOKBatchSize = 12344;        
-////      final int defaultConsumerWindowSize = 1212;
-////      final int defaultConsumerMaxRate = 5656;
-////      final int defaultProducerWindowSize = 2323;
-////      final int defaultProducerMaxRate = 988;
-////      final boolean defaultBlockOnAcknowledge = true;
-////      final boolean defaultSendNonPersistentMessagesBlocking = true;
-////      final boolean defaultSendPersistentMessagesBlocking = true;
-////
-////      JBossConnectionFactory factory = new JBossConnectionFactory(cf, params,
-////               pingPeriod, callTimeout,
-////               clientID, dupsOKBatchSize,
-////               defaultConsumerWindowSize, defaultConsumerMaxRate,
-////               defaultProducerWindowSize, defaultProducerMaxRate, defaultBlockOnAcknowledge,
-////               defaultSendNonPersistentMessagesBlocking, defaultSendPersistentMessagesBlocking);
-////      Object connection = creation.createConnection(factory, username, password);
-////      assertNotNull(connection);
-////      assertTrue(expectedInterface.isAssignableFrom(connection.getClass()));
-////   }
-////
-
-   // Inner classes -------------------------------------------------
-
-   private class ConnectionCreation
-   {
-      Connection createConnection(JBossConnectionFactory factory)
-            throws Exception
-      {
-         return null;
-      }
-
-      Connection createConnection(JBossConnectionFactory factory, String user,
-            String password) throws Exception
-      {
-         return null;
-      }
-   }
-}

Deleted: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionMetaDataTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionMetaDataTest.java	2009-03-23 09:48:00 UTC (rev 6133)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionMetaDataTest.java	2009-03-23 09:52:29 UTC (rev 6134)
@@ -1,119 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */ 
-
-package org.jboss.messaging.tests.unit.jms.client;
-
-import static org.easymock.EasyMock.createStrictMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.jms.ConnectionMetaData;
-
-import org.jboss.messaging.core.version.Version;
-import org.jboss.messaging.jms.client.JBossConnectionMetaData;
-import org.jboss.messaging.tests.util.UnitTestCase;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * 
- * @version <tt>$Revision$</tt>
- * 
- */
-public class JBossConnectionMetaDataTest extends UnitTestCase
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   public void testJMSAttributes() throws Exception
-   {
-      Version version = createStrictMock(Version.class);
-      replay(version);
-
-      ConnectionMetaData metadata = new JBossConnectionMetaData(version);
-      assertEquals("1.1", metadata.getJMSVersion());
-      assertEquals(1, metadata.getJMSMajorVersion());
-      assertEquals(1, metadata.getJMSMinorVersion());
-      assertEquals(JBossConnectionMetaData.JBOSS_MESSAGING, metadata
-            .getJMSProviderName());
-
-      verify(version);
-   }
-   
-   public void testProviderAttributes() throws Exception
-   {
-      Version version = createStrictMock(Version.class);
-      expect(version.getMajorVersion()).andReturn(23);
-      expect(version.getMinorVersion()).andReturn(11);
-      expect(version.getFullVersion()).andReturn("foo.bar r234");
-      replay(version);
-
-      ConnectionMetaData metadata = new JBossConnectionMetaData(version);
-      assertEquals(23, metadata.getProviderMajorVersion());
-      assertEquals(11, metadata.getProviderMinorVersion());
-      assertEquals("foo.bar r234", metadata.getProviderVersion());
-
-      verify(version);
-   }
-   
-   public void testJMSXpropertyNames() throws Exception
-   {
-      Version version = createStrictMock(Version.class);
-      replay(version);
-
-      ConnectionMetaData metadata = new JBossConnectionMetaData(version);
-      Enumeration<String> enumeration = metadata.getJMSXPropertyNames();
-      Set<String> names = new HashSet<String>();
-      while (enumeration.hasMoreElements())
-      {
-         names.add((String) enumeration.nextElement());         
-      }
-
-      Set<String>expectedNames = new HashSet<String>();
-      expectedNames.add("JMSXGroupID");
-      //expectedNames.add("JMSXGroupSeq");
-      expectedNames.add("JMSXDeliveryCount");
-      
-      assertEquals(expectedNames, names);
-      verify(version);
-
-   }
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}

Deleted: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionTest.java	2009-03-23 09:48:00 UTC (rev 6133)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossConnectionTest.java	2009-03-23 09:52:29 UTC (rev 6134)
@@ -1,1354 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */ 
-
-package org.jboss.messaging.tests.unit.jms.client;
-
-import org.easymock.IArgumentMatcher;
-import org.jboss.messaging.core.remoting.FailureListener;
-import org.jboss.messaging.tests.util.UnitTestCase;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * 
- * @version <tt>$Revision$</tt>
- * 
- */
-public class JBossConnectionTest extends UnitTestCase
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-   
-   public void testFoo()
-   {      
-   }
-//
-//   public void testStart() throws Exception
-//   {      
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      ClientSession sess1 = createStrictMock(ClientSession.class);
-//      ClientSession sess2 = createStrictMock(ClientSession.class);
-//      ClientSession sess3 = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, false, 0)).andReturn(sess1);
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, false, 0)).andReturn(sess2);
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, false, 0)).andReturn(sess3);
-//      
-//      sess1.addFailureListener(EasyMock.isA(FailureListener.class));
-//      sess2.addFailureListener(EasyMock.isA(FailureListener.class));
-//      sess3.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      sess1.start();
-//      sess2.start();
-//      sess3.start();
-//      
-//      replay(sf, sess1, sess2, sess3);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, -1, sf);
-//      
-//      assertNotNull(connection.getUID());
-//      
-//      connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-//      connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-//      connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-//
-//      connection.start();
-//
-//      verify(sf, sess1, sess2, sess3);      
-//   }
-//
-//   public void testStartThrowsException() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      ClientSession sess1 = createStrictMock(ClientSession.class);
-//           
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, false, 0)).andReturn(sess1);     
-//      
-//      sess1.addFailureListener(EasyMock.isA(FailureListener.class));
-//
-//      sess1.start();
-//      expectLastCall().andThrow(new MessagingException());
-//
-//      replay(sf, sess1);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, -1, sf);
-//      connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-//
-//      try
-//      {
-//         connection.start();
-//         fail("should throw a JMSException");
-//      } catch(JMSException e)
-//      {
-//      }
-//
-//      verify(sf, sess1);
-//   }
-//   
-//   public void testStop() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      ClientSession sess1 = createStrictMock(ClientSession.class);
-//      ClientSession sess2 = createStrictMock(ClientSession.class);
-//      ClientSession sess3 = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, false, 0)).andReturn(sess1);
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, false, 0)).andReturn(sess2);
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, false, 0)).andReturn(sess3);
-//      
-//      sess1.addFailureListener(EasyMock.isA(FailureListener.class));
-//      sess2.addFailureListener(EasyMock.isA(FailureListener.class));
-//      sess3.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      sess1.stop();
-//      sess2.stop();
-//      sess3.stop();
-//      
-//      replay(sf, sess1, sess2, sess3);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, -1, sf);
-//      
-//      assertNotNull(connection.getUID());
-//      
-//      connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-//      connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-//      connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-//
-//      connection.stop();
-//
-//      verify(sf, sess1, sess2, sess3);      
-//   }
-//
-//   public void testStopThrowsException() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      ClientSession sess1 = createStrictMock(ClientSession.class);
-//           
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, false, 0)).andReturn(sess1);     
-//      
-//      sess1.addFailureListener(EasyMock.isA(FailureListener.class));
-//
-//      sess1.stop();
-//      expectLastCall().andThrow(new MessagingException());
-//
-//      replay(sf, sess1);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, -1, sf);
-//      connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-//
-//      try
-//      {
-//         connection.stop();
-//         fail("should throw a JMSException");
-//      } catch(JMSException e)
-//      {
-//      }
-//
-//      verify(sf, sess1);
-//   }
-//   
-//   public void testClose() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      ClientSession sess1 = createStrictMock(ClientSession.class);
-//      ClientSession sess2 = createStrictMock(ClientSession.class);
-//      ClientSession sess3 = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, false, 0)).andReturn(sess1);
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, false, 0)).andReturn(sess2);
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, false, 0)).andReturn(sess3);
-//      
-//      sess1.addFailureListener(EasyMock.isA(FailureListener.class));
-//      sess2.addFailureListener(EasyMock.isA(FailureListener.class));
-//      sess3.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      sess1.close();
-//      sess2.close();
-//      sess3.close();
-//      
-//      replay(sf, sess1, sess2, sess3);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, -1, sf);
-//      
-//      assertNotNull(connection.getUID());
-//      
-//      connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-//      connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-//      connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-//
-//      connection.close();
-//
-//      verify(sf, sess1, sess2, sess3);      
-//   }
-//   
-//   public void testCloseThrowsException() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      ClientSession sess1 = createStrictMock(ClientSession.class);
-//           
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, false, 0)).andReturn(sess1);     
-//      
-//      sess1.addFailureListener(EasyMock.isA(FailureListener.class));
-//
-//      sess1.close();
-//      expectLastCall().andThrow(new MessagingException());
-//
-//      replay(sf, sess1);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-//
-//      try
-//      {
-//         connection.close();
-//         fail("should throw a JMSException");
-//      } catch(JMSException e)
-//      {
-//      }
-//
-//      verify(sf, sess1);
-//   }
-//   
-//   public void testUsingClosedConnection() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      
-//      connection.close();
-//
-//      try
-//      {
-//         connection.getClientID();
-//         fail("should throw a JMSException");
-//      }
-//      catch (JMSException e)
-//      {
-//      };
-//      try
-//      {
-//         connection.createSession(false, 1);
-//         fail("should throw a JMSException");
-//      }
-//      catch (JMSException e)
-//      {
-//      };
-//      try
-//      {
-//         connection.setClientID("123");
-//         fail("should throw a JMSException");
-//      }
-//      catch (JMSException e)
-//      {
-//      };
-//      try
-//      {
-//         connection.getMetaData();
-//         fail("should throw a JMSException");
-//      }
-//      catch (JMSException e)
-//      {
-//      };
-//      try
-//      {
-//         connection.getExceptionListener();
-//         fail("should throw a JMSException");
-//      }
-//      catch (JMSException e)
-//      {
-//      };
-//      try
-//      {
-//         connection.setExceptionListener(new ExceptionListener() {
-//            public void onException(JMSException e)
-//            {              
-//            }
-//         });
-//         fail("should throw a JMSException");
-//      }
-//      catch (JMSException e)
-//      {
-//      };
-//      try
-//      {
-//         connection.setExceptionListener(new ExceptionListener() {
-//            public void onException(JMSException e)
-//            {              
-//            }
-//         });
-//         fail("should throw a JMSException");
-//      }
-//      catch (JMSException e)
-//      {
-//      };
-//      try
-//      {
-//         connection.start();
-//         fail("should throw a JMSException");
-//      }
-//      catch (JMSException e)
-//      {
-//      };
-//      try
-//      {
-//         connection.stop();
-//         fail("should throw a JMSException");
-//      }
-//      catch (JMSException e)
-//      {
-//      };
-//      try
-//      {
-//         connection.createConnectionConsumer((Destination)null, null, null, 23);
-//         fail("should throw a JMSException");
-//      }
-//      catch (JMSException e)
-//      {
-//      };
-//      try
-//      {
-//         connection.createDurableConnectionConsumer((Topic)null, null, null, null, 23);
-//         fail("should throw a JMSException");
-//      }
-//      catch (JMSException e)
-//      {
-//      };
-//      try
-//      {
-//         connection.createQueueSession(false, 1);
-//         fail("should throw a JMSException");
-//      }
-//      catch (JMSException e)
-//      {
-//      };
-//      try
-//      {
-//         connection.createConnectionConsumer((Queue)null, null, null, 23);
-//         fail("should throw a JMSException");
-//      }
-//      catch (JMSException e)
-//      {
-//      };
-//      try
-//      {
-//         connection.createTopicSession(false, 1);
-//         fail("should throw a JMSException");
-//      }
-//      catch (JMSException e)
-//      {
-//      };
-//      try
-//      {
-//         connection.createConnectionConsumer((Topic)null, null, null, 23);
-//         fail("should throw a JMSException");
-//      }
-//      catch (JMSException e)
-//      {
-//      };
-//      try
-//      {
-//         connection.createXASession();
-//         fail("should throw a JMSException");
-//      }
-//      catch (JMSException e)
-//      {
-//      };
-//      try
-//      {
-//         connection.createXAQueueSession();
-//         fail("should throw a JMSException");
-//      }
-//      catch (JMSException e)
-//      {
-//      };
-//      try
-//      {
-//         connection.createXATopicSession();
-//         fail("should throw a JMSException");
-//      }
-//      catch (JMSException e)
-//      {
-//      };
-//   }
-//
-//   public void testGetClientID() throws Exception
-//   {
-//      String clientID = randomString();
-//      
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, clientID, -1, sf);
-//      
-//      assertEquals(clientID, connection.getClientID());
-//   }
-//
-//   public void testSetClientID() throws Exception
-//   {
-//      String clientID = randomString();
-//      
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      
-//      connection.setClientID(clientID);
-//      
-//      assertEquals(clientID, connection.getClientID());
-//   }
-//
-//   public void testSetClientIDFailsIfClientIDAlreadyExists() throws Exception
-//   {
-//      String clientID = randomString();
-//      
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      
-//      connection.setClientID(clientID);
-//      
-//      assertEquals(clientID, connection.getClientID());
-//
-//      try
-//      {
-//         connection.setClientID(randomString());
-//         fail("should throw a JMS Exception");
-//      } catch (JMSException e)
-//      {
-//      }
-//   }
-//
-//   public void testSetClientIDFailsIfConnectionAlreadyUsed() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      
-//      connection.start();
-//      
-//      try
-//      {
-//         connection.setClientID(randomString());
-//         fail("should throw a JMS Exception");
-//      } catch (JMSException e)
-//      {
-//      }
-//   }
-//   
-//   public void testGetMetaData() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      
-//      ConnectionMetaData data = connection.getMetaData();
-//      
-//      assertNotNull(data);
-//   }
-//   
-//   public void testSetGetExceptionListener() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      
-//      ExceptionListener listener = createStrictMock(ExceptionListener.class);
-//      
-//      assertNull(connection.getExceptionListener());
-//           
-//      connection.setExceptionListener(listener);
-//      
-//      assertEquals(listener, connection.getExceptionListener());
-//      
-//      connection.setExceptionListener(null);
-//      
-//      assertNull(connection.getExceptionListener());
-//  }
-//   
-//   public void testCreateConnectionConsumerFromDestination() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Destination destination = createStrictMock(Destination.class);
-//      ServerSessionPool sessionPool = createStrictMock(ServerSessionPool.class);
-//
-//      ConnectionConsumer connConsumer = connection.createConnectionConsumer(destination, null, sessionPool, 10);
-//      assertNull(connConsumer); 
-//   }
-//   
-//   public void testCreateConnectionConsumerFromQueue() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Queue queue = createStrictMock(Queue.class);
-//      ServerSessionPool sessionPool = createStrictMock(ServerSessionPool.class);
-//
-//      ConnectionConsumer connConsumer = connection.createConnectionConsumer(queue, null, sessionPool, 10);
-//      assertNull(connConsumer); 
-//   }
-//   
-//   public void testCreateConnectionConsumerFromTopic() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_TOPIC_CONNECTION, null, -1, sf);
-//      Topic topic = createStrictMock(Topic.class);
-//      ServerSessionPool sessionPool = createStrictMock(ServerSessionPool.class);
-//      
-//
-//      ConnectionConsumer connConsumer = connection.createConnectionConsumer(topic, null, sessionPool, 10);
-//      assertNull(connConsumer); 
-//   }
-//      
-//   public void testCreateDurableConnectionConsumerFromTopic() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_TOPIC_CONNECTION, null, -1, sf);
-//      Topic topic = createStrictMock(Topic.class);
-//      ServerSessionPool sessionPool = createStrictMock(ServerSessionPool.class);
-//      
-//
-//      ConnectionConsumer connConsumer = connection.createDurableConnectionConsumer(topic, null, null, sessionPool, 10);
-//      assertNull(connConsumer); 
-//   }
-//   
-//   public void testCreateDurableConnectionConsumerFromQueueConnection() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Topic topic = createStrictMock(Topic.class);
-//      ServerSessionPool sessionPool = createStrictMock(ServerSessionPool.class);
-//
-//      try
-//      {
-//         connection.createDurableConnectionConsumer(topic, RandomUtil.randomString(), null, sessionPool, 10);
-//         connection.setClientID(randomString());
-//         fail("should throw a JMS Exception");
-//      } catch (JMSException e)
-//      {
-//      }
-//   }
-//   
-//   public void testCreateSessionThrowsException() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, false)).andThrow(new MessagingException());
-//      
-//      replay(sf);
-//  
-//      try
-//      {
-//         connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-//         fail("should throw a JMSException");
-//      } catch(JMSException e)
-//      {
-//      }
-//
-//      verify(sf);
-//   }
-//   
-//   public void testCreateTransactedQueueSession() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, false, false, false)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      QueueSession session = connection.createQueueSession(true, 0);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//
-//   public void testCreateAutoAckQueueSession() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, false)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      QueueSession session = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateDupsOKQueueSession() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, false)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      QueueSession session = connection.createQueueSession(false, Session.DUPS_OK_ACKNOWLEDGE);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateClientAckQueueSession() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, false, false)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      QueueSession session = connection.createQueueSession(false, Session.CLIENT_ACKNOWLEDGE);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateQueueSessionWithInvalidAckMode() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      replay(sf, clientSession);
-//
-//      
-//      try 
-//      {
-//         connection.createQueueSession(false, 12345);
-//         fail("must throw a IllegalArgumentException");
-//      } catch (IllegalArgumentException e)
-//      {         
-//      }
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateTransactedTopicSession() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_TOPIC_CONNECTION, null, -1, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, false, false, false)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      TopicSession session = connection.createTopicSession(true, 0);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//
-//   public void testCreateAutoAckTopicSession() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_TOPIC_CONNECTION, null, -1, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, false)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      TopicSession session = connection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateDupsOKTopicSession() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_TOPIC_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, false)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      TopicSession session = connection.createTopicSession(false, Session.DUPS_OK_ACKNOWLEDGE);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateClientAckTopicSession() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_TOPIC_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, false, false)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      TopicSession session = connection.createTopicSession(false, Session.CLIENT_ACKNOWLEDGE);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateTopicSessionWithInvalidAckMode() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_TOPIC_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      replay(sf, clientSession);
-//     
-//      try 
-//      {
-//         connection.createTopicSession(false, 12345);
-//         fail("must throw a IllegalArgumentException");
-//      } catch (IllegalArgumentException e)
-//      {         
-//      }
-//
-//      verify(sf, clientSession);
-//   }
-//         
-//   
-//   
-//   public void testCreateTransactedSession() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_GENERIC_CONNECTION, null, -1, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, false, false, false)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      Session session = connection.createSession(true, 0);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//
-//   public void testCreateAutoAckSession() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_GENERIC_CONNECTION, null, -1, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, false)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateDupsOKSession() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_GENERIC_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, false)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      Session session = connection.createSession(false, Session.DUPS_OK_ACKNOWLEDGE);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateClientAckSession() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_GENERIC_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, false, false)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateSessionWithInvalidAckMode() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_GENERIC_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      replay(sf, clientSession);
-//     
-//      try 
-//      {
-//         connection.createSession(false, 12345);
-//         fail("must throw a IllegalArgumentException");
-//      } catch (IllegalArgumentException e)
-//      {         
-//      }
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   
-//   public void testCreateXASession() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_GENERIC_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, true, false, false, false)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      XASession session = connection.createXASession();
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateXAQueueSession() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_GENERIC_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, true, false, false, false)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      XAQueueSession session = connection.createXAQueueSession();
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateXATopicSession() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_GENERIC_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, true, false, false, false)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      XATopicSession session = connection.createXATopicSession();
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   // here
-//   
-//   public void testCreateSessionThrowsExceptionCacheProducers() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, true)).andThrow(new MessagingException());
-//      
-//      replay(sf);
-//  
-//      try
-//      {
-//         connection.createSession(false, Session.AUTO_ACKNOWLEDGE, true);
-//         fail("should throw a JMSException");
-//      } catch(JMSException e)
-//      {
-//      }
-//
-//      verify(sf);
-//   }
-//   
-//   public void testCreateTransactedQueueSessionCacheProducers() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, false, false, true)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      QueueSession session = connection.createQueueSession(true, 0, true);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//
-//   public void testCreateAutoAckQueueSessionCacheProducers() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, true)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      QueueSession session = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE, true);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateDupsOKQueueSessionCacheProducers() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, true)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      QueueSession session = connection.createQueueSession(false, Session.DUPS_OK_ACKNOWLEDGE, true);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateClientAckQueueSessionCacheProducers() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, false, true)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      QueueSession session = connection.createQueueSession(false, Session.CLIENT_ACKNOWLEDGE, true);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateQueueSessionWithInvalidAckModeCacheProducers() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      replay(sf, clientSession);
-//
-//      
-//      try 
-//      {
-//         connection.createQueueSession(false, 12345, true);
-//         fail("must throw a IllegalArgumentException");
-//      } catch (IllegalArgumentException e)
-//      {         
-//      }
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateTransactedTopicSessionCacheProducers() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_TOPIC_CONNECTION, null, -1, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, false, false, true)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      TopicSession session = connection.createTopicSession(true, 0, true);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//
-//   public void testCreateAutoAckTopicSessionCacheProducers() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_TOPIC_CONNECTION, null, -1, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, true)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      TopicSession session = connection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE, true);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateDupsOKTopicSessionCacheProducers() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_TOPIC_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, true)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      TopicSession session = connection.createTopicSession(false, Session.DUPS_OK_ACKNOWLEDGE, true);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateClientAckTopicSessionCacheProducers() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_TOPIC_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, false, true)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      TopicSession session = connection.createTopicSession(false, Session.CLIENT_ACKNOWLEDGE, true);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateTopicSessionWithInvalidAckModeCacheProducers() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_TOPIC_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      replay(sf, clientSession);
-//     
-//      try 
-//      {
-//         connection.createTopicSession(false, 12345, true);
-//         fail("must throw a IllegalArgumentException");
-//      } catch (IllegalArgumentException e)
-//      {         
-//      }
-//
-//      verify(sf, clientSession);
-//   }
-//         
-//   
-//   
-//   public void testCreateTransactedSessionCacheProducers() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_GENERIC_CONNECTION, null, -1, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, false, false, true)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      Session session = connection.createSession(true, 0, true);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//
-//   public void testCreateAutoAckSessionCacheProducers() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_GENERIC_CONNECTION, null, -1, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, true)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE, true);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateDupsOKSessionCacheProducers() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_GENERIC_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, true, true)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      Session session = connection.createSession(false, Session.DUPS_OK_ACKNOWLEDGE, true);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateClientAckSessionCacheProducers() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_GENERIC_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, false, true, false, true)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE, true);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateSessionWithInvalidAckModeCacheProducers() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_GENERIC_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      replay(sf, clientSession);
-//     
-//      try 
-//      {
-//         connection.createSession(false, 12345, true);
-//         fail("must throw a IllegalArgumentException");
-//      } catch (IllegalArgumentException e)
-//      {         
-//      }
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   
-//   public void testCreateXASessionCacheProducers() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_GENERIC_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, true, false, false, true)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      XASession session = connection.createXASession(true);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateXAQueueSessionCacheProducers() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_GENERIC_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, true, false, false, true)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      XAQueueSession session = connection.createXAQueueSession(true);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-//   
-//   public void testCreateXATopicSessionCacheProducers() throws Exception
-//   {
-//      ClientSessionFactory sf = createStrictMock(ClientSessionFactory.class);
-//      
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_GENERIC_CONNECTION, null, 100, sf);
-//      ClientSession clientSession = createStrictMock(ClientSession.class);
-//      
-//      EasyMock.expect(sf.createSession(null, null, true, false, false, true)).andReturn(clientSession);
-//      clientSession.addFailureListener(EasyMock.isA(FailureListener.class));
-//      
-//      replay(sf, clientSession);
-//
-//      XATopicSession session = connection.createXATopicSession(true);
-//      assertNotNull(session);
-//
-//      verify(sf, clientSession);
-//   }
-   
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-   class FailureListenerMatcher implements IArgumentMatcher
-   {
-      FailureListener listener = null;
-      public boolean matches(Object o)
-      {
-         listener = (FailureListener) o;
-         return true;
-      }
-
-      public void appendTo(StringBuffer stringBuffer)
-      {
-         //we dont need this
-      }
-   }
-}

Deleted: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageConsumerTest.java	2009-03-23 09:48:00 UTC (rev 6133)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageConsumerTest.java	2009-03-23 09:52:29 UTC (rev 6134)
@@ -1,413 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.messaging.tests.unit.jms.client;
-
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.isA;
-import static org.easymock.classextension.EasyMock.createStrictMock;
-import static org.easymock.classextension.EasyMock.replay;
-import static org.easymock.classextension.EasyMock.reset;
-import static org.easymock.classextension.EasyMock.verify;
-import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-
-import javax.jms.IllegalStateException;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.Session;
-
-import org.jboss.messaging.core.client.ClientConsumer;
-import org.jboss.messaging.core.client.ClientMessage;
-import org.jboss.messaging.core.client.ClientSession;
-import org.jboss.messaging.core.client.MessageHandler;
-import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
-import org.jboss.messaging.jms.JBossDestination;
-import org.jboss.messaging.jms.JBossQueue;
-import org.jboss.messaging.jms.JBossTopic;
-import org.jboss.messaging.jms.client.JBossMessage;
-import org.jboss.messaging.jms.client.JBossMessageConsumer;
-import org.jboss.messaging.jms.client.JBossSession;
-import org.jboss.messaging.tests.util.UnitTestCase;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * 
- * @version <tt>$Revision$</tt>
- * 
- */
-public class JBossMessageConsumerTest extends UnitTestCase
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   public void testClose() throws Exception
-   {
-      JBossSession session = createStrictMock(JBossSession.class);
-      
-      ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
-      
-      expect(session.getAcknowledgeMode()).andStubReturn(Session.AUTO_ACKNOWLEDGE);
-                                      
-      replay(session, clientConsumer);
-                  
-      JBossDestination destination = new JBossQueue(randomString());
-      
-      JBossMessageConsumer consumer = new JBossMessageConsumer(session,
-               clientConsumer, false, destination, null, null);
-      
-      verify(session, clientConsumer);
-      
-      reset(session, clientConsumer);
-            
-      clientConsumer.close();
-      
-      session.removeConsumer(consumer);
-
-      replay(session, clientConsumer);
-
-      consumer.close();
-
-      verify(session, clientConsumer);
-   }
-
-   public void testCloseThrowsException() throws Exception
-   {
-      JBossSession session = createStrictMock(JBossSession.class);
-      JBossDestination destination = new JBossQueue(randomString());
-      expect(session.getAcknowledgeMode()).andReturn(Session.AUTO_ACKNOWLEDGE);
-      ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
-      clientConsumer.close();
-      expectLastCall().andThrow(new MessagingException());
-
-      replay(session, clientConsumer);
-
-      JBossMessageConsumer consumer = new JBossMessageConsumer(session,
-            clientConsumer, false, destination, null, null);
-
-      try
-      {
-         consumer.close();
-         fail("JMSException");
-      } catch (JMSException e)
-      {
-      }
-
-      verify(session, clientConsumer);
-   }
-
-   public void testCheckClosed() throws Exception
-   {
-      JBossDestination destination = new JBossQueue(randomString());
-      JBossSession session = createStrictMock(JBossSession.class);
-      ClientSession clientSession = createStrictMock(ClientSession.class);
-      expect(session.getAcknowledgeMode()).andReturn(Session.AUTO_ACKNOWLEDGE);
-
-      expect(clientSession.isClosed()).andReturn(true);
-
-      expect(session.getCoreSession()).andReturn(clientSession);
-      ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
-
-      replay(session, clientSession, clientConsumer);
-
-      JBossMessageConsumer consumer = new JBossMessageConsumer(session,
-            clientConsumer, false, destination, null, null);
-
-      try
-      {
-         consumer.getMessageSelector();
-         fail("IllegalStateException");
-      } catch (IllegalStateException e)
-      {
-      }
-
-      verify(session, clientSession, clientConsumer);
-   }
-
-   public void testGetMessageSelector() throws Exception
-   {
-      String messageSelector = "color = 'green'";
-      JBossDestination destination = new JBossQueue(randomString());
-      JBossSession session = createStrictMock(JBossSession.class);
-      ClientSession clientSession = createStrictMock(ClientSession.class);
-      expect(session.getAcknowledgeMode()).andReturn(Session.AUTO_ACKNOWLEDGE);
-      expect(clientSession.isClosed()).andReturn(false);
-      expect(session.getCoreSession()).andReturn(clientSession);
-      ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
-
-      replay(session, clientSession, clientConsumer);
-
-      JBossMessageConsumer consumer = new JBossMessageConsumer(session,
-            clientConsumer, false, destination, messageSelector, null);
-
-      assertEquals(messageSelector, consumer.getMessageSelector());
-
-      verify(session, clientSession, clientConsumer);
-   }
-
-   public void testGetNoLocal() throws Exception
-   {
-      boolean noLocal = true;
-      JBossDestination 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, noLocal, destination, null, null);
-
-      assertEquals(noLocal, consumer.getNoLocal());
-
-      verify(session, clientConsumer);
-   }
-
-   public void testGetQueue() throws Exception
-   {
-      JBossDestination 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, null);
-
-      assertEquals(destination, consumer.getQueue());
-
-      verify(session, clientConsumer);
-   }
-
-   public void testGetTopic() throws Exception
-   {
-      JBossDestination destination = new JBossTopic(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, null);
-
-      assertEquals(destination, consumer.getTopic());
-
-      verify(session, clientConsumer);
-   }
-
-   public void testGetMessageListenerIsNull() throws Exception
-   {
-      JBossDestination destination = new JBossQueue(randomString());
-      JBossSession session = createStrictMock(JBossSession.class);
-      ClientSession clientSession = createStrictMock(ClientSession.class);
-      expect(session.getAcknowledgeMode()).andReturn(Session.AUTO_ACKNOWLEDGE);
-      expect(clientSession.isClosed()).andReturn(false);
-      expect(session.getCoreSession()).andReturn(clientSession);
-      ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
-
-      replay(session, clientSession, clientConsumer);
-
-      JBossMessageConsumer consumer = new JBossMessageConsumer(session,
-            clientConsumer, false, destination, null, null);
-      assertNull(consumer.getMessageListener());
-
-      verify(session, clientSession, clientConsumer);
-   }
-
-   public void testSetMessageListener() throws Exception
-   {
-      JBossDestination destination = new JBossQueue(randomString());
-      JBossSession session = createStrictMock(JBossSession.class);
-      ClientSession clientSession = createStrictMock(ClientSession.class);
-      expect(session.getAcknowledgeMode()).andReturn(Session.AUTO_ACKNOWLEDGE);
-      expect(clientSession.isClosed()).andReturn(false);
-      expect(session.getCoreSession()).andReturn(clientSession);
-      ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
-      clientConsumer.setMessageHandler(isA(MessageHandler.class));
-      MessageListener listener = createStrictMock(MessageListener.class);
-
-      replay(session, clientSession, clientConsumer, listener);
-
-      JBossMessageConsumer consumer = new JBossMessageConsumer(session,
-            clientConsumer, false, destination, null, null);
-      consumer.setMessageListener(listener);
-      assertEquals(listener, consumer.getMessageListener());
-
-      verify(session, clientSession, clientConsumer, listener);
-   }
-
-   public void testSetMessageListenerThrowsException() throws Exception
-   {
-      JBossDestination destination = new JBossQueue(randomString());
-      JBossSession session = createStrictMock(JBossSession.class);
-      ClientSession clientSession = createStrictMock(ClientSession.class);
-      expect(session.getAcknowledgeMode()).andReturn(Session.AUTO_ACKNOWLEDGE);
-      ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
-      clientConsumer.setMessageHandler(isA(MessageHandler.class));
-      expectLastCall().andThrow(new MessagingException());
-      MessageListener listener = createStrictMock(MessageListener.class);
-
-      replay(session, clientSession, clientConsumer, listener);
-
-      JBossMessageConsumer consumer = new JBossMessageConsumer(session,
-            clientConsumer, false, destination, null, null);
-      try
-      {
-         consumer.setMessageListener(listener);
-         fail("JMSException");
-      } catch (JMSException e)
-      {
-      }
-
-      verify(session, clientSession, clientConsumer, listener);
-   }
-
-   public void testReceiveWithNoMessage() throws Exception
-   {
-      doReceiveWithNoMessage(0, new MessageReceiver()
-      {
-         public Message receive(MessageConsumer consumer) throws Exception
-         {
-            return consumer.receive();
-         }
-      });
-   }
-
-   public void testReceiveNoWaitWithNoMessage() throws Exception
-   {
-      doReceiveWithNoMessage(-1, new MessageReceiver()
-      {
-         public Message receive(MessageConsumer consumer) throws Exception
-         {
-            return consumer.receiveNoWait();
-         }
-      });
-   }
-
-   public void testReceiveWithTimeoutWithNoMessage() throws Exception
-   {
-      final long timeout = 1000;
-      doReceiveWithNoMessage(timeout, new MessageReceiver()
-      {
-         public Message receive(MessageConsumer consumer) throws Exception
-         {
-            return consumer.receive(timeout);
-         }
-      });
-   }
-
-   public void testReceiveThrowsException() throws Exception
-   {
-      JBossDestination destination = new JBossQueue(randomString());
-      JBossSession session = createStrictMock(JBossSession.class);
-      expect(session.getAcknowledgeMode()).andReturn(Session.AUTO_ACKNOWLEDGE);
-      ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
-      expect(clientConsumer.receive(0)).andThrow(new MessagingException());
-
-      replay(session, clientConsumer);
-
-      JBossMessageConsumer consumer = new JBossMessageConsumer(session,
-            clientConsumer, false, destination, null, null);
-
-      try
-      {
-         consumer.receive();
-         fail("JMSException");
-      } catch (JMSException e)
-      {
-      }
-
-      verify(session, clientConsumer);
-   }
-
-   public void testReceive() throws Exception
-   {
-      JBossDestination destination = new JBossQueue(randomString());
-      JBossSession session = createStrictMock(JBossSession.class);
-      ClientSession clientSession = createStrictMock(ClientSession.class);
-      expect(session.getAcknowledgeMode()).andReturn(Session.AUTO_ACKNOWLEDGE);
-      expect(session.getCoreSession()).andStubReturn(clientSession);
-      ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
-      ClientMessage clientMessage = createStrictMock(ClientMessage.class);
-      clientMessage.acknowledge();
-      expect(clientMessage.getType()).andReturn(JBossMessage.TYPE);
-      MessagingBuffer body = createStrictMock(MessagingBuffer.class);
-      expect(clientMessage.getBody()).andStubReturn(body );
-      expect(clientConsumer.receive(0)).andReturn(clientMessage );
-      body.resetReaderIndex();
-
-      replay(session, clientSession, clientConsumer, clientMessage, body);
-
-      JBossMessageConsumer consumer = new JBossMessageConsumer(session,
-            clientConsumer, false, destination, null, null);
-
-      Message message = consumer.receive();
-      assertNotNull(message);
-      
-      verify(session, clientSession, clientConsumer, clientMessage, body);
-   }
-   
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   public void doReceiveWithNoMessage(long expectedTimeout,
-         MessageReceiver receiver) throws Exception
-   {
-      JBossDestination destination = new JBossQueue(randomString());
-      JBossSession session = createStrictMock(JBossSession.class);
-      expect(session.getAcknowledgeMode()).andReturn(Session.AUTO_ACKNOWLEDGE);
-      ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
-      expect(clientConsumer.receive(expectedTimeout)).andReturn(null);
-
-      replay(session, clientConsumer);
-
-      JBossMessageConsumer consumer = new JBossMessageConsumer(session,
-            clientConsumer, false, destination, null, null);
-
-      Message message = receiver.receive(consumer);
-      assertNull(message);
-
-      verify(session, clientConsumer);
-   }
-
-   // Inner classes -------------------------------------------------
-
-   private interface MessageReceiver
-   {
-      Message receive(MessageConsumer consumer) throws Exception;
-   }
-}

Deleted: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageProducerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageProducerTest.java	2009-03-23 09:48:00 UTC (rev 6133)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageProducerTest.java	2009-03-23 09:52:29 UTC (rev 6134)
@@ -1,478 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.messaging.tests.unit.jms.client;
-
-import static org.easymock.EasyMock.anyInt;
-import static org.easymock.EasyMock.anyLong;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.isA;
-import static org.easymock.EasyMock.isNull;
-import static org.easymock.EasyMock.startsWith;
-import static org.easymock.classextension.EasyMock.createStrictMock;
-import static org.easymock.classextension.EasyMock.replay;
-import static org.easymock.classextension.EasyMock.verify;
-import static org.jboss.messaging.tests.util.RandomUtil.randomBoolean;
-import static org.jboss.messaging.tests.util.RandomUtil.randomBytes;
-import static org.jboss.messaging.tests.util.RandomUtil.randomSimpleString;
-import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-
-import java.util.Vector;
-
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.IllegalStateException;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Queue;
-import javax.jms.Topic;
-
-import org.easymock.EasyMock;
-import org.jboss.messaging.core.buffers.ChannelBuffers;
-import org.jboss.messaging.core.client.ClientMessage;
-import org.jboss.messaging.core.client.ClientProducer;
-import org.jboss.messaging.core.client.ClientSession;
-import org.jboss.messaging.core.client.impl.ClientMessageImpl;
-import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
-import org.jboss.messaging.jms.JBossDestination;
-import org.jboss.messaging.jms.JBossQueue;
-import org.jboss.messaging.jms.JBossTopic;
-import org.jboss.messaging.jms.client.JBossConnection;
-import org.jboss.messaging.jms.client.JBossMessage;
-import org.jboss.messaging.jms.client.JBossMessageProducer;
-import org.jboss.messaging.tests.util.UnitTestCase;
-import org.jboss.messaging.utils.SimpleString;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- *
- * @version <tt>$Revision$</tt>
- *
- */
-public class JBossMessageProducerTest extends UnitTestCase
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   public void testClose() throws Exception
-   {
-      ClientProducer clientProducer = createStrictMock(ClientProducer.class);
-      ClientSession clientSession = createStrictMock(ClientSession.class);
-      JBossConnection jbConn = createStrictMock(JBossConnection.class);
-      EasyMock.expect(jbConn.getUID()).andReturn(randomSimpleString());
-      clientProducer.close();
-
-      replay(clientProducer, clientSession, jbConn);
-
-      JBossDestination destination = new JBossQueue(randomString());
-      JBossMessageProducer producer = new JBossMessageProducer(jbConn, clientProducer,
-            destination, clientSession);
-
-      producer.close();
-
-      verify(clientProducer, clientSession, jbConn);
-   }
-
-   public void testCloseThrowsException() throws Exception
-   {
-      ClientProducer clientProducer = createStrictMock(ClientProducer.class);
-      ClientSession clientSession = createStrictMock(ClientSession.class);
-      JBossConnection jbConn = createStrictMock(JBossConnection.class);
-      EasyMock.expect(jbConn.getUID()).andReturn(randomSimpleString());
-      clientProducer.close();
-      expectLastCall().andThrow(new MessagingException());
-
-      replay(clientProducer, clientSession, jbConn);
-
-      JBossDestination destination = new JBossQueue(randomString());
-      JBossMessageProducer producer = new JBossMessageProducer(jbConn, clientProducer,
-            destination, clientSession);
-
-      try
-      {
-         producer.close();
-         fail("JMSException");
-      } catch (JMSException e)
-      {
-      }
-
-      verify(clientProducer, clientSession, jbConn);
-   }
-
-   public void testCheckClosed() throws Exception
-   {
-      JBossDestination destination = new JBossQueue(randomString());
-      ClientProducer clientProducer = createStrictMock(ClientProducer.class);
-      ClientSession clientSession = createStrictMock(ClientSession.class);
-      JBossConnection jbConn = createStrictMock(JBossConnection.class);
-      EasyMock.expect(jbConn.getUID()).andReturn(randomSimpleString());
-      expect(clientProducer.isClosed()).andReturn(true);
-      replay(clientProducer, clientSession, jbConn);
-
-      JBossMessageProducer producer = new JBossMessageProducer(jbConn, clientProducer,
-            destination, clientSession);
-
-      try
-      {
-         producer.getDeliveryMode();
-         fail("IllegalStateException");
-      } catch (IllegalStateException e)
-      {
-      }
-
-      verify(clientProducer, clientSession, jbConn);
-   }
-
-   public void testDisabledMessageID() throws Exception
-   {
-      ClientProducer clientProducer = createStrictMock(ClientProducer.class);
-      ClientSession clientSession = createStrictMock(ClientSession.class);
-      EasyMock.expect(clientProducer.isClosed()).andStubReturn(false);
-      JBossConnection jbConn = createStrictMock(JBossConnection.class);
-      EasyMock.expect(jbConn.getUID()).andReturn(randomSimpleString());
-      replay(clientProducer, clientSession, jbConn);
-
-      JBossDestination destination = new JBossQueue(randomString());
-      JBossMessageProducer producer = new JBossMessageProducer(jbConn, clientProducer,
-            destination, clientSession);
-      boolean disabledMessageID = randomBoolean();
-      producer.setDisableMessageID(disabledMessageID);
-      assertEquals(disabledMessageID, producer.getDisableMessageID());
-
-      verify(clientProducer, clientSession, jbConn);
-   }
-
-   public void testDisableMessageTimestamp() throws Exception
-   {
-      ClientProducer clientProducer = createStrictMock(ClientProducer.class);
-      ClientSession clientSession = createStrictMock(ClientSession.class);
-      JBossConnection jbConn = createStrictMock(JBossConnection.class);
-      EasyMock.expect(jbConn.getUID()).andReturn(randomSimpleString());
-      EasyMock.expect(clientProducer.isClosed()).andStubReturn(false);
-
-      replay(clientProducer, clientSession, jbConn);
-
-      JBossDestination destination = new JBossQueue(randomString());
-      JBossMessageProducer producer = new JBossMessageProducer(jbConn, clientProducer,
-            destination, clientSession);;
-      boolean disabledTimestamp = randomBoolean();
-      producer.setDisableMessageTimestamp(disabledTimestamp);
-      assertEquals(disabledTimestamp, producer.getDisableMessageTimestamp());
-
-      verify(clientProducer, clientSession, jbConn);
-   }
-
-   public void testDeliveryMode() throws Exception
-   {
-      ClientProducer clientProducer = createStrictMock(ClientProducer.class);
-      ClientSession clientSession = createStrictMock(ClientSession.class);
-      JBossConnection jbConn = createStrictMock(JBossConnection.class);
-      EasyMock.expect(jbConn.getUID()).andReturn(randomSimpleString());
-      EasyMock.expect(clientProducer.isClosed()).andStubReturn(false);
-      replay(clientProducer, clientSession, jbConn);
-
-      JBossDestination destination = new JBossQueue(randomString());
-      JBossMessageProducer producer = new JBossMessageProducer(jbConn, clientProducer,
-            destination, clientSession);
-      int deliveryMode = DeliveryMode.PERSISTENT;
-      producer.setDeliveryMode(deliveryMode);
-      assertEquals(deliveryMode, producer.getDeliveryMode());
-
-      verify(clientProducer, clientSession, jbConn);
-   }
-
-   public void testPriority() throws Exception
-   {
-      ClientProducer clientProducer = createStrictMock(ClientProducer.class);
-      ClientSession clientSession = createStrictMock(ClientSession.class);
-      JBossConnection jbConn = createStrictMock(JBossConnection.class);
-      EasyMock.expect(jbConn.getUID()).andReturn(randomSimpleString());
-      EasyMock.expect(clientProducer.isClosed()).andStubReturn(false);
-      replay(clientProducer, clientSession, jbConn);
-
-      JBossDestination destination = new JBossQueue(randomString());
-      JBossMessageProducer producer = new JBossMessageProducer(jbConn, clientProducer,
-            destination, clientSession);
-      int priority = 7;
-      producer.setPriority(priority);
-      assertEquals(priority, producer.getPriority());
-
-      verify(clientProducer, clientSession, jbConn);
-   }
-
-   public void testTimeToLive() throws Exception
-   {
-      ClientProducer clientProducer = createStrictMock(ClientProducer.class);
-      ClientSession clientSession = createStrictMock(ClientSession.class);
-      JBossConnection jbConn = createStrictMock(JBossConnection.class);
-      EasyMock.expect(jbConn.getUID()).andReturn(randomSimpleString());
-      EasyMock.expect(clientProducer.isClosed()).andStubReturn(false);
-      replay(clientProducer, clientSession, jbConn);
-
-      JBossDestination destination = new JBossQueue(randomString());
-      JBossMessageProducer producer = new JBossMessageProducer(jbConn, clientProducer,
-            destination, clientSession);
-      long ttl = System.currentTimeMillis();
-      producer.setTimeToLive(ttl);
-      assertEquals(ttl, producer.getTimeToLive());
-
-      verify(clientProducer, clientSession, jbConn);
-   }
-
-   public void testGetDestination() throws Exception
-   {
-      ClientProducer clientProducer = createStrictMock(ClientProducer.class);
-      ClientSession clientSession = createStrictMock(ClientSession.class);
-      JBossConnection jbConn = createStrictMock(JBossConnection.class);
-      EasyMock.expect(jbConn.getUID()).andReturn(randomSimpleString());
-      EasyMock.expect(clientProducer.isClosed()).andStubReturn(false);
-      replay(clientProducer, clientSession, jbConn);
-
-      JBossDestination destination = new JBossQueue(randomString());
-      JBossMessageProducer producer = new JBossMessageProducer(jbConn, clientProducer,
-            destination, clientSession);
-      assertEquals(destination, producer.getDestination());
-
-      verify(clientProducer, clientSession, jbConn);
-   }
-
-   public void testGetDelegate() throws Exception
-   {
-      ClientProducer clientProducer = createStrictMock(ClientProducer.class);
-      ClientSession clientSession = createStrictMock(ClientSession.class);
-      JBossConnection jbConn = createStrictMock(JBossConnection.class);
-      EasyMock.expect(jbConn.getUID()).andReturn(randomSimpleString());
-      EasyMock.expect(clientProducer.isClosed()).andStubReturn(false);
-      EasyMock.expect(clientProducer.isClosed()).andStubReturn(false);
-      replay(clientProducer, clientSession, jbConn);
-
-      JBossDestination destination = new JBossQueue(randomString());
-      JBossMessageProducer producer = new JBossMessageProducer(jbConn, clientProducer,
-            destination, clientSession);
-      assertEquals(destination, producer.getDestination());
-      verify(clientProducer, clientSession, jbConn);
-   }
-
-   public void testGetTopic() throws Exception
-   {
-      ClientProducer clientProducer = createStrictMock(ClientProducer.class);
-      ClientSession clientSession = createStrictMock(ClientSession.class);
-      JBossConnection jbConn = createStrictMock(JBossConnection.class);
-      EasyMock.expect(jbConn.getUID()).andReturn(randomSimpleString());
-      EasyMock.expect(clientProducer.isClosed()).andStubReturn(false);
-      replay(clientProducer, clientSession, jbConn);
-
-      JBossDestination destination = new JBossTopic(randomString());
-      JBossMessageProducer producer = new JBossMessageProducer(jbConn, clientProducer,
-            destination, clientSession);
-      assertEquals(destination, producer.getTopic());
-
-      verify(clientProducer, clientSession, jbConn);
-   }
-
-   public void testGetQueue() throws Exception
-   {
-      ClientProducer clientProducer = createStrictMock(ClientProducer.class);
-      ClientSession clientSession = createStrictMock(ClientSession.class);
-      JBossConnection jbConn = createStrictMock(JBossConnection.class);
-      EasyMock.expect(jbConn.getUID()).andReturn(randomSimpleString());
-      EasyMock.expect(clientProducer.isClosed()).andStubReturn(false);
-      replay(clientProducer, clientSession, jbConn);
-
-      JBossDestination destination = new JBossQueue(randomString());
-      JBossMessageProducer producer = new JBossMessageProducer(jbConn, clientProducer,
-            destination, clientSession);
-      assertEquals(destination, producer.getQueue());
-
-      verify(clientProducer, clientSession, jbConn);
-   }
-
-   public void testSend() throws Exception
-   {
-      doProduce(new MessageProduction()
-      {
-         public void produce(JBossMessageProducer producer, Message message,
-               Destination destination) throws Exception
-         {
-            producer.send(message);
-         }
-      });
-   }
-
-   public void testSendWithDestination() throws Exception
-   {
-      doProduceWithDestination(new JBossQueue(randomString()),
-            new MessageProduction()
-            {
-               public void produce(JBossMessageProducer producer,
-                     Message message, Destination destination) throws Exception
-               {
-                  producer.send(destination, message);
-               }
-            });
-   }
-
-   public void testSendWithQueue() throws Exception
-   {
-      doProduceWithDestination(new JBossQueue(randomString()),
-            new MessageProduction()
-            {
-               public void produce(JBossMessageProducer producer,
-                     Message message, Destination destination) throws Exception
-               {
-                  assertTrue(destination instanceof Queue);
-                  producer.send((Queue)destination, message);
-               }
-            });
-   }
-
-   public void testPublish() throws Exception
-   {
-      doProduce(new MessageProduction()
-      {
-         public void produce(JBossMessageProducer producer, Message message,
-               Destination destination) throws Exception
-         {
-            producer.publish(message);
-         }
-      });
-   }
-
-   public void testPublishWithDestination() throws Exception
-   {
-      doProduceWithDestination(new JBossTopic(randomString()), new MessageProduction()
-      {
-         public void produce(JBossMessageProducer producer, Message message,
-               Destination destination) throws Exception
-         {
-            assertTrue(destination instanceof Topic);
-            producer.publish((Topic) destination, message);
-         }
-      });
-   }
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   private void doProduce(MessageProduction production) throws Exception
-   {
-      JBossDestination destination = new JBossQueue(randomString());
-      JBossDestination replyTo = new JBossQueue(randomString());
-      ClientProducer clientProducer = createStrictMock(ClientProducer.class);
-      JBossConnection jbConn = createStrictMock(JBossConnection.class);
-      EasyMock.expect(jbConn.getUID()).andReturn(randomSimpleString());
-      EasyMock.expect(jbConn.hasNoLocal()).andStubReturn(false);
-      Message message = createStrictMock(Message.class);
-      ClientSession session = EasyMock.createNiceMock(ClientSession.class);
-      MessagingBuffer body = ChannelBuffers.wrappedBuffer(new byte[1024]);
-      ClientMessage clientMessage = new ClientMessageImpl(JBossMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
-      expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
-      expect(clientProducer.isClosed()).andStubReturn(false);
-      message.setJMSDeliveryMode(anyInt());
-      message.setJMSPriority(anyInt());
-      message.setJMSExpiration(0);
-      message.setJMSTimestamp(anyLong());
-      expect(message.getJMSTimestamp()).andReturn(0L);
-      expect(message.getJMSCorrelationIDAsBytes()).andReturn(randomBytes());
-      expect(message.getJMSReplyTo()).andReturn(replyTo);
-      expect(message.getJMSDestination()).andReturn(destination);
-      expect(message.getJMSDeliveryMode()).andReturn(
-            DeliveryMode.NON_PERSISTENT);
-      expect(message.getJMSExpiration()).andReturn(0L);
-      expect(message.getJMSPriority()).andReturn(4);
-      expect(message.getJMSType()).andReturn(null);
-      expect(message.getPropertyNames()).andReturn(
-            (new Vector<String>()).elements());
-      message.setJMSDestination(destination);
-      message.setJMSMessageID(startsWith("ID:"));
-      clientProducer.send((SimpleString) isNull(), isA(ClientMessage.class));
-      replay(clientProducer, message, session, jbConn);
-
-      JBossMessageProducer producer = new JBossMessageProducer(jbConn, clientProducer,
-            destination, session);
-      production.produce(producer, message, destination);
-
-      verify(clientProducer, message, session, jbConn);
-   }
-
-   private void doProduceWithDestination(JBossDestination destination,
-         MessageProduction production) throws Exception
-   {
-      JBossDestination replyTo = new JBossQueue(randomString());
-      ClientProducer clientProducer = createStrictMock(ClientProducer.class);
-      ClientSession clientSession = createStrictMock(ClientSession.class);
-      JBossConnection jbConn = createStrictMock(JBossConnection.class);
-      EasyMock.expect(jbConn.getUID()).andReturn(randomSimpleString());
-      EasyMock.expect(jbConn.hasNoLocal()).andStubReturn(false);
-      MessagingBuffer body = ChannelBuffers.wrappedBuffer(new byte[1024]);
-      ClientMessage clientMessage = new ClientMessageImpl(JBossMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
-      expect(clientSession.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
-      Message message = createStrictMock(Message.class);
-      expect(clientProducer.isClosed()).andStubReturn(false);
-      message.setJMSDeliveryMode(anyInt());
-      message.setJMSPriority(anyInt());
-      message.setJMSExpiration(0);
-      message.setJMSTimestamp(anyLong());
-      expect(message.getJMSTimestamp()).andReturn(0L);
-      expect(message.getJMSCorrelationIDAsBytes()).andReturn(randomBytes());
-      expect(message.getJMSReplyTo()).andReturn(replyTo);
-      expect(message.getJMSDestination()).andReturn(destination);
-      expect(message.getJMSDeliveryMode()).andReturn(
-            DeliveryMode.NON_PERSISTENT);
-      expect(message.getJMSExpiration()).andReturn(0L);
-      expect(message.getJMSPriority()).andReturn(4);
-      expect(message.getJMSType()).andReturn(null);
-      expect(message.getPropertyNames()).andReturn(
-            (new Vector<String>()).elements());
-      message.setJMSDestination(destination);
-      message.setJMSMessageID(startsWith("ID:"));
-      clientProducer.send(eq(destination.getSimpleAddress()), isA(ClientMessage.class));
-      replay(clientProducer, message, clientSession, jbConn);
-
-      JBossMessageProducer producer = new JBossMessageProducer(jbConn, clientProducer,
-            destination, clientSession);
-      production.produce(producer, message, destination);
-
-      verify(clientProducer, message, clientSession, jbConn);
-   }
-
-   // Inner classes -------------------------------------------------
-
-   private interface MessageProduction
-   {
-      void produce(JBossMessageProducer producer, Message message,
-            Destination destination) throws Exception;
-   }
-}

Deleted: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java	2009-03-23 09:48:00 UTC (rev 6133)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossMessageTest.java	2009-03-23 09:52:29 UTC (rev 6134)
@@ -1,1411 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */ 
-
-package org.jboss.messaging.tests.unit.jms.client;
-
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.createStrictMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.jboss.messaging.tests.util.RandomUtil.randomByte;
-import static org.jboss.messaging.tests.util.RandomUtil.randomBytes;
-import static org.jboss.messaging.tests.util.RandomUtil.randomDouble;
-import static org.jboss.messaging.tests.util.RandomUtil.randomFloat;
-import static org.jboss.messaging.tests.util.RandomUtil.randomInt;
-import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
-import static org.jboss.messaging.tests.util.RandomUtil.randomShort;
-import static org.jboss.messaging.tests.util.RandomUtil.randomSimpleString;
-import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-
-import java.util.Collections;
-
-import javax.jms.DeliveryMode;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageFormatException;
-
-import org.easymock.EasyMock;
-import org.jboss.messaging.core.buffers.ChannelBuffers;
-import org.jboss.messaging.core.client.ClientMessage;
-import org.jboss.messaging.core.client.ClientSession;
-import org.jboss.messaging.core.client.impl.ClientMessageImpl;
-import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.message.impl.MessageImpl;
-import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
-import org.jboss.messaging.jms.client.JBossBytesMessage;
-import org.jboss.messaging.jms.client.JBossMapMessage;
-import org.jboss.messaging.jms.client.JBossMessage;
-import org.jboss.messaging.jms.client.JBossObjectMessage;
-import org.jboss.messaging.jms.client.JBossStreamMessage;
-import org.jboss.messaging.jms.client.JBossTextMessage;
-import org.jboss.messaging.tests.util.UnitTestCase;
-import org.jboss.messaging.utils.SimpleString;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * 
- * @version <tt>$Revision$</tt>
- * 
- */
-public class JBossMessageTest extends UnitTestCase
-{
-   private ClientSession clientSession;
-   private ClientMessage clientMessage;
-   private String propertyName;
-
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-   
-   public void testCreateMessage() throws Exception
-   {
-      doTestCreateMessage(JBossMessage.TYPE, JBossMessage.class);
-   }
-
-   public void testCreateBytesMessage() throws Exception
-   {
-      doTestCreateMessage(JBossBytesMessage.TYPE, JBossBytesMessage.class);
-   }
-
-   public void testCreateMapMessage() throws Exception
-   {
-      doTestCreateMessage(JBossMapMessage.TYPE, JBossMapMessage.class);
-   }
-
-   public void testCreateObjectMessage() throws Exception
-   {
-      doTestCreateMessage(JBossObjectMessage.TYPE, JBossObjectMessage.class);
-   }
-
-   public void testCreateStreamMessage() throws Exception
-   {
-      doTestCreateMessage(JBossStreamMessage.TYPE, JBossStreamMessage.class);
-   }
-
-   public void testCreateTextMessage() throws Exception
-   {
-      doTestCreateMessage(JBossTextMessage.TYPE, JBossTextMessage.class);
-   }
-
-   public void testCreateInvalidMessage() throws Exception
-   {
-      try
-      {
-         doTestCreateMessage((byte) 23, JBossTextMessage.class);
-         fail("must throw a IllegalArgumentException");
-      } catch (IllegalArgumentException e)
-      {
-      }
-   }
-
-   public void testForeignMessage() throws Exception
-   {
-      Message foreignMessage = createNiceMock(Message.class);
-      ClientSession session = EasyMock.createNiceMock(ClientSession.class);
-      MessagingBuffer body = ChannelBuffers.wrappedBuffer(new byte[1024]);
-      ClientMessage clientMessage = new ClientMessageImpl(JBossMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
-      expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
-      expect(foreignMessage.getJMSDeliveryMode()).andReturn(
-            DeliveryMode.NON_PERSISTENT);
-      expect(foreignMessage.getPropertyNames()).andReturn(
-            Collections.enumeration(Collections.EMPTY_LIST));
-
-      replay(foreignMessage, session);
-
-      JBossMessage msg = new JBossMessage(foreignMessage, session);
-
-      verify(foreignMessage, session);
-   }
-
-   public void testGetJMSMessageID() throws Exception
-   {
-      SimpleString messageID = randomSimpleString();
-      clientSession = createStrictMock(ClientSession.class);
-      clientMessage = createStrictMock(ClientMessage.class);
-      MessagingBuffer buffer = createStrictMock(MessagingBuffer.class);
-      expect(clientMessage.getBody()).andStubReturn(buffer);
-      expect(clientMessage.getProperty(JBossMessage.JBM_MESSAGE_ID)).andReturn(
-            messageID);
-      replay(clientSession, clientMessage, buffer);
-
-      JBossMessage message = new JBossMessage(clientMessage, clientSession);
-      assertEquals(messageID.toString(), message.getJMSMessageID());
-
-      verify(clientSession, clientMessage, buffer);
-   }
-   
-   public void testGetJMSDeliveryModeAsPersistent() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().setDurable(true);
-      
-      assertEquals(DeliveryMode.PERSISTENT, message.getJMSDeliveryMode());
-   }
-
-   public void testGetJMSDeliveryModeAsNonPersistent() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().setDurable(false);
-      
-      assertEquals(DeliveryMode.NON_PERSISTENT, message.getJMSDeliveryMode());
-   }
-
-   public void testSetJMSDeliveryModeWithPersistent() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      message.setJMSDeliveryMode(DeliveryMode.PERSISTENT);
-      
-      assertTrue(message.getCoreMessage().isDurable());
-   }
-
-   public void testSetJMSDeliveryModeWithNonPersistent() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      message.setJMSDeliveryMode(DeliveryMode.NON_PERSISTENT);
-      
-      assertFalse(message.getCoreMessage().isDurable());
-   }
-
-   public void testSetJMSDeliveryModeWithInvalidValue() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      
-      try
-      {
-         message.setJMSDeliveryMode(12345);         
-         fail("invalid DeliveryMode value");
-      } catch (JMSException e)
-      {
-      }
-   }
-   
-   public void testGetJMSRedelivered() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      
-      message.getCoreMessage().setDeliveryCount(0);
-      assertFalse(message.getJMSRedelivered());
-      
-      message.getCoreMessage().setDeliveryCount(1);
-      assertFalse(message.getJMSRedelivered());
-
-      message.getCoreMessage().setDeliveryCount(2);
-      assertTrue(message.getJMSRedelivered());
-   }
-   
-   public void testSetJMSRedeliveredToTrue() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-
-      message.setJMSRedelivered(true);
-      assertEquals(2, message.getCoreMessage().getDeliveryCount());
-   }
-   
-   public void testSetJMSRedeliveredToFalse() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-
-      message.setJMSRedelivered(false);
-      assertEquals(1, message.getCoreMessage().getDeliveryCount());
-   }
-
-   public void testSetJMSType() throws Exception
-   {
-      String type = randomString();
-      JBossMessage message = new JBossMessage();      
-      message.setJMSType(type);
-      
-      SimpleString t = (SimpleString) message.getCoreMessage().getProperty(JBossMessage.TYPE_HEADER_NAME);
-      assertEquals(type, t.toString());
-   }
-   
-   public void testGetJMSType() throws Exception
-   {
-      String type = randomString();
-      JBossMessage message = new JBossMessage();      
-    
-      assertNull(message.getJMSType());
-      
-      message.getCoreMessage().putStringProperty(JBossMessage.TYPE_HEADER_NAME, new SimpleString(type));
-      assertEquals(type, message.getJMSType());
-   }
-   
-   public void testSetJMSTimestamp() throws Exception
-   {
-      long timestamp = randomLong();
-      JBossMessage message = new JBossMessage();      
-      message.setJMSTimestamp(timestamp);
-      
-      assertEquals(timestamp, message.getCoreMessage().getTimestamp());
-   }
-   
-   public void testGetJMSTimestamp() throws Exception
-   {
-      long timestamp = randomLong();
-      JBossMessage message = new JBossMessage();      
-      message.getCoreMessage().setTimestamp(timestamp);
-    
-      assertEquals(timestamp, message.getJMSTimestamp());
-   }
-   
-   public void testSetJMSCorrelationID() throws Exception
-   {
-      String correlationID = randomString();
-      JBossMessage message = new JBossMessage();      
-    
-      message.setJMSCorrelationID(correlationID);
-      
-      SimpleString value = (SimpleString) message.getCoreMessage().getProperty(JBossMessage.CORRELATIONID_HEADER_NAME);
-      
-      assertEquals(correlationID, value.toString());      
-   }
-   
-   public void testSetJMSCorrelationIDToNull() throws Exception
-   {
-      JBossMessage message = new JBossMessage();      
-      message.setJMSCorrelationID(null);
-      
-      assertFalse(message.getCoreMessage().containsProperty(JBossMessage.CORRELATIONID_HEADER_NAME));
-   }
-   
-   public void testGetJMSCorrelationID() throws Exception
-   {
-      String correlationID = randomString();
-      JBossMessage message = new JBossMessage();
-      
-      message.getCoreMessage().putStringProperty(JBossMessage.CORRELATIONID_HEADER_NAME, new SimpleString(correlationID));
-      
-      assertEquals(correlationID, message.getJMSCorrelationID());
-   }
-   
-   
-   public void testSetJMSCorrelationIDAsBytes() throws Exception
-   {
-      byte[] correlationID = randomBytes();
-      JBossMessage message = new JBossMessage();      
-    
-      message.setJMSCorrelationIDAsBytes(correlationID);
-      
-      byte[] value = (byte[]) message.getCoreMessage().getProperty(JBossMessage.CORRELATIONID_HEADER_NAME);
-      
-      assertEquals(correlationID, value);      
-   }
-   
-   public void testGetJMSCorrelationIDAsBytes() throws Exception
-   {
-      byte[] correlationID = randomBytes();
-      JBossMessage message = new JBossMessage();
-      
-      message.getCoreMessage().putBytesProperty(JBossMessage.CORRELATIONID_HEADER_NAME, correlationID);
-      
-      assertEquals(correlationID, message.getJMSCorrelationIDAsBytes());
-   }
-   
-   public void testSetPriority() throws Exception
-   {
-      int priority = 9;
-      JBossMessage message = new JBossMessage();
-      
-      message.setJMSPriority(priority);
-      assertEquals(priority, message.getCoreMessage().getPriority());
-   }
-   
-   public void testSetInvalidPriority() throws Exception
-   {
-      int invalidPriority = 10;
-      JBossMessage message = new JBossMessage();
-
-      try
-      {
-         message.setJMSPriority(invalidPriority);
-         fail("0 <= priority <= 9");
-      }
-      catch(JMSException e)
-      {
-      }
-   }
-   
-   public void testGetPriority() throws Exception
-   {
-      int priority = 9;
-      JBossMessage message = new JBossMessage();
-
-      message.getCoreMessage().setPriority((byte) priority);
-      assertEquals(priority, message.getJMSPriority());
-   }
-   
-   public void testSetJMSExpiration() throws Exception
-   {
-      long expiration = randomLong();
-      JBossMessage message = new JBossMessage();
-      message.setJMSExpiration(expiration);
-      
-      assertEquals(expiration, message.getCoreMessage().getExpiration());
-   }
-
-   public void testGetJMSExpiration() throws Exception
-   {
-      long expiration = randomLong();
-      JBossMessage message = new JBossMessage();
-      
-      message.getCoreMessage().setExpiration(expiration);
-      assertEquals(expiration, message.getJMSExpiration());
-   }
-
-   public void testJMSXGroupIDPropertyNull() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      assertFalse(message.propertyExists(JBossMessage.JMSXGROUPID));
-      assertNull(message.getStringProperty(JBossMessage.JMSXGROUPID));
-   }
-
-   public void testSetJMSXGroupIDProperty() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      message.setStringProperty(JBossMessage.JMSXGROUPID, "testid");
-      assertTrue(message.propertyExists(JBossMessage.JMSXGROUPID));
-      assertEquals(new SimpleString("testid"), message.getCoreMessage().getProperty(MessageImpl.HDR_GROUP_ID));
-   }
-
-   public void testGetJMSXGroupIDProperty() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putStringProperty(MessageImpl.HDR_GROUP_ID, new SimpleString("testid"));
-      assertTrue(message.propertyExists(JBossMessage.JMSXGROUPID));
-      assertEquals("testid", message.getStringProperty(JBossMessage.JMSXGROUPID));
-   }
-
-   public void testSetJMSMessageID() throws Exception
-   {
-      String messageID = "ID:" + randomString();
-      clientSession = createStrictMock(ClientSession.class);
-      clientMessage = createStrictMock(ClientMessage.class);
-      MessagingBuffer buffer = createStrictMock(MessagingBuffer.class);
-      expect(clientMessage.getBody()).andStubReturn(buffer);
-      clientMessage.putStringProperty(JBossMessage.JBM_MESSAGE_ID,
-            new SimpleString(messageID));
-      replay(clientSession, clientMessage, buffer);
-
-      JBossMessage message = new JBossMessage(clientMessage, clientSession);
-      message.setJMSMessageID(messageID);
-
-      verify(clientSession, clientMessage, buffer);
-   }
-
-   public void testSetJMSMessageIDNotStartingWithID() throws Exception
-   {
-      String messageID = randomString();
-      assertTrue(!messageID.startsWith("ID:"));
-      clientSession = createStrictMock(ClientSession.class);
-      clientMessage = createStrictMock(ClientMessage.class);
-      MessagingBuffer buffer = createStrictMock(MessagingBuffer.class);
-      expect(clientMessage.getBody()).andStubReturn(buffer);
-      replay(clientSession, clientMessage, buffer);
-
-      JBossMessage message = new JBossMessage(clientMessage, clientSession);
-      try
-      {
-         message.setJMSMessageID(messageID);
-         fail("messageID does not start with ID:");
-      }
-      catch (JMSException e)
-      {
-
-      }
-
-      verify(clientSession, clientMessage, buffer);
-   }
-
-   public void testSetJMSMessageIDWithNull() throws Exception
-   {
-      String messageID = null;
-      clientSession = createStrictMock(ClientSession.class);
-      clientMessage = createStrictMock(ClientMessage.class);
-      MessagingBuffer buffer = createStrictMock(MessagingBuffer.class);
-      expect(clientMessage.getBody()).andStubReturn(buffer);
-      expect(clientMessage.removeProperty(JBossMessage.JBM_MESSAGE_ID))
-            .andReturn(null);
-      replay(clientSession, clientMessage, buffer);
-
-      JBossMessage message = new JBossMessage(clientMessage, clientSession);
-      message.setJMSMessageID(messageID);
-
-      verify(clientSession, clientMessage, buffer);
-   }
-
-   public void testCheckPropertyNameIsNull() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      
-      try
-      {
-         message.setBooleanProperty(null, true);
-         fail("property name can not be null");
-      }
-      catch (IllegalArgumentException e)
-      {
-      }
-   }
-   
-   public void testCheckPropertyNameIsEmpty() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      
-      try
-      {
-         message.setBooleanProperty("a-1", true);
-         fail("property name can not be an invalid java identifier");
-      } catch (IllegalArgumentException e)
-      {
-      }
-   }
-   
-   public void testCheckPropertyNameIsNotJavaIdentifier() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      
-      try
-      {
-         message.setBooleanProperty("", true);
-         fail("property name can not be empty");
-      }
-      catch (IllegalArgumentException e)
-      {
-      }
-   }
-   
-   public void testCheckPropertyNameIsReservedIdentifier() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      
-      try
-      {
-         message.setBooleanProperty("BETWEEN", true);
-         fail("property name can not be a reserverd identifier used by message selector");
-      } catch (IllegalArgumentException e)
-      {
-      }
-   }
-   
-   public void testCheckPropertyNameStartingWithJMS() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      
-      try
-      {
-         message.setBooleanProperty("JMSWathever", true);
-         fail("property name can not start with JMS");
-      } catch (IllegalArgumentException e)
-      {
-      }
-   }
-   public void testSetBooleanProperty() throws Exception
-   {
-      boolean value = true;
-
-      JBossMessage message = new JBossMessage();
-      message.setBooleanProperty(propertyName, value);
-
-      boolean v = (Boolean) message.getCoreMessage().getProperty(
-            new SimpleString(propertyName));
-      assertEquals(value, v);
-   }
-
-   public void testGetBooleanProperty() throws Exception
-   {
-      boolean value = true;
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putBooleanProperty(new SimpleString(propertyName), value);
-      
-      boolean v = message.getBooleanProperty(propertyName);
-      assertEquals(value, v);
-   }
-   
-   public void testGetBooleanPropertyWithNull() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      
-      boolean v = message.getBooleanProperty(propertyName);
-      assertEquals(false, v);
-   }
-   
-   public void testGetBooleanPropertyWithString() throws Exception
-   {
-      SimpleString value = new SimpleString("true");
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putStringProperty(new SimpleString(propertyName), value);
-      
-      boolean v = message.getBooleanProperty(propertyName);
-      assertEquals(true, v);
-   }
-   
-   public void testGetBooleanPropertyWithInvalidType() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putFloatProperty(new SimpleString(propertyName), randomFloat());
-
-      try
-      {
-         message.getBooleanProperty(propertyName);
-         fail("invalid conversion");
-      } catch (MessageFormatException e)
-      {
-      }
-   }
-   
-   public void testSetByteProperty() throws Exception
-   {
-      byte value = randomByte();
-
-      JBossMessage message = new JBossMessage();
-      message.setByteProperty(propertyName, value);
-
-      byte v = (Byte) message.getCoreMessage().getProperty(
-            new SimpleString(propertyName));
-      assertEquals(value, v);
-   }
-   
-   public void testGetByteProperty() throws Exception
-   {
-      byte value = randomByte();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putByteProperty(new SimpleString(propertyName), value);
-      
-      byte v = message.getByteProperty(propertyName);
-      assertEquals(value, v);
-   }
-   
-   public void testGetBytePropertyWithNull() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      
-      try
-      {
-         message.getByteProperty(propertyName);
-         fail("can not get a null byte property");
-      } catch (NumberFormatException e)
-      {
-      }
-   }
-   
-   public void testGetBytePropertyWithString() throws Exception
-   {
-      byte b = randomByte();
-      SimpleString value = new SimpleString(Byte.toString(b));
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putStringProperty(new SimpleString(propertyName), value);
-      
-      byte v = message.getByteProperty(propertyName);
-      assertEquals(b, v);
-   }
-   
-   public void testGetBytePropertyWithInvalidType() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putFloatProperty(new SimpleString(propertyName), randomFloat());
-
-      try
-      {
-         message.getByteProperty(propertyName);
-         fail("invalid conversion");
-      } catch (MessageFormatException e)
-      {
-      }
-   }
-
-   public void testSetShortProperty() throws Exception
-   {
-      short value = randomShort();
-
-      JBossMessage message = new JBossMessage();
-      message.setShortProperty(propertyName, value);
-
-      short v = (Short) message.getCoreMessage().getProperty(
-            new SimpleString(propertyName));
-      assertEquals(value, v);
-   }
-
-   public void testGetShortProperty() throws Exception
-   {
-      short value = randomShort();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putShortProperty(new SimpleString(propertyName), value);
-      
-      short v = message.getShortProperty(propertyName);
-      assertEquals(value, v);
-   }
-   
-   public void testGetShortPropertyWithNull() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      
-      try
-      {
-         message.getShortProperty(propertyName);
-         fail("can not get a null byte property");
-      } catch (NumberFormatException e)
-      {
-      }
-   }
-   
-   public void testGetShortPropertyWithByte() throws Exception
-   {
-      byte value = randomByte();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putByteProperty(new SimpleString(propertyName), value);
-      
-      short v = message.getShortProperty(propertyName);
-      assertEquals(value, v);
-   }
-   
-   public void testGetShortPropertyWithString() throws Exception
-   {
-      short s = randomShort();
-      SimpleString value = new SimpleString(Short.toString(s));
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putStringProperty(new SimpleString(propertyName), value);
-      
-      short v = message.getShortProperty(propertyName);
-      assertEquals(s, v);
-   }
-   
-   public void testGetShortPropertyWithInvalidType() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putFloatProperty(new SimpleString(propertyName), randomFloat());
-
-      try
-      {
-         message.getShortProperty(propertyName);
-         fail("invalid conversion");
-      } catch (MessageFormatException e)
-      {
-      }
-   }
-   
-   public void testSetIntProperty() throws Exception
-   {
-      int value = randomInt();
-
-      JBossMessage message = new JBossMessage();
-      message.setIntProperty(propertyName, value);
-
-      int v = (Integer) message.getCoreMessage().getProperty(
-            new SimpleString(propertyName));
-      assertEquals(value, v);
-   }
-
-   public void testGetIntProperty() throws Exception
-   {
-      int value = randomInt();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putIntProperty(new SimpleString(propertyName), value);
-      
-      int v = message.getIntProperty(propertyName);
-      assertEquals(value, v);
-   }
-   
-   public void testGetIntPropertyWithJMSXDeliveryCount() throws Exception
-   {
-      int value = randomInt();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().setDeliveryCount(value);
-      
-      int v = message.getIntProperty(JBossMessage.JMSXDELIVERYCOUNT);
-      assertEquals(value, v);
-   }
-   public void testGetIntPropertyWithNull() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      
-      try
-      {
-         message.getIntProperty(propertyName);
-         fail("can not get a null byte property");
-      } catch (NumberFormatException e)
-      {
-      }
-   }
-   
-   public void testGetIntPropertyWithByte() throws Exception
-   {
-      byte value = randomByte();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putByteProperty(new SimpleString(propertyName), value);
-      
-      int v = message.getIntProperty(propertyName);
-      assertEquals(value, v);
-   }
-   
-   public void testGetIntPropertyWithShort() throws Exception
-   {
-      short value = randomShort();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putShortProperty(new SimpleString(propertyName), value);
-      
-      int v = message.getIntProperty(propertyName);
-      assertEquals(value, v);
-   }
-   
-   public void testGetIntPropertyWithString() throws Exception
-   {
-      int i = randomInt();
-      SimpleString value = new SimpleString(Integer.toString(i));
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putStringProperty(new SimpleString(propertyName), value);
-      
-      int v = message.getIntProperty(propertyName);
-      assertEquals(i, v);
-   }
-   
-   public void testGetIntPropertyWithInvalidType() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putFloatProperty(new SimpleString(propertyName), randomFloat());
-
-      try
-      {
-         message.getIntProperty(propertyName);
-         fail("invalid conversion");
-      } catch (MessageFormatException e)
-      {
-      }
-   }
-   
-   public void testSetLongProperty() throws Exception
-   {
-      long value = randomLong();
-
-      JBossMessage message = new JBossMessage();
-      message.setLongProperty(propertyName, value);
-
-      long v = (Long) message.getCoreMessage().getProperty(
-            new SimpleString(propertyName));
-      assertEquals(value, v);
-   }
-
-   public void testGetLongProperty() throws Exception
-   {
-      long value = randomLong();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putLongProperty(new SimpleString(propertyName), value);
-      
-      long v = message.getLongProperty(propertyName);
-      assertEquals(value, v);
-   }
-   
-   public void testGetLongPropertyWithJMSXDeliveryCount() throws Exception
-   {
-      int value = randomInt();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().setDeliveryCount(value);
-      
-      long v = message.getLongProperty(JBossMessage.JMSXDELIVERYCOUNT);
-      assertEquals(value, v);
-   }
-   
-   public void testGetLongPropertyWithNull() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      
-      try
-      {
-         message.getLongProperty(propertyName);
-         fail("can not get a null byte property");
-      } catch (NumberFormatException e)
-      {
-      }
-   }
-   
-   public void testGetLongPropertyWithByte() throws Exception
-   {
-      byte value = randomByte();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putByteProperty(new SimpleString(propertyName), value);
-      
-      long v = message.getLongProperty(propertyName);
-      assertEquals(value, v);
-   }
-   
-   public void testGetLongPropertyWithShort() throws Exception
-   {
-      short value = randomShort();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putShortProperty(new SimpleString(propertyName), value);
-      
-      long v = message.getLongProperty(propertyName);
-      assertEquals(value, v);
-   }
-   
-   public void testGetLongPropertyWithInt() throws Exception
-   {
-      int value = randomInt();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putIntProperty(new SimpleString(propertyName), value);
-      
-      long v = message.getLongProperty(propertyName);
-      assertEquals(value, v);
-   }
-   
-   public void testGetLongPropertyWithString() throws Exception
-   {
-      long l = randomLong();
-      SimpleString value = new SimpleString(Long.toString(l));
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putStringProperty(new SimpleString(propertyName), value);
-      
-      long v = message.getLongProperty(propertyName);
-      assertEquals(l, v);
-   }
-   
-   public void testGetLongPropertyWithInvalidType() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putFloatProperty(new SimpleString(propertyName), randomFloat());
-
-      try
-      {
-         message.getLongProperty(propertyName);
-         fail("invalid conversion");
-      } catch (MessageFormatException e)
-      {
-      }
-   }
-   
-   public void testSetFloatProperty() throws Exception
-   {
-      float value = randomFloat();
-
-      JBossMessage message = new JBossMessage();
-      message.setFloatProperty(propertyName, value);
-
-      float v = (Float) message.getCoreMessage().getProperty(
-            new SimpleString(propertyName));
-      assertEquals(value, v);
-   }
-   
-   public void testGetFloatProperty() throws Exception
-   {
-      float value = randomFloat();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putFloatProperty(new SimpleString(propertyName), value);
-      
-      float v = message.getFloatProperty(propertyName);
-      assertEquals(value, v);
-   }
-   
-   public void testGetFloatPropertyWithNull() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      
-      try
-      {
-         message.getFloatProperty(propertyName);
-         fail("can not get a null float property");
-      } catch (NullPointerException e)
-      {
-      }
-   }
-   
-   public void testGetFloatPropertyWithString() throws Exception
-   {
-      float f = randomFloat();
-      SimpleString value = new SimpleString(Float.toString(f));
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putStringProperty(new SimpleString(propertyName), value);
-      
-      float v = message.getFloatProperty(propertyName);
-      assertEquals(f, v);
-   }
-   
-   public void testGetFloatPropertyWithInvalidType() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putBooleanProperty(new SimpleString(propertyName), true);
-
-      try
-      {
-         message.getFloatProperty(propertyName);
-         fail("invalid conversion");
-      } catch (MessageFormatException e)
-      {
-      }
-   }
-
-   public void testSetDoubleProperty() throws Exception
-   {
-      double value = randomDouble();
-
-      JBossMessage message = new JBossMessage();
-      message.setDoubleProperty(propertyName, value);
-
-      double v = (Double) message.getCoreMessage().getProperty(
-            new SimpleString(propertyName));
-      assertEquals(value, v);
-   }
-   
-   public void testGetDoubleProperty() throws Exception
-   {
-      double value = randomDouble();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putDoubleProperty(new SimpleString(propertyName), value);
-      
-      double v = message.getDoubleProperty(propertyName);
-      assertEquals(value, v);
-   }
-   
-   public void testGetDoublePropertyWithNull() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      
-      try
-      {
-         message.getDoubleProperty(propertyName);
-         fail("can not get a null float property");
-      } catch (NullPointerException e)
-      {
-      }
-   }
-   
-   public void testGetDoublePropertyWithFloat() throws Exception
-   {
-      float value = randomFloat();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putFloatProperty(new SimpleString(propertyName), value);
-      
-      double v = message.getDoubleProperty(propertyName);
-      assertEquals(Float.valueOf(value).doubleValue(), v);
-   }
-   
-   public void testGetDoublePropertyWithString() throws Exception
-   {
-      double d = randomDouble();
-      SimpleString value = new SimpleString(Double.toString(d));
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putStringProperty(new SimpleString(propertyName), value);
-      
-      double v = message.getDoubleProperty(propertyName);
-      assertEquals(d, v);
-   }
-   
-   public void testGetDoublePropertyWithInvalidType() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putBooleanProperty(new SimpleString(propertyName), true);
-
-      try
-      {
-         message.getDoubleProperty(propertyName);
-         fail("invalid conversion");
-      } catch (MessageFormatException e)
-      {
-      }
-   }
-
-   public void testSetStringProperty() throws Exception
-   {
-      String value = randomString();
-
-      JBossMessage message = new JBossMessage();
-      message.setStringProperty(propertyName, value);
-
-      SimpleString v = (SimpleString) message.getCoreMessage().getProperty(
-            new SimpleString(propertyName));
-      assertEquals(value, v.toString());
-   }
-
-   public void testGetStringProperty() throws Exception
-   {
-      String value = randomString();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putStringProperty(new SimpleString(propertyName), new SimpleString(value));
-      
-      String v = message.getStringProperty(propertyName);
-      assertEquals(value, v);
-   }
-   
-   public void testGetStringPropertyWithJMSXDeliveryCount() throws Exception
-   {
-      int value = randomInt();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().setDeliveryCount(value);
-      
-      String v = message.getStringProperty(JBossMessage.JMSXDELIVERYCOUNT);
-      assertEquals(Integer.toString(value), v);
-   }
-   
-   public void testGetStringPropertyWithNull() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      
-      String value = message.getStringProperty(propertyName);
-      assertNull(value);
-   }
-   
-   public void testGetStringPropertyWithBoolean() throws Exception
-   {
-      boolean value = true;
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putBooleanProperty(new SimpleString(propertyName), value);
-      
-      String v = message.getStringProperty(propertyName);
-      assertEquals(Boolean.toString(value), v);
-   }
-   
-   public void testGetStringPropertyWithByte() throws Exception
-   {
-      byte value = randomByte();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putByteProperty(new SimpleString(propertyName), value);
-      
-      String v = message.getStringProperty(propertyName);
-      assertEquals(Byte.toString(value), v);
-   }
-   
-   public void testGetStringPropertyWithShort() throws Exception
-   {
-      short value = randomShort();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putShortProperty(new SimpleString(propertyName), value);
-      
-      String v = message.getStringProperty(propertyName);
-      assertEquals(Short.toString(value), v);
-   }
-   
-   public void testGetStringPropertyWithInt() throws Exception
-   {
-      int value = randomInt();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putIntProperty(new SimpleString(propertyName), value);
-      
-      String v = message.getStringProperty(propertyName);
-      assertEquals(Integer.toString(value), v);
-   }
-   
-   public void testGetStringPropertyWithLong() throws Exception
-   {
-      long value = randomLong();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putLongProperty(new SimpleString(propertyName), value);
-      
-      String v = message.getStringProperty(propertyName);
-      assertEquals(Long.toString(value), v);
-   }
-   
-   public void testGetStringPropertyWithFloat() throws Exception
-   {
-      float value = randomFloat();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putFloatProperty(new SimpleString(propertyName), value);
-      
-      String v = message.getStringProperty(propertyName);
-      assertEquals(Float.toString(value), v);
-   }
-   
-   public void testGetStringPropertyWithDouble() throws Exception
-   {
-      double value = randomDouble();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putDoubleProperty(new SimpleString(propertyName), value);
-      
-      String v = message.getStringProperty(propertyName);
-      assertEquals(Double.toString(value), v);
-   }
-   
-   public void testSetObjectPropertyWithBoolean() throws Exception
-   {
-      boolean value = true;
-
-      JBossMessage message = new JBossMessage();
-      message.setObjectProperty(propertyName, value);
-
-      boolean v = (Boolean) message.getCoreMessage().getProperty(
-            new SimpleString(propertyName));
-      assertEquals(value, v);
-   }
-
-   public void testSetObjectPropertyWithByte() throws Exception
-   {
-      byte value = randomByte();
-
-      JBossMessage message = new JBossMessage();
-      message.setObjectProperty(propertyName, value);
-
-      byte v = (Byte) message.getCoreMessage().getProperty(
-            new SimpleString(propertyName));
-      assertEquals(value, v);
-   }
-
-   public void testSetObjectPropertyWithShort() throws Exception
-   {
-      short value = randomShort();
-
-      JBossMessage message = new JBossMessage();
-      message.setObjectProperty(propertyName, value);
-
-      short v = (Short) message.getCoreMessage().getProperty(
-            new SimpleString(propertyName));
-      assertEquals(value, v);
-   }
-
-   public void testSetObjectPropertyWithInt() throws Exception
-   {
-      int value = randomInt();
-
-      JBossMessage message = new JBossMessage();
-      message.setObjectProperty(propertyName, value);
-
-      int v = (Integer) message.getCoreMessage().getProperty(
-            new SimpleString(propertyName));
-      assertEquals(value, v);
-   }
-
-   public void testSetObjectPropertyWithLong() throws Exception
-   {
-      long value = randomLong();
-
-      JBossMessage message = new JBossMessage();
-      message.setObjectProperty(propertyName, value);
-
-      long v = (Long) message.getCoreMessage().getProperty(
-            new SimpleString(propertyName));
-      assertEquals(value, v);
-   }
-
-   public void testSetObjectPropertyWithFloat() throws Exception
-   {
-      float value = randomFloat();
-
-      JBossMessage message = new JBossMessage();
-      message.setObjectProperty(propertyName, value);
-
-      float v = (Float) message.getCoreMessage().getProperty(
-            new SimpleString(propertyName));
-      assertEquals(value, v);
-   }
-
-   public void testSetObjectPropertyWithDouble() throws Exception
-   {
-      double value = randomDouble();
-
-      JBossMessage message = new JBossMessage();
-      message.setObjectProperty(propertyName, value);
-
-      double v = (Double) message.getCoreMessage().getProperty(
-            new SimpleString(propertyName));
-      assertEquals(value, v);
-   }
-
-   public void testSetObjectPropertyWithString() throws Exception
-   {
-      String value = randomString();
-
-      JBossMessage message = new JBossMessage();
-      message.setObjectProperty(propertyName, value);
-
-      SimpleString v = (SimpleString) message.getCoreMessage().getProperty(
-            new SimpleString(propertyName));
-      assertEquals(value, v.toString());
-   }
-
-   public void testSetObjectPropertyWithInvalidType() throws Exception
-   {
-
-      JBossMessage message = new JBossMessage();
-      try
-      {
-         message.setObjectProperty(propertyName, new Character('a'));
-         fail("invalid type");
-      } catch (MessageFormatException e)
-      {
-      }
-   }
-   
-   public void testGetObjectProperty() throws Exception
-   {
-      double value = randomDouble();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putDoubleProperty(new SimpleString(propertyName), value);
-      
-      Object v = message.getObjectProperty(propertyName);
-      assertTrue(v instanceof Double);
-      assertEquals(value, v);
-   }
-   
-   public void testGetObjectPropertyWithString() throws Exception
-   {
-      String value = randomString();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().putStringProperty(new SimpleString(propertyName), new SimpleString(value));
-      
-      Object v = message.getObjectProperty(propertyName);
-      assertTrue(v instanceof String);
-      assertEquals(value, v);
-   }
-   
-   public void testGetObjectPropertyWithJMSXDeliveryCount() throws Exception
-   {
-      int value = randomInt();
-      
-      JBossMessage message = new JBossMessage();
-      message.getCoreMessage().setDeliveryCount(value);
-      
-      Object v = message.getObjectProperty(JBossMessage.JMSXDELIVERYCOUNT);
-      assertTrue(v instanceof String);
-      assertEquals(Integer.toString(value), v);
-   }
-
-   public void testClearProperties() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      message.setBooleanProperty(propertyName, true);
-      
-      assertTrue(message.getBooleanProperty(propertyName));
-      
-      message.clearProperties();
-      
-      assertFalse(message.getBooleanProperty(propertyName));
-   }
-   
-   public void testPropertyExists() throws Exception
-   {
-      JBossMessage message = new JBossMessage();
-      
-      assertFalse(message.propertyExists(propertyName));
-      
-      message.setBooleanProperty(propertyName, true);
-      
-      assertTrue(message.propertyExists(propertyName));
-   }
-   
-   public void testAcknowledge() throws Exception
-   {
-      clientMessage = createStrictMock(ClientMessage.class);
-      clientSession = createStrictMock(ClientSession.class);
-      MessagingBuffer buffer = createStrictMock(MessagingBuffer.class);
-      expect(clientMessage.getBody()).andStubReturn(buffer);
-      clientSession.commit();
-      replay(clientMessage, clientSession, buffer);
-      
-      JBossMessage message = new JBossMessage(clientMessage, clientSession);      
-      message.acknowledge();
-      
-      verify(clientMessage, clientSession, buffer);
-   }
-   
-   public void testAcknowledgeThrowsException() throws Exception
-   {
-      clientMessage = createStrictMock(ClientMessage.class);
-      clientSession = createStrictMock(ClientSession.class);
-      MessagingBuffer buffer = createStrictMock(MessagingBuffer.class);
-      expect(clientMessage.getBody()).andStubReturn(buffer);
-      clientSession.commit();
-      EasyMock.expectLastCall().andThrow(new MessagingException());
-      replay(clientMessage, clientSession, buffer);
-      
-      JBossMessage message = new JBossMessage(clientMessage, clientSession);      
-      try
-      {
-         message.acknowledge();
-         fail("JMSException");
-      } catch (JMSException e)
-      {
-      }
-      
-      verify(clientMessage, clientSession, buffer);
-   }
-   
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   @Override
-   protected void setUp() throws Exception
-   {
-      super.setUp();
-
-      propertyName = "property";
-   }
-
-   // Private -------------------------------------------------------
-
-   private void doTestCreateMessage(byte expectedType, Class expectedInterface)
-         throws Exception
-   {
-      clientSession = createStrictMock(ClientSession.class);
-      clientMessage = createStrictMock(ClientMessage.class);
-      MessagingBuffer buffer = createStrictMock(MessagingBuffer.class);
-      expect(clientMessage.getType()).andReturn(expectedType);
-      expect(clientMessage.getBody()).andStubReturn(buffer);
-      replay(clientSession, clientMessage, buffer);
-
-      JBossMessage message = JBossMessage.createMessage(clientMessage,
-            clientSession);
-      assertEquals(expectedType, message.getType());
-      assertTrue(message.getClass().isAssignableFrom(expectedInterface));
-
-      verify(clientSession, clientMessage, buffer);
-   }
-
-   // Inner classes -------------------------------------------------
-}

Deleted: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossObjectMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossObjectMessageTest.java	2009-03-23 09:48:00 UTC (rev 6133)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossObjectMessageTest.java	2009-03-23 09:52:29 UTC (rev 6134)
@@ -1,163 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */ 
-
-package org.jboss.messaging.tests.unit.jms.client;
-
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.util.Collections;
-
-import javax.jms.DeliveryMode;
-import javax.jms.ObjectMessage;
-
-import org.easymock.EasyMock;
-import org.jboss.messaging.core.buffers.ChannelBuffers;
-import org.jboss.messaging.core.client.ClientMessage;
-import org.jboss.messaging.core.client.ClientSession;
-import org.jboss.messaging.core.client.impl.ClientMessageImpl;
-import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
-import org.jboss.messaging.jms.client.JBossObjectMessage;
-import org.jboss.messaging.tests.util.UnitTestCase;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- *
- * @version <tt>$Revision$</tt>
- *
- */
-public class JBossObjectMessageTest extends UnitTestCase
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   private Serializable object;
-
-   @Override
-   protected void setUp() throws Exception
-   {
-      super.setUp();
-
-      object = randomString();
-   }
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   public void testForeignObjectMessage() throws Exception
-   {
-      ObjectMessage foreignMessage = createNiceMock(ObjectMessage.class);
-      ClientSession session = EasyMock.createNiceMock(ClientSession.class);
-      MessagingBuffer body = ChannelBuffers.wrappedBuffer(new byte[1024]);
-      ClientMessage clientMessage = new ClientMessageImpl(JBossObjectMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
-      expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
-      expect(foreignMessage.getJMSDeliveryMode()).andReturn(DeliveryMode.NON_PERSISTENT);
-      expect(foreignMessage.getPropertyNames()).andReturn(Collections.enumeration(Collections.EMPTY_LIST));
-      expect(foreignMessage.getObject()).andReturn(object);
-
-      replay(foreignMessage, session);
-
-      JBossObjectMessage msg = new JBossObjectMessage(foreignMessage, session);
-      assertEquals(object, msg.getObject());
-
-      verify(foreignMessage, session);
-   }
-
-   public void testGetText() throws Exception
-   {
-      JBossObjectMessage msg = new JBossObjectMessage();
-      msg.setObject(object);
-      assertEquals(object, msg.getObject());
-   }
-
-   public void testClearBody() throws Exception
-   {
-      JBossObjectMessage msg = new JBossObjectMessage();
-      msg.setObject(object);
-      assertEquals(object, msg.getObject());
-      msg.clearBody();
-      assertEquals(null, msg.getObject());
-   }
-
-   public void testGetType() throws Exception
-   {
-      JBossObjectMessage msg = new JBossObjectMessage();
-      assertEquals(JBossObjectMessage.TYPE, msg.getType());
-   }
-
-   public void testDoBeforeSend() throws Exception
-   {
-      ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
-      ObjectOutputStream oos = new ObjectOutputStream(baos);
-      oos.writeObject(object);
-      oos.flush();
-      byte[] data = baos.toByteArray();
-
-      JBossObjectMessage msg = new JBossObjectMessage();
-      msg.setObject(object);
-
-      msg.doBeforeSend();
-
-      MessagingBuffer body = msg.getCoreMessage().getBody();
-      assertEquals(data.length, body.readInt());
-      byte[] bytes = new byte[data.length];
-      body.readBytes(bytes);
-
-      assertEqualsByteArrays(data, bytes);
-   }
-   
-   public void testDoBeforeReceive() throws Exception
-   {
-      ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);      
-      ObjectOutputStream oos = new ObjectOutputStream(baos);
-      oos.writeObject(object);
-      oos.flush();
-      byte[] data = baos.toByteArray();
-      
-      JBossObjectMessage message = new JBossObjectMessage();
-      MessagingBuffer body = message.getCoreMessage().getBody();
-      body.writeInt(data.length);
-      body.writeBytes(data);
-      
-      message.doBeforeReceive();
-      
-      assertEquals(object, message.getObject());
-   }
-   
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}

Deleted: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossQueueBrowserTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossQueueBrowserTest.java	2009-03-23 09:48:00 UTC (rev 6133)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossQueueBrowserTest.java	2009-03-23 09:52:29 UTC (rev 6134)
@@ -1,178 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.messaging.tests.unit.jms.client;
-
-import static org.easymock.EasyMock.createStrictMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-
-import java.util.Enumeration;
-
-import javax.jms.Message;
-
-import org.easymock.EasyMock;
-import org.jboss.messaging.core.client.ClientConsumer;
-import org.jboss.messaging.core.client.ClientMessage;
-import org.jboss.messaging.core.client.ClientSession;
-import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
-import org.jboss.messaging.jms.JBossQueue;
-import org.jboss.messaging.jms.client.JBossMessage;
-import org.jboss.messaging.jms.client.JBossQueueBrowser;
-import org.jboss.messaging.tests.util.UnitTestCase;
-import org.jboss.messaging.utils.SimpleString;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- *
- * @version <tt>$Revision$</tt>
- *
- */
-public class JBossQueueBrowserTest extends UnitTestCase
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   public void testGetMessageSelector() throws Exception
-   {
-      String messageSelector = "color = 'green'";
-      JBossQueue queue = new JBossQueue(randomString());
-      ClientSession clientBrowser = createStrictMock(ClientSession.class);
-      replay(clientBrowser);
-
-      JBossQueueBrowser browser = new JBossQueueBrowser(queue, messageSelector,
-            clientBrowser);
-      assertEquals(messageSelector, browser.getMessageSelector());
-
-      verify(clientBrowser);
-   }
-
-   public void testGetQueue() throws Exception
-   {
-      JBossQueue queue = new JBossQueue(randomString());
-      ClientSession clientBrowser = createStrictMock(ClientSession.class);
-      replay(clientBrowser);
-
-      JBossQueueBrowser browser = new JBossQueueBrowser(queue, null,
-            clientBrowser);
-      assertEquals(queue, browser.getQueue());
-
-      verify(clientBrowser);
-   }
-
-   public void testClose() throws Exception
-   {
-      JBossQueue queue = new JBossQueue(randomString());
-      ClientSession clientBrowser = createStrictMock(ClientSession.class);
-      replay(clientBrowser);
-
-      JBossQueueBrowser browser = new JBossQueueBrowser(queue, null,
-            clientBrowser);
-
-      browser.close();
-
-      verify(clientBrowser);
-   }
-
-/*   public void testCloseThrowsException() throws Exception
-   {
-      JBossQueue queue = new JBossQueue(randomString());
-      ClientSession clientBrowser = createStrictMock(ClientSession.class);
-      clientBrowser.close();
-      expectLastCall().andThrow(new MessagingException());
-
-      replay(clientBrowser);
-
-      JBossQueueBrowser browser = new JBossQueueBrowser(queue, null,
-            clientBrowser);
-
-      try
-      {
-         browser.close();
-         fail("JMSException");
-      } catch (JMSException e)
-      {
-      }
-
-      verify(clientBrowser);
-   }*/
-
-   public void testGetEnumeration() throws Exception
-   {
-      JBossQueue queue = new JBossQueue(randomString());
-      ClientConsumer consumer = createStrictMock(ClientConsumer.class);
-      ClientSession session = createStrictMock(ClientSession.class);    
-      expect(session.createConsumer((SimpleString) EasyMock.anyObject(), (SimpleString) EasyMock.anyObject(), EasyMock.anyBoolean())).andReturn(consumer);
-      replay(session, consumer);
-
-      JBossQueueBrowser browser = new JBossQueueBrowser(queue, null,
-            session);
-
-      Enumeration enumeration = browser.getEnumeration();
-      assertNotNull(enumeration);
-
-      verify(session, consumer);
-   }
-
-   public void testGetEnumerationWithOneMessage() throws Exception
-   {
-      JBossQueue queue = new JBossQueue(randomString());
-      ClientMessage clientMessage = createStrictMock(ClientMessage.class);
-      MessagingBuffer buffer = createStrictMock(MessagingBuffer.class);
-      ClientConsumer consumer = createStrictMock(ClientConsumer.class);
-      ClientSession session = createStrictMock(ClientSession.class);   
-      expect(session.createConsumer((SimpleString) EasyMock.anyObject(), (SimpleString) EasyMock.anyObject(), EasyMock.anyBoolean())).andReturn(consumer);
-      expect(consumer.receive(1000)).andReturn(clientMessage);
-      expect(clientMessage.getType()).andReturn(JBossMessage.TYPE);
-      expect(clientMessage.getBody()).andStubReturn(buffer);
-      expect(consumer.receive(1000)).andReturn(null);
-      replay(clientMessage, session, consumer);
-
-      JBossQueueBrowser browser = new JBossQueueBrowser(queue, null,
-            session);
-
-      Enumeration enumeration = browser.getEnumeration();
-      assertNotNull(enumeration);
-      assertTrue(enumeration.hasMoreElements());
-      Message message = (Message) enumeration.nextElement();
-      assertFalse(enumeration.hasMoreElements());
-
-      verify(clientMessage, session, consumer);
-   }
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}

Deleted: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossSessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossSessionTest.java	2009-03-23 09:48:00 UTC (rev 6133)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossSessionTest.java	2009-03-23 09:52:29 UTC (rev 6134)
@@ -1,2061 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */ 
-
-package org.jboss.messaging.tests.unit.jms.client;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
-
-import org.jboss.messaging.core.client.ClientSession;
-import org.jboss.messaging.core.client.ClientSessionFactory;
-import org.jboss.messaging.tests.util.UnitTestCase;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * 
- * @version <tt>$Revision$</tt>
- * 
- */
-public class JBossSessionTest extends UnitTestCase
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   private ClientSessionFactory sf;
-   private ClientSession mockClientSession;
-
-//   @Override
-//   protected void setUp() throws Exception
-//   {
-//      super.setUp();
-//
-//      sf = createStrictMock(ClientSessionFactory.class);      
-//      mockClientSession = createStrictMock(ClientSession.class);
-//   }
-//
-//   @Override
-//   protected void tearDown() throws Exception
-//   {
-//      verify(sf, mockClientSession);
-//
-//      super.tearDown();
-//   }
-   
-   public void testFoo()
-   {      
-   }
-//
-//   public void testClose() throws Exception
-//   {
-//      mockClientSession.close();
-//
-//      replay(sf, mockClientSession);
-//      
-//      JBossConnection connection = new JBossConnection(null, null, JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      session.close();
-//   }
-//      
-//   public void testCloseThrowsException() throws Exception
-//   {
-//      mockClientSession.close();
-//      expectLastCall().andThrow(new MessagingException());
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null, JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, true, false,
-//            Session.DUPS_OK_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      try
-//      {
-//         session.close();
-//         fail("should throw a JMSException");
-//      } catch (JMSException e)
-//      {
-//      }
-//   }
-//
-//   public void testClosedSession() throws Exception
-//   {
-//      mockClientSession.close();
-//      expect(mockClientSession.isClosed()).andReturn(true);
-//
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null, JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      session.close();
-//
-//      try
-//      {
-//         session.getTransacted();
-//         fail("once a session is closed, this must throw a IllegalStateException");
-//      } catch (IllegalStateException e)
-//      {
-//      }
-//   }
-//
-//   public void testGetTransacted() throws Exception
-//   {
-//      expect(mockClientSession.isClosed()).andReturn(false);
-//
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//               JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      
-//      Session session = new JBossSession(connection, true, false, 0,
-//            mockClientSession, JBossSession.TYPE_GENERIC_SESSION);
-//
-//      assertEquals(true, session.getTransacted());
-//   }
-//
-//   public void testGetAcknowledgeMode() throws Exception
-//   {
-//      expect(mockClientSession.isClosed()).andReturn(false);
-//
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.DUPS_OK_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      assertEquals(Session.DUPS_OK_ACKNOWLEDGE, session.getAcknowledgeMode());
-//   }
-//
-//   public void testCommitOnTransactedSession() throws Exception
-//   {
-//      mockClientSession.commit();
-//
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, true, false,
-//            Session.DUPS_OK_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      session.commit();
-//   }
-//
-//   public void testCommitThrowsException() throws Exception
-//   {
-//      mockClientSession.commit();
-//      expectLastCall().andThrow(new MessagingException());
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, true, false,
-//            Session.DUPS_OK_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      try
-//      {
-//         session.commit();
-//         fail("should throw a JMSException");
-//      } catch (JMSException e)
-//      {
-//      }
-//   }
-//
-//   public void testCommitOnNonTransactedSession() throws Exception
-//   {
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.DUPS_OK_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      try
-//      {
-//         session.commit();
-//         fail("commit() is not allowed on a non-transacted session");
-//      } catch (IllegalStateException e)
-//      {
-//      }
-//   }
-//
-//   public void testCommitOnXASession() throws Exception
-//   {
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, true, true, 0,
-//            mockClientSession, JBossSession.TYPE_GENERIC_SESSION);
-//
-//      try
-//      {
-//         session.commit();
-//         fail("commit() is not allowed on a XA session");
-//      } catch (TransactionInProgressException e)
-//      {
-//      }
-//   }
-//
-//   public void testRollbackOnTransactedSession() throws Exception
-//   {
-//      mockClientSession.rollback();
-//
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, true, false,
-//            Session.DUPS_OK_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      session.rollback();
-//   }
-//
-//   public void testRollbackThrowsException() throws Exception
-//   {
-//      mockClientSession.rollback();
-//      expectLastCall().andThrow(new MessagingException());
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, true, false,
-//            Session.DUPS_OK_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      try
-//      {
-//         session.rollback();
-//         fail("should throw a JMSException");
-//      } catch (JMSException e)
-//      {
-//      }
-//   }
-//
-//   public void testRollbackOnNonTransactedSession() throws Exception
-//   {
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.DUPS_OK_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      try
-//      {
-//         session.rollback();
-//         fail("rollback() is not allowed on a non-transacted session");
-//      } catch (IllegalStateException e)
-//      {
-//      }
-//   }
-//
-//   public void testRollbackOnXASession() throws Exception
-//   {
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, true, true, 0,
-//            mockClientSession, JBossSession.TYPE_GENERIC_SESSION);
-//
-//      try
-//      {
-//         session.rollback();
-//         fail("rollback() is not allowed on a XA session");
-//      } catch (TransactionInProgressException e)
-//      {
-//      }
-//   }
-//
-//   public void testRecoverOnTransactedSession() throws Exception
-//   {
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, true, false,
-//            Session.DUPS_OK_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      try
-//      {
-//         session.recover();
-//         fail("recover() is not allowed on a non-transacted session");
-//      } catch (IllegalStateException e)
-//      {
-//      }
-//   }
-//
-//   public void testRecoverOnNonTransactedSession() throws Exception
-//   {
-//      mockClientSession.rollback();
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.DUPS_OK_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      session.recover();
-//   }
-//
-//   public void testRecoverThrowsException() throws Exception
-//   {
-//      mockClientSession.rollback();
-//      expectLastCall().andThrow(new MessagingException());
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.DUPS_OK_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      try
-//      {
-//         session.recover();
-//         fail("should throw a JMSException");
-//      } catch (JMSException e)
-//      {
-//      }
-//   }
-//
-//   public void testMessageListener() throws Exception
-//   {
-//      expect(mockClientSession.isClosed()).andStubReturn(false);
-//      MessageListener listener = createStrictMock(MessageListener.class);
-//      replay(sf, mockClientSession, listener);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.DUPS_OK_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//      assertNull(session.getMessageListener());
-//      session.setMessageListener(listener);
-//      //Note we don't implement ASF so always return null
-//      assertNull(session.getMessageListener());
-//
-//      verify(listener);
-//   }
-//
-//   public void testCreateMessage() throws Exception
-//   {
-//      doTestCreateMessage(new MessageCreation()
-//      {
-//         public Message createMessage(Session session) throws JMSException
-//         {
-//            Message message = session.createMessage();
-//            return message;
-//         }
-//      });
-//
-//   }
-//
-//   public void testCreateMapMessage() throws Exception
-//   {
-//      doTestCreateMessage(new MessageCreation()
-//      {
-//         public Message createMessage(Session session) throws JMSException
-//         {
-//            MapMessage message = session.createMapMessage();
-//            return message;
-//         }
-//      });
-//
-//   }
-//
-//   public void testCreateBytesMessage() throws Exception
-//   {
-//      doTestCreateMessage(new MessageCreation()
-//      {
-//         public Message createMessage(Session session) throws JMSException
-//         {
-//            BytesMessage message = session.createBytesMessage();
-//            return message;
-//         }
-//      });
-//
-//   }
-//
-//   public void testCreateTextMessage() throws Exception
-//   {
-//      doTestCreateMessage(new MessageCreation()
-//      {
-//         public Message createMessage(Session session) throws JMSException
-//         {
-//            TextMessage message = session.createTextMessage();
-//            return message;
-//         }
-//      });
-//
-//   }
-//
-//   public void testCreateTextMessageWithString() throws Exception
-//   {
-//      doTestCreateMessage(new MessageCreation()
-//      {
-//         public Message createMessage(Session session) throws JMSException
-//         {
-//            TextMessage message = session.createTextMessage(randomString());
-//            return message;
-//         }
-//      });
-//
-//   }
-//
-//   public void testCreateObjectMessage() throws Exception
-//   {
-//      doTestCreateMessage(new MessageCreation()
-//      {
-//         public Message createMessage(Session session) throws JMSException
-//         {
-//            ObjectMessage message = session.createObjectMessage();
-//            return message;
-//         }
-//      });
-//
-//   }
-//
-//   public void testCreateObjectMessageWithSerializable() throws Exception
-//   {
-//      doTestCreateMessage(new MessageCreation()
-//      {
-//         public Message createMessage(Session session) throws JMSException
-//         {
-//            ObjectMessage message = session.createObjectMessage(randomString());
-//            return message;
-//         }
-//      });
-//
-//   }
-//
-//   public void testCreateStreamMessage() throws Exception
-//   {
-//      doTestCreateMessage(new MessageCreation()
-//      {
-//         public Message createMessage(Session session) throws JMSException
-//         {
-//            StreamMessage message = session.createStreamMessage();
-//            return message;
-//         }
-//      });
-//   }
-//
-//   public void testCreateProducer() throws Exception
-//   {
-//      JBossDestination destination = new JBossQueue(randomString());
-//      ClientProducer clientProducer = createStrictMock(ClientProducer.class);
-//      expect(mockClientSession.createProducer(destination.getSimpleAddress()))
-//            .andReturn(clientProducer);
-//
-//      replay(sf, mockClientSession, clientProducer);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      MessageProducer producer = session.createProducer(destination);
-//      assertNotNull(producer);
-//
-//      verify(clientProducer);
-//   }
-//
-//   public void testCreateProducerThrowsException() throws Exception
-//   {
-//      JBossDestination destination = new JBossQueue(randomString());
-//      ClientProducer clientProducer = createStrictMock(ClientProducer.class);
-//      expect(mockClientSession.createProducer(destination.getSimpleAddress()))
-//            .andThrow(new MessagingException());
-//
-//      replay(sf, mockClientSession, clientProducer);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      try
-//      {
-//         session.createProducer(destination);
-//         fail("should throw a JMSException");
-//      } catch (JMSException e)
-//      {
-//      }
-//
-//      verify(clientProducer);
-//   }
-//
-//   public void testCreateProducerWithInvalidDestination() throws Exception
-//   {
-//      Destination destination = createStrictMock(Destination.class);
-//
-//      replay(sf, mockClientSession, destination);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      try
-//      {
-//         session.createProducer(destination);
-//         fail("only instances of JBossDestination are allowed as destination");
-//      } catch (InvalidDestinationException e)
-//      {
-//      }
-//
-//      verify(destination);
-//   }
-//
-//   public void testCreateProducerWithNullDestination() throws Exception
-//   {
-//      ClientProducer clientProducer = createStrictMock(ClientProducer.class);
-//      expect(mockClientSession.createProducer(null)).andReturn(clientProducer);
-//
-//      replay(sf, mockClientSession, clientProducer);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      session.createProducer(null);
-//
-//      verify(clientProducer);
-//   }
-//
-//   public void testCreatePublisher() throws Exception
-//   {
-//      JBossTopic topic = new JBossTopic(randomString());
-//      ClientProducer clientProducer = createStrictMock(ClientProducer.class);
-//      expect(mockClientSession.createProducer(topic.getSimpleAddress()))
-//            .andReturn(clientProducer);
-//
-//      replay(sf, mockClientSession, clientProducer);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, null, -1, sf);
-//      TopicSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      TopicPublisher publisher = session.createPublisher(topic);
-//      assertNotNull(publisher);
-//
-//      verify(clientProducer);
-//   }
-//
-//   public void testCreateSender() throws Exception
-//   {
-//      JBossQueue queue = new JBossQueue(randomString());
-//      ClientProducer clientProducer = createStrictMock(ClientProducer.class);
-//      expect(mockClientSession.createProducer(queue.getSimpleAddress()))
-//            .andReturn(clientProducer);
-//
-//      replay(sf, mockClientSession, clientProducer);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      QueueSender sender = session.createSender(queue);
-//      assertNotNull(sender);
-//
-//      verify(clientProducer);
-//   }
-//
-//   public void testCreateConsumer() throws Exception
-//   {
-//      JBossDestination destination = new JBossQueue(randomString());
-//      ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
-//
-//      // isExists() will return true
-//      SessionQueueQueryResponseMessage resp = new SessionQueueQueryResponseMessage(
-//            false, 0, 1, null, destination.getSimpleAddress());
-//      expect(mockClientSession.queueQuery(destination.getSimpleAddress()))
-//            .andReturn(resp);
-//      expect(
-//            mockClientSession.createConsumer(destination.getSimpleAddress(),
-//                  null, false)).andReturn(clientConsumer);
-//      expect(mockClientSession.isClosed()).andReturn(false);
-//
-//      replay(sf, mockClientSession, clientConsumer);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      MessageConsumer consumer = session.createConsumer(destination);
-//      assertNotNull(consumer);
-//
-//      verify(clientConsumer);
-//   }
-//
-//   public void testCreateConsumerWithMessageSelector() throws Exception
-//   {
-//      String selector = "color = 'red";
-//      doTestCreateConsumerWithSelector(selector, new SimpleString(selector));
-//   }
-//
-//   public void testCreateConsumerWithEmptyMessageSelector() throws Exception
-//   {
-//      doTestCreateConsumerWithSelector("", null);
-//   }
-//
-//   public void testCreateConsumerThrowsException() throws Exception
-//   {
-//      JBossDestination destination = new JBossQueue(randomString());
-//      expect(mockClientSession.queueQuery(destination.getSimpleAddress())).andThrow(new MessagingException());
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      try
-//      {
-//         session.createConsumer(destination);
-//         fail("must throw an JMSException");
-//      } catch (JMSException e)
-//      {
-//      }
-//   }
-//   
-//   public void testCreateConsumerWithNullDestination() throws Exception
-//   {
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      try
-//      {
-//         session.createConsumer(null);
-//         fail("must throw an InvalidDestinationException");
-//      } catch (InvalidDestinationException e)
-//      {
-//      }
-//   }
-//
-//   public void testCreateConsumerWithInvalidDestination() throws Exception
-//   {
-//      Destination invalidDestination = createStrictMock(Destination.class);
-//      replay(sf, mockClientSession, invalidDestination);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      try
-//      {
-//         session.createConsumer(invalidDestination);
-//         fail("only instances of JBossDestination are allowed");
-//      } catch (InvalidDestinationException e)
-//      {
-//      }
-//
-//      verify(invalidDestination);
-//   }
-//
-//   public void testCreateConsumerWithUnknownQueue() throws Exception
-//   {
-//      JBossDestination destination = new JBossQueue(randomString());
-//
-//      // isExists() will return false
-//      SessionQueueQueryResponseMessage resp = new SessionQueueQueryResponseMessage();
-//      expect(mockClientSession.queueQuery(destination.getSimpleAddress()))
-//            .andReturn(resp);
-//
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      try
-//      {
-//         session.createConsumer(destination);
-//         fail("should throw an InvalidDestinationException");
-//      } catch (InvalidDestinationException e)
-//      {
-//      }
-//   }
-//
-//   public void testCreateConsumerWithUnknownTopic() throws Exception
-//   {
-//      JBossDestination destination = new JBossTopic(randomString());
-//
-//      // isExists() will return false
-//      SessionBindingQueryResponseMessage resp = new SessionBindingQueryResponseMessage();
-//      expect(mockClientSession.bindingQuery(destination.getSimpleAddress()))
-//      .andReturn(resp);
-//
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      try
-//      {
-//         session.createConsumer(destination);
-//         fail("should throw an InvalidDestinationException");
-//      } catch (InvalidDestinationException e)
-//      {
-//      }
-//   }
-//   
-//   public void testCreateConsumerForTopic() throws Exception
-//   {
-//      JBossDestination destination = new JBossTopic(randomString());
-//      ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
-//
-//      // isExists() will return true
-//      SessionBindingQueryResponseMessage resp = new SessionBindingQueryResponseMessage(
-//            true, new ArrayList<SimpleString>());
-//      expect(mockClientSession.bindingQuery(destination.getSimpleAddress()))
-//            .andReturn(resp);
-//      mockClientSession.createQueue(eq(destination.getSimpleAddress()),
-//            isA(SimpleString.class), (SimpleString) isNull(), eq(false),
-//            eq(true));
-//      expect(
-//            mockClientSession.createConsumer(isA(SimpleString.class),
-//                  (SimpleString) isNull(), eq(false)))
-//            .andReturn(clientConsumer);
-//      expect(mockClientSession.isClosed()).andReturn(false);
-//
-//      replay(sf, mockClientSession, clientConsumer);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      MessageConsumer consumer = session.createConsumer(destination);
-//      assertNotNull(consumer);
-//
-//      verify(clientConsumer);
-//   }
-//
-//
-//   public void testCreateDurableSubscriberFromQueueSession() throws Exception
-//   {
-//      JBossTopic topic = new JBossTopic(randomString());
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      try
-//      {
-//         session.createDurableSubscriber(topic, randomString());
-//         fail("cannot create a durable subscriber on a QueueSession");
-//      } catch (IllegalStateException e)
-//      {
-//      }
-//   }
-//   
-//   public void testCreateDurableSubscriberForNullTopic() throws Exception
-//   {
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      try
-//      {
-//         session.createDurableSubscriber(null, randomString());
-//         fail("cannot create a durable subscriber on a null topict");
-//      } catch (InvalidDestinationException e)
-//      {
-//      }
-//   }
-//   
-//   public void testCreateDurableSubscriberForInvalidTopic() throws Exception
-//   {
-//      Topic invalidTopic = createStrictMock(Topic.class);
-//      replay(sf, mockClientSession, invalidTopic);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      try
-//      {
-//         session.createDurableSubscriber(invalidTopic, randomString());
-//         fail("only instances of JBossTopic are allowed");
-//      } catch (InvalidDestinationException e)
-//      {
-//      }
-//      
-//      verify(invalidTopic);
-//   }
-//   
-//   public void testCreateDurableSubscriber() throws Exception
-//   {
-//      String subscriptionName = randomString();
-//      String clientID = randomString();
-//      JBossTopic topic = new JBossTopic(randomString());
-//      ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
-//    
-//      expect(mockClientSession.isClosed()).andStubReturn(false);
-//
-//      // isExists() will return true
-//      SessionBindingQueryResponseMessage bindingResp = new SessionBindingQueryResponseMessage(
-//            true, new ArrayList<SimpleString>());
-//      expect(mockClientSession.bindingQuery(topic.getSimpleAddress()))
-//            .andReturn(bindingResp);
-//      SessionQueueQueryResponseMessage queryResp = new SessionQueueQueryResponseMessage();
-//      expect(mockClientSession.queueQuery(isA(SimpleString.class))).andReturn(queryResp);
-//      mockClientSession.createQueue(eq(topic.getSimpleAddress()),
-//            isA(SimpleString.class), (SimpleString) isNull(), eq(true),
-//            eq(false));
-//      expect(
-//            mockClientSession.createConsumer(isA(SimpleString.class),
-//                  (SimpleString) isNull(), eq(false)))
-//            .andReturn(clientConsumer);
-//
-//      replay(sf, mockClientSession, clientConsumer);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, clientID, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      MessageConsumer consumer = session.createDurableSubscriber(topic, subscriptionName);
-//      assertNotNull(consumer);
-//
-//      verify(clientConsumer);
-//   }
-//   
-//   public void testCreateDurableSubscriberWithNullClientID() throws Exception
-//   {
-//      String subscriptionName = randomString();
-//      String clientID = null;
-//      JBossTopic topic = new JBossTopic(randomString());
-//
-//      
-//      expect(mockClientSession.isClosed()).andStubReturn(false);
-//
-//      // isExists() will return true
-//      SessionBindingQueryResponseMessage bindingResp = new SessionBindingQueryResponseMessage(
-//            true, new ArrayList<SimpleString>());
-//      expect(mockClientSession.bindingQuery(topic.getSimpleAddress()))
-//            .andReturn(bindingResp);
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, clientID, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      try {
-//         session.createDurableSubscriber(topic, subscriptionName);
-//         fail("clientID must be set to create a durable subscriber");
-//      } catch (InvalidClientIDException e)
-//      {
-//      }
-//   }
-//   
-//   public void testCreateDurableSubscriberWithTemporaryTopic() throws Exception
-//   {
-//      String topicName = randomString();
-//      SimpleString topicAddress = new SimpleString(
-//            JBossTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX + topicName);
-//      
-//      String subscriptionName = randomString();
-//      String clientID = randomString();
-//      
-//      expect(mockClientSession.isClosed()).andStubReturn(false);
-//
-//      // isExists() will return true
-//      SessionBindingQueryResponseMessage bindingResp = new SessionBindingQueryResponseMessage(
-//            true, new ArrayList<SimpleString>());
-//      expect(mockClientSession.bindingQuery(topicAddress))
-//            .andReturn(bindingResp);
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, clientID, -1, sf);
-//      JBossSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//      JBossTopic tempTopic = new JBossTemporaryTopic(session, topicName);
-//
-//
-//      try {
-//         session.createDurableSubscriber(tempTopic, subscriptionName);
-//         fail("can not create a durable subscriber for a temporary topic");
-//      } catch (InvalidDestinationException e)
-//      {
-//      }
-//   }
-//   
-//   public void testCreateDurableSubscriberWithAlreadyReigsteredSubscriber() throws Exception
-//   {
-//      String subscriptionName = randomString();
-//      String clientID = randomString();
-//      JBossTopic topic = new JBossTopic(randomString());
-//
-//      
-//      expect(mockClientSession.isClosed()).andStubReturn(false);
-//
-//      // isExists() will return true
-//      SessionBindingQueryResponseMessage bindingResp = new SessionBindingQueryResponseMessage(
-//            true, new ArrayList<SimpleString>());
-//      expect(mockClientSession.bindingQuery(topic.getSimpleAddress()))
-//            .andReturn(bindingResp);
-//      // already 1 durable subscriber
-//      SessionQueueQueryResponseMessage queryResp =
-//         new SessionQueueQueryResponseMessage(true, 1, 0, null, topic.getSimpleAddress());
-//      expect(mockClientSession.queueQuery(isA(SimpleString.class))).andReturn(queryResp);
-//
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, clientID, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      try
-//      {
-//         session.createDurableSubscriber(topic, subscriptionName);         
-//         fail("can not create a durable subscriber when another is already registered");
-//      } catch (IllegalStateException e)
-//      {
-//      }
-//   }
-//   
-//   public void testCreateDurableSubscriberWithEmptyMessageSelector() throws Exception
-//   {
-//      String subscriptionName = randomString();
-//      String clientID = randomString();
-//      String selector = "";
-//      JBossTopic topic = new JBossTopic(randomString());
-//      ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
-//
-//      
-//      expect(mockClientSession.isClosed()).andStubReturn(false);
-//
-//      // isExists() will return true
-//      SessionBindingQueryResponseMessage bindingResp = new SessionBindingQueryResponseMessage(
-//            true, new ArrayList<SimpleString>());
-//      expect(mockClientSession.bindingQuery(topic.getSimpleAddress()))
-//            .andReturn(bindingResp);
-//      SessionQueueQueryResponseMessage queryResp = new SessionQueueQueryResponseMessage();
-//      expect(mockClientSession.queueQuery(isA(SimpleString.class))).andReturn(queryResp);
-//      mockClientSession.createQueue(eq(topic.getSimpleAddress()),
-//            isA(SimpleString.class), (SimpleString) isNull(), eq(true),
-//            eq(false));
-//      expect(
-//            mockClientSession.createConsumer(isA(SimpleString.class),
-//                  (SimpleString) isNull(), eq(false)))
-//            .andReturn(clientConsumer);
-//
-//      replay(sf, mockClientSession, clientConsumer);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, clientID, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      MessageConsumer consumer = session.createDurableSubscriber(topic, subscriptionName, selector, false);
-//      assertNotNull(consumer);
-//
-//      verify(clientConsumer);
-//   }
-//   
-//   public void testCreateDurableSubscriberWhichWasAlreadyRegistered() throws Exception
-//   {
-//      String subscriptionName = randomString();
-//      String clientID = randomString();
-//      JBossTopic topic = new JBossTopic(randomString());
-//      ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
-//
-//      
-//      expect(mockClientSession.isClosed()).andStubReturn(false);
-//
-//      // isExists() will return true
-//      SessionBindingQueryResponseMessage bindingResp = new SessionBindingQueryResponseMessage(
-//            true, new ArrayList<SimpleString>());
-//      expect(mockClientSession.bindingQuery(topic.getSimpleAddress()))
-//            .andReturn(bindingResp);
-//      // isExists will return true
-//      SessionQueueQueryResponseMessage queryResp =
-//         new SessionQueueQueryResponseMessage(true, 0, 0, null, topic.getSimpleAddress());
-//      expect(mockClientSession.queueQuery(isA(SimpleString.class))).andReturn(queryResp);
-//      expect(
-//            mockClientSession.createConsumer(isA(SimpleString.class),
-//                  (SimpleString) isNull(), eq(false)))
-//            .andReturn(clientConsumer);
-//
-//      replay(sf, mockClientSession, clientConsumer);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, clientID, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      MessageConsumer consumer = session.createDurableSubscriber(topic, subscriptionName);
-//      assertNotNull(consumer);
-//
-//      verify(clientConsumer);
-//   }
-//   
-//   public void testCreateDurableSubscriberWhichWasAlreadyRegisteredWithAnotherTopic() throws Exception
-//   {
-//      String subscriptionName = randomString();
-//      String clientID = randomString();
-//      JBossTopic oldTopic = new JBossTopic(randomString());
-//      JBossTopic newTopic = new JBossTopic(randomString());
-//      ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
-//
-//      
-//      expect(mockClientSession.isClosed()).andStubReturn(false);
-//
-//      // isExists() will return true
-//      SessionBindingQueryResponseMessage bindingResp = new SessionBindingQueryResponseMessage(
-//            true, new ArrayList<SimpleString>());
-//      expect(mockClientSession.bindingQuery(newTopic.getSimpleAddress()))
-//            .andReturn(bindingResp);
-//      // isExists will return true
-//      SessionQueueQueryResponseMessage queryResp =
-//         new SessionQueueQueryResponseMessage(true, 0, 0, null, oldTopic.getSimpleAddress());
-//      expect(mockClientSession.queueQuery(isA(SimpleString.class))).andReturn(queryResp);
-//      // queue address of the old topic
-//      mockClientSession.deleteQueue(isA(SimpleString.class));
-//      mockClientSession.createQueue(eq(newTopic.getSimpleAddress()), isA(SimpleString.class), (SimpleString) isNull(), eq(true), eq(false));
-//      expect(
-//            mockClientSession.createConsumer(isA(SimpleString.class),
-//                  (SimpleString) isNull(), eq(false)))
-//            .andReturn(clientConsumer);
-//
-//      replay(sf, mockClientSession, clientConsumer);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, clientID, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      MessageConsumer consumer = session.createDurableSubscriber(newTopic, subscriptionName);
-//      assertNotNull(consumer);
-//
-//      verify(clientConsumer);
-//   }
-//   
-//   public void testCreateDurableSubscriberWhichWasAlreadyRegisteredWithAnotherMessageSelector() throws Exception
-//   {
-//      String subscriptionName = randomString();
-//      String clientID = randomString();
-//      JBossTopic topic = new JBossTopic(randomString());
-//      SimpleString oldSelector = new SimpleString("color = 'red'");
-//      SimpleString newSelector = new SimpleString("color = 'blue'");
-//      ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
-//
-//      
-//      expect(mockClientSession.isClosed()).andStubReturn(false);
-//
-//      // isExists() will return true
-//      SessionBindingQueryResponseMessage bindingResp = new SessionBindingQueryResponseMessage(
-//            true, new ArrayList<SimpleString>());
-//      expect(mockClientSession.bindingQuery(topic.getSimpleAddress()))
-//            .andReturn(bindingResp);
-//      // isExists will return true
-//      SessionQueueQueryResponseMessage queryResp =
-//         new SessionQueueQueryResponseMessage(true, 0, 0, oldSelector, topic.getSimpleAddress());
-//      expect(mockClientSession.queueQuery(isA(SimpleString.class))).andReturn(queryResp);
-//      // queue address of the old topic
-//      mockClientSession.deleteQueue(isA(SimpleString.class));
-//      mockClientSession.createQueue(eq(topic.getSimpleAddress()), isA(SimpleString.class), eq(newSelector), eq(true), eq(false));
-//      expect(
-//            mockClientSession.createConsumer(isA(SimpleString.class),
-//                  (SimpleString) isNull(), eq(false)))
-//            .andReturn(clientConsumer);
-//
-//      replay(sf, mockClientSession, clientConsumer);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, clientID, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      MessageConsumer consumer = session.createDurableSubscriber(topic, subscriptionName, newSelector.toString(), false);
-//      assertNotNull(consumer);
-//
-//      verify(clientConsumer);
-//   }
-//
-//
-//   /*public void testCreateBrowser() throws Exception
-//   {
-//      JBossQueue queue = new JBossQueue(randomString());
-//      ClientBrowser clientBrowser = createStrictMock(ClientBrowser.class);
-//      expect(mockClientSession.createBrowser(queue.getSimpleAddress(), null))
-//            .andReturn(clientBrowser);
-//
-//      replay(sf, mockClientSession, clientBrowser);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      QueueBrowser browser = session.createBrowser(queue);
-//      assertNotNull(browser);
-//
-//      verify(clientBrowser);
-//   }
-//
-//   public void testCreateBrowserThrowsException() throws Exception
-//   {
-//      JBossQueue queue = new JBossQueue(randomString());
-//      ClientBrowser clientBrowser = createStrictMock(ClientBrowser.class);
-//      expect(mockClientSession.createBrowser(queue.getSimpleAddress(), null))
-//            .andThrow(new MessagingException());
-//
-//      replay(sf, mockClientSession, clientBrowser);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      try
-//      {
-//         session.createBrowser(queue);
-//         fail("should throw a JMSException");
-//      } catch (JMSException e)
-//      {
-//      }
-//
-//      verify(clientBrowser);
-//   }
-//
-//   public void testCreateBrowserWithEmptyFilter() throws Exception
-//   {
-//      JBossQueue queue = new JBossQueue(randomString());
-//      ClientBrowser clientBrowser = createStrictMock(ClientBrowser.class);
-//      expect(mockClientSession.createBrowser(queue.getSimpleAddress(), null))
-//            .andReturn(clientBrowser);
-//
-//      replay(sf, mockClientSession, clientBrowser);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      QueueBrowser browser = session.createBrowser(queue, "");
-//      assertNotNull(browser);
-//
-//      verify(clientBrowser);
-//   }
-//
-//   public void testCreateBrowserWithFilter() throws Exception
-//   {
-//      String filter = "color = 'red'";
-//      JBossQueue queue = new JBossQueue(randomString());
-//      ClientBrowser clientBrowser = createStrictMock(ClientBrowser.class);
-//      expect(
-//            mockClientSession.createBrowser(queue.getSimpleAddress(),
-//                  new SimpleString(filter))).andReturn(clientBrowser);
-//
-//      replay(sf, mockClientSession, clientBrowser);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      QueueBrowser browser = session.createBrowser(queue, filter);
-//      assertNotNull(browser);
-//
-//      verify(clientBrowser);
-//   }*/
-//
-//   public void testCreateBrowserFromTopicSession() throws Exception
-//   {
-//      Queue queue = new JBossQueue(randomString());
-//
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      try
-//      {
-//         session.createBrowser(queue);
-//         fail("browser can not be created from topic session");
-//      } catch (IllegalStateException e)
-//      {
-//      }
-//   }
-//
-//   public void testCreateBrowserForNullQueue() throws Exception
-//   {
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      try
-//      {
-//         session.createBrowser(null);
-//         fail("browser can not be created for a null destination");
-//      } catch (InvalidDestinationException e)
-//      {
-//      }
-//   }
-//
-//   public void testCreateBrowserForInvalidQueue() throws Exception
-//   {
-//      Queue queue = createStrictMock(Queue.class);
-//      replay(sf, mockClientSession, queue);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      try
-//      {
-//         session.createBrowser(queue);
-//         fail("browser can not be created for queues which are not instances of JBossQueue");
-//      } catch (InvalidDestinationException e)
-//      {
-//      }
-//
-//      verify(queue);
-//   }
-//
-//   public void testCreateQueue() throws Exception
-//   {
-//      String queueName = randomString();
-//      SimpleString queueAddress = new SimpleString(
-//            JBossQueue.JMS_QUEUE_ADDRESS_PREFIX + queueName);
-//
-//      // isExists() will return true
-//      SessionQueueQueryResponseMessage resp = new SessionQueueQueryResponseMessage(
-//            false, -1, 1, null, queueAddress);
-//      expect(mockClientSession.queueQuery(queueAddress)).andReturn(resp);
-//
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      Queue queue = session.createQueue(queueName);
-//      assertNotNull(queue);
-//   }
-//
-//   public void testCreateQueueThrowsException() throws Exception
-//   {
-//      String queueName = randomString();
-//      SimpleString queueAddress = new SimpleString(
-//            JBossQueue.JMS_QUEUE_ADDRESS_PREFIX + queueName);
-//
-//      expect(mockClientSession.queueQuery(queueAddress)).andThrow(
-//            new MessagingException());
-//
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      try
-//      {
-//         session.createQueue(queueName);
-//         fail("should throw a JMSException");
-//      } catch (JMSException e)
-//      {
-//      }
-//   }
-//
-//   public void testCreateQueueWithUnknownName() throws Exception
-//   {
-//      String queueName = randomString();
-//      SimpleString queueAddress = new SimpleString(
-//            JBossQueue.JMS_QUEUE_ADDRESS_PREFIX + queueName);
-//
-//      // isExists() will return false
-//      SessionQueueQueryResponseMessage resp = new SessionQueueQueryResponseMessage();
-//      expect(mockClientSession.queueQuery(queueAddress)).andReturn(resp);
-//
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      try
-//      {
-//         session.createQueue(queueName);
-//         fail("creating a queue with an unknown name must throw a JMSException");
-//      } catch (JMSException e)
-//      {
-//      }
-//   }
-//
-//   public void testCreateQueueFromTopicSession() throws Exception
-//   {
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      try
-//      {
-//         session.createQueue(randomString());
-//         fail("creating a queue from a topic session must throw a IllegalStateException");
-//      } catch (IllegalStateException e)
-//      {
-//      }
-//   }
-//
-//   public void testCreateTopic() throws Exception
-//   {
-//      String topicName = randomString();
-//      SimpleString topicAddress = new SimpleString(
-//            JBossTopic.JMS_TOPIC_ADDRESS_PREFIX + topicName);
-//
-//      SessionBindingQueryResponseMessage resp = new SessionBindingQueryResponseMessage(
-//            true, new ArrayList<SimpleString>());
-//      expect(mockClientSession.bindingQuery(topicAddress)).andReturn(resp);
-//
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      Topic topic = session.createTopic(topicName);
-//      assertNotNull(topic);
-//   }
-//
-//   public void testCreateTopicThrowsException() throws Exception
-//   {
-//      String topicName = randomString();
-//      SimpleString topicAddress = new SimpleString(
-//            JBossTopic.JMS_TOPIC_ADDRESS_PREFIX + topicName);
-//
-//      expect(mockClientSession.bindingQuery(topicAddress)).andThrow(
-//            new MessagingException());
-//
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      try
-//      {
-//         session.createTopic(topicName);
-//         fail("should throw a JMSException");
-//      } catch (JMSException e)
-//      {
-//      }
-//   }
-//
-//   public void testCreateTopicWithUnknownName() throws Exception
-//   {
-//      String topicName = randomString();
-//      SimpleString topicAddress = new SimpleString(
-//            JBossTopic.JMS_TOPIC_ADDRESS_PREFIX + topicName);
-//
-//      SessionBindingQueryResponseMessage resp = new SessionBindingQueryResponseMessage(
-//            false, new ArrayList<SimpleString>());
-//      expect(mockClientSession.bindingQuery(topicAddress)).andReturn(resp);
-//
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      try
-//      {
-//         session.createTopic(topicName);
-//         fail("creating a topic with an unknown name must throw a JMSException");
-//      } catch (JMSException e)
-//      {
-//      }
-//   }
-//
-//   public void testCreateTopicFromQueueSession() throws Exception
-//   {
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      try
-//      {
-//         session.createTopic(randomString());
-//         fail("creating a topic from a queue session must throw a IllegalStateException");
-//      } catch (IllegalStateException e)
-//      {
-//      }
-//   }
-//   
-//   public void testCreateTemporaryQueue() throws Exception
-//   {
-//      mockClientSession.createQueue(isA(SimpleString.class), isA(SimpleString.class), (SimpleString) isNull(), eq(false), eq(true));
-//      mockClientSession.addDestination(isA(SimpleString.class), eq(false), eq(true));
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      TemporaryQueue topic = session.createTemporaryQueue();
-//      assertNotNull(topic);
-//   }
-//   
-//   public void testCreateTemporaryQueueThrowsException() throws Exception
-//   {
-//      mockClientSession.createQueue(isA(SimpleString.class), isA(SimpleString.class), (SimpleString) isNull(), eq(false), eq(true));
-//      expectLastCall().andThrow(new MessagingException());
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//      try
-//      {
-//         session.createTemporaryQueue();
-//         fail("must throw a JMSException");
-//      } catch (JMSException e)
-//      {
-//      }
-//   }
-//   
-//   public void testCreateTemporaryQueueFromTopicSession() throws Exception
-//   {
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//      try
-//      {
-//         session.createTemporaryQueue();
-//         fail("must throw a JMSException");
-//      } catch (JMSException e)
-//      {
-//      }
-//   }
-//   
-//   public void testCreateTemporaryTopic() throws Exception
-//   {
-//      mockClientSession.addDestination(isA(SimpleString.class), eq(false), eq(true));
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      TemporaryTopic topic = session.createTemporaryTopic();
-//      assertNotNull(topic);
-//   }
-//   
-//   public void testCreateTemporaryTopicThrowsException() throws Exception
-//   {
-//      mockClientSession.addDestination(isA(SimpleString.class), eq(false), eq(true));
-//      expectLastCall().andThrow(new MessagingException());
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      try
-//      {
-//         session.createTemporaryTopic();
-//         fail("must throw a JMSException");
-//      } catch (JMSException e)
-//      {
-//      }
-//   }
-//
-//   public void testCreateTemporaryTopicFromQueueSession() throws Exception
-//   {
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      QueueSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      try
-//      {
-//         session.createTemporaryTopic();
-//         fail("must throw a JMSException");
-//      } catch (JMSException e)
-//      {
-//      }
-//   }
-//   
-//   public void testDeleteTemporaryQueue() throws Exception
-//   {
-//      String queueName = randomString();
-//      SimpleString queueAddress = new SimpleString(JBossTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX + queueName);
-//      
-//      // isExists() will return true
-//      SessionQueueQueryResponseMessage resp = new SessionQueueQueryResponseMessage(
-//            false, -1, 1, null, queueAddress);
-//      expect(mockClientSession.queueQuery(queueAddress)).andReturn(resp);      
-//      mockClientSession.removeDestination(queueAddress, false);
-//      mockClientSession.deleteQueue(queueAddress);
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      JBossSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//      JBossTemporaryQueue tempQueue = new JBossTemporaryQueue(session, queueName);
-//
-//      session.deleteTemporaryQueue(tempQueue);
-//   }
-//   
-//   public void testDeleteTemporaryQueueWithUnknownQueue() throws Exception
-//   {
-//      String queueName = randomString();
-//      SimpleString queueAddress = new SimpleString(JBossTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX + queueName);
-//      
-//      // isExists() will return false
-//      SessionQueueQueryResponseMessage resp = new SessionQueueQueryResponseMessage();
-//      expect(mockClientSession.queueQuery(queueAddress)).andReturn(resp);
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      JBossSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//      JBossTemporaryQueue tempQueue = new JBossTemporaryQueue(session, queueName);
-//
-//      try
-//      {
-//         session.deleteTemporaryQueue(tempQueue);   
-//         fail("can not delete a temp queue which does not exist");
-//      } catch (InvalidDestinationException e)
-//      {
-//      }
-//   }
-//   
-//   public void testDeleteTemporaryQueueWithConsumers() throws Exception
-//   {
-//      String queueName = randomString();
-//      int consumerCount = 1;
-//      SimpleString queueAddress = new SimpleString(JBossTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX + queueName);
-//      
-//      
-//      SessionQueueQueryResponseMessage resp =
-//         new SessionQueueQueryResponseMessage(false, consumerCount, 0, null, queueAddress);
-//      expect(mockClientSession.queueQuery(queueAddress)).andReturn(resp);
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      JBossSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//      JBossTemporaryQueue tempQueue = new JBossTemporaryQueue(session, queueName);
-//
-//      try
-//      {
-//         session.deleteTemporaryQueue(tempQueue);   
-//         fail("can not delete a temp queue which has consumers");
-//      } catch (IllegalStateException e)
-//      {
-//      }
-//   }
-//   
-//   public void testDeleteTemporaryQueueThrowsException() throws Exception
-//   {
-//      expect(mockClientSession.queueQuery(isA(SimpleString.class))).andThrow(new MessagingException());
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      JBossSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//      JBossTemporaryQueue tempQueue = new JBossTemporaryQueue(session, randomString());
-//
-//      try
-//      {
-//         session.deleteTemporaryQueue(tempQueue);   
-//         fail("must throw a JMSException");
-//      } catch (JMSException e)
-//      {
-//      }
-//   } 
-//   
-//   public void testDeleteTemporaryTopic() throws Exception
-//   {
-//      String topicName = randomString();
-//      SimpleString topicAddress = new SimpleString(JBossTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX + topicName);
-//      
-//      SessionBindingQueryResponseMessage resp = new SessionBindingQueryResponseMessage(true, new ArrayList<SimpleString>());
-//      expect(mockClientSession.bindingQuery(topicAddress)).andReturn(resp);
-//      mockClientSession.removeDestination(topicAddress, false);
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      JBossSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//      JBossTemporaryTopic tempTopic = new JBossTemporaryTopic(session, topicName);
-//
-//      session.deleteTemporaryTopic(tempTopic);
-//   }
-// 
-//   public void testDeleteTemporaryTopicWithUnknownTopic() throws Exception
-//   {
-//      String topicName = randomString();
-//      SimpleString topicAddress = new SimpleString(JBossTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX + topicName);
-//      
-//      SessionBindingQueryResponseMessage resp = new SessionBindingQueryResponseMessage(false, new ArrayList<SimpleString>());
-//      expect(mockClientSession.bindingQuery(topicAddress)).andReturn(resp);
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      JBossSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//      JBossTemporaryTopic tempTopic = new JBossTemporaryTopic(session, topicName);
-//
-//      try
-//      {
-//         session.deleteTemporaryTopic(tempTopic);
-//         fail("can not delete a temp topic which does not exist");
-//      } catch (InvalidDestinationException e)
-//      {
-//      }
-//   }
-//   
-//   public void testDeleteTemporaryTopicWhichHasSubscribers() throws Exception
-//   {
-//      String topicName = randomString();
-//      SimpleString topicAddress = new SimpleString(JBossTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX + topicName);
-//      List<SimpleString> queueNames = new ArrayList<SimpleString>();
-//      queueNames.add(randomSimpleString());
-//      
-//      SessionBindingQueryResponseMessage resp = new SessionBindingQueryResponseMessage(true, queueNames);
-//      expect(mockClientSession.bindingQuery(topicAddress)).andReturn(resp);
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      JBossSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//      JBossTemporaryTopic tempTopic = new JBossTemporaryTopic(session, topicName);
-//
-//      try
-//      {
-//         session.deleteTemporaryTopic(tempTopic);
-//         fail("can not delete a temp topic which has subscribers");
-//      } catch (IllegalStateException e)
-//      {
-//      }
-//   }
-//   
-//   public void testDeleteTemporaryTopicWhichThrowsException() throws Exception
-//   {
-//      String topicName = randomString();
-//
-//      expect(mockClientSession.bindingQuery(isA(SimpleString.class))).andThrow(new MessagingException());
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      JBossSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//      JBossTemporaryTopic tempTopic = new JBossTemporaryTopic(session, topicName);
-//
-//      try
-//      {
-//         session.deleteTemporaryTopic(tempTopic);
-//         fail("must throw a JMSException");
-//      } catch (JMSException e)
-//      {
-//      }
-//   }
-//   
-//   public void testGetSessionOnXASession() throws Exception
-//   {
-//      boolean isXA = true;
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      JBossSession session = new JBossSession(connection, false, isXA,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      Session sess = session.getSession();
-//      assertNotNull(sess);
-//   }
-//
-//   public void testGetSessionOnNonXASession() throws Exception
-//   {
-//      boolean isXA = false;
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      JBossSession session = new JBossSession(connection, false, isXA,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      try
-//      {
-//         session.getSession();
-//         fail("can not get the session on a non-XA session");
-//      } catch (IllegalStateException e)
-//      {
-//      }
-//   }
-//   
-//   public void testGetXAResource() throws Exception
-//   {
-//      expect(mockClientSession.getXAResource()).andReturn(mockClientSession);
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      JBossSession session = new JBossSession(connection, false, true,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      XAResource xares = session.getXAResource();
-//      assertNotNull(xares);
-//      assertSame(mockClientSession, xares);
-//   }
-//   
-//   public void testGetQueueSession() throws Exception
-//   {
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      JBossSession session = new JBossSession(connection, false, true,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      QueueSession queueSess = session.getQueueSession();
-//      assertNotNull(queueSess);
-//      assertSame(session, queueSess);
-//   }
-//   
-//   public void testGetCoreSession() throws Exception
-//   {
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      JBossSession session = new JBossSession(connection, false, true,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      ClientSession clientSession = session.getCoreSession();
-//      assertNotNull(clientSession);
-//      assertSame(mockClientSession, clientSession);
-//   }
-//   
-//   public void testUnsubscribe() throws Exception
-//   {
-//      String subName = randomString();
-//      String clientID = randomString();
-//      SimpleString queueAddres = new SimpleString(JBossTopic.createQueueNameForDurableSubscription(clientID, subName));      
-//      SessionQueueQueryResponseMessage resp = new SessionQueueQueryResponseMessage(false, 0, 0, null, queueAddres);
-//      expect(mockClientSession.queueQuery(queueAddres)).andReturn(resp );
-//      mockClientSession.deleteQueue(queueAddres);
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, clientID, -1, sf);
-//      JBossSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      session.unsubscribe(subName);
-//   }
-//   
-//   public void testUnsubscribeWithUnknownSubscription() throws Exception
-//   {
-//      String clientID = randomString();     
-//      // isExists() will return false
-//      SessionQueueQueryResponseMessage resp = new SessionQueueQueryResponseMessage();
-//      expect(mockClientSession.queueQuery(isA(SimpleString.class))).andReturn(resp );
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, clientID, -1, sf);
-//      JBossSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      try
-//      {
-//         session.unsubscribe(randomString());
-//         fail("can not unsubscribe from an unknown subscription");
-//      } catch (InvalidDestinationException e)
-//      {
-//      }
-//   }
-//   
-//   public void testUnsubscribeWithActiveSubscribers() throws Exception
-//   {
-//      String clientID = randomString();
-//      String subName = randomString();
-//      SimpleString queueAddres = new SimpleString(JBossTopic.createQueueNameForDurableSubscription(clientID, subName));
-//      int consumerCount = 1;      
-//
-//      SessionQueueQueryResponseMessage resp =
-//         new SessionQueueQueryResponseMessage(true, consumerCount, 0, null, queueAddres);
-//      expect(mockClientSession.queueQuery(isA(SimpleString.class))).andReturn(resp );
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, clientID, -1, sf);
-//      JBossSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      try
-//      {
-//         session.unsubscribe(randomString());
-//         fail("can not unsubscribe when there are active subscribers");
-//      } catch (IllegalStateException e)
-//      {
-//      }
-//   }
-//   
-//   public void testUnsubscribeThrowsException() throws Exception
-//   {
-//      String clientID = randomString();
-//      expect(mockClientSession.queueQuery(isA(SimpleString.class))).andThrow(new MessagingException());
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_TOPIC_CONNECTION, clientID, -1, sf);
-//      JBossSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_TOPIC_SESSION);
-//
-//      try
-//      {
-//         session.unsubscribe(randomString());
-//         fail("must throw a JMSException");
-//      } catch (JMSException e)
-//      {
-//      }
-//   }
-//   
-//   public void testUnsubscribeFromQueueSession() throws Exception
-//   {
-//      String subName = randomString();
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      JBossSession session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_QUEUE_SESSION);
-//
-//      try
-//      {
-//         session.unsubscribe(subName);
-//         fail("can not unsubscribe from a queue session");
-//      } catch (IllegalStateException e)
-//      {
-//      }
-//   }
-//
-//      // Package protected ---------------------------------------------
-//
-//   // Protected -----------------------------------------------------
-//
-//   // Private -------------------------------------------------------
-//
-//   private void doTestCreateMessage(MessageCreation creation)
-//         throws JMSException
-//   {
-//      ByteBufferWrapper body = new ByteBufferWrapper(ByteBuffer.allocate(1024));
-//      ClientMessage clientMessage = new ClientMessageImpl(JBossMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
-//      expect(mockClientSession.isClosed()).andReturn(false);
-//      expect(mockClientSession.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);
-//      replay(sf, mockClientSession);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//      Message message = creation.createMessage(session);
-//      assertNotNull(message);
-//   }
-//
-//   private void doTestCreateConsumerWithSelector(String selector,
-//         SimpleString expectedSelector) throws Exception
-//   {
-//      JBossDestination destination = new JBossQueue(randomString());
-//      ClientConsumer clientConsumer = createStrictMock(ClientConsumer.class);
-//
-//      // isExists() will return true
-//      SessionQueueQueryResponseMessage resp = new SessionQueueQueryResponseMessage(
-//            false, 0, 1, null, destination.getSimpleAddress());
-//      expect(mockClientSession.queueQuery(destination.getSimpleAddress()))
-//            .andReturn(resp);
-//      expect(
-//            mockClientSession.createConsumer(destination.getSimpleAddress(),
-//                  expectedSelector, false)).andReturn(
-//            clientConsumer);
-//      expect(mockClientSession.isClosed()).andReturn(false);
-//
-//      replay(sf, mockClientSession, clientConsumer);
-//
-//      JBossConnection connection = new JBossConnection(null, null,
-//            JBossConnection.TYPE_QUEUE_CONNECTION, null, -1, sf);
-//      Session session = new JBossSession(connection, false, false,
-//            Session.AUTO_ACKNOWLEDGE, mockClientSession,
-//            JBossSession.TYPE_GENERIC_SESSION);
-//
-//      MessageConsumer consumer = session.createConsumer(destination, selector);
-//      assertNotNull(consumer);
-//
-//      verify(clientConsumer);
-//   }
-
-   // Inner classes -------------------------------------------------
-
-   interface MessageCreation
-   {
-      Message createMessage(Session session) throws JMSException;
-   }
-}

Deleted: trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossTextMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossTextMessageTest.java	2009-03-23 09:48:00 UTC (rev 6133)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/client/JBossTextMessageTest.java	2009-03-23 09:52:29 UTC (rev 6134)
@@ -1,145 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */ 
-
-package org.jboss.messaging.tests.unit.jms.client;
-
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-
-import java.util.Collections;
-
-import javax.jms.DeliveryMode;
-import javax.jms.TextMessage;
-
-import org.easymock.EasyMock;
-import org.jboss.messaging.core.buffers.ChannelBuffers;
-import org.jboss.messaging.core.client.ClientMessage;
-import org.jboss.messaging.core.client.ClientSession;
-import org.jboss.messaging.core.client.impl.ClientMessageImpl;
-import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
-import org.jboss.messaging.jms.client.JBossTextMessage;
-import org.jboss.messaging.tests.util.UnitTestCase;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * 
- * @version <tt>$Revision$</tt>
- * 
- */
-public class JBossTextMessageTest extends UnitTestCase
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   private String text;
-
-   @Override
-   protected void setUp() throws Exception
-   {
-      super.setUp();
-
-      text = randomString();
-   }
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   public void testForeignTextMessage() throws Exception
-   {
-      TextMessage foreignMessage = createNiceMock(TextMessage.class);
-      ClientSession session = EasyMock.createNiceMock(ClientSession.class);
-      MessagingBuffer body = ChannelBuffers.wrappedBuffer(new byte[1024]);
-      ClientMessage clientMessage = new ClientMessageImpl(JBossTextMessage.TYPE, true, 0, System.currentTimeMillis(), (byte)4, body);
-      expect(session.createClientMessage(EasyMock.anyByte(), EasyMock.anyBoolean(), EasyMock.anyInt(), EasyMock.anyLong(), EasyMock.anyByte())).andReturn(clientMessage);  
-      expect(foreignMessage.getJMSDeliveryMode()).andReturn(DeliveryMode.NON_PERSISTENT);
-      expect(foreignMessage.getPropertyNames()).andReturn(Collections.enumeration(Collections.EMPTY_LIST));
-      expect(foreignMessage.getText()).andReturn(text);
-      
-      replay(foreignMessage, session);
-      
-      JBossTextMessage msg = new JBossTextMessage(foreignMessage, session);
-      assertEquals(text, msg.getText());
-      
-      verify(foreignMessage, session);
-   }
-   
-   public void testGetText() throws Exception
-   {
-      JBossTextMessage msg = new JBossTextMessage();
-      msg.setText(text);
-      assertEquals(text, msg.getText());
-   }
-
-   public void testClearBody() throws Exception
-   {
-      JBossTextMessage msg = new JBossTextMessage();
-      msg.setText(text);
-      assertEquals(text, msg.getText());
-      msg.clearBody();
-      assertEquals(null, msg.getText());
-   }
-   
-   public void testGetType() throws Exception
-   {
-      JBossTextMessage msg = new JBossTextMessage();
-      assertEquals(JBossTextMessage.TYPE, msg.getType());
-   }
-   
-   public void testDoBeforeSend() throws Exception
-   {
-      JBossTextMessage msg = new JBossTextMessage();
-      msg.setText(text);
-      
-      msg.doBeforeSend();
-
-      MessagingBuffer body = msg.getCoreMessage().getBody();
-      String s = body.readNullableString();
-      assertEquals(text, s);
-   }
-   
-   public void testDoBeforeReceive() throws Exception
-   {
-      JBossTextMessage msg = new JBossTextMessage();
-      assertNull(msg.getText());
-      MessagingBuffer body = msg.getCoreMessage().getBody();
-      body.writeNullableString(text);
-      
-      msg.doBeforeReceive();
-      
-      assertEquals(text, msg.getText());
-   }
-   
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}




More information about the jboss-cvs-commits mailing list