You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2007/01/23 23:41:42 UTC
svn commit: r499170 -
/incubator/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java
Author: ritchiem
Date: Tue Jan 23 14:41:41 2007
New Revision: 499170
URL: http://svn.apache.org/viewvc?view=rev&rev=499170
Log:
Removed references to code not yet available via mvn
Modified:
incubator/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java
Modified: incubator/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java?view=diff&rev=499170&r1=499169&r2=499170
==============================================================================
--- incubator/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java (original)
+++ incubator/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java Tue Jan 23 14:41:41 2007
@@ -20,8 +20,8 @@
*/
package org.apache.qpid.ping;
-import uk.co.thebadgerset.junit.extensions.TimingControllerAware;
-import uk.co.thebadgerset.junit.extensions.TimingController;
+//import uk.co.thebadgerset.junit.extensions.TimingControllerAware;
+//import uk.co.thebadgerset.junit.extensions.TimingController;
import javax.jms.MessageListener;
import javax.jms.ObjectMessage;
@@ -35,15 +35,15 @@
import java.util.concurrent.CountDownLatch;
-public class PingAsyncTestPerf extends PingTestPerf implements TimingControllerAware
+public class PingAsyncTestPerf extends PingTestPerf //implements TimingControllerAware
{
private static Logger _logger = Logger.getLogger(PingAsyncTestPerf.class);
- private TimingController _timingController;
-
- private final CountDownLatch _completedLock = new CountDownLatch(1);
-
- private AsyncMessageListener _listener;
+// private TimingController _timingController;
+//
+// private final CountDownLatch _completedLock = new CountDownLatch(1);
+//
+// private AsyncMessageListener _listener;
private volatile boolean _done = false;
@@ -51,238 +51,238 @@
{
super(name);
}
-
- /**
- * Compile all the tests into a test suite.
- */
- public static Test suite()
- {
- // Build a new test suite
- TestSuite suite = new TestSuite("Ping Performance Tests");
-
- // Run performance tests in read committed mode.
- suite.addTest(new PingAsyncTestPerf("testAsyncPingOk"));
-
- return suite;
- }
-
- protected void setUp() throws Exception
- {
- // Create the test setups on a per thread basis, only if they have not already been created.
-
- if (threadSetup.get() == null)
- {
- PerThreadSetup perThreadSetup = new PerThreadSetup();
-
- // Extract the test set up paramaeters.
- String brokerDetails = testParameters.getProperty(BROKER_PROPNAME);
- String username = "guest";
- String password = "guest";
- String virtualpath = testParameters.getProperty(VIRTUAL_PATH_PROPNAME);
- int queueCount = Integer.parseInt(testParameters.getProperty(PING_QUEUE_COUNT_PROPNAME));
- String queueName = testParameters.getProperty(PING_QUEUE_NAME_PROPNAME);
- boolean persistent = Boolean.parseBoolean(testParameters.getProperty(PERSISTENT_MODE_PROPNAME));
- boolean transacted = Boolean.parseBoolean(testParameters.getProperty(TRANSACTED_PROPNAME));
- String selector = null;
- boolean verbose = Boolean.parseBoolean(testParameters.getProperty(VERBOSE_OUTPUT_PROPNAME));
- int messageSize = Integer.parseInt(testParameters.getProperty(MESSAGE_SIZE_PROPNAME));
-
- boolean afterCommit = Boolean.parseBoolean(testParameters.getProperty(FAIL_AFTER_COMMIT));
- boolean beforeCommit = Boolean.parseBoolean(testParameters.getProperty(FAIL_BEFORE_COMMIT));
- boolean afterSend = Boolean.parseBoolean(testParameters.getProperty(FAIL_AFTER_SEND));
- boolean beforeSend = Boolean.parseBoolean(testParameters.getProperty(FAIL_BEFORE_SEND));
- boolean failOnce = Boolean.parseBoolean(testParameters.getProperty(FAIL_ONCE));
-
- int batchSize = Integer.parseInt(testParameters.getProperty(BATCH_SIZE));
- int commitbatchSize = Integer.parseInt(testParameters.getProperty(COMMIT_BATCH_SIZE));
-
- int rate = Integer.parseInt(testParameters.getProperty(RATE_PROPNAME));
-
- // This is synchronized because there is a race condition, which causes one connection to sleep if
- // all threads try to create connection concurrently
- synchronized (this)
- {
- // Establish a client to ping a Queue and listen the reply back from same Queue
- perThreadSetup._pingItselfClient = new TestPingItself(brokerDetails, username, password, virtualpath,
- queueName, selector, transacted, persistent,
- messageSize, verbose,
- afterCommit, beforeCommit, afterSend, beforeSend, failOnce,
- commitbatchSize, queueCount, rate);
-
-
- _listener = new AsyncMessageListener(batchSize);
-
- perThreadSetup._pingItselfClient.setMessageListener(_listener);
- // Start the client connection
- perThreadSetup._pingItselfClient.getConnection().start();
-
- // Attach the per-thread set to the thread.
- threadSetup.set(perThreadSetup);
- }
- }
- }
-
-
- public void testAsyncPingOk(int numPings)
- {
- _timingController = this.getTimingController();
-
- _listener.setTotalMessages(numPings);
-
- PerThreadSetup perThreadSetup = threadSetup.get();
- if (numPings == 0)
- {
- _logger.error("Number of pings requested was zero.");
- }
-
- // Generate a sample message. This message is already time stamped and has its reply-to destination set.
- ObjectMessage msg = null;
-
- try
- {
- msg = perThreadSetup._pingItselfClient.getTestMessage(null,
- Integer.parseInt(testParameters.getProperty(
- MESSAGE_SIZE_PROPNAME)),
- Boolean.parseBoolean(testParameters.getProperty(
- PERSISTENT_MODE_PROPNAME)));
- }
- catch (JMSException e)
- {
-
- }
-
- // start the test
- long timeout = Long.parseLong(testParameters.getProperty(TIMEOUT_PROPNAME));
-
- try
- {
- perThreadSetup._pingItselfClient.pingNoWaitForReply(msg, numPings);
- }
- catch (JMSException e)
- {
- e.printStackTrace();
- Assert.fail("JMS Exception Recevied" + e);
- }
- catch (InterruptedException e)
- {
- e.printStackTrace();
- }
-
- while (!_done)
- {
- try
- {
- _logger.info("awating test finish");
-
- _completedLock.await();
- }
- catch (InterruptedException e)
- {
- //ignore
- }
- }
-
- // Fail the test if the timeout was exceeded.
- int numReplies = _listener.getReplyCount();
-
- _logger.info("Test Finished");
-
- if (numReplies != numPings)
-
- {
- Assert.fail("The ping timed out after " + timeout + " ms. Messages Sent = " + numPings + ", MessagesReceived = " + numReplies);
- try
- {
- _timingController.completeTest(false);
- }
- catch (InterruptedException e)
- {
- //ignore
- }
- }
- }
-
-
- public void setTimingController(TimingController timingController)
- {
- _timingController = timingController;
- }
-
- public TimingController getTimingController()
- {
- return _timingController;
- }
-
-
- private class AsyncMessageListener implements MessageListener
- {
- private int _messageRecevied;
- private int _totalMessages;
- private int _batchSize;
-
- public AsyncMessageListener(int batchSize, int totalMessages)
- {
- _batchSize = batchSize;
- _totalMessages = totalMessages;
- _messageRecevied = 0;
- }
-
- public AsyncMessageListener(int batchSize)
- {
- _batchSize = batchSize;
- _totalMessages = -1;
- _messageRecevied = 0;
- }
-
- public void setTotalMessages(int newTotal)
- {
- _totalMessages = newTotal;
- }
-
- public void onMessage(Message message)
- {
- _logger.info("Message Recevied");
- try
- {
- _messageRecevied++;
- if (_messageRecevied == _batchSize)
- {
- if (_timingController != null)
- {
- _timingController.completeTest(true);
- }
- }
- }
- catch (InterruptedException e)
- {
- doDone();
- }
-
- if (_totalMessages == -1 || _messageRecevied == _totalMessages)
- {
- _logger.info("Test Completed.. signalling");
- doDone();
- }
- }
-
- private void doDone()
- {
- _done = true;
- _completedLock.countDown();
- try
- {
- _timingController.completeTest(true);
- }
- catch (InterruptedException e)
- {
- //ignore
- }
- }
-
- public int getReplyCount()
- {
- return _messageRecevied;
- }
- }
+//
+// /**
+// * Compile all the tests into a test suite.
+// */
+// public static Test suite()
+// {
+// // Build a new test suite
+// TestSuite suite = new TestSuite("Ping Performance Tests");
+//
+// // Run performance tests in read committed mode.
+// suite.addTest(new PingAsyncTestPerf("testAsyncPingOk"));
+//
+// return suite;
+// }
+//
+// protected void setUp() throws Exception
+// {
+// // Create the test setups on a per thread basis, only if they have not already been created.
+//
+// if (threadSetup.get() == null)
+// {
+// PerThreadSetup perThreadSetup = new PerThreadSetup();
+//
+// // Extract the test set up paramaeters.
+// String brokerDetails = testParameters.getProperty(BROKER_PROPNAME);
+// String username = "guest";
+// String password = "guest";
+// String virtualpath = testParameters.getProperty(VIRTUAL_PATH_PROPNAME);
+// int queueCount = Integer.parseInt(testParameters.getProperty(PING_QUEUE_COUNT_PROPNAME));
+// String queueName = testParameters.getProperty(PING_QUEUE_NAME_PROPNAME);
+// boolean persistent = Boolean.parseBoolean(testParameters.getProperty(PERSISTENT_MODE_PROPNAME));
+// boolean transacted = Boolean.parseBoolean(testParameters.getProperty(TRANSACTED_PROPNAME));
+// String selector = null;
+// boolean verbose = Boolean.parseBoolean(testParameters.getProperty(VERBOSE_OUTPUT_PROPNAME));
+// int messageSize = Integer.parseInt(testParameters.getProperty(MESSAGE_SIZE_PROPNAME));
+//
+// boolean afterCommit = Boolean.parseBoolean(testParameters.getProperty(FAIL_AFTER_COMMIT));
+// boolean beforeCommit = Boolean.parseBoolean(testParameters.getProperty(FAIL_BEFORE_COMMIT));
+// boolean afterSend = Boolean.parseBoolean(testParameters.getProperty(FAIL_AFTER_SEND));
+// boolean beforeSend = Boolean.parseBoolean(testParameters.getProperty(FAIL_BEFORE_SEND));
+// boolean failOnce = Boolean.parseBoolean(testParameters.getProperty(FAIL_ONCE));
+//
+// int batchSize = Integer.parseInt(testParameters.getProperty(BATCH_SIZE));
+// int commitbatchSize = Integer.parseInt(testParameters.getProperty(COMMIT_BATCH_SIZE));
+//
+// int rate = Integer.parseInt(testParameters.getProperty(RATE_PROPNAME));
+//
+// // This is synchronized because there is a race condition, which causes one connection to sleep if
+// // all threads try to create connection concurrently
+// synchronized (this)
+// {
+// // Establish a client to ping a Queue and listen the reply back from same Queue
+// perThreadSetup._pingItselfClient = new TestPingItself(brokerDetails, username, password, virtualpath,
+// queueName, selector, transacted, persistent,
+// messageSize, verbose,
+// afterCommit, beforeCommit, afterSend, beforeSend, failOnce,
+// commitbatchSize, queueCount, rate);
+//
+//
+// _listener = new AsyncMessageListener(batchSize);
+//
+// perThreadSetup._pingItselfClient.setMessageListener(_listener);
+// // Start the client connection
+// perThreadSetup._pingItselfClient.getConnection().start();
+//
+// // Attach the per-thread set to the thread.
+// threadSetup.set(perThreadSetup);
+// }
+// }
+// }
+//
+//
+// public void testAsyncPingOk(int numPings)
+// {
+// _timingController = this.getTimingController();
+//
+// _listener.setTotalMessages(numPings);
+//
+// PerThreadSetup perThreadSetup = threadSetup.get();
+// if (numPings == 0)
+// {
+// _logger.error("Number of pings requested was zero.");
+// }
+//
+// // Generate a sample message. This message is already time stamped and has its reply-to destination set.
+// ObjectMessage msg = null;
+//
+// try
+// {
+// msg = perThreadSetup._pingItselfClient.getTestMessage(null,
+// Integer.parseInt(testParameters.getProperty(
+// MESSAGE_SIZE_PROPNAME)),
+// Boolean.parseBoolean(testParameters.getProperty(
+// PERSISTENT_MODE_PROPNAME)));
+// }
+// catch (JMSException e)
+// {
+//
+// }
+//
+// // start the test
+// long timeout = Long.parseLong(testParameters.getProperty(TIMEOUT_PROPNAME));
+//
+// try
+// {
+// perThreadSetup._pingItselfClient.pingNoWaitForReply(msg, numPings);
+// }
+// catch (JMSException e)
+// {
+// e.printStackTrace();
+// Assert.fail("JMS Exception Recevied" + e);
+// }
+// catch (InterruptedException e)
+// {
+// e.printStackTrace();
+// }
+//
+// while (!_done)
+// {
+// try
+// {
+// _logger.info("awating test finish");
+//
+// _completedLock.await();
+// }
+// catch (InterruptedException e)
+// {
+// //ignore
+// }
+// }
+//
+// // Fail the test if the timeout was exceeded.
+// int numReplies = _listener.getReplyCount();
+//
+// _logger.info("Test Finished");
+//
+// if (numReplies != numPings)
+//
+// {
+// Assert.fail("The ping timed out after " + timeout + " ms. Messages Sent = " + numPings + ", MessagesReceived = " + numReplies);
+// try
+// {
+// _timingController.completeTest(false);
+// }
+// catch (InterruptedException e)
+// {
+// //ignore
+// }
+// }
+// }
+//
+//
+// public void setTimingController(TimingController timingController)
+// {
+// _timingController = timingController;
+// }
+//
+// public TimingController getTimingController()
+// {
+// return _timingController;
+// }
+//
+//
+// private class AsyncMessageListener implements MessageListener
+// {
+// private int _messageRecevied;
+// private int _totalMessages;
+// private int _batchSize;
+//
+// public AsyncMessageListener(int batchSize, int totalMessages)
+// {
+// _batchSize = batchSize;
+// _totalMessages = totalMessages;
+// _messageRecevied = 0;
+// }
+//
+// public AsyncMessageListener(int batchSize)
+// {
+// _batchSize = batchSize;
+// _totalMessages = -1;
+// _messageRecevied = 0;
+// }
+//
+// public void setTotalMessages(int newTotal)
+// {
+// _totalMessages = newTotal;
+// }
+//
+// public void onMessage(Message message)
+// {
+// _logger.info("Message Recevied");
+// try
+// {
+// _messageRecevied++;
+// if (_messageRecevied == _batchSize)
+// {
+// if (_timingController != null)
+// {
+// _timingController.completeTest(true);
+// }
+// }
+// }
+// catch (InterruptedException e)
+// {
+// doDone();
+// }
+//
+// if (_totalMessages == -1 || _messageRecevied == _totalMessages)
+// {
+// _logger.info("Test Completed.. signalling");
+// doDone();
+// }
+// }
+//
+// private void doDone()
+// {
+// _done = true;
+// _completedLock.countDown();
+// try
+// {
+// _timingController.completeTest(true);
+// }
+// catch (InterruptedException e)
+// {
+// //ignore
+// }
+// }
+//
+// public int getReplyCount()
+// {
+// return _messageRecevied;
+// }
+// }
}