You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ra...@apache.org on 2008/04/23 18:18:15 UTC
svn commit: r650930 - in
/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf:
SimpleDurableTopicNetworkTest.java SimpleDurableTopicTest.java
SimpleNetworkTest.java SimpleTopicTest.java
Author: rajdavies
Date: Wed Apr 23 09:18:06 2008
New Revision: 650930
URL: http://svn.apache.org/viewvc?rev=650930&view=rev
Log:
updated some defaults
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleDurableTopicNetworkTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleDurableTopicTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleNetworkTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleTopicTest.java
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleDurableTopicNetworkTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleDurableTopicNetworkTest.java?rev=650930&r1=650929&r2=650930&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleDurableTopicNetworkTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleDurableTopicNetworkTest.java Wed Apr 23 09:18:06 2008
@@ -21,15 +21,12 @@
import javax.jms.Destination;
import javax.jms.JMSException;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.network.NetworkConnector;
-
public class SimpleDurableTopicNetworkTest extends SimpleNetworkTest {
protected void setUp() throws Exception {
- numberofProducers=60;
- numberOfConsumers=60;
+ numberofProducers=1;
+ numberOfConsumers=1;
samepleCount=1000;
playloadSize = 1024;
super.setUp();
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleDurableTopicTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleDurableTopicTest.java?rev=650930&r1=650929&r2=650930&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleDurableTopicTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleDurableTopicTest.java Wed Apr 23 09:18:06 2008
@@ -27,8 +27,8 @@
public class SimpleDurableTopicTest extends SimpleTopicTest {
protected void setUp() throws Exception {
- numberOfDestinations=6;
- numberOfConsumers = 1;
+ numberOfDestinations=1;
+ numberOfConsumers = 4;
numberofProducers = 1;
samepleCount=1000;
playloadSize = 1024;
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleNetworkTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleNetworkTest.java?rev=650930&r1=650929&r2=650930&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleNetworkTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleNetworkTest.java Wed Apr 23 09:18:06 2008
@@ -32,7 +32,7 @@
private static final Log LOG = LogFactory.getLog(SimpleNetworkTest.class);
//protected String consumerBindAddress = "tcp://rexmac.home:61616?wireFormat.maxInactivityDuration=1000,tcp://localhost:61617?wireFormat.maxInactivityDuration=1000";
- protected String consumerBindAddress = "tcp://rexmac.home:61616?wireFormat.maxInactivityDuration=1000&wireFormat.maxInactivityDurationInitalDelay=2000&socket.tcpNoDelayEnabled=false";
+ protected String consumerBindAddress = "tcp://localhost:61616";
protected String producerBindAddress = "tcp://localhost:61617";
protected static final String CONSUMER_BROKER_NAME = "Consumer";
protected static final String PRODUCER_BROKER_NAME = "Producer";
@@ -44,7 +44,7 @@
protected void setUp() throws Exception {
if (consumerBroker == null) {
- // consumerBroker = createConsumerBroker(consumerBindAddress);
+ consumerBroker = createConsumerBroker(consumerBindAddress);
}
if (producerBroker == null) {
producerBroker = createProducerBroker(producerBindAddress);
@@ -69,7 +69,7 @@
Destination destination = createDestination(session, destinationName+":"+k);
LOG.info("Testing against destination: " + destination);
for (int i = 0; i < numberOfConsumers; i++) {
- consumers[consumerCount] = createConsumer(factory, destination, consumerCount);
+ consumers[consumerCount] = createConsumer(consumerFactory, destination, consumerCount);
consumers[consumerCount].setSleepDuration(consumerSleepDuration);
consumerCount++;
}
@@ -78,7 +78,7 @@
for (int j = i; j < array.length; j++) {
array[j] = (byte)j;
}
- producers[producerCount] = createProducer(factory, destination, i, array);
+ producers[producerCount] = createProducer(producerFactory, destination, i, array);
producerCount++;
}
}
@@ -133,10 +133,10 @@
//answer.setSplitSystemUsageForProducersConsumers(true);
answer.setPersistent(false);
answer.setDeleteAllMessagesOnStartup(true);
- NetworkConnector connector = answer.addNetworkConnector("static://tcp://rexmac.home:61616?wireFormat.maxInactivityDuration=2000");
+ NetworkConnector connector = answer.addNetworkConnector("static://"+consumerBindAddress);
//connector.setNetworkTTL(3);
//connector.setDynamicOnly(true);
- //connector.setDuplex(true);
+ connector.setDuplex(true);
answer.addConnector(uri);
answer.setUseShutdownHook(false);
}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleTopicTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleTopicTest.java?rev=650930&r1=650929&r2=650930&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleTopicTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleTopicTest.java Wed Apr 23 09:18:06 2008
@@ -47,8 +47,8 @@
protected int samepleCount = 20;
protected long sampleInternal = 10000;
protected int numberOfDestinations=1;
- protected int numberOfConsumers = 10;
- protected int numberofProducers = 10;
+ protected int numberOfConsumers = 1;
+ protected int numberofProducers = 1;
protected int totalNumberOfProducers;
protected int totalNumberOfConsumers;
protected int playloadSize = 1024;