[jboss-cvs] JBoss Messaging SVN: r7742 - trunk/tests/src/org/jboss/messaging/tests/integration/client.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 17 00:18:46 EDT 2009
Author: clebert.suconic at jboss.com
Date: 2009-08-17 00:18:46 -0400 (Mon, 17 Aug 2009)
New Revision: 7742
Modified:
trunk/tests/src/org/jboss/messaging/tests/integration/client/CommitRollbackTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/CompactingTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/ConsumerCloseTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/DurableQueueTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/FailureDeadlockTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageDurabilityTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageExpirationTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/MessagePriorityTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/QueueBrowserTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/RedeliveryConsumerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/RequestorTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/SelfExpandingBufferTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionCloseTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionCreateAndDeleteQueueTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionFactoryTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/TemporaryQueueTest.java
Log:
tweaks on tests
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/CommitRollbackTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/CommitRollbackTest.java 2009-08-16 12:42:51 UTC (rev 7741)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/CommitRollbackTest.java 2009-08-17 04:18:46 UTC (rev 7742)
@@ -128,6 +128,7 @@
assertEquals(numMessages, q.getDeliveringCount());
session.close();
sendSession.close();
+ cf.close();
}
finally
{
@@ -243,6 +244,7 @@
assertEquals(0, q.getMessageCount());
sendSession.close();
session.close();
+ cf.close();
}
finally
{
@@ -289,6 +291,7 @@
assertTrue(latch.await(5, TimeUnit.SECONDS));
sendSession.close();
session.close();
+ cf.close();
}
finally
{
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/CompactingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/CompactingTest.java 2009-08-16 12:42:51 UTC (rev 7741)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/CompactingTest.java 2009-08-17 04:18:46 UTC (rev 7742)
@@ -311,10 +311,12 @@
sf.close();
server.stop();
+
+ server = null;
+
+ sf = null;
- // We don't super.tearDown here because in case of failure, the data may be useful for debug
- // so, we only clear data on setup.
- // super.tearDown();
+ super.tearDown();
}
// Package protected ---------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ConsumerCloseTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ConsumerCloseTest.java 2009-08-16 12:42:51 UTC (rev 7741)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ConsumerCloseTest.java 2009-08-17 04:18:46 UTC (rev 7742)
@@ -188,6 +188,10 @@
sf.close();
server.stop();
+
+ session = null;
+ sf = null;
+ server = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/DurableQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/DurableQueueTest.java 2009-08-16 12:42:51 UTC (rev 7741)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/DurableQueueTest.java 2009-08-17 04:18:46 UTC (rev 7742)
@@ -166,6 +166,14 @@
session.close();
server.stop();
+
+ sf.close();
+
+ session = null;
+
+ server = null;
+
+ sf = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/FailureDeadlockTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/FailureDeadlockTest.java 2009-08-16 12:42:51 UTC (rev 7741)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/FailureDeadlockTest.java 2009-08-17 04:18:46 UTC (rev 7742)
@@ -82,6 +82,11 @@
@Override
protected void tearDown() throws Exception
{
+ if (jmsServer != null && jmsServer.isStarted())
+ {
+ jmsServer.stop();
+ }
+
if (server != null && server.isStarted())
{
try
@@ -92,10 +97,18 @@
{
e.printStackTrace();
}
- server = null;
}
+ server = null;
+
+ jmsServer = null;
+
+ cf1 = null;
+
+ cf2 = null;
+
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageDurabilityTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageDurabilityTest.java 2009-08-16 12:42:51 UTC (rev 7741)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageDurabilityTest.java 2009-08-17 04:18:46 UTC (rev 7742)
@@ -202,9 +202,17 @@
@Override
protected void tearDown() throws Exception
{
+ sf.close();
+
session.close();
server.stop();
+
+ server = null;
+
+ session = null;
+
+ sf = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageExpirationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageExpirationTest.java 2009-08-16 12:42:51 UTC (rev 7741)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageExpirationTest.java 2009-08-17 04:18:46 UTC (rev 7742)
@@ -61,6 +61,8 @@
private MessagingServer server;
private ClientSession session;
+
+ private ClientSessionFactory sf;
// Static --------------------------------------------------------
@@ -146,16 +148,24 @@
server = createServer(false);
server.start();
- ClientSessionFactory sf = createInVMFactory();
+ sf = createInVMFactory();
session = sf.createSession(false, true, true);
}
@Override
protected void tearDown() throws Exception
{
+ sf.close();
+
session.close();
server.stop();
+
+ session = null;
+
+ server = null;
+
+ sf = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/MessagePriorityTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/MessagePriorityTest.java 2009-08-16 12:42:51 UTC (rev 7741)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/MessagePriorityTest.java 2009-08-17 04:18:46 UTC (rev 7742)
@@ -55,6 +55,8 @@
private MessagingServer server;
private ClientSession session;
+
+ private ClientSessionFactory sf;
// Static --------------------------------------------------------
@@ -228,7 +230,7 @@
server = Messaging.newMessagingServer(config, false);
server.start();
- ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
+ sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
sf.setBlockOnNonPersistentSend(true);
sf.setBlockOnPersistentSend(true);
session = sf.createSession(false, true, true);
@@ -237,9 +239,17 @@
@Override
protected void tearDown() throws Exception
{
+ sf.close();
+
session.close();
server.stop();
+
+ sf = null;
+
+ session = null;
+
+ server = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/QueueBrowserTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/QueueBrowserTest.java 2009-08-16 12:42:51 UTC (rev 7741)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/QueueBrowserTest.java 2009-08-17 04:18:46 UTC (rev 7742)
@@ -111,6 +111,8 @@
consumer.close();
session.close();
+
+ sf.close();
}
@@ -158,6 +160,8 @@
session.close();
+ sf.close();
+
}
public void testConsumerBrowserWithStringSelector() throws Exception
@@ -194,6 +198,8 @@
session.close();
+ sf.close();
+
}
public void testConsumerMultipleBrowser() throws Exception
@@ -230,6 +236,7 @@
}
session.close();
+ sf.close();
}
@@ -274,6 +281,9 @@
}
session.close();
+
+
+ sf.close();
}
@@ -318,6 +328,8 @@
assertEquals(100, ((Queue)server.getPostOffice().getBinding(QUEUE).getBindable()).getMessageCount());
session.close();
+
+ sf.close();
}
public void testConsumerBrowserMessageAckDoesNothing() throws Exception
@@ -353,6 +365,8 @@
assertEquals(100, ((Queue)server.getPostOffice().getBinding(QUEUE).getBindable()).getMessageCount());
session.close();
+
+ sf.close();
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/RedeliveryConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/RedeliveryConsumerTest.java 2009-08-16 12:42:51 UTC (rev 7741)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/RedeliveryConsumerTest.java 2009-08-17 04:18:46 UTC (rev 7742)
@@ -269,11 +269,22 @@
@Override
protected void tearDown() throws Exception
{
+
+ if (factory != null)
+ {
+ factory.close();
+ }
+
if (server != null && server.isStarted())
{
server.stop();
}
+
+ factory = null;
+
+ server = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/RequestorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/RequestorTest.java 2009-08-16 12:42:51 UTC (rev 7741)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/RequestorTest.java 2009-08-17 04:18:46 UTC (rev 7742)
@@ -57,6 +57,8 @@
// Attributes ----------------------------------------------------
private MessagingServer service;
+
+ private ClientSessionFactory sf;
// Static --------------------------------------------------------
@@ -71,7 +73,6 @@
SimpleString requestAddress = randomSimpleString();
SimpleString requestQueue = randomSimpleString();
- ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
final ClientSession session = sf.createSession(false, true, true);
session.start();
@@ -228,12 +229,20 @@
conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
service = Messaging.newMessagingServer(conf, false);
service.start();
+
+ sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
}
@Override
protected void tearDown() throws Exception
{
service.stop();
+
+ sf.close();
+
+ sf = null;
+
+ service = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/SelfExpandingBufferTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/SelfExpandingBufferTest.java 2009-08-16 12:42:51 UTC (rev 7741)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/SelfExpandingBufferTest.java 2009-08-17 04:18:46 UTC (rev 7742)
@@ -138,6 +138,8 @@
{
service.stop();
}
+
+ service = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionCloseTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionCloseTest.java 2009-08-16 12:42:51 UTC (rev 7741)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionCloseTest.java 2009-08-17 04:18:46 UTC (rev 7742)
@@ -61,6 +61,8 @@
private MessagingServer server;
+ private ClientSessionFactory sf;
+
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
@@ -70,7 +72,6 @@
public void testCanNotUseAClosedSession() throws Exception
{
- ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
final ClientSession session = sf.createSession(false, true, true);
session.close();
@@ -140,7 +141,7 @@
session.rollback();
}
});
-
+
expectMessagingException(MessagingException.OBJECT_CLOSED, new MessagingAction()
{
public void run() throws MessagingException
@@ -148,7 +149,7 @@
session.queueQuery(randomSimpleString());
}
});
-
+
expectMessagingException(MessagingException.OBJECT_CLOSED, new MessagingAction()
{
public void run() throws MessagingException
@@ -158,11 +159,10 @@
});
}
-
+
public void testCanNotUseXAWithClosedSession() throws Exception
{
- ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
final ClientSession session = sf.createSession(true, false, false);
session.close();
@@ -177,7 +177,7 @@
session.commit(randomXid(), randomBoolean());
}
});
-
+
expectXAException(XAException.XAER_RMERR, new MessagingAction()
{
public void run() throws XAException
@@ -233,7 +233,6 @@
SimpleString address = randomSimpleString();
SimpleString queue = randomSimpleString();
- ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
ClientSession session = sf.createSession(false, true, true);
session.createQueue(address, queue, false);
@@ -262,15 +261,30 @@
config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getCanonicalName()));
config.setSecurityEnabled(false);
server = Messaging.newMessagingServer(config, false);
-
+
server.start();
+
+ sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
+
}
@Override
protected void tearDown() throws Exception
{
- server.stop();
+ if (sf != null)
+ {
+ sf.close();
+ }
+ if (server != null)
+ {
+ server.stop();
+ }
+
+ sf = null;
+
+ server = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionCreateAndDeleteQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionCreateAndDeleteQueueTest.java 2009-08-16 12:42:51 UTC (rev 7741)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionCreateAndDeleteQueueTest.java 2009-08-17 04:18:46 UTC (rev 7742)
@@ -157,6 +157,8 @@
server.stop();
}
+ server = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionFactoryTest.java 2009-08-16 12:42:51 UTC (rev 7741)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionFactoryTest.java 2009-08-17 04:18:46 UTC (rev 7742)
@@ -70,6 +70,24 @@
private TransportConfiguration backupTC;
+ protected void tearDown() throws Exception
+ {
+ if (liveService != null && liveService.isStarted())
+ {
+ liveService.stop();
+ }
+ if (backupService != null && backupService.isStarted())
+ {
+ liveService.stop();
+ }
+ liveService = null;
+ backupService = null;
+ liveTC = null;
+ backupTC = null;
+
+ super.tearDown();
+ }
+
public void testSerializable() throws Exception
{
ClientSessionFactory cf = new ClientSessionFactoryImpl();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/TemporaryQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/TemporaryQueueTest.java 2009-08-16 12:42:51 UTC (rev 7741)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/TemporaryQueueTest.java 2009-08-17 04:18:46 UTC (rev 7742)
@@ -250,9 +250,18 @@
@Override
protected void tearDown() throws Exception
{
+
+ sf.close();
+
session.close();
server.stop();
+
+ session = null;
+
+ server = null;
+
+ sf = null;
super.tearDown();
}
More information about the jboss-cvs-commits
mailing list