[jboss-cvs] JBoss Messaging SVN: r3029 - in trunk: tests/src/org/jboss/test/messaging/core/paging and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 22 10:01:01 EDT 2007
Author: timfox
Date: 2007-08-22 10:01:01 -0400 (Wed, 22 Aug 2007)
New Revision: 3029
Removed:
trunk/src/main/org/jboss/messaging/util/LockMap.java
Modified:
trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_2PCTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_NTTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_TTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_2PCTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_NTTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_TTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_2PCTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_TTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_2PCTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_NTTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_TTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java
trunk/tests/src/org/jboss/test/messaging/jms/JMSTestCase.java
trunk/tests/src/org/jboss/test/messaging/jms/WireFormatTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSMessage.java
trunk/tests/src/org/jboss/test/messaging/jms/stress/StressTestBase.java
Log:
PM interim commit 7
Deleted: trunk/src/main/org/jboss/messaging/util/LockMap.java
===================================================================
--- trunk/src/main/org/jboss/messaging/util/LockMap.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/src/main/org/jboss/messaging/util/LockMap.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -1,106 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * 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.util;
-
-import java.util.Map;
-
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
-
-/**
- *
- * A LockMap.
- *
- * This class effectively enables arbitrary objects to be locked
- * It does this by maintaining a mutex for each object in a map
- * When no more locks held, object is removed from the map
- *
- * @author <a href="tim.fox at jboss.com">Tim Fox</a>
- * @version <tt>$Revision: 1935 $</tt>
- *
- * $Id: LockMap.java 1935 2007-01-09 23:29:20Z clebert.suconic at jboss.com $
- */
-public class LockMap
-{
- protected Map map;
-
- private static class Entry
- {
- ReentrantLock lock = new ReentrantLock();
- int refCount;
- }
-
- public static final LockMap instance = new LockMap();
-
- private LockMap()
- {
- this.map = new ConcurrentHashMap();
- }
-
-// public void obtainLock(Object obj)
-// {
-// Entry entry = null;
-// synchronized (obj)
-// {
-// entry = (Entry)map.get(obj);
-// if (entry == null)
-// {
-// entry = new Entry();
-// map.put(obj, entry);
-// }
-// entry.refCount++;
-// }
-// try
-// {
-// entry.lock.acquire();
-// }
-// catch (InterruptedException e)
-// {
-// throw new IllegalStateException("Thread interrupted while acquiring lock");
-// }
-// }
-//
-// public void releaseLock(Object obj)
-// {
-// synchronized (obj)
-// {
-// Entry entry = (Entry)map.get(obj);
-// if (entry == null)
-// {
-// throw new IllegalArgumentException("Cannot find mutex in map for " + obj);
-// }
-// if (entry.refCount == 1)
-// {
-// map.remove(obj);
-// }
-// entry.refCount--;
-// entry.lock.release();
-// }
-// }
-
- public int getSize()
- {
- return map.size();
- }
-}
-
-
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_2PCTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_2PCTest.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_2PCTest.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -27,7 +27,6 @@
import org.jboss.messaging.core.contract.MessageReference;
import org.jboss.messaging.core.impl.MessagingQueue;
import org.jboss.messaging.core.impl.tx.Transaction;
-import org.jboss.messaging.util.LockMap;
import org.jboss.test.messaging.util.CoreMessageFactory;
@@ -318,10 +317,7 @@
assertEquals(0, queue1.getMessageCount());
- assertEquals(0, queue2.getMessageCount());
-
- assertEquals(0, LockMap.instance.getSize());
-
+ assertEquals(0, queue2.getMessageCount());
}
}
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_NTTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_NTTest.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_NTTest.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -26,7 +26,6 @@
import org.jboss.messaging.core.contract.Message;
import org.jboss.messaging.core.contract.MessageReference;
import org.jboss.messaging.core.impl.MessagingQueue;
-import org.jboss.messaging.util.LockMap;
import org.jboss.test.messaging.util.CoreMessageFactory;
@@ -309,8 +308,5 @@
assertEquals(0, queue1.getMessageCount());
assertEquals(0, queue2.getMessageCount());
-
- assertEquals(0, LockMap.instance.getSize());
-
}
}
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_TTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_TTest.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_NP_TTest.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -27,7 +27,6 @@
import org.jboss.messaging.core.contract.MessageReference;
import org.jboss.messaging.core.impl.MessagingQueue;
import org.jboss.messaging.core.impl.tx.Transaction;
-import org.jboss.messaging.util.LockMap;
import org.jboss.test.messaging.util.CoreMessageFactory;
@@ -317,9 +316,6 @@
assertEquals(0, queue1.getMessageCount());
assertEquals(0, queue2.getMessageCount());
-
- assertEquals(0, LockMap.instance.getSize());
-
}
}
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_2PCTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_2PCTest.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_2PCTest.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -27,7 +27,6 @@
import org.jboss.messaging.core.contract.MessageReference;
import org.jboss.messaging.core.impl.MessagingQueue;
import org.jboss.messaging.core.impl.tx.Transaction;
-import org.jboss.messaging.util.LockMap;
import org.jboss.test.messaging.util.CoreMessageFactory;
@@ -338,9 +337,7 @@
assertEquals(0, queue1.getMessageCount());
assertEquals(0, queue2.getMessageCount());
-
- assertEquals(0, LockMap.instance.getSize());
-
+
}
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_NTTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_NTTest.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_NTTest.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -26,7 +26,6 @@
import org.jboss.messaging.core.contract.Message;
import org.jboss.messaging.core.contract.MessageReference;
import org.jboss.messaging.core.impl.MessagingQueue;
-import org.jboss.messaging.util.LockMap;
import org.jboss.test.messaging.util.CoreMessageFactory;
/**
@@ -335,9 +334,6 @@
assertEquals(0, queue1.getMessageCount());
assertEquals(0, queue2.getMessageCount());
-
- assertEquals(0, LockMap.instance.getSize());
-
}
}
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_TTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_TTest.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/ChannelShare_P_TTest.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -27,7 +27,6 @@
import org.jboss.messaging.core.contract.MessageReference;
import org.jboss.messaging.core.impl.MessagingQueue;
import org.jboss.messaging.core.impl.tx.Transaction;
-import org.jboss.messaging.util.LockMap;
import org.jboss.test.messaging.util.CoreMessageFactory;
/**
@@ -339,9 +338,6 @@
assertEquals(0, queue1.getMessageCount());
assertEquals(0, queue2.getMessageCount());
-
- assertEquals(0, LockMap.instance.getSize());
-
}
}
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_2PCTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_2PCTest.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_2PCTest.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -28,7 +28,6 @@
import org.jboss.messaging.core.impl.MessagingQueue;
import org.jboss.messaging.core.impl.SimpleDelivery;
import org.jboss.messaging.core.impl.tx.Transaction;
-import org.jboss.messaging.util.LockMap;
import org.jboss.test.messaging.util.CoreMessageFactory;
/**
@@ -882,9 +881,5 @@
//Make sure there are no more refs in queue
assertEquals(0, queue.getMessageCount());
-
- assertEquals(0, LockMap.instance.getSize());
-
-
}
}
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_NTTest.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -27,7 +27,6 @@
import org.jboss.messaging.core.contract.MessageReference;
import org.jboss.messaging.core.impl.MessagingQueue;
import org.jboss.messaging.core.impl.SimpleDelivery;
-import org.jboss.messaging.util.LockMap;
import org.jboss.test.messaging.util.CoreMessageFactory;
/**
@@ -846,8 +845,6 @@
//Make sure there are no more refs in queue
assertEquals(0, queue.getMessageCount());
-
- assertEquals(0, LockMap.instance.getSize());
}
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_TTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_TTest.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_NP_TTest.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -28,7 +28,6 @@
import org.jboss.messaging.core.impl.MessagingQueue;
import org.jboss.messaging.core.impl.SimpleDelivery;
import org.jboss.messaging.core.impl.tx.Transaction;
-import org.jboss.messaging.util.LockMap;
import org.jboss.test.messaging.util.CoreMessageFactory;
/**
@@ -872,8 +871,6 @@
//Make sure there are no more refs in queue
assertEquals(0, queue.getMessageCount());
-
- assertEquals(0, LockMap.instance.getSize());
}
}
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_2PCTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_2PCTest.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_2PCTest.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -28,7 +28,6 @@
import org.jboss.messaging.core.impl.MessagingQueue;
import org.jboss.messaging.core.impl.SimpleDelivery;
import org.jboss.messaging.core.impl.tx.Transaction;
-import org.jboss.messaging.util.LockMap;
import org.jboss.test.messaging.util.CoreMessageFactory;
/**
@@ -1011,9 +1010,5 @@
//Make sure there are no more refs in queue
assertEquals(0, queue.getMessageCount());
-
-
- assertEquals(0, LockMap.instance.getSize());
-
}
}
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_NTTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_NTTest.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_NTTest.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -27,7 +27,6 @@
import org.jboss.messaging.core.contract.MessageReference;
import org.jboss.messaging.core.impl.MessagingQueue;
import org.jboss.messaging.core.impl.SimpleDelivery;
-import org.jboss.messaging.util.LockMap;
import org.jboss.test.messaging.util.CoreMessageFactory;
/**
@@ -965,10 +964,6 @@
//Make sure there are no more refs in queue
assertEquals(0, queue.getMessageCount());
-
- assertEquals(0, LockMap.instance.getSize());
-
-
}
}
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_TTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_TTest.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_P_TTest.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -28,7 +28,6 @@
import org.jboss.messaging.core.impl.MessagingQueue;
import org.jboss.messaging.core.impl.SimpleDelivery;
import org.jboss.messaging.core.impl.tx.Transaction;
-import org.jboss.messaging.util.LockMap;
import org.jboss.test.messaging.util.CoreMessageFactory;
/**
@@ -996,11 +995,7 @@
//Make sure there are no more refs in queue
- assertEquals(0, queue.getMessageCount());
-
-
- assertEquals(0, LockMap.instance.getSize());
-
+ assertEquals(0, queue.getMessageCount());
}
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -29,7 +29,6 @@
import org.jboss.messaging.core.impl.MessagingQueue;
import org.jboss.messaging.core.impl.message.SimpleMessageStore;
import org.jboss.messaging.core.impl.tx.TransactionRepository;
-import org.jboss.messaging.util.LockMap;
import org.jboss.test.messaging.util.CoreMessageFactory;
/**
@@ -152,8 +151,6 @@
assertEquals(0, queue2.getDeliveringCount());
assertEquals(0, queue2.getMessageCount());
-
- assertEquals(0, LockMap.instance.getSize());
}
public void testNonRecoverableQueueCrash() throws Throwable
@@ -242,8 +239,6 @@
assertEquals(0, queue2.getDeliveringCount());
assertEquals(0, queue2.getMessageCount());
-
- assertEquals(0, LockMap.instance.getSize());
}
public void testNonRecoverableQueueRemoveAllReferences() throws Throwable
@@ -306,8 +301,6 @@
assertEquals(0, queue.getDeliveringCount());
assertEquals(0, queue.getMessageCount());
-
- assertEquals(0, LockMap.instance.getSize());
}
Modified: trunk/tests/src/org/jboss/test/messaging/jms/JMSTestCase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/JMSTestCase.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/jms/JMSTestCase.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -6,7 +6,6 @@
import org.jboss.jms.client.JBossConnectionFactory;
import org.jboss.jms.tx.ResourceManagerFactory;
-import org.jboss.messaging.core.impl.message.SimpleMessageStore;
import org.jboss.test.messaging.MessagingTestCase;
import org.jboss.test.messaging.tools.ServerManagement;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/WireFormatTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/WireFormatTest.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/jms/WireFormatTest.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -58,10 +58,13 @@
import org.jboss.jms.wireformat.ClosingResponse;
import org.jboss.jms.wireformat.ConnectionCreateSessionDelegateRequest;
import org.jboss.jms.wireformat.ConnectionCreateSessionDelegateResponse;
+import org.jboss.jms.wireformat.ConnectionFactoryAddCallbackRequest;
import org.jboss.jms.wireformat.ConnectionFactoryCreateConnectionDelegateRequest;
import org.jboss.jms.wireformat.ConnectionFactoryCreateConnectionDelegateResponse;
import org.jboss.jms.wireformat.ConnectionFactoryGetClientAOPStackRequest;
import org.jboss.jms.wireformat.ConnectionFactoryGetClientAOPStackResponse;
+import org.jboss.jms.wireformat.ConnectionFactoryGetTopologyRequest;
+import org.jboss.jms.wireformat.ConnectionFactoryRemoveCallbackRequest;
import org.jboss.jms.wireformat.ConnectionGetClientIDRequest;
import org.jboss.jms.wireformat.ConnectionGetClientIDResponse;
import org.jboss.jms.wireformat.ConnectionGetIDBlockRequest;
@@ -95,10 +98,6 @@
import org.jboss.jms.wireformat.SessionRecoverDeliveriesRequest;
import org.jboss.jms.wireformat.SessionSendRequest;
import org.jboss.jms.wireformat.SessionUnsubscribeRequest;
-import org.jboss.jms.wireformat.ConnectionFactoryAddCallbackRequest;
-import org.jboss.jms.wireformat.ConnectionFactoryGetTopologyRequest;
-import org.jboss.jms.wireformat.ConnectionFactoryGetTopologyResponse;
-import org.jboss.jms.wireformat.ConnectionFactoryRemoveCallbackRequest;
import org.jboss.remoting.InvocationRequest;
/**
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -22,21 +22,20 @@
package org.jboss.test.messaging.jms.clustering;
+import java.lang.ref.WeakReference;
+
import javax.jms.Connection;
-import javax.jms.Session;
-import javax.jms.MessageProducer;
import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
import javax.jms.TextMessage;
import org.jboss.jms.client.JBossConnectionFactory;
-import org.jboss.jms.client.container.ClusteringAspect;
-import org.jboss.jms.client.remoting.ConnectionFactoryCallbackHandler;
import org.jboss.jms.client.delegate.ClientClusteredConnectionFactoryDelegate;
import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate;
import org.jboss.jms.client.state.ConnectionState;
import org.jboss.jms.delegate.TopologyResult;
import org.jboss.test.messaging.tools.ServerManagement;
-import java.lang.ref.WeakReference;
/**
* @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -25,13 +25,13 @@
import javax.jms.Connection;
import org.jboss.jms.client.JBossConnectionFactory;
+import org.jboss.jms.client.delegate.ClientClusteredConnectionFactoryDelegate;
import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate;
-import org.jboss.jms.client.delegate.ClientClusteredConnectionFactoryDelegate;
import org.jboss.jms.exception.MessagingNetworkFailureException;
import org.jboss.test.messaging.tools.ServerManagement;
+import org.jboss.test.messaging.tools.aop.PoisonInterceptor;
import org.jboss.test.messaging.tools.container.ServiceAttributeOverrides;
import org.jboss.test.messaging.tools.container.ServiceContainer;
-import org.jboss.test.messaging.tools.aop.PoisonInterceptor;
/**
* @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -35,7 +35,6 @@
import javax.jms.Session;
import javax.jms.TextMessage;
import javax.jms.Topic;
-import javax.management.ObjectName;
import org.jboss.jms.client.FailoverEvent;
import org.jboss.jms.client.JBossConnection;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSMessage.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSMessage.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSMessage.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -25,13 +25,14 @@
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
-import org.jboss.logging.Logger;
import javax.jms.DeliveryMode;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Message;
+import org.jboss.logging.Logger;
+
/**
* Foreign message implementation. Used for testing only.
*
Modified: trunk/tests/src/org/jboss/test/messaging/jms/stress/StressTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/stress/StressTestBase.java 2007-08-22 13:34:55 UTC (rev 3028)
+++ trunk/tests/src/org/jboss/test/messaging/jms/stress/StressTestBase.java 2007-08-22 14:01:01 UTC (rev 3029)
@@ -26,7 +26,6 @@
import javax.jms.Topic;
import javax.naming.InitialContext;
-import org.jboss.messaging.util.LockMap;
import org.jboss.test.messaging.MessagingTestCase;
import org.jboss.test.messaging.tools.ServerManagement;
@@ -76,11 +75,11 @@
//We test with small values for paging params to really stress it
- final int fullSize = 1000;
+ final int fullSize = 2000;
- final int pageSize = 100;
+ final int pageSize = 300;
- final int downCacheSize = 100;
+ final int downCacheSize = 300;
ServerManagement.deployQueue("Queue1", fullSize, pageSize, downCacheSize);
ServerManagement.deployQueue("Queue2", fullSize, pageSize, downCacheSize);
@@ -108,8 +107,13 @@
public void tearDown() throws Exception
{
- assertEquals(0, LockMap.instance.getSize());
-
+ ServerManagement.getServer().reapMessages();
+
+ if (checkNoMessageData())
+ {
+ fail("Message data still exists");
+ }
+
ServerManagement.undeployQueue("Queue1");
ServerManagement.undeployQueue("Queue2");
ServerManagement.undeployQueue("Queue3");
More information about the jboss-cvs-commits
mailing list