[jboss-cvs] JBoss Messaging SVN: r5819 - in trunk: src/main/org/jboss/messaging/core/server/impl and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 5 11:20:46 EST 2009
Author: ataylor
Date: 2009-02-05 11:20:46 -0500 (Thu, 05 Feb 2009)
New Revision: 5819
Added:
trunk/tests/src/org/jboss/messaging/tests/integration/session/
trunk/tests/src/org/jboss/messaging/tests/integration/session/CreateQueueTest.java
Modified:
trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/QueueFactoryImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/SoloQueueImpl.java
trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java
trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/timing/core/server/impl/QueueImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/QueueImplTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/fakes/FakeQueueFactory.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java
Log:
added session createqueue tests and fixed issues where queue name being used instead of address for address settings
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java 2009-02-05 16:11:06 UTC (rev 5818)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java 2009-02-05 16:20:46 UTC (rev 5819)
@@ -124,6 +124,8 @@
private final boolean xa;
+ private ClientXAState state = null;
+
private final Executor executor;
private volatile RemotingConnection remotingConnection;
@@ -1062,6 +1064,11 @@
public void start(final Xid xid, final int flags) throws XAException
{
checkXA();
+ if(state != null)
+ {
+ log.error("XA operation failed Cannot start, session is already doing work in a transaction " + state.xid + "code:" + XAException.XAER_PROTO);
+ throw new XAException(XAException.XAER_PROTO);
+ }
try
{
Packet packet;
@@ -1298,4 +1305,15 @@
consumer.flushAcks();
}
}
+
+ class ClientXAState
+ {
+ final Xid xid;
+ int state;
+
+ public ClientXAState(Xid xid)
+ {
+ this.xid = xid;
+ }
+ }
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/QueueFactoryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/QueueFactoryImpl.java 2009-02-05 16:11:06 UTC (rev 5818)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/QueueFactoryImpl.java 2009-02-05 16:20:46 UTC (rev 5819)
@@ -80,7 +80,7 @@
Queue queue;
if(addressSettings.isSoloQueue())
{
- queue = new SoloQueueImpl(persistenceID,name,
+ queue = new SoloQueueImpl(persistenceID,address, name,
filter,
durable,
temporary,
@@ -91,7 +91,7 @@
}
else
{
- queue = new QueueImpl(persistenceID,name,
+ queue = new QueueImpl(persistenceID, address,name,
filter,
durable,
temporary,
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java 2009-02-05 16:11:06 UTC (rev 5818)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java 2009-02-05 16:20:46 UTC (rev 5819)
@@ -115,7 +115,10 @@
private int consumersToFailover = -1;
+ private SimpleString address;
+
public QueueImpl(final long persistenceID,
+ final SimpleString address,
final SimpleString name,
final Filter filter,
final boolean durable,
@@ -127,6 +130,8 @@
{
this.persistenceID = persistenceID;
+ this.address = address;
+
this.name = name;
this.filter = filter;
@@ -545,7 +550,7 @@
public void expire(final MessageReference ref) throws Exception
{
- SimpleString expiryAddress = queueSettingsRepository.getMatch(name.toString()).getExpiryAddress();
+ SimpleString expiryAddress = queueSettingsRepository.getMatch(address.toString()).getExpiryAddress();
if (expiryAddress != null)
{
@@ -946,7 +951,7 @@
private void expire(final Transaction tx, final MessageReference ref) throws Exception
{
- SimpleString expiryAddress = queueSettingsRepository.getMatch(name.toString()).getExpiryAddress();
+ SimpleString expiryAddress = queueSettingsRepository.getMatch(address.toString()).getExpiryAddress();
if (expiryAddress != null)
{
@@ -971,7 +976,7 @@
private void sendToDeadLetterAddress(final MessageReference ref) throws Exception
{
- SimpleString deadLetterAddress = queueSettingsRepository.getMatch(name.toString()).getDeadLetterAddress();
+ SimpleString deadLetterAddress = queueSettingsRepository.getMatch(address.toString()).getDeadLetterAddress();
if (deadLetterAddress != null)
{
Bindings bindingList = postOffice.getBindingsForAddress(deadLetterAddress);
@@ -1020,7 +1025,7 @@
storageManager.updateDeliveryCount(reference);
}
- AddressSettings addressSettings = queueSettingsRepository.getMatch(name.toString());
+ AddressSettings addressSettings = queueSettingsRepository.getMatch(address.toString());
int maxDeliveries = addressSettings.getMaxDeliveryAttempts();
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/SoloQueueImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/SoloQueueImpl.java 2009-02-05 16:11:06 UTC (rev 5818)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/SoloQueueImpl.java 2009-02-05 16:20:46 UTC (rev 5819)
@@ -56,6 +56,7 @@
public SoloQueueImpl(final long persistenceID,
+ final SimpleString address,
final SimpleString name,
final Filter filter,
final boolean durable,
@@ -65,7 +66,7 @@
final StorageManager storageManager,
final HierarchicalRepository<AddressSettings> queueSettingsRepository)
{
- super(persistenceID, name, filter, durable, temporary, scheduledExecutor, postOffice, storageManager, queueSettingsRepository);
+ super(persistenceID, address, name, filter, durable, temporary, scheduledExecutor, postOffice, storageManager, queueSettingsRepository);
this.pagingManager = postOffice.getPagingManager();
this.storageManager = storageManager;
}
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java 2009-02-05 16:11:06 UTC (rev 5818)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java 2009-02-05 16:20:46 UTC (rev 5819)
@@ -165,7 +165,7 @@
public String getDeadLetterAddress()
{
- AddressSettings addressSettings = queueSettingsRepository.getMatch(getName());
+ AddressSettings addressSettings = queueSettingsRepository.getMatch(getAddress());
if (addressSettings != null && addressSettings.getDeadLetterAddress() != null)
{
return addressSettings.getDeadLetterAddress().toString();
@@ -178,7 +178,7 @@
public void setDeadLetterAddress(String deadLetterAddress) throws Exception
{
- AddressSettings addressSettings = queueSettingsRepository.getMatch(getName());
+ AddressSettings addressSettings = queueSettingsRepository.getMatch(getAddress());
if (deadLetterAddress != null)
{
@@ -188,7 +188,7 @@
public String getExpiryAddress()
{
- AddressSettings addressSettings = queueSettingsRepository.getMatch(getName());
+ AddressSettings addressSettings = queueSettingsRepository.getMatch(getAddress());
if (addressSettings != null && addressSettings.getExpiryAddress() != null)
{
return addressSettings.getExpiryAddress().toString();
@@ -201,7 +201,7 @@
public void setExpiryAddress(String expiryQueueName)
{
- AddressSettings addressSettings = queueSettingsRepository.getMatch(getName());
+ AddressSettings addressSettings = queueSettingsRepository.getMatch(getAddress());
if (expiryQueueName != null)
{
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java 2009-02-05 16:11:06 UTC (rev 5818)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/scheduling/ScheduledMessageTest.java 2009-02-05 16:20:46 UTC (rev 5819)
@@ -172,7 +172,7 @@
{
AddressSettings qs = new AddressSettings();
qs.setRedeliveryDelay(5000l);
- messagingService.getServer().getAddressSettingsRepository().addMatch(atestq2.toString(), qs);
+ messagingService.getServer().getAddressSettingsRepository().addMatch(atestq.toString(), qs);
// then we create a client as normal
ClientSessionFactory sessionFactory = createInVMFactory();
ClientSession session = sessionFactory.createSession(false, true, false);
@@ -198,8 +198,8 @@
consumer2.close();
consumer = session.createConsumer(atestq);
consumer2 = session.createConsumer(atestq2);
- message3 = consumer.receive(1000);
- message2 = consumer2.receive(5250);
+ message3 = consumer.receive(5250);
+ message2 = consumer2.receive(1000);
time += 5000;
assertTrue(System.currentTimeMillis() >= time);
assertEquals("m1", message3.getBody().getString());
@@ -221,7 +221,7 @@
AddressSettings qs = new AddressSettings();
qs.setRedeliveryDelay(5000l);
- messagingService.getServer().getAddressSettingsRepository().addMatch(atestq2.toString(), qs);
+ messagingService.getServer().getAddressSettingsRepository().addMatch(atestq.toString(), qs);
// then we create a client as normal
ClientSessionFactory sessionFactory = createInVMFactory();
ClientSession session = sessionFactory.createSession(false, true, false);
@@ -258,9 +258,9 @@
consumer = session.createConsumer(atestq);
consumer2 = session.createConsumer(atestq2);
session.start();
- message3 = consumer.receive(1000);
+ message3 = consumer.receive(5250);
assertNotNull(message3);
- message2 = consumer2.receive(5250);
+ message2 = consumer2.receive(1000);
assertNotNull(message2);
time += 5000;
assertTrue(System.currentTimeMillis() >= time);
@@ -268,13 +268,13 @@
assertEquals("m1", message2.getBody().getString());
message2.acknowledge();
message3.acknowledge();
-
+
// Make sure no more messages
consumer.close();
consumer2.close();
consumer = session.createConsumer(atestq);
assertNull(consumer.receive(1000));
-
+
session.close();
}
Added: trunk/tests/src/org/jboss/messaging/tests/integration/session/CreateQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/session/CreateQueueTest.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/session/CreateQueueTest.java 2009-02-05 16:20:46 UTC (rev 5819)
@@ -0,0 +1,120 @@
+/*
+ * 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.integration.session;
+
+import org.jboss.messaging.tests.util.ServiceTestBase;
+import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.core.server.Queue;
+import org.jboss.messaging.core.server.impl.SoloQueueImpl;
+import org.jboss.messaging.core.client.ClientSession;
+import org.jboss.messaging.core.postoffice.Binding;
+import org.jboss.messaging.core.settings.impl.AddressSettings;
+import org.jboss.messaging.util.SimpleString;
+
+/**
+ * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
+ */
+public class CreateQueueTest extends ServiceTestBase
+{
+ private MessagingService messagingService;
+
+ private SimpleString address = new SimpleString("address");
+
+ private SimpleString queueName = new SimpleString("queue");
+
+
+ public void testDurableFalse() throws Exception
+ {
+ ClientSession session = createInVMFactory().createSession(false, true, true);
+ session.createQueue(address, queueName, false);
+ Binding binding = messagingService.getServer().getPostOffice().getBinding(queueName);
+ Queue q = (Queue) binding.getBindable();
+ assertFalse(q.isDurable());
+ }
+
+ public void testDurableTrue() throws Exception
+ {
+ ClientSession session = createInVMFactory().createSession(false, true, true);
+ session.createQueue(address, queueName, true);
+ Binding binding = messagingService.getServer().getPostOffice().getBinding(queueName);
+ Queue q = (Queue) binding.getBindable();
+ assertTrue(q.isDurable());
+ }
+
+ public void testTemporaryFalse() throws Exception
+ {
+ ClientSession session = createInVMFactory().createSession(false, true, true);
+ session.createQueue(address, queueName, false, false);
+ Binding binding = messagingService.getServer().getPostOffice().getBinding(queueName);
+ Queue q = (Queue) binding.getBindable();
+ assertFalse(q.isTemporary());
+ }
+
+ public void testTemporaryTrue() throws Exception
+ {
+ ClientSession session = createInVMFactory().createSession(false, true, true);
+ session.createQueue(address, queueName, true, true);
+ Binding binding = messagingService.getServer().getPostOffice().getBinding(queueName);
+ Queue q = (Queue) binding.getBindable();
+ assertTrue(q.isTemporary());
+ }
+
+ public void testcreateWithFilter() throws Exception
+ {
+ ClientSession session = createInVMFactory().createSession(false, true, true);
+ SimpleString filterString = new SimpleString("x=y");
+ session.createQueue(address, queueName, filterString, false, false);
+ Binding binding = messagingService.getServer().getPostOffice().getBinding(queueName);
+ Queue q = (Queue) binding.getBindable();
+ assertEquals(q.getFilter().getFilterString(), filterString);
+ }
+
+ public void testAddressSettingUSed() throws Exception
+ {
+ AddressSettings addressSettings = new AddressSettings();
+ addressSettings.setSoloQueue(true);
+ messagingService.getServer().getAddressSettingsRepository().addMatch(address.toString(), addressSettings);
+ ClientSession session = createInVMFactory().createSession(false, true, true);
+ SimpleString filterString = new SimpleString("x=y");
+ session.createQueue(address, queueName, filterString, false, false);
+ Binding binding = messagingService.getServer().getPostOffice().getBinding(queueName);
+ assertTrue(binding.getBindable() instanceof SoloQueueImpl);
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ messagingService = createService(false);
+ messagingService.start();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ if(messagingService != null && messagingService.isStarted())
+ {
+ messagingService.stop();
+ }
+ }
+}
Modified: trunk/tests/src/org/jboss/messaging/tests/timing/core/server/impl/QueueImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/timing/core/server/impl/QueueImplTest.java 2009-02-05 16:11:06 UTC (rev 5818)
+++ trunk/tests/src/org/jboss/messaging/tests/timing/core/server/impl/QueueImplTest.java 2009-02-05 16:20:46 UTC (rev 5819)
@@ -81,7 +81,7 @@
public void testScheduledNoConsumer() throws Exception
{
- Queue queue = new QueueImpl(1, new SimpleString("queue1"), null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, new SimpleString("address1"), new SimpleString("queue1"), null, false, true, scheduledExecutor, null, null, null);
//Send one scheduled
@@ -147,7 +147,7 @@
private void testScheduled(boolean direct)
{
- Queue queue = new QueueImpl(1, new SimpleString("queue1"), null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1,new SimpleString("address1"), new SimpleString("queue1"), null, false, true, scheduledExecutor, null, null, null);
FakeConsumer consumer = null;
@@ -245,7 +245,7 @@
public void testDeliveryScheduled() throws Exception
{
Consumer consumer = EasyMock.createStrictMock(Consumer.class);
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, new SimpleString("address1"), queue1, null, false, true, scheduledExecutor, null, null, null);
MessageReference messageReference = generateReference(queue, 1);
final CountDownLatch countDownLatch = new CountDownLatch(1);
EasyMock.expect(consumer.handle(messageReference)).andAnswer(new IAnswer<HandleStatus>()
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/QueueImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/QueueImplTest.java 2009-02-05 16:11:06 UTC (rev 5818)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/QueueImplTest.java 2009-02-05 16:20:46 UTC (rev 5819)
@@ -64,11 +64,13 @@
private static final SimpleString queue1 = new SimpleString("queue1");
+ private static final SimpleString address1 = new SimpleString("address1");
+
public void testID()
{
final long id = 123;
- Queue queue = new QueueImpl(id, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(id, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
assertEquals(id, queue.getPersistenceID());
@@ -83,7 +85,7 @@
{
final SimpleString name = new SimpleString("oobblle");
- Queue queue = new QueueImpl(1, name, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, name, null, false, true, scheduledExecutor, null, null, null);
assertEquals(name, queue.getName());
}
@@ -91,11 +93,11 @@
public void testDurable()
{
- Queue queue = new QueueImpl(1, queue1, null, false, false, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, false, scheduledExecutor, null, null, null);
assertFalse(queue.isDurable());
- queue = new QueueImpl(1, queue1, null, true, false, scheduledExecutor, null, null, null);
+ queue = new QueueImpl(1, address1, queue1, null, true, false, scheduledExecutor, null, null, null);
assertTrue(queue.isDurable());
}
@@ -108,7 +110,7 @@
Consumer cons3 = new FakeConsumer();
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
assertEquals(0, queue.getConsumerCount());
@@ -149,7 +151,7 @@
public void testGetSetDistributionPolicy()
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
assertNotNull(queue.getDistributionPolicy());
@@ -164,14 +166,14 @@
public void testGetFilter()
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
assertNull(queue.getFilter());
Filter filter = createMock(Filter.class);
replay(filter);
- queue = new QueueImpl(1, queue1, filter, false, true, scheduledExecutor, null, null, null);
+ queue = new QueueImpl(1, address1, queue1, filter, false, true, scheduledExecutor, null, null, null);
assertEquals(filter, queue.getFilter());
@@ -180,7 +182,7 @@
public void testSimpleadd()
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
final int numMessages = 10;
@@ -199,7 +201,7 @@
public void testSimpleDirectDelivery()
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
FakeConsumer consumer = new FakeConsumer();
@@ -227,7 +229,7 @@
public void testSimpleNonDirectDelivery()
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
final int numMessages = 10;
@@ -265,7 +267,7 @@
public void testBusyConsumer()
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
FakeConsumer consumer = new FakeConsumer();
@@ -309,7 +311,7 @@
public void testBusyConsumerThenAddMoreMessages()
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
FakeConsumer consumer = new FakeConsumer();
@@ -376,7 +378,7 @@
public void testAddFirstadd()
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
final int numMessages = 10;
@@ -431,7 +433,7 @@
public void testChangeConsumersAndDeliver() throws Exception
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, createMockPostOffice(), null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, createMockPostOffice(), null, null);
final int numMessages = 10;
@@ -585,7 +587,7 @@
public void testConsumerReturningNull()
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
class NullConsumer implements Consumer
{
@@ -618,7 +620,7 @@
public void testRoundRobinWithQueueing()
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
assertTrue(queue.getDistributionPolicy() instanceof RoundRobinDistributor);
@@ -663,7 +665,7 @@
public void testRoundRobinDirect()
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
assertTrue(queue.getDistributionPolicy() instanceof RoundRobinDistributor);
@@ -706,7 +708,7 @@
// public void testDeleteAllReferences() throws Exception
// {
-// Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, createMockPostOffice(), null);
+// Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, createMockPostOffice(), null);
//
// StorageManager storageManager = EasyMock.createStrictMock(StorageManager.class);
//
@@ -790,7 +792,7 @@
public void testWithPriorities()
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
final int numMessages = 10;
@@ -857,7 +859,7 @@
public void testConsumerWithFilterAddAndRemove()
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
Filter filter = new FakeFilter("fruit", "orange");
@@ -866,7 +868,7 @@
public void testList()
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
final int numMessages = 20;
@@ -890,7 +892,7 @@
public void testListWithFilter()
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
final int numMessages = 20;
@@ -926,7 +928,7 @@
public void testConsumeWithFiltersAddAndRemoveConsumer() throws Exception
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, createMockPostOffice(), null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, createMockPostOffice(), null, null);
Filter filter = new FakeFilter("fruit", "orange");
@@ -999,7 +1001,7 @@
private void testConsumerWithFilters(boolean direct) throws Exception
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, createMockPostOffice(), null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, createMockPostOffice(), null, null);
Filter filter = new FakeFilter("fruit", "orange");
@@ -1088,7 +1090,7 @@
public void testMessageOrder() throws Exception
{
Consumer consumer = EasyMock.createStrictMock(Consumer.class);
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
MessageReference messageReference = generateReference(queue, 1);
MessageReference messageReference2 = generateReference(queue, 2);
MessageReference messageReference3 = generateReference(queue, 3);
@@ -1106,7 +1108,7 @@
public void testMessagesAdded() throws Exception
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
MessageReference messageReference = generateReference(queue, 1);
MessageReference messageReference2 = generateReference(queue, 2);
MessageReference messageReference3 = generateReference(queue, 3);
@@ -1119,7 +1121,7 @@
public void testGetReference() throws Exception
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
MessageReference messageReference = generateReference(queue, 1);
MessageReference messageReference2 = generateReference(queue, 2);
MessageReference messageReference3 = generateReference(queue, 3);
@@ -1132,7 +1134,7 @@
public void testGetNonExistentReference() throws Exception
{
- Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+ Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
MessageReference messageReference = generateReference(queue, 1);
MessageReference messageReference2 = generateReference(queue, 2);
MessageReference messageReference3 = generateReference(queue, 3);
@@ -1146,7 +1148,7 @@
// public void testConsumerRemovedAfterException() throws Exception
// {
// Consumer consumer = EasyMock.createStrictMock(Consumer.class);
-// Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+// Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
// MessageReference messageReference = generateReference(queue, 1);
// MessageReference messageReference2 = generateReference(queue, 2);
// MessageReference messageReference3 = generateReference(queue, 3);
@@ -1166,7 +1168,7 @@
// public void testDeliveryAsync() throws Exception
// {
// Consumer consumer = EasyMock.createStrictMock(Consumer.class);
-// Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, null, null, null);
+// Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, null, null, null);
// MessageReference messageReference = generateReference(queue, 1);
// MessageReference messageReference2 = generateReference(queue, 2);
// MessageReference messageReference3 = generateReference(queue, 3);
@@ -1195,7 +1197,7 @@
// {
// long messageID = randomLong();
// final SimpleString expiryQueue = new SimpleString("expiryQueue");
-// Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, createMockPostOffice());
+// Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, createMockPostOffice());
// MessageReference messageReference = generateReference(queue, messageID);
// StorageManager storageManager = EasyMock.createMock(StorageManager.class);
// EasyMock.expect(storageManager.generateUniqueID()).andReturn(randomLong());
@@ -1252,7 +1254,7 @@
// {
// long messageID = randomLong();
// final SimpleString dlqName = new SimpleString("dlq");
-// Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, createMockPostOffice());
+// Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, createMockPostOffice());
// MessageReference messageReference = generateReference(queue, messageID);
// StorageManager storageManager = createMock(StorageManager.class);
// expect(storageManager.generateUniqueID()).andReturn(randomLong());
@@ -1310,7 +1312,7 @@
// long newMessageID = randomLong();
// long tid = randomLong();
// final SimpleString toQueueName = new SimpleString("toQueueName");
-// Queue queue = new QueueImpl(1, queue1, null, false, true, scheduledExecutor, createMockPostOffice(), null);
+// Queue queue = new QueueImpl(1, address1, queue1, null, false, true, scheduledExecutor, createMockPostOffice(), null);
// Queue toQueue = createMock(Queue.class);
//
// MessageReference messageReference = generateReference(queue, messageID);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/fakes/FakeQueueFactory.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/fakes/FakeQueueFactory.java 2009-02-05 16:11:06 UTC (rev 5818)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/fakes/FakeQueueFactory.java 2009-02-05 16:20:46 UTC (rev 5819)
@@ -48,7 +48,7 @@
public Queue createQueue(long persistenceID, final SimpleString address, SimpleString name, Filter filter,
boolean durable, boolean temporary)
{
- return new QueueImpl(persistenceID, name, filter, durable, temporary, scheduledExecutor, postOffice, null, null);
+ return new QueueImpl(persistenceID, address, name, filter, durable, temporary, scheduledExecutor, postOffice, null, null);
}
public void setPostOffice(PostOffice postOffice)
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java 2009-02-05 16:11:06 UTC (rev 5818)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java 2009-02-05 16:20:46 UTC (rev 5819)
@@ -223,7 +223,7 @@
return new SimpleString(JBossQueue.JMS_QUEUE_ADDRESS_PREFIX + deadLetterAddress);
}
};
- expect(queueSettingsRepository.getMatch(name)).andReturn(settings);
+ expect(queueSettingsRepository.getMatch(JBossQueue.JMS_QUEUE_ADDRESS_PREFIX + name)).andReturn(settings);
replayMockedAttributes();
@@ -245,7 +245,7 @@
return new SimpleString(JBossQueue.JMS_QUEUE_ADDRESS_PREFIX + expiryQueue);
}
};
- expect(queueSettingsRepository.getMatch(name)).andReturn(settings);
+ expect(queueSettingsRepository.getMatch(JBossQueue.JMS_QUEUE_ADDRESS_PREFIX + name)).andReturn(settings);
replayMockedAttributes();
More information about the jboss-cvs-commits
mailing list