[jboss-cvs] JBoss Messaging SVN: r6138 - trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Mar 23 06:46:24 EDT 2009


Author: ataylor
Date: 2009-03-23 06:46:23 -0400 (Mon, 23 Mar 2009)
New Revision: 6138

Removed:
   trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/DeliveryImplTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/GroupingRoundRobinDistributionPolicyTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServerImplTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServerPacketHandlerTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServiceImplTest.java
Log:
deleted easymock test

Deleted: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/DeliveryImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/DeliveryImplTest.java	2009-03-23 10:37:23 UTC (rev 6137)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/DeliveryImplTest.java	2009-03-23 10:46:23 UTC (rev 6138)
@@ -1,61 +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.core.server.impl;
-
-import org.jboss.messaging.tests.util.UnitTestCase;
-
-/**
- * @author <a href="ataylor at redhat.com">Andy Taylor</a>
- */
-public class DeliveryImplTest extends UnitTestCase
-{
-   public void testDummy()
-   {      
-   }
-//   public void testDeliver() throws Exception
-//   {
-//      ServerMessage message = EasyMock.createStrictMock(ServerMessage.class);
-//      MessageReference messageReference = EasyMock.createStrictMock(MessageReference.class);     
-//      final long consumerID = 1234l;
-//      final long deliveryID = 48548l;
-//      final int deliveryCount  = 252;
-//      DeliveryImpl delivery = new DeliveryImpl(messageReference, consumerID, deliveryID, cm);
-//      EasyMock.expect(messageReference.getMessage()).andStubReturn(message);
-//      EasyMock.expect(messageReference.getDeliveryCount()).andReturn(deliveryCount);
-//      cm.sendCommandOneway(EasyMock.eq(consumerID), (Packet) EasyMock.anyObject());
-//      EasyMock.expectLastCall().andAnswer(new IAnswer<Object>()
-//      {
-//         public Object answer() throws Throwable
-//         {
-//            long targetID = (Long)EasyMock.getCurrentArguments()[0];
-//            assertEquals(consumerID, targetID);
-//            SessionReceiveMessage receiveMessage = (SessionReceiveMessage) EasyMock.getCurrentArguments()[1];            
-//            assertEquals(receiveMessage.getDeliveryCount(), deliveryCount + 1);
-//            return null;
-//         }
-//      });      
-//      EasyMock.replay(messageReference, cm, message);
-//      delivery.deliver();
-//      EasyMock.verify(messageReference, cm, message);
-//      assertEquals(messageReference, delivery.getReference());
-//   }
-}

Deleted: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/GroupingRoundRobinDistributionPolicyTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/GroupingRoundRobinDistributionPolicyTest.java	2009-03-23 10:37:23 UTC (rev 6137)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/GroupingRoundRobinDistributionPolicyTest.java	2009-03-23 10:46:23 UTC (rev 6138)
@@ -1,332 +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.core.server.impl;
-
-import org.easymock.EasyMock;
-import org.jboss.messaging.core.message.impl.MessageImpl;
-import org.jboss.messaging.core.server.Consumer;
-import org.jboss.messaging.core.server.Distributor;
-import org.jboss.messaging.core.server.HandleStatus;
-import org.jboss.messaging.core.server.MessageReference;
-import org.jboss.messaging.core.server.ServerMessage;
-import org.jboss.messaging.core.server.impl.GroupingRoundRobinDistributor;
-import org.jboss.messaging.core.server.impl.RoundRobinDistributor;
-import org.jboss.messaging.tests.util.UnitTestCase;
-import org.jboss.messaging.utils.SimpleString;
-
-/**
- * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
- */
-public class GroupingRoundRobinDistributionPolicyTest extends UnitTestCase
-{
-   GroupingRoundRobinDistributor policy = null;
-
-   protected void setUp() throws Exception
-   {
-      super.setUp();
-      policy = new GroupingRoundRobinDistributor();
-   }
-
-   protected void tearDown() throws Exception
-   {
-      policy = null;
-      super.tearDown();
-   }
-
-   public void testSingleConsumerSingleGroup() throws Exception
-   {
-      MessageReference reference = EasyMock.createStrictMock(MessageReference.class);
-      Consumer consumer = EasyMock.createStrictMock(Consumer.class);
-      policy.addConsumer(consumer);
-      ServerMessage serverMessage = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference.getMessage()).andStubReturn(serverMessage);
-      EasyMock.expect(serverMessage.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid1"));
-      EasyMock.expect(consumer.handle(reference)).andReturn(HandleStatus.HANDLED);
-      EasyMock.expect(consumer.handle(reference)).andReturn(HandleStatus.HANDLED);
-      EasyMock.replay(consumer, serverMessage, reference);
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference));
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference));
-      EasyMock.verify(consumer, serverMessage, reference);
-   }
-
-   public void testRunOutOfConsumers() throws Exception
-   {
-      MessageReference reference = EasyMock.createStrictMock(MessageReference.class);
-      Consumer c1 = EasyMock.createStrictMock(Consumer.class);
-      Consumer c2 = EasyMock.createStrictMock(Consumer.class);
-      Consumer c3 = EasyMock.createStrictMock(Consumer.class);
-      ServerMessage serverMessage = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference.getMessage()).andStubReturn(serverMessage);
-      EasyMock.expect(serverMessage.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid1"));
-      Distributor dp = new RoundRobinDistributor();
-      dp.addConsumer(c1);
-      dp.addConsumer(c2);
-      dp.addConsumer(c3);
-      EasyMock.expect(c1.handle(reference)).andReturn(HandleStatus.BUSY);
-      EasyMock.expect(c2.handle(reference)).andReturn(HandleStatus.BUSY);
-      EasyMock.expect(c3.handle(reference)).andReturn(HandleStatus.BUSY);
-      EasyMock.replay(reference, c1, c2, c3, serverMessage);
-
-      HandleStatus status = dp.distribute(reference);
-      assertEquals(status, HandleStatus.BUSY);
-      EasyMock.verify(reference, c1, c2, c3, serverMessage);
-   }
-
-   public void testRunOutOfConsumersNoMatch() throws Exception
-   {
-      MessageReference reference = EasyMock.createStrictMock(MessageReference.class);
-      Consumer c1 = EasyMock.createStrictMock(Consumer.class);
-      Consumer c2 = EasyMock.createStrictMock(Consumer.class);
-      Consumer c3 = EasyMock.createStrictMock(Consumer.class);
-      ServerMessage serverMessage = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference.getMessage()).andStubReturn(serverMessage);
-      EasyMock.expect(serverMessage.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid1"));
-      Distributor dp = new RoundRobinDistributor();
-      dp.addConsumer(c1);
-      dp.addConsumer(c2);
-      dp.addConsumer(c3);
-      EasyMock.expect(c1.handle(reference)).andReturn(HandleStatus.NO_MATCH);
-      EasyMock.expect(c2.handle(reference)).andReturn(HandleStatus.NO_MATCH);
-      EasyMock.expect(c3.handle(reference)).andReturn(HandleStatus.NO_MATCH);
-      EasyMock.replay(reference, c1, c2, c3, serverMessage);
-
-      HandleStatus status = dp.distribute(reference);
-      assertEquals(status, HandleStatus.NO_MATCH);
-      EasyMock.verify(reference, c1, c2, c3, serverMessage);
-   }
-
-   public void testMultipleConsumersSingleGroup() throws Exception
-   {
-      MessageReference reference = EasyMock.createStrictMock(MessageReference.class);
-      Consumer consumer = EasyMock.createStrictMock(Consumer.class);
-      Consumer consumer2 = EasyMock.createStrictMock(Consumer.class);
-      Consumer consumer3 = EasyMock.createStrictMock(Consumer.class);
-      policy.addConsumer(consumer);
-      policy.addConsumer(consumer2);
-      policy.addConsumer(consumer3);
-      ServerMessage serverMessage = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference.getMessage()).andStubReturn(serverMessage);
-      EasyMock.expect(serverMessage.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid1"));
-      EasyMock.expect(consumer.handle(reference)).andReturn(HandleStatus.HANDLED);
-      EasyMock.expect(consumer.handle(reference)).andReturn(HandleStatus.HANDLED);
-      EasyMock.replay(consumer, consumer2, consumer3, serverMessage, reference);
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference));
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference));
-      EasyMock.verify(consumer, consumer2, consumer3, serverMessage, reference);
-   }
-
-   public void testSingleConsumerTwoGroups() throws Exception
-   {
-      MessageReference reference = EasyMock.createStrictMock(MessageReference.class);
-      MessageReference reference2 = EasyMock.createStrictMock(MessageReference.class);
-      Consumer consumer = EasyMock.createStrictMock(Consumer.class);
-      policy.addConsumer(consumer);
-      ServerMessage serverMessage = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference.getMessage()).andStubReturn(serverMessage);
-      EasyMock.expect(serverMessage.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid1"));
-      ServerMessage serverMessage2 = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference2.getMessage()).andStubReturn(serverMessage2);
-      EasyMock.expect(serverMessage2.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid2"));
-      EasyMock.expect(consumer.handle(reference)).andReturn(HandleStatus.HANDLED);
-      EasyMock.expect(consumer.handle(reference)).andReturn(HandleStatus.HANDLED);
-      EasyMock.replay(consumer, serverMessage, serverMessage2, reference, reference2);
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference));
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference));
-      EasyMock.verify(consumer, serverMessage2, reference, reference2);
-   }
-
-   public void testMultipleConsumersTwoGroups() throws Exception
-   {
-      MessageReference reference = EasyMock.createStrictMock(MessageReference.class);
-      MessageReference reference2 = EasyMock.createStrictMock(MessageReference.class);
-      Consumer consumer = EasyMock.createStrictMock(Consumer.class);
-      Consumer consumer2 = EasyMock.createStrictMock(Consumer.class);
-      Consumer consumer3 = EasyMock.createStrictMock(Consumer.class);
-      policy.addConsumer(consumer);
-      policy.addConsumer(consumer2);
-      policy.addConsumer(consumer3);
-      ServerMessage serverMessage = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference.getMessage()).andStubReturn(serverMessage);
-      EasyMock.expect(serverMessage.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid1"));
-      ServerMessage serverMessage2 = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference2.getMessage()).andStubReturn(serverMessage2);
-      EasyMock.expect(serverMessage2.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid2"));
-      EasyMock.expect(consumer.handle(reference)).andReturn(HandleStatus.HANDLED);
-      EasyMock.expect(consumer2.handle(reference2)).andReturn(HandleStatus.HANDLED);
-      EasyMock.expect(consumer.handle(reference)).andReturn(HandleStatus.HANDLED);
-      EasyMock.expect(consumer2.handle(reference2)).andReturn(HandleStatus.HANDLED);
-      EasyMock.replay(consumer, consumer2, consumer3, serverMessage, serverMessage2, reference, reference2);
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference));
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference2));
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference));
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference2));
-      EasyMock.verify(consumer, consumer2, consumer3, serverMessage, serverMessage2, reference, reference2);
-   }
-
-   public void testMultipleConsumersSingleGroupFirstDeliveryFailed() throws Exception
-   {
-      MessageReference reference = EasyMock.createStrictMock(MessageReference.class);
-      Consumer consumer = EasyMock.createStrictMock(Consumer.class);
-      Consumer consumer2 = EasyMock.createStrictMock(Consumer.class);
-      Consumer consumer3 = EasyMock.createStrictMock(Consumer.class);
-      policy.addConsumer(consumer);
-      policy.addConsumer(consumer2);
-      policy.addConsumer(consumer3);
-      ServerMessage serverMessage = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference.getMessage()).andStubReturn(serverMessage);
-      EasyMock.expect(serverMessage.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid1"));
-      EasyMock.expect(consumer.handle(reference)).andReturn(HandleStatus.BUSY);
-      EasyMock.replay(consumer, consumer2, consumer3, serverMessage, reference);
-      assertEquals(HandleStatus.BUSY, policy.distribute(reference));
-      EasyMock.verify(consumer, consumer2, consumer3, serverMessage, reference);
-   }
-
-   public void testMultipleConsumersSingleGroupSecondDeliveryFailed() throws Exception
-   {
-      MessageReference reference = EasyMock.createStrictMock(MessageReference.class);
-      Consumer consumer = EasyMock.createStrictMock(Consumer.class);
-      Consumer consumer2 = EasyMock.createStrictMock(Consumer.class);
-      Consumer consumer3 = EasyMock.createStrictMock(Consumer.class);
-      policy.addConsumer(consumer);
-      policy.addConsumer(consumer2);
-      policy.addConsumer(consumer3);
-      ServerMessage serverMessage = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference.getMessage()).andStubReturn(serverMessage);
-      EasyMock.expect(serverMessage.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid1"));
-      EasyMock.expect(consumer.handle(reference)).andReturn(HandleStatus.HANDLED);
-      EasyMock.expect(consumer.handle(reference)).andReturn(HandleStatus.BUSY);
-      EasyMock.replay(consumer, consumer2, consumer3, serverMessage, reference);
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference));
-      assertEquals(HandleStatus.BUSY, policy.distribute(reference));
-      EasyMock.verify(consumer, consumer2, consumer3, serverMessage, reference);
-   }
-
-   public void testMultipleConsumersMultipleGroupMultipleGroupsEach() throws Exception
-   {
-      MessageReference reference = EasyMock.createStrictMock(MessageReference.class);
-      MessageReference reference2 = EasyMock.createStrictMock(MessageReference.class);
-      MessageReference reference3 = EasyMock.createStrictMock(MessageReference.class);
-      MessageReference reference4 = EasyMock.createStrictMock(MessageReference.class);
-      MessageReference reference5 = EasyMock.createStrictMock(MessageReference.class);
-      MessageReference reference6 = EasyMock.createStrictMock(MessageReference.class);
-      MessageReference reference7 = EasyMock.createStrictMock(MessageReference.class);
-      MessageReference reference8 = EasyMock.createStrictMock(MessageReference.class);
-      MessageReference reference9 = EasyMock.createStrictMock(MessageReference.class);
-      Consumer consumer = EasyMock.createStrictMock(Consumer.class);
-      Consumer consumer2 = EasyMock.createStrictMock(Consumer.class);
-      Consumer consumer3 = EasyMock.createStrictMock(Consumer.class);
-      policy.addConsumer(consumer);
-      policy.addConsumer(consumer2);
-      policy.addConsumer(consumer3);
-      ServerMessage serverMessage = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference.getMessage()).andStubReturn(serverMessage);
-      EasyMock.expect(serverMessage.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid1"));
-      ServerMessage serverMessage2 = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference2.getMessage()).andStubReturn(serverMessage2);
-      EasyMock.expect(serverMessage2.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid2"));
-      ServerMessage serverMessage3 = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference3.getMessage()).andStubReturn(serverMessage3);
-      EasyMock.expect(serverMessage3.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid3"));
-      ServerMessage serverMessage4 = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference4.getMessage()).andStubReturn(serverMessage4);
-      EasyMock.expect(serverMessage4.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid4"));
-      ServerMessage serverMessage5 = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference5.getMessage()).andStubReturn(serverMessage5);
-      EasyMock.expect(serverMessage5.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid5"));
-      ServerMessage serverMessage6 = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference6.getMessage()).andStubReturn(serverMessage6);
-      EasyMock.expect(serverMessage6.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid6"));
-      ServerMessage serverMessage7 = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference7.getMessage()).andStubReturn(serverMessage7);
-      EasyMock.expect(serverMessage7.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid7"));
-      ServerMessage serverMessage8 = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference8.getMessage()).andStubReturn(serverMessage8);
-      EasyMock.expect(serverMessage8.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid8"));
-      ServerMessage serverMessage9 = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference9.getMessage()).andStubReturn(serverMessage9);
-      EasyMock.expect(consumer.handle(reference)).andReturn(HandleStatus.HANDLED);
-      EasyMock.expect(consumer2.handle(reference2)).andReturn(HandleStatus.HANDLED);
-      EasyMock.expect(consumer3.handle(reference3)).andReturn(HandleStatus.HANDLED);
-      EasyMock.expect(consumer.handle(reference4)).andReturn(HandleStatus.HANDLED);
-      EasyMock.expect(consumer2.handle(reference5)).andReturn(HandleStatus.HANDLED);
-      EasyMock.expect(consumer3.handle(reference6)).andReturn(HandleStatus.HANDLED);
-      EasyMock.expect(consumer.handle(reference7)).andReturn(HandleStatus.HANDLED);
-      EasyMock.expect(consumer2.handle(reference8)).andReturn(HandleStatus.HANDLED);
-      EasyMock.expect(consumer3.handle(reference9)).andReturn(HandleStatus.HANDLED);
-      EasyMock.expect(serverMessage9.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid9"));
-      EasyMock.replay(consumer, consumer2, consumer3, serverMessage, serverMessage2, serverMessage3, serverMessage4,
-                      serverMessage5, serverMessage6, serverMessage7, serverMessage8, serverMessage9, reference,
-                      reference2, reference3, reference4, reference5, reference6, reference7, reference8, reference9);
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference));
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference2));
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference3));
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference4));
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference5));
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference6));
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference7));
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference8));
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference9));
-
-      EasyMock.verify(consumer, consumer2, consumer3, serverMessage, serverMessage2, serverMessage3, serverMessage4,
-                      serverMessage5, serverMessage6, serverMessage7, serverMessage8, serverMessage9, reference,
-                      reference2, reference3, reference4, reference5, reference6, reference7, reference8, reference9);
-   }
-
-   public void testMultipleConsumersConsumerRemoved() throws Exception
-   {
-      MessageReference reference = EasyMock.createStrictMock(MessageReference.class);
-      MessageReference reference2 = EasyMock.createStrictMock(MessageReference.class);
-      MessageReference reference3 = EasyMock.createStrictMock(MessageReference.class);
-      Consumer consumer = EasyMock.createStrictMock(Consumer.class);
-      Consumer consumer2 = EasyMock.createStrictMock(Consumer.class);
-      Consumer consumer3 = EasyMock.createStrictMock(Consumer.class);
-      Consumer consumer4 = EasyMock.createStrictMock(Consumer.class);
-      policy.addConsumer(consumer);
-      policy.addConsumer(consumer2);
-      policy.addConsumer(consumer3);
-      policy.addConsumer(consumer4);
-      ServerMessage serverMessage = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference.getMessage()).andStubReturn(serverMessage);
-      EasyMock.expect(serverMessage.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid1"));
-      ServerMessage serverMessage2 = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference2.getMessage()).andStubReturn(serverMessage2);
-      EasyMock.expect(serverMessage2.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid2"));
-      ServerMessage serverMessage3 = EasyMock.createStrictMock(ServerMessage.class);
-      EasyMock.expect(reference3.getMessage()).andStubReturn(serverMessage3);
-      EasyMock.expect(serverMessage3.getProperty(MessageImpl.HDR_GROUP_ID)).andStubReturn(new SimpleString("gid3"));
-      EasyMock.expect(consumer.handle(reference)).andReturn(HandleStatus.HANDLED);
-      EasyMock.expect(consumer2.handle(reference2)).andReturn(HandleStatus.HANDLED);
-      EasyMock.expect(consumer3.handle(reference3)).andReturn(HandleStatus.HANDLED);
-      EasyMock.expect(consumer.handle(reference2)).andReturn(HandleStatus.HANDLED);
-      EasyMock.replay(consumer, consumer2, consumer3, consumer4, serverMessage, serverMessage2, serverMessage3,
-                      reference, reference2, reference3);
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference));
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference2));
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference3));
-      policy.removeConsumer(consumer2);
-      assertEquals(HandleStatus.HANDLED, policy.distribute(reference2));
-      EasyMock.verify(consumer, consumer2, consumer3, consumer4, serverMessage, serverMessage2, serverMessage3,
-                      reference, reference2, reference3);
-   }
-
-
-}

Deleted: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServerImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServerImplTest.java	2009-03-23 10:37:23 UTC (rev 6137)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServerImplTest.java	2009-03-23 10:46:23 UTC (rev 6138)
@@ -1,478 +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.core.server.impl;
-
-import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.tests.util.UnitTestCase;
-
-/**
- * 
- * A MessagingServerImplTest
- * 
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- *
- */
-public class MessagingServerImplTest extends UnitTestCase
-{
-   private static final Logger log = Logger.getLogger(MessagingServerImplTest.class);
-   
-   // Private -----------------------------------------------------------------------------------------------------------
-   
-   public void testDummy()
-   {      
-   }
-   
-//   public void testConstructor()
-//   {
-//      MessagingServer server = new MessagingServerImpl();
-//      
-//      Version version = VersionLoader.load();      
-//      assertEquals(version, server.getVersion());      
-//      assertNull(server.getConfiguration());     
-//      assertNull(server.getRemotingService());      
-//      assertNull(server.getSecurityManager());     
-//      assertNull(server.getStorageManager());      
-//   }
-//   
-//   public void testSetGetPlugins() throws Exception
-//   {
-//      MessagingServer server = new MessagingServerImpl();
-//      
-//      Configuration config = EasyMock.createMock(Configuration.class);
-//      server.setConfiguration(config);
-//      assertTrue(config == server.getConfiguration());
-//      
-//      StorageManager sm = EasyMock.createMock(StorageManager.class);
-//      server.setStorageManager(sm);
-//      assertTrue(sm == server.getStorageManager());
-//      
-//      RemotingService rs = EasyMock.createMock(RemotingService.class);
-//      server.setRemotingService(rs);
-//      assertTrue(rs == server.getRemotingService());
-//      
-//      JBMSecurityManager jsm = EasyMock.createMock(JBMSecurityManager.class);
-//      server.setSecurityManager(jsm);
-//      assertTrue(jsm == server.getSecurityManager());
-//   }
-//   
-//   public void testStartStop() throws Exception
-//   {
-//      MessagingServer server = new MessagingServerImpl();
-//      
-//      try
-//      {
-//         server.start();
-//         fail("Should throw exception");
-//      }
-//      catch (IllegalStateException e)
-//      {
-//         //Ok
-//      }
-//      
-//      server.setConfiguration(new ConfigurationImpl());
-//      
-//      try
-//      {
-//         server.start();
-//         fail("Should throw exception");
-//      }
-//      catch (IllegalStateException e)
-//      {
-//         //Ok
-//      }
-//      
-//      StorageManager sm = EasyMock.createMock(StorageManager.class);
-//      
-//      server.setStorageManager(sm);
-//      
-//      try
-//      {
-//         server.start();
-//         fail("Should throw exception");
-//      }
-//      catch (IllegalStateException e)
-//      {
-//         //Ok
-//      }
-//      
-//      RemotingService rs = EasyMock.createMock(RemotingService.class);
-//      
-//      server.setRemotingService(rs);
-//      
-//      try
-//      {
-//         server.start();
-//         fail("Should throw exception");
-//      }
-//      catch (IllegalStateException e)
-//      {
-//         //Ok
-//      }
-//      
-//      JBMSecurityManager sem = EasyMock.createMock(JBMSecurityManager.class);
-//                 
-//      server.setSecurityManager(sem);
-//      
-//      try
-//      {
-//         server.start();
-//         fail("Should throw exception");
-//      }
-//      catch (IllegalStateException e)
-//      {
-//         //Ok
-//      }
-//      
-//      ManagementService ms = EasyMock.createMock(ManagementService.class);
-//      server.setManagementService(ms);
-//      
-//      try
-//      {
-//         server.start();
-//         fail("Should throw exception");
-//      }
-//      catch (IllegalStateException e)
-//      {
-//         //Ok
-//      }
-//      
-//      EasyMock.reset(sm, rs);
-//      
-//      EasyMock.expect(sm.isStarted()).andStubReturn(true);
-//      EasyMock.expect(rs.isStarted()).andStubReturn(false);
-//
-//      EasyMock.replay(sm, rs);
-//      
-//      try
-//      {
-//         server.start();
-//         fail("Should throw exception");
-//      }
-//      catch (IllegalStateException e)
-//      {
-//         //Ok
-//      }
-//      
-//      EasyMock.reset(sm, rs);
-//      
-//      PacketDispatcher pd = EasyMock.createMock(PacketDispatcher.class);
-//      EasyMock.expect(rs.getDispatcher()).andReturn(pd);
-//      EasyMock.expect(sm.isStarted()).andStubReturn(true);
-//      EasyMock.expect(rs.isStarted()).andStubReturn(true);
-//      sm.loadBindings(EasyMock.isA(BindableFactoryImpl.class), EasyMock.isA(ArrayList.class), EasyMock.isA(ArrayList.class));
-//      sm.loadMessages(EasyMock.isA(PostOfficeImpl.class), EasyMock.isA(Map.class));
-//            
-//      pd.register(EasyMock.isA(MessagingServerPacketHandler.class));
-//      
-//      MessagingServerControlMBean managedServer = EasyMock.createMock(MessagingServerControlMBean.class);
-//      expect(ms.registerServer(isA(PostOffice.class), eq(sm), eq(server
-//            .getConfiguration()), isA(HierarchicalRepository.class), eq(server
-//            .getAddressSettingsRepository()), eq(server))).andReturn(managedServer);
-//
-//      EasyMock.replay(sm, rs, pd, ms);
-//      
-//      assertFalse(server.isStarted());
-//      
-//      server.start();
-//      
-//      assertTrue(server.isStarted());
-//      
-//      EasyMock.verify(sm, rs, pd, ms);
-//      
-//      EasyMock.reset(sm, rs, pd);
-//      
-//      assertNotNull(server.getAddressSettingsRepository());
-//      
-//      //Starting again should do nothing
-//      
-//      EasyMock.replay(sm, rs, pd);
-//      
-//      server.start();
-//      
-//      assertTrue(server.isStarted());
-//      
-//      EasyMock.verify(sm, rs, pd);
-//      
-//      EasyMock.reset(sm, rs, pd);
-//      
-//      //Can't set the plugins when server is started
-//      
-//      try
-//      {
-//         server.setConfiguration(new ConfigurationImpl());
-//         fail("Should throw exception");
-//      }
-//      catch (IllegalStateException e)
-//      {
-//         //Ok
-//      }
-//      
-//      try
-//      {
-//         server.setStorageManager(sm);
-//         fail("Should throw exception");
-//      }
-//      catch (IllegalStateException e)
-//      {
-//         //Ok
-//      }
-//      
-//      try
-//      {
-//         server.setRemotingService(rs);
-//         fail("Should throw exception");
-//      }
-//      catch (IllegalStateException e)
-//      {
-//         //Ok
-//      }
-//      
-//      try
-//      {
-//         server.setSecurityManager(sem);
-//         fail("Should throw exception");
-//      }
-//      catch (IllegalStateException e)
-//      {
-//         //Ok
-//      }
-//      
-//      pd.unregister(0);
-//      
-//      EasyMock.replay(sm, rs, pd);
-//      
-//      server.stop();
-//      
-//      assertFalse(server.isStarted());
-//      
-//      EasyMock.verify(sm, rs, pd);
-//      
-//      EasyMock.reset(sm, rs, pd);
-//      
-//      //Stopping again should do nothing
-//      
-//      EasyMock.replay(sm, rs, pd);
-//      
-//      server.stop();
-//      
-//      assertFalse(server.isStarted());
-//      
-//      EasyMock.verify(sm, rs, pd);
-//      
-//      EasyMock.reset(sm, rs, pd, ms);
-//      
-//      EasyMock.expect(rs.getDispatcher()).andReturn(pd);
-//      EasyMock.expect(sm.isStarted()).andStubReturn(true);
-//      EasyMock.expect(rs.isStarted()).andStubReturn(true);
-//      sm.loadBindings(EasyMock.isA(BindableFactoryImpl.class), EasyMock.isA(ArrayList.class), EasyMock.isA(ArrayList.class));
-//      sm.loadMessages(EasyMock.isA(PostOfficeImpl.class), EasyMock.isA(Map.class));
-//            
-//      pd.register(EasyMock.isA(MessagingServerPacketHandler.class));
-//      
-//      expect(ms.registerServer(isA(PostOffice.class), eq(sm), eq(server
-//            .getConfiguration()), isA(HierarchicalRepository.class), eq(server
-//            .getAddressSettingsRepository()), eq(server))).andReturn(managedServer);
-//
-//      EasyMock.replay(sm, rs, pd, ms);
-//                 
-//      //Should be able to start again
-//      server.start();
-//      
-//      EasyMock.verify(sm, rs, pd, ms);
-//      
-//      assertTrue(server.isStarted());
-//      
-//      assertNotNull(server.getAddressSettingsRepository());
-//      
-//      EasyMock.reset(sm, rs, pd);
-//      
-//      pd.unregister(0);
-//  
-//      EasyMock.replay(sm, rs, pd);
-//      
-//      //And stop
-//      server.stop();
-//      
-//      assertFalse(server.isStarted());
-//      
-//      EasyMock.verify(sm, rs, pd);
-//   }
-//   
-//   public void testCreateConnectionIncompatibleVersion() throws Exception
-//   {
-//      Version version = VersionLoader.load();
-//      
-//      MessagingServer server = new MessagingServerImpl();
-//                  
-//      try
-//      {
-//         server.createSession("blah", null, null, version.getIncrementingVersion() + 1,
-//                  null, false, false, false, 124152);
-//         fail("Should throw exception");
-//      }
-//      catch (MessagingException e)
-//      {
-//         assertEquals(MessagingException.INCOMPATIBLE_CLIENT_SERVER_VERSIONS, e.getCode());
-//      }            
-//   }
-//   
-//   public void testCreateConnectionFailAuthentication() throws Exception
-//   {      
-//      MessagingServerImpl server = new MessagingServerImpl();          
-//      server.setConfiguration(new ConfigurationImpl());            
-//      StorageManager sm = EasyMock.createMock(StorageManager.class);      
-//      server.setStorageManager(sm);      
-//      RemotingService rs = EasyMock.createMock(RemotingService.class);      
-//      server.setRemotingService(rs);
-//      
-//      JBMSecurityManager sem = new JBMSecurityManager()
-//      {
-//         public boolean validateUser(String user, String password)
-//         {
-//            return false;
-//         }
-//
-//         public boolean validateUserAndRole(String user, String password, Set<Role> roles, CheckType checkType)
-//         {
-//            return false;
-//         }
-//      };
-//      
-//      server.setSecurityManager(sem);
-//      
-//      ManagementService mr = EasyMock.createMock(ManagementService.class);
-//      MessagingServerControlMBean managedServer = EasyMock.createMock(MessagingServerControlMBean.class);
-//      expect(mr.registerServer(isA(PostOffice.class), eq(sm), eq(server
-//            .getConfiguration()), isA(HierarchicalRepository.class), eq(server
-//            .getAddressSettingsRepository()), eq(server))).andReturn(managedServer);
-//      server.setManagementService(mr);
-//
-//      PacketDispatcher pd = EasyMock.createMock(PacketDispatcher.class);
-//      EasyMock.expect(rs.getDispatcher()).andReturn(pd);
-//      
-//      sm.loadBindings(EasyMock.isA(BindableFactoryImpl.class), EasyMock.isA(ArrayList.class), EasyMock.isA(ArrayList.class));
-//      sm.loadMessages(EasyMock.isA(PostOfficeImpl.class), EasyMock.isA(Map.class));
-//
-//      pd.register(EasyMock.isA(MessagingServerPacketHandler.class));      
-//      EasyMock.expect(sm.isStarted()).andStubReturn(true);
-//      EasyMock.expect(rs.isStarted()).andStubReturn(true);
-//      
-//      EasyMock.replay(rs, sm, pd);
-//      
-//      server.start();
-//            
-//      Version version = VersionLoader.load();
-//                     
-//      try
-//      {
-//         server.createSession("blah", "kajsjk", "asuh", version.getIncrementingVersion(),
-//                  null, false, false, false, 124152);
-//         fail("Should throw exception");
-//      }
-//      catch (MessagingException e)
-//      {
-//         assertEquals(MessagingException.SECURITY_EXCEPTION, e.getCode());
-//      }   
-//   }
-//   
-//   public void testCreateSessionOK() throws Exception
-//   {      
-//      MessagingServerImpl server = new MessagingServerImpl();          
-//      server.setConfiguration(new ConfigurationImpl());            
-//      StorageManager sm = EasyMock.createMock(StorageManager.class);      
-//      server.setStorageManager(sm);      
-//      RemotingService rs = EasyMock.createMock(RemotingService.class);      
-//      server.setRemotingService(rs);
-//      JBMSecurityManager sem = new JBMSecurityManager()
-//      {
-//         public boolean validateUser(String user, String password)
-//         {
-//            return true;
-//         }
-//
-//         public boolean validateUserAndRole(String user, String password, Set<Role> roles, CheckType checkType)
-//         {
-//            return true;
-//         }
-//      };
-//      
-//      server.setSecurityManager(sem);
-//      
-//      ManagementService mr = EasyMock.createMock(ManagementService.class);
-//      MessagingServerControlMBean managedServer = EasyMock.createMock(MessagingServerControlMBean.class);
-//      expect(mr.registerServer(isA(PostOffice.class), eq(sm), eq(server
-//            .getConfiguration()), isA(HierarchicalRepository.class), eq(server
-//            .getAddressSettingsRepository()), eq(server))).andReturn(managedServer);
-//      server.setManagementService(mr);
-//
-//      PacketDispatcher pd = EasyMock.createMock(PacketDispatcher.class);
-//      EasyMock.expect(rs.getDispatcher()).andReturn(pd);
-//      
-//      sm.loadBindings(EasyMock.isA(BindableFactoryImpl.class), EasyMock.isA(ArrayList.class), EasyMock.isA(ArrayList.class));
-//      sm.loadMessages(EasyMock.isA(PostOfficeImpl.class), EasyMock.isA(Map.class));
-//      
-//      pd.register(EasyMock.isA(MessagingServerPacketHandler.class));      
-//      EasyMock.expect(sm.isStarted()).andStubReturn(true);
-//      EasyMock.expect(rs.isStarted()).andStubReturn(true);
-//            
-//      final long localCommandResponseID = 87879;
-//      EasyMock.expect(pd.generateID()).andReturn(localCommandResponseID);
-//      
-//      final long id = 129812;
-//      EasyMock.expect(pd.generateID()).andReturn(id);
-//
-//      pd.register(EasyMock.isA(ServerSessionPacketHandler.class));
-//            
-//      RemotingConnection rc = EasyMock.createStrictMock(RemotingConnection.class);  
-//      EasyMock.expect(rc.getPacketDispatcher()).andStubReturn(pd);
-//      
-//      long txID = 12767126;
-//      EasyMock.expect(sm.generateTransactionID()).andReturn(txID);
-//      
-//      pd.register(EasyMock.isA(CommandManagerImpl.class));
-//      
-//      rc.addFailureListener(EasyMock.isA(ServerSessionImpl.class));
-//      
-//      EasyMock.replay(rs, sm, pd, rc);
-//      
-//      server.start();
-//      final String username = "okasokas";
-//      final String password = "oksokasws";
-//      
-//      
-//      final String name = "blah";
-//      CreateSessionResponseMessage resp = server.createSession(name, username, password, 45, rc,
-//               false, false, false, 12345);
-//      
-//      EasyMock.verify(rs, sm, pd, rc);
-//      
-//      assertEquals(VersionLoader.load().getIncrementingVersion(), resp.getServerVersion());
-//      assertEquals(id, resp.getSessionID());       
-//      assertEquals(localCommandResponseID, resp.getCommandResponseTargetID());  
-//      assertEquals(1, server.getSessions().size());
-//      ServerSession session = server.getSessions().get(name);
-//      assertEquals(username, session.getUsername());
-//      assertEquals(password, session.getPassword());
-//   }
-//   
-  
-}

Deleted: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServerPacketHandlerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServerPacketHandlerTest.java	2009-03-23 10:37:23 UTC (rev 6137)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServerPacketHandlerTest.java	2009-03-23 10:46:23 UTC (rev 6138)
@@ -1,122 +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.core.server.impl;
-
-import org.jboss.messaging.tests.util.UnitTestCase;
-
-/**
- * @author <a href="ataylor at redhat.com">Andy Taylor</a>
- * @author <a href="tim.fox at jboss.com">Tim Fox</a>
- */
-public class MessagingServerPacketHandlerTest extends UnitTestCase
-{
-   public void testDummy()
-   {      
-   }
-   
-//   public void testIdIsZero()
-//   {
-//      MessagingServer server = EasyMock.createStrictMock(MessagingServer.class);
-//      RemotingService rs = EasyMock.createStrictMock(RemotingService.class);
-//      MessagingServerPacketHandler messagingServerPacketHandler = new MessagingServerPacketHandler(server, rs);
-//      EasyMock.replay(server, rs);
-//      assertEquals(0, messagingServerPacketHandler.getID());
-//      EasyMock.verify(server, rs);
-//   }
-//
-//   public void testHandleCreateSession() throws Exception
-//   {
-//      MessagingServer server = EasyMock.createStrictMock(MessagingServer.class);
-//      RemotingService rs = EasyMock.createStrictMock(RemotingService.class);
-//      Version serverVersion = EasyMock.createStrictMock(Version.class);
-//      RemotingConnection rc = EasyMock.createStrictMock(RemotingConnection.class);
-//      CreateSessionMessage packet = new CreateSessionMessage("blah", 123, "andy", "taylor",
-//                                                             false, false, false, 123456);
-//      CreateSessionResponseMessage createConnectionResponse =
-//         new CreateSessionResponseMessage(16256152, 98365, 123, 1234);
-//      MessagingServerPacketHandler messagingServerPacketHandler = new MessagingServerPacketHandler(server, rs);
-//      final long connectionID = 23982893;
-//      EasyMock.expect(rs.getConnection(connectionID)).andReturn(rc);      
-//      EasyMock.expect(server.createSession("blah", "andy", "taylor", 123, rc, false, false, false, 123456)).andReturn(createConnectionResponse);
-//      rc.sendOneWay(createConnectionResponse);
-//      EasyMock.replay(server, rc, rs, serverVersion);
-//      messagingServerPacketHandler.handle(connectionID, packet);
-//      EasyMock.verify(server, rc, rs, serverVersion);
-//   }
-//
-//   public void testHandlePing() throws Exception
-//   {
-//      MessagingServer server = EasyMock.createStrictMock(MessagingServer.class);
-//      RemotingService rs = EasyMock.createStrictMock(RemotingService.class);
-//      final Packet ping = new PacketImpl(PacketImpl.PING);
-//      final long responseTargetID = 282828;
-//      ping.setResponseTargetID(responseTargetID);
-//      RemotingConnection rc = EasyMock.createStrictMock(RemotingConnection.class);
-//      MessagingServerPacketHandler messagingServerPacketHandler = new MessagingServerPacketHandler(server, rs);
-//      final long connectionID = 23982893;
-//      EasyMock.expect(rs.getConnection(connectionID)).andReturn(rc);
-//      rc.sendOneWay((Packet) EasyMock.anyObject());
-//      EasyMock.expectLastCall().andAnswer(new IAnswer<Object>()
-//      {
-//         public Object answer() throws Throwable
-//         {
-//            Packet decodedPong = (PacketImpl) EasyMock.getCurrentArguments()[0];
-//            assertEquals(PacketImpl.PONG, decodedPong.getType()); 
-//            assertEquals(decodedPong.getTargetID(), responseTargetID);
-//            return null;
-//         }
-//      });
-//      EasyMock.replay(server, rs, rc);
-//      messagingServerPacketHandler.handle(connectionID, ping);
-//      EasyMock.verify(server, rs, rc);
-//   }
-//
-//   public void testUnsupportedPacket() throws Exception
-//   {
-//      MessagingServer server = EasyMock.createStrictMock(MessagingServer.class);
-//      RemotingService rs = EasyMock.createStrictMock(RemotingService.class);          
-//      RemotingConnection rc = EasyMock.createStrictMock(RemotingConnection.class);
-//      MessagingServerPacketHandler messagingServerPacketHandler = new MessagingServerPacketHandler(server, rs);
-//      final long connectionID = 23982893;
-//      EasyMock.expect(rs.getConnection(connectionID)).andReturn(rc);     
-//      Packet packet = EasyMock.createStrictMock(Packet.class);
-//     
-//      EasyMock.expect(packet.getType()).andReturn(Byte.MAX_VALUE);
-//      final long responseTargetID = 283782374;
-//      EasyMock.expect(packet.getResponseTargetID()).andReturn(responseTargetID);
-//      rc.sendOneWay(EasyMock.isA(MessagingExceptionMessage.class));
-//      EasyMock.expectLastCall().andAnswer(new IAnswer<Object>()
-//      {
-//         public Object answer() throws Throwable
-//         {
-//            MessagingExceptionMessage me = (MessagingExceptionMessage) EasyMock.getCurrentArguments()[0];
-//            assertEquals(MessagingException.UNSUPPORTED_PACKET, me.getException().getCode());
-//            return null;
-//         }
-//      });
-//      EasyMock.replay(server, packet, rs, rc);
-//  
-//      messagingServerPacketHandler.handle(connectionID, packet);
-//      
-//      EasyMock.verify(server, packet, rs, rc);
-//   }
-}

Deleted: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServiceImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServiceImplTest.java	2009-03-23 10:37:23 UTC (rev 6137)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessagingServiceImplTest.java	2009-03-23 10:46:23 UTC (rev 6138)
@@ -1,94 +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.core.server.impl;
-
-import org.easymock.EasyMock;
-import org.jboss.messaging.core.config.Configuration;
-import org.jboss.messaging.core.config.impl.ConfigurationImpl;
-import org.jboss.messaging.core.persistence.StorageManager;
-import org.jboss.messaging.core.persistence.impl.nullpm.NullStorageManager;
-import org.jboss.messaging.core.remoting.server.RemotingService;
-import org.jboss.messaging.core.server.Messaging;
-import org.jboss.messaging.core.server.MessagingServer;
-import org.jboss.messaging.core.server.MessagingService;
-import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
-import org.jboss.messaging.tests.util.UnitTestCase;
-
-/**
- * @author <a href="ataylor at redhat.com">Andy Taylor</a>
- */
-public class MessagingServiceImplTest extends UnitTestCase
-{
-   public void testStart() throws Exception
-   {
-      MessagingServer messagingServer = EasyMock.createStrictMock(MessagingServer.class);
-      StorageManager storageManager = EasyMock.createStrictMock(StorageManager.class);
-      RemotingService remotingService = EasyMock.createStrictMock(RemotingService.class);
-      remotingService.start();
-      storageManager.start();
-      messagingServer.start();
-      EasyMock.replay(messagingServer, storageManager, remotingService);
-      MessagingService messagingService = new MessagingServiceImpl(messagingServer, storageManager, remotingService);
-      messagingService.start();
-      EasyMock.verify(messagingServer, storageManager, remotingService);
-      assertEquals(messagingService.getServer(), messagingServer);
-   }
-
-   public void testStop() throws Exception
-   {
-      MessagingServer messagingServer = EasyMock.createStrictMock(MessagingServer.class);
-      StorageManager storageManager = EasyMock.createStrictMock(StorageManager.class);
-      RemotingService remotingService = EasyMock.createStrictMock(RemotingService.class);
-      remotingService.start();
-      storageManager.start();
-      messagingServer.start();
-      remotingService.stop();
-      storageManager.stop();
-      messagingServer.stop();
-      EasyMock.replay(messagingServer, storageManager, remotingService);
-      MessagingService messagingService = new MessagingServiceImpl(messagingServer, storageManager, remotingService);
-      messagingService.start();
-      messagingService.stop();
-      EasyMock.verify(messagingServer, storageManager, remotingService);
-   }
-
-   public void testNewNullStorageMessagingServer() throws Exception
-   {
-      Configuration config = new ConfigurationImpl();
-      MessagingService messagingService = Messaging.newNullStorageMessagingService(config);
-      messagingService.start();
-      assertTrue(messagingService.isStarted());
-      assertEquals(messagingService.getServer().getStorageManager().getClass(), NullStorageManager.class);
-      messagingService.stop();
-      assertFalse(messagingService.isStarted());
-   }
-
-   public void testNewNullStorageMessagingServerDefault() throws Exception
-   {
-      MessagingService messagingService = Messaging.newNullStorageMessagingService();
-      messagingService.start();
-      assertTrue(messagingService.isStarted());
-      assertEquals(messagingService.getServer().getStorageManager().getClass(), NullStorageManager.class);
-      messagingService.stop();
-      assertFalse(messagingService.isStarted());
-   }
-}




More information about the jboss-cvs-commits mailing list