[jboss-cvs] JBoss Messaging SVN: r6050 - in trunk/tests/jms-tests/src/org/jboss/test/messaging: jms and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 9 13:33:16 EDT 2009
Author: jmesnil
Date: 2009-03-09 13:33:16 -0400 (Mon, 09 Mar 2009)
New Revision: 6050
Modified:
trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/BrowserTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ConsumerClosedTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MiscellaneousTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/QueueReceiverTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/SecurityTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/SessionTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/JMSMessageIDHeaderTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/selector/SelectorTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/stress/SeveralClientsStressTest.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/ServerManagement.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/Server.java
Log:
test suite cleanup
* removed unused legacy code
* removed some server-indexed methods since most JMS tests requires a single server (except for stress and bridge tests)
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2009-03-09 14:53:41 UTC (rev 6049)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/JBMServerTestCase.java 2009-03-09 17:33:16 UTC (rev 6050)
@@ -121,7 +121,7 @@
try
{
//create any new server we need
- servers.add(ServerManagement.create(0));
+ servers.add(ServerManagement.create());
//start the servers if needed
boolean started = false;
@@ -147,7 +147,7 @@
// }
}
//deploy the objects for this test
- deployAdministeredObjects(0);
+ deployAdministeredObjects();
lookUp();
}
catch (Exception e)
@@ -202,7 +202,7 @@
public void startServerPeer() throws Exception
{
System.setProperty("java.naming.factory.initial", getContextFactory());
- servers.get(0).startServerPeer(0);
+ servers.get(0).startServerPeer();
//deployAdministeredObjects();
}
@@ -224,15 +224,15 @@
lookUp();
}
- protected void deployAdministeredObjects(int i) throws Exception
+ protected void deployAdministeredObjects() throws Exception
{
- createTopic("Topic1", i);
- createTopic("Topic2", i);
- createTopic("Topic3", i);
- createQueue("Queue1", i);
- createQueue("Queue2", i);
- createQueue("Queue3", i);
- createQueue("Queue4", i);
+ createTopic("Topic1");
+ createTopic("Topic2");
+ createTopic("Topic3");
+ createQueue("Queue1");
+ createQueue("Queue2");
+ createQueue("Queue3");
+ createQueue("Queue4");
}
private void lookUp()
@@ -297,11 +297,6 @@
}
- protected void checkNoSubscriptions(Topic topic, int server) throws Exception
- {
-
- }
-
protected void drainDestination(ConnectionFactory cf, Destination dest) throws Exception
{
Connection conn = null;
@@ -328,7 +323,7 @@
public InitialContext getInitialContext() throws Exception
{
- return getInitialContext(0);
+ return new InitialContext(ServerManagement.getJNDIEnvironment(0));
}
public ConnectionFactory getConnectionFactory() throws Exception
@@ -398,133 +393,6 @@
servers.get(i).destroyQueue(name, null);
}
-// public void deployQueue(String name) throws Exception
-// {
-// for (int i = 0; i < getServerCount(); i++)
-// {
-// servers.get(i).deployQueue(name, null, i != 0);
-// }
-// }
-//
-// public void deployQueue(String name, String jndiName) throws Exception
-// {
-// for (int i = 0; i < getServerCount(); i++)
-// {
-// servers.get(i).deployQueue(name, jndiName, i != 0);
-// }
-// }
-//
-// public void deployQueue(String name, int server) throws Exception
-// {
-// servers.get(server).deployQueue(name, null, true);
-//
-// }
-//
-// public void deployQueue(String name, int fullSize, int pageSize, int downCacheSize) throws Exception
-// {
-// for (int i = 0; i < getServerCount(); i++)
-// {
-// servers.get(i).deployQueue(name, null, fullSize, pageSize, downCacheSize, i != 0);
-// }
-// }
-//
-// public void deployQueue(String name, String jndiName, int fullSize, int pageSize,
-// int downCacheSize, int serverIndex, boolean manageConfirmations) throws Exception
-// {
-// servers.get(serverIndex).deployQueue(name, jndiName, fullSize, pageSize, downCacheSize, manageConfirmations);
-//
-// }
-//
-// public void deployTopic(String name) throws Exception
-// {
-// for (int i = 0; i < getServerCount(); i++)
-// {
-// servers.get(i).deployTopic(name, null, i != 0);
-// }
-// }
-//
-// public void deployTopic(String name, String jndiName) throws Exception
-// {
-// for (int i = 0; i < getServerCount(); i++)
-// {
-// servers.get(i).deployTopic(name, jndiName, i != 0);
-// }
-// }
-//
-// public void deployTopic(String name, int server) throws Exception
-// {
-// servers.get(server).deployTopic(name, null, server != 0);
-//
-// }
-//
-// public void deployTopic(String name, int fullSize, int pageSize, int downCacheSize) throws Exception
-// {
-// for (int i = 0; i < getServerCount(); i++)
-// {
-// servers.get(i).deployTopic(name, null, fullSize, pageSize, downCacheSize, i != 0);
-// }
-// }
-//
-// public void deployTopic(String name, String jndiName, int fullSize, int pageSize,
-// int downCacheSize, int serverIndex, boolean manageConfirmations) throws Exception
-// {
-// servers.get(serverIndex).deployTopic(name, jndiName, fullSize, pageSize, downCacheSize, manageConfirmations);
-//
-// }
-//
-// public void undeployQueue(String name) throws Exception
-// {
-// for (int i = 0; i < getServerCount(); i++)
-// {
-// try
-// {
-// servers.get(i).undeployDestination(true, name);
-// }
-// catch (Exception e)
-// {
-// log.info("did not undeploy " + name);
-// }
-// }
-// }
-//
-// public void undeployQueue(String name, int server) throws Exception
-// {
-// servers.get(server).undeployDestination(true, name);
-//
-// }
-//
-// public void undeployTopic(String name) throws Exception
-// {
-// for (int i = 0; i < getServerCount(); i++)
-// {
-// try
-// {
-// servers.get(i).undeployDestination(false, name);
-// }
-// catch (Exception e)
-// {
-// log.info("did not undeploy " + name);
-// }
-// }
-// }
-//
-// public void undeployTopic(String name, int server) throws Exception
-// {
-// servers.get(server).undeployDestination(false, name);
-//
-// }
-//
-// public static boolean destroyTopic(String name) throws Exception
-// {
-// return servers.get(0).undeployDestinationProgrammatically(false, name);
-// }
-//
-// public static boolean destroyQueue(String name) throws Exception
-// {
-// return servers.get(0).undeployDestinationProgrammatically(true, name);
-// }
-//
-
public boolean checkNoMessageData()
{
return false;
@@ -550,28 +418,11 @@
return true;
}
- public boolean checkEmpty(Topic topic, int i)
- {
- return true;
- }
-
protected void removeAllMessages(String destName, boolean isQueue) throws Exception
{
- try
- {
- removeAllMessages(destName, isQueue, 0);
- }
- catch (Exception e)
- {
- log.info("did not clear messages for " + destName);
- }
+ servers.get(0).removeAllMessages(destName, isQueue);
}
- protected void removeAllMessages(String destName, boolean isQueue, int server) throws Exception
- {
- servers.get(server).removeAllMessages(destName, isQueue);
- }
-
protected boolean assertRemainingMessages(int expected) throws Exception
{
Integer messageCount = servers.get(0).getMessageCountForQueue("Queue1");
@@ -662,11 +513,6 @@
servers.get(0).undeployConnectionFactory(objectName);
}
- public static void undeployConnectionFactory(int server, String objectName) throws Exception
- {
- servers.get(server).undeployConnectionFactory(objectName);
- }
-
protected List<String> listAllSubscribersForTopic(String s) throws Exception
{
return servers.get(0).listAllSubscribersForTopic(s);
@@ -677,11 +523,6 @@
return servers.get(0).getMessageCountForQueue(s);
}
- protected Integer getMessageCountForQueue(String s, int server) throws Exception
- {
- return servers.get(server).getMessageCountForQueue(s);
- }
-
protected Set<Role> getSecurityConfig() throws Exception
{
return servers.get(0).getSecurityConfig();
@@ -696,59 +537,4 @@
{
servers.get(0).configureSecurityForDestination(destination, isQueue, roles);
}
-
- protected void kill(int i) throws Exception
- {
- log.info("Attempting to kill server " + i);
-
- if (i == 0)
- {
- //Cannot kill server 0 if there are any other servers since it has the rmi registry in it
- for (int j = 1; j < servers.size(); j++)
- {
- if (servers.get(j) != null)
- {
- throw new IllegalStateException("Cannot kill server 0, since server[" + j + "] still exists");
- }
- }
- }
-
- if (i >= servers.size())
- {
- log.info("server " + i + " has not been created or has already been killed, so it cannot be killed");
- }
- else
- {
- Server server = servers.get(i);
- log.info("invoking kill() on server " + i);
- try
- {
- server.kill();
- }
- catch (Throwable t)
- {
- // This is likely to throw an exception since the server dies before the response is received
- }
-
- log.info("Waiting for server to die");
-
- try
- {
- while (true)
- {
- server.ping();
- log.debug("server " + i + " still alive ...");
- Thread.sleep(100);
- }
- }
- catch (Throwable e)
- {
- //Ok
- }
-
- Thread.sleep(300);
-
- log.info("server " + i + " killed and dead");
- }
- }
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java 2009-03-09 14:53:41 UTC (rev 6049)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java 2009-03-09 17:33:16 UTC (rev 6050)
@@ -576,7 +576,7 @@
conn.close();
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/BrowserTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/BrowserTest.java 2009-03-09 14:53:41 UTC (rev 6049)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/BrowserTest.java 2009-03-09 17:33:16 UTC (rev 6050)
@@ -233,7 +233,7 @@
conn.close();
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
@@ -289,7 +289,7 @@
conn.close();
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java 2009-03-09 14:53:41 UTC (rev 6049)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java 2009-03-09 17:33:16 UTC (rev 6050)
@@ -151,7 +151,7 @@
c.close();
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ConsumerClosedTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ConsumerClosedTest.java 2009-03-09 14:53:41 UTC (rev 6049)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ConsumerClosedTest.java 2009-03-09 17:33:16 UTC (rev 6050)
@@ -70,7 +70,7 @@
c.close();
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java 2009-03-09 14:53:41 UTC (rev 6049)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java 2009-03-09 17:33:16 UTC (rev 6050)
@@ -116,7 +116,7 @@
conn.close();
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
@@ -199,7 +199,7 @@
conn.close();
}
- removeAllMessages(queue2.getQueueName(), true, 0);
+ removeAllMessages(queue2.getQueueName(), true);
}
}
@@ -776,7 +776,7 @@
}
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
@@ -899,7 +899,7 @@
checkEmpty(queue1);
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
@@ -954,7 +954,7 @@
checkEmpty(queue1);
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
@@ -1008,7 +1008,7 @@
checkEmpty(queue1);
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
@@ -1066,7 +1066,7 @@
//This last step is important - there shouldn't be any more messages to receive
checkEmpty(queue1);
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
@@ -1129,7 +1129,7 @@
//This last step is important - there shouldn't be any more messages to receive
checkEmpty(queue1);
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
@@ -1185,7 +1185,7 @@
//This last step is important - there shouldn't be any more messages to receive
checkEmpty(queue1);
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
@@ -1248,7 +1248,7 @@
//This last step is important - there shouldn't be any more messages to receive
checkEmpty(queue1);
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
@@ -1307,7 +1307,7 @@
{
conn.close();
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
@@ -2624,7 +2624,7 @@
{
consumerConnection.close();
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
@@ -2738,7 +2738,7 @@
{
consumerConnection.close();
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
@@ -3664,7 +3664,7 @@
{
consumerConnection.close();
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
@@ -3900,7 +3900,7 @@
{
conn.close();
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
@@ -3949,7 +3949,7 @@
conn.close();
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MiscellaneousTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MiscellaneousTest.java 2009-03-09 14:53:41 UTC (rev 6049)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/MiscellaneousTest.java 2009-03-09 17:33:16 UTC (rev 6050)
@@ -53,7 +53,7 @@
protected void tearDown() throws Exception
{
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
super.tearDown();
}
@@ -94,7 +94,7 @@
conn.close();
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
@@ -483,7 +483,7 @@
conn.close();
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/QueueReceiverTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/QueueReceiverTest.java 2009-03-09 14:53:41 UTC (rev 6049)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/QueueReceiverTest.java 2009-03-09 17:33:16 UTC (rev 6050)
@@ -85,7 +85,7 @@
}
Thread.sleep(2000);
log.info("****** removing merssages");
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
checkEmpty(queue1);
}
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/SecurityTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/SecurityTest.java 2009-03-09 14:53:41 UTC (rev 6049)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/SecurityTest.java 2009-03-09 17:33:16 UTC (rev 6050)
@@ -865,7 +865,7 @@
if (dest instanceof Queue)
{
String destName = ((Queue)dest).getQueueName();
- removeAllMessages(destName, true, 0);
+ removeAllMessages(destName, true);
}
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/SessionTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/SessionTest.java 2009-03-09 14:53:41 UTC (rev 6049)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/SessionTest.java 2009-03-09 17:33:16 UTC (rev 6050)
@@ -377,7 +377,7 @@
conn.close();
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java 2009-03-09 14:53:41 UTC (rev 6049)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java 2009-03-09 17:33:16 UTC (rev 6050)
@@ -90,7 +90,7 @@
{
conn.close();
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
@@ -679,7 +679,7 @@
{
conn.close();
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
@@ -799,7 +799,7 @@
{
conn.close();
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
@@ -1034,7 +1034,7 @@
{
conn.close();
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java 2009-03-09 14:53:41 UTC (rev 6049)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java 2009-03-09 17:33:16 UTC (rev 6050)
@@ -809,8 +809,8 @@
}
}
Thread.sleep(1000);
- removeAllMessages(queue2.getQueueName(), true, 0);
- removeAllMessages(queue3.getQueueName(), true, 0);
+ removeAllMessages(queue2.getQueueName(), true);
+ removeAllMessages(queue3.getQueueName(), true);
}
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java 2009-03-09 14:53:41 UTC (rev 6049)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java 2009-03-09 17:33:16 UTC (rev 6050)
@@ -556,7 +556,7 @@
bridge.stop();
}
- removeAllMessages(sourceQueue.getQueueName(), true, 0);
+ removeAllMessages(sourceQueue.getQueueName(), true);
}
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/JMSMessageIDHeaderTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/JMSMessageIDHeaderTest.java 2009-03-09 14:53:41 UTC (rev 6049)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/message/JMSMessageIDHeaderTest.java 2009-03-09 17:33:16 UTC (rev 6050)
@@ -62,7 +62,7 @@
}
finally
{
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/selector/SelectorTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/selector/SelectorTest.java 2009-03-09 14:53:41 UTC (rev 6049)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/selector/SelectorTest.java 2009-03-09 17:33:16 UTC (rev 6050)
@@ -450,7 +450,7 @@
conn.close();
}
- removeAllMessages(queue1.getQueueName(), true, 0);
+ removeAllMessages(queue1.getQueueName(), true);
}
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/stress/SeveralClientsStressTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/stress/SeveralClientsStressTest.java 2009-03-09 14:53:41 UTC (rev 6049)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/stress/SeveralClientsStressTest.java 2009-03-09 17:33:16 UTC (rev 6050)
@@ -219,7 +219,7 @@
if (startServer)
{
- ServerManagement.start(0, "all", true);
+ //ServerManagement.start("all", true);
createQueue("testQueue");
}
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/ServerManagement.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2009-03-09 14:53:41 UTC (rev 6049)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2009-03-09 17:33:16 UTC (rev 6050)
@@ -66,10 +66,10 @@
* Makes sure that a "hollow" TestServer (either local or remote, depending on the nature of the
* test), exists and it's ready to be started.
*/
- public static synchronized Server create(int i) throws Exception
+ public static synchronized Server create() throws Exception
{
- log.info("Attempting to create local server " + i);
- return new LocalTestServer(i);
+ log.info("Attempting to create local server ");
+ return new LocalTestServer();
}
public static void start(int i, String config, boolean clearDatabase) throws Exception
@@ -93,20 +93,11 @@
s.start(config, attrOverrides, clearDatabase, startMessagingServer);
*/
- log.info("server " + i + " started");
- }
+ throw new IllegalStateException("Method to start a server is not implemented");
-
- public static synchronized boolean isStarted(int i) throws Exception
- {
- return servers.get(i).isStarted();
+ //log.info("server " + i + " started");
}
- public static void stop() throws Exception
- {
- servers.get(0).stop();
- }
-
public static synchronized void kill(int i) throws Exception
{
log.info("Attempting to kill server " + i);
@@ -163,31 +154,6 @@
}
- public static void startServerPeer() throws Exception
- {
- startServerPeer(0);
- }
-
- /**
- * @param serverPeerID - if null, the jboss-service.xml value will be used.
- */
- public static void startServerPeer(int serverPeerID) throws Exception
- {
-
- servers.get(0).startServerPeer(serverPeerID);
- }
-
- public static void stopServerPeer() throws Exception
- {
-
- servers.get(0).stopServerPeer();
- }
-
- public static Hashtable getJNDIEnvironment()
- {
- return getJNDIEnvironment(0);
- }
-
public static Hashtable getJNDIEnvironment(int serverIndex)
{
return InVMInitialContextFactory.getJNDIEnvironment(serverIndex);
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2009-03-09 14:53:41 UTC (rev 6049)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2009-03-09 17:33:16 UTC (rev 6050)
@@ -97,11 +97,11 @@
// Constructors ---------------------------------------------------------------------------------
- public LocalTestServer(int serverIndex)
+ public LocalTestServer()
{
super();
- this.serverIndex = serverIndex;
+ this.serverIndex = 0;
}
// Server implementation ------------------------------------------------------------------------
@@ -184,7 +184,7 @@
return started;
}
- public synchronized void startServerPeer(int serverPeerID) throws Exception
+ public synchronized void startServerPeer() throws Exception
{
System.setProperty(Constants.SERVER_INDEX_PROPERTY_NAME, "" + getServerID());
getMessagingServer().start();
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/Server.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/Server.java 2009-03-09 14:53:41 UTC (rev 6049)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/Server.java 2009-03-09 17:33:16 UTC (rev 6050)
@@ -72,9 +72,8 @@
void ping() throws Exception;
/**
- * @param serverPeerID - if null, the jboss-service.xml value will be used.
*/
- void startServerPeer(int serverPeerID) throws Exception;
+ void startServerPeer() throws Exception;
void stopServerPeer() throws Exception;
More information about the jboss-cvs-commits
mailing list