[jboss-cvs] JBoss Messaging SVN: r2913 - in trunk/tests: src/org/jboss/test/messaging/jms and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 19 14:47:34 EDT 2007
Author: timfox
Date: 2007-07-19 14:47:34 -0400 (Thu, 19 Jul 2007)
New Revision: 2913
Modified:
trunk/tests/build.xml
trunk/tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java
trunk/tests/src/org/jboss/test/messaging/jms/BrowserTest.java
trunk/tests/src/org/jboss/test/messaging/jms/ConnectionClosedTest.java
trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java
trunk/tests/src/org/jboss/test/messaging/jms/ConsumerClosedTest.java
trunk/tests/src/org/jboss/test/messaging/jms/LongRunningInvocationTest.java
trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
trunk/tests/src/org/jboss/test/messaging/jms/ReferencingTest.java
trunk/tests/src/org/jboss/test/messaging/jms/SessionTest.java
trunk/tests/src/org/jboss/test/messaging/jms/TopicTest.java
trunk/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
trunk/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java
trunk/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java
trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTestBase.java
trunk/tests/src/org/jboss/test/messaging/tools/aop/PoisonInterceptor.java
trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java
trunk/tests/src/org/jboss/test/thirdparty/remoting/InvokerReferenceCountTest.java
Log:
Some more test speedups
Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml 2007-07-19 17:03:14 UTC (rev 2912)
+++ trunk/tests/build.xml 2007-07-19 18:47:34 UTC (rev 2913)
@@ -375,8 +375,8 @@
<exclude name="**/*LeakTest.class"/>
<exclude name="**/jms/bridge/**/*Test.class"/>
<exclude name="**/jms/manual/**/*Test.class"/>
+ <exclude name="**/jms/clustering/*Test.class"/>
<exclude name="**/jms/LongRunningInvocationTest.class"/>
- <exclude name="**/jms/clustering/*Test.class"/>
<exclude name="**/jms/RemotingConnectionConfigurationTest.class"/>
<exclude name="**/thirdparty/remoting/ManualConnectionValidatorTest.class"/>
<exclude name="**/thirdparty/remoting/PureAsynchronousCallTest.class"/>
Modified: trunk/tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java 2007-07-19 17:03:14 UTC (rev 2912)
+++ trunk/tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java 2007-07-19 18:47:34 UTC (rev 2913)
@@ -986,6 +986,8 @@
log.trace("Set message listener");
listener.waitForMessages();
+
+ Thread.sleep(500);
assertRemainingMessages(0);
@@ -1109,6 +1111,8 @@
conn.close();
+ Thread.sleep(500);
+
assertRemainingMessages(0);
assertFalse(listener.failed);
}
@@ -1137,6 +1141,8 @@
listener.waitForMessages();
+ Thread.sleep(500);
+
assertRemainingMessages(0);
conn.close();
@@ -1168,6 +1174,8 @@
cons.setMessageListener(listener);
listener.waitForMessages();
+ Thread.sleep(500);
+
assertRemainingMessages(0);
conn.close();
@@ -1201,8 +1209,7 @@
public void waitForMessages() throws InterruptedException
{
- latch.acquire();
- Thread.sleep(500);
+ latch.acquire();
}
public abstract void onMessage(Message m);
@@ -1566,7 +1573,7 @@
private boolean assertRemainingMessages(int expected) throws Exception
{
//Need to pause since delivery may still be in progress
- Thread.sleep(500);
+ // Thread.sleep(500);
ObjectName destObjectName =
new ObjectName("jboss.messaging.destination:service=Queue,name=Queue");
Integer messageCount = (Integer)ServerManagement.getAttribute(destObjectName, "MessageCount");
Modified: trunk/tests/src/org/jboss/test/messaging/jms/BrowserTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/BrowserTest.java 2007-07-19 17:03:14 UTC (rev 2912)
+++ trunk/tests/src/org/jboss/test/messaging/jms/BrowserTest.java 2007-07-19 18:47:34 UTC (rev 2913)
@@ -154,15 +154,9 @@
assertNotNull(m);
}
- // Need to pause here since delivery is done on a different thread. Message might not be
- // removed from in memory state by this point.
-
- Thread.sleep(2000);
-
browser = session.createBrowser(queue);
en = browser.getEnumeration();
-
-
+
count = 0;
while (en.hasMoreElements())
{
Modified: trunk/tests/src/org/jboss/test/messaging/jms/ConnectionClosedTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ConnectionClosedTest.java 2007-07-19 17:03:14 UTC (rev 2912)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ConnectionClosedTest.java 2007-07-19 18:47:34 UTC (rev 2913)
@@ -147,7 +147,7 @@
int count = 0;
while (true)
{
- TextMessage tm = (TextMessage)sub1.receive(2000);
+ TextMessage tm = (TextMessage)sub1.receive(1000);
if (tm == null)
{
break;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java 2007-07-19 17:03:14 UTC (rev 2912)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java 2007-07-19 18:47:34 UTC (rev 2913)
@@ -508,56 +508,8 @@
}
}
- // TODO - Decide if valid and uncomment or get rid of it!
+
-// Commented out for now, since how can i make the server fail from a test?
-// public void testExceptionListenerFail() throws Exception
-// {
-// if (!ServerManagement.isRemote()) return;
-//
-// Connection conn = cf.createConnection();
-//
-// MyExceptionListener listener1 = new MyExceptionListener();
-//
-// conn.setExceptionListener(listener1);
-//
-//
-// RMIAdaptor rmiAdaptor = (RMIAdaptor) initialContext.lookup("jmx/invoker/RMIAdaptor");
-//
-// ObjectName on = new ObjectName("jboss.messaging:service=ServerPeer");
-//
-// rmiAdaptor.invoke(on, "stop",
-// new Object[] {}, new String[] {});
-//
-// try
-// {
-// Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-// }
-// catch (Exception ignore)
-// {}
-//
-//
-// Thread.sleep(10000);
-//
-// if (listener1.exceptionReceived == null)
-// {
-// fail();
-// }
-// else
-// {
-// log.trace("Received exception:", listener1.exceptionReceived.getLinkedException());
-// }
-//
-// try
-// {
-// conn.close();
-// }
-// catch (Exception e)
-// {}
-// }
-
-
-
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/jms/ConsumerClosedTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ConsumerClosedTest.java 2007-07-19 17:03:14 UTC (rev 2912)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ConsumerClosedTest.java 2007-07-19 18:47:34 UTC (rev 2913)
@@ -69,18 +69,11 @@
log.debug("consumer closed");
- //Need to sleep - cancelling back to queue is asynch and can take some time
- Thread.sleep(500);
-
// make sure that all messages are in queue
ObjectName on =
new ObjectName("jboss.messaging.destination:service=Queue,name=ConsumerClosedTestQueue");
Integer count = (Integer)ServerManagement.getAttribute(on, "MessageCount");
assertEquals(NUMBER_OF_MESSAGES, count.intValue());
-
- //Thread.sleep(900000000);
-
-
}
// Package protected ---------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/jms/LongRunningInvocationTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/LongRunningInvocationTest.java 2007-07-19 17:03:14 UTC (rev 2912)
+++ trunk/tests/src/org/jboss/test/messaging/jms/LongRunningInvocationTest.java 2007-07-19 18:47:34 UTC (rev 2913)
@@ -120,11 +120,9 @@
//Poison the server so the invocation takes 2 minutes - longer than the ping period
-
- // log.info("server is " + ServerManagement.getServer(0));
ServerManagement.poisonTheServer(0, PoisonInterceptor.LONG_SEND);
- log.info("This will pause for 2 minutes on send");
+ log.info("This will pause for 1 minutes on send");
prod.send(m);
conn.start();
@@ -163,9 +161,9 @@
//Poison the server so the invocation takes 2 minutes - longer than the ping period
- //ServerManagement.poisonTheServer(0, PoisonInterceptor.LONG_SEND);
+ ServerManagement.poisonTheServer(0, PoisonInterceptor.LONG_SEND);
- log.info("This will pause for 2 minutes on send");
+ log.info("This will pause for 1 minutes on send");
prod.send(m);
conn.start();
Modified: trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java 2007-07-19 17:03:14 UTC (rev 2912)
+++ trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java 2007-07-19 18:47:34 UTC (rev 2913)
@@ -52,7 +52,6 @@
import org.jboss.test.messaging.tools.ServerManagement;
import EDU.oswego.cs.dl.util.concurrent.Latch;
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
@@ -387,7 +386,7 @@
// start consumer connection after the message is submitted
consumerConnection.start();
- TextMessage m = (TextMessage)queueConsumer.receive(3000);
+ TextMessage m = (TextMessage)queueConsumer.receive(2000);
assertEquals(tm.getText(), m.getText());
}
@@ -407,7 +406,7 @@
//It will be available some indeterminate time later.
//This is fine and as per spec.
//To implement receiveNoWait otherwise would be very costly
- //Also other messaging systems e.g. Sun implement it this way
+ //Also other messaging systems e.g. Sun, ActiveMQ implement it this way
Thread.sleep(500);
@@ -468,41 +467,6 @@
// closed consumer tests
//
- //This test is not valid -
- //The message will not be in the new consumer it will be in the original consumer
-
-// public void testClose1() throws Exception
-// {
-// // there is a consumer already open by setup
-//
-// consumerConnection.start();
-//
-// Message m = producerSession.createMessage();
-// queueProducer.send(m);
-//
-// // the message is in the channel, however the queue maintains it as "not delivered"
-//
-// QueueBrowser browser = producerSession.createBrowser(queue);
-// Enumeration e = browser.getEnumeration();
-// Message bm = (Message)e.nextElement();
-// assertEquals(m.getJMSMessageID(), bm.getJMSMessageID());
-// assertFalse(e.hasMoreElements());
-//
-// // create a second consumer and try to receive from queue, it should return the message
-// MessageConsumer queueConsumer2 = consumerSession.createConsumer(queue);
-//
-// Message rm = queueConsumer2.receive(3000);
-// assertEquals(m.getJMSMessageID(), rm.getJMSMessageID());
-//
-// queueConsumer.close();
-//
-//
-// // try to receive from queue again, it should get a message
-// rm = queueConsumer2.receive(3000);
-// assertNull(rm);
-//
-// }
-
/* Test that an ack can be sent after the consumer that received the message has been closed.
* Acks are scoped per session.
*/
@@ -616,7 +580,7 @@
consumerConnection.start();
- Message r = queueConsumer.receive(3000);
+ Message r = queueConsumer.receive(2000);
assertEquals(m.getJMSMessageID(), r.getJMSMessageID());
}
@@ -909,9 +873,6 @@
cons1.close();
- //Cancelling is asynch so can take some time
- Thread.sleep(500);
-
//rollback should cause redelivery of messages
//in this case redelivery occurs to a different receiver
@@ -1027,9 +988,6 @@
cons1.close();
- //Give time for asynch cancel to happen
- Thread.sleep(500);
-
log.debug("sess.recover()");
//redeliver
@@ -1191,107 +1149,7 @@
}
- /**
- * Test server-side consumer delegate activation (on receive())
- */
-// This test is not valid since the message will be in the first consumer, not c2
-
-// public void testReceive1() throws Exception
-// {
-// Connection conn = null;
-//
-// try
-// {
-// conn = cf.createConnection();
-//
-// Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-//
-// s.createConsumer(queue);
-//
-// conn.start();
-//
-// MessageProducer p = s.createProducer(queue);
-// Message m = s.createTextMessage("1");
-// p.send(m);
-//
-// MessageConsumer c2 = s.createConsumer(queue);
-//
-// // TODO the test should be modified to deal with the multiple consumer receive undeterminism
-//
-// Message r = c2.receive(2000);
-//
-//
-// assertEquals(m.getJMSMessageID(), r.getJMSMessageID());
-// }
-// finally
-// {
-// if (conn != null)
-// {
-// conn.close();
-// }
-// }
-// }
-
- /**
- * Test server-side consumer delegate activation (on receive())
- */
-
- //This test is not valid since the message will be in the first consumer, not c2
-
-// public void testReceive2() throws Exception
-// {
-// Connection conn = null;
-//
-// try
-// {
-// conn = cf.createConnection();
-//
-// Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-//
-// s.createConsumer(queue);
-//
-// conn.start();
-//
-// MessageProducer p = s.createProducer(queue);
-// Message m = s.createTextMessage("1");
-// p.send(m);
-//
-// MessageConsumer c2 = s.createConsumer(queue);
-// final Set received = new HashSet();
-//
-// // TODO the test should be modified to deal with the multiple consumer receive undeterminism
-//
-// class Listener implements MessageListener
-// {
-// Latch latch = new Latch();
-//
-// public void onMessage(Message m)
-// {
-// received.add(m);
-// latch.release();
-// }
-// }
-//
-// Listener list = new Listener();
-// c2.setMessageListener(list);
-//
-// list.latch.acquire();
-// assertEquals(1, received.size());
-// Message r = (Message)received.iterator().next();
-// assertEquals(m.getJMSMessageID(), r.getJMSMessageID());
-//
-// }
-// finally
-// {
-// if (conn != null)
-// {
-// conn.close();
-// }
-// }
-// }
-
-
public void testSendAndReceivePersistentDifferentConnections() throws Exception
{
Connection connSend = null;
@@ -1361,40 +1219,6 @@
}
- /**
- * TODO Get rid of this (http://jira.jboss.org/jira/browse/JBMESSAGING-92)
- */
-
- //This test is no longer valid since we only use one listener per connection now
-
-// public void testRemotingInternals() throws Exception
-// {
-// if (ServerManagement.isRemote())
-// {
-// return;
-// }
-//
-// Connector serverConnector = ServerManagement.getConnector();
-// ServerInvoker serverInvoker = serverConnector.getServerInvoker();
-//
-// JMSServerInvocationHandler invocationHandler =
-// (JMSServerInvocationHandler)serverInvoker.getInvocationHandler("JMS");
-//
-// Collection listeners = invocationHandler.getListeners();
-//
-// assertEquals(3, listeners.size()); // topicConsumer's and queueConsumer's
-//
-// MessageConsumer c = consumerSession.createConsumer(queue);
-//
-// listeners = invocationHandler.getListeners();
-// assertEquals(4, listeners.size());
-//
-// c.close();
-//
-// listeners = invocationHandler.getListeners();
-// assertEquals(3, listeners.size());
-// }
-
public void testMultipleConcurrentConsumers() throws Exception
{
consumerConnection.start();
@@ -1691,7 +1515,6 @@
// this is needed to make sure the main thread has enough time to block
Thread.sleep(1000);
-
for (int i = 0; i < count; i++)
{
Message m = producerSession.createMessage();
@@ -1713,12 +1536,10 @@
{
break;
}
- //Thread.sleep(1000);
received++;
}
assertEquals(count, received);
-
}
@@ -1745,7 +1566,6 @@
// this is needed to make sure the main thread has enough time to block
Thread.sleep(1000);
-
for (int i = 0; i < count; i++)
{
Message m = producerSession.createMessage();
@@ -1767,7 +1587,6 @@
{
break;
}
- //Thread.sleep(1000);
received++;
}
@@ -2160,9 +1979,7 @@
queueProducer.send(producerSession.createTextMessage("Message #" + Integer.toString(i)));
}
- Thread.sleep(500);
consumerConnection.stop();
- Thread.sleep(500);
consumerConnection.close();
}
@@ -3391,7 +3208,6 @@
public void waitForMessages() throws InterruptedException
{
latch.acquire();
- //Thread.sleep(2000); //enough time for postdeliver to be called
}
public ExceptionRedelMessageListenerImpl(Session sess)
@@ -3521,7 +3337,6 @@
public void waitForMessages() throws InterruptedException
{
latch.acquire();
- //Thread.sleep(2000); //enough time for postdeliver to be called
}
public void onMessage(Message m)
@@ -3615,7 +3430,6 @@
public void waitForMessages() throws InterruptedException
{
latch.acquire();
- //Thread.sleep(2000); //enough time for postdeliver to be called
}
public void waitForMessages(long timeout) throws InterruptedException
@@ -3625,7 +3439,6 @@
{
log.trace("unsucessful latch aquire attemnpt");
}
- //Thread.sleep(2000); //enough time for postdeliver to be called
}
@@ -3635,7 +3448,6 @@
log.trace("Added message " + m + " to my list");
latch.release();
- //latch = new Latch();
};
public Message getNextMessage()
Modified: trunk/tests/src/org/jboss/test/messaging/jms/ReferencingTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ReferencingTest.java 2007-07-19 17:03:14 UTC (rev 2912)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ReferencingTest.java 2007-07-19 18:47:34 UTC (rev 2913)
@@ -147,8 +147,6 @@
prod.send(m);
- Thread.sleep(1000);
-
MessageConsumer cons = sess.createConsumer(queue);
TextMessage m2 = (TextMessage)cons.receive(1000);
@@ -219,8 +217,6 @@
prod.send(m);
- Thread.sleep(1000);
-
MessageConsumer cons = sess.createConsumer(queue);
TextMessage m2 = (TextMessage)cons.receive(1000);
@@ -259,8 +255,6 @@
prod.send(m);
- Thread.sleep(1000);
-
MessageConsumer cons = sess.createConsumer(queue);
TextMessage m2 = (TextMessage)cons.receive(1000);
Modified: trunk/tests/src/org/jboss/test/messaging/jms/SessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/SessionTest.java 2007-07-19 17:03:14 UTC (rev 2912)
+++ trunk/tests/src/org/jboss/test/messaging/jms/SessionTest.java 2007-07-19 18:47:34 UTC (rev 2913)
@@ -524,9 +524,6 @@
// JMS 1.1 4.4.1: "Closing a transacted session must roll back its transaction in progress"
- //Cancelling is asynch so may take a little while
- Thread.sleep(500);
-
mc = (Integer)ServerManagement.getAttribute(on, "MessageCount");
assertEquals(1, mc.intValue());
Modified: trunk/tests/src/org/jboss/test/messaging/jms/TopicTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/TopicTest.java 2007-07-19 17:03:14 UTC (rev 2912)
+++ trunk/tests/src/org/jboss/test/messaging/jms/TopicTest.java 2007-07-19 18:47:34 UTC (rev 2913)
@@ -162,7 +162,7 @@
conn.start();
- for (int i = 0; i < 5000; i++)
+ for (int i = 0; i < 500; i++)
{
byte[] blah = new byte[10000];
String str = new String(blah);
@@ -175,7 +175,7 @@
}
- Thread.sleep(30000);
+ Thread.sleep(10000);
assertFalse(l1.failed);
assertFalse(l2.failed);
Modified: trunk/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java 2007-07-19 17:03:14 UTC (rev 2912)
+++ trunk/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java 2007-07-19 18:47:34 UTC (rev 2913)
@@ -223,10 +223,6 @@
conn.close();
- //Need to pause a little while - cancelling back to the queue is async
-
- Thread.sleep(500);
-
ObjectName on = new ObjectName("jboss.messaging.destination:service=Queue,name=Queue");
Integer i = (Integer)ServerManagement.getAttribute(on, "MessageCount");
Modified: trunk/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java 2007-07-19 17:03:14 UTC (rev 2912)
+++ trunk/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java 2007-07-19 18:47:34 UTC (rev 2913)
@@ -522,8 +522,6 @@
log.trace("rolledb back the tx");
- Thread.sleep(1000);
-
conn1.close();
conn2.close();
Modified: trunk/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java 2007-07-19 17:03:14 UTC (rev 2912)
+++ trunk/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java 2007-07-19 18:47:34 UTC (rev 2913)
@@ -321,7 +321,7 @@
log.info("Restarted server");
- Thread.sleep(5000);
+ Thread.sleep(3000);
ServerManagement.deployQueue("queue1", 1);
@@ -425,9 +425,7 @@
XAResource res1 = sess1.getXAResource();
conn1.start();
-
-
-
+
//first send a few messages to server 1
conn2 = ((ConnectionFactory)cf1).createConnection();
@@ -444,10 +442,8 @@
prod2.send(tm2);
- conn2.close();
+ conn2.close();
-
-
tm.begin();
Transaction tx = tm.getTransaction();
@@ -468,9 +464,7 @@
assertNotNull(rm1);
assertEquals(tm1.getText(), rm1.getText());
-
-
-
+
// Poison server 1 so it crashes on commit of dest but after prepare
//This means the transaction branch on source will get commmitted
@@ -499,7 +493,7 @@
log.info("Restarted server");
- Thread.sleep(5000);
+ Thread.sleep(3000);
ServerManagement.deployQueue("queue1", 1);
@@ -574,7 +568,4 @@
}
}
}
-
-
-
}
Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTestBase.java 2007-07-19 17:03:14 UTC (rev 2912)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTestBase.java 2007-07-19 18:47:34 UTC (rev 2913)
@@ -76,8 +76,6 @@
{
super.setUp();
- log.info("** setting up");
-
ServerManagement.start("all");
InitialContext ic = new InitialContext(ServerManagement.getJNDIEnvironment());
@@ -100,20 +98,16 @@
conn.start();
ic.close();
-
- log.info("** done setup");
}
public void tearDown() throws Exception
{
- log.info("** tearing down");
conn.close();
ServerManagement.undeployQueue("Queue");
ServerManagement.undeployTopic("Topic");
super.tearDown();
- log.info("** done teardown");
}
public void testNonPersistentSend() throws Exception
Modified: trunk/tests/src/org/jboss/test/messaging/tools/aop/PoisonInterceptor.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/aop/PoisonInterceptor.java 2007-07-19 17:03:14 UTC (rev 2912)
+++ trunk/tests/src/org/jboss/test/messaging/tools/aop/PoisonInterceptor.java 2007-07-19 18:47:34 UTC (rev 2913)
@@ -193,9 +193,9 @@
{
if ("send".equals(methodName))
{
- //Pause for 2 mins before processing send
- log.info("Sleeping for 2 minutes before sending....");
- Thread.sleep(120000);
+ //Pause for 1 mins before processing send
+ log.info("Sleeping for 1 minutes before sending....");
+ Thread.sleep(60000);
invocation.invokeNext();
}
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java 2007-07-19 17:03:14 UTC (rev 2912)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java 2007-07-19 18:47:34 UTC (rev 2913)
@@ -859,9 +859,6 @@
log.debug(url + " deployed");
-// URL url = this.getClass().getClassLoader().getResource("poison.xml");
-// AspectXmlLoader.undeployXML(url);
-
PoisonInterceptor.setType(type);
}
Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/InvokerReferenceCountTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/InvokerReferenceCountTest.java 2007-07-19 17:03:14 UTC (rev 2912)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/InvokerReferenceCountTest.java 2007-07-19 18:47:34 UTC (rev 2913)
@@ -76,11 +76,7 @@
public void testReferenceCount() throws Exception
{
-// if (!ServerManagement.isRemote())
-// {
-// fail("This test should be run in a remote configuration!");
-// }
-
+
log.info("Creating conn1");
Connection conn1 = cf.createConnection();
log.info("Created conn2");
More information about the jboss-cvs-commits
mailing list