Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re-enabled some tests and tinkered to make a frew work better 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@516031 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Strachan 2007-03-08 13:11:12 +00:00
parent 222dd260e6
commit 544ffe9dce
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
activemq-core/pom.xml
View File

@ -214,11 +214,11 @@
<exclude>**/MultipleTestsWithSpringXBeanFactoryBeanTest.*</exclude> <exclude>**/MultipleTestsWithSpringXBeanFactoryBeanTest.*</exclude>
<!-- these seem to fail only in m2 --> <!-- these seem to fail only in m2 -->
<exclude>**/TransactedTopicMasterSlaveTest.*</exclude> <!--<exclude>**/TransactedTopicMasterSlaveTest.*</exclude>-->
<!-- Kaha in flux - removing tests --> <!-- Kaha in flux - removing tests -->
<exclude>**/KahaXARecoveryBrokerTest.*</exclude> <!--<exclude>**/KahaXARecoveryBrokerTest.*</exclude>-->
<exclude>**/KahaRecoveryBrokerTest.*</exclude> <!--<exclude>**/KahaRecoveryBrokerTest.*</exclude>-->
<!-- Multicast and UDP based tests fail on GBuild --> <!-- Multicast and UDP based tests fail on GBuild -->
<exclude>**/PeerTransportTest.*</exclude> <exclude>**/PeerTransportTest.*</exclude>
@ -238,10 +238,6 @@
<exclude>**/UdpSendReceiveWithTwoConnectionsTest.*</exclude> <exclude>**/UdpSendReceiveWithTwoConnectionsTest.*</exclude>
<exclude>**/UdpSendReceiveWithTwoConnectionsAndLargeMessagesTest.*</exclude> <exclude>**/UdpSendReceiveWithTwoConnectionsAndLargeMessagesTest.*</exclude>
<!-- http://issues.apache.org/activemq/browse/AMQ-724 -->
<exclude>**/StompSubscriptionRemoveTest.*</exclude>
<!-- m2 tests failing since move from assembly --> <!-- m2 tests failing since move from assembly -->
<exclude>**/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.*</exclude> <exclude>**/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.*</exclude>
<exclude>**/TwoBrokerQueueClientsReconnectTest.*</exclude> <exclude>**/TwoBrokerQueueClientsReconnectTest.*</exclude>
@ -257,20 +253,18 @@
<!-- This test only works on machines which have ssh propertly configured --> <!-- This test only works on machines which have ssh propertly configured -->
<exclude>**/SSHTunnelNetworkReconnectTest.*</exclude> <exclude>**/SSHTunnelNetworkReconnectTest.*</exclude>
<!-- TODO need to get the JUnit test configured to create SSL sockets nicely via system properties -->
<exclude>**/StompSslTest.*</exclude>
<!-- see http://issues.apache.org/activemq/browse/AMQ-826 --> <!-- see http://issues.apache.org/activemq/browse/AMQ-826 -->
<!-- have not yet figured out the way to configure ApacheDS via Spring --> <!-- have not yet figured out the way to configure ApacheDS via Spring -->
<exclude>**/LDAPAuthorizationMapTest.*</exclude> <exclude>**/LDAPAuthorizationMapTest.*</exclude>
<!-- TODO need to get the JUnit test configured to create SSL sockets nicely via system properties -->
<exclude>**/StompSslTest.*</exclude>
<!-- http://issues.apache.org/activemq/browse/AMQ-1027 --> <!-- http://issues.apache.org/activemq/browse/AMQ-1027 -->
<exclude>**/FailoverConsumerTest.*</exclude> <exclude>**/FailoverConsumerTest.*</exclude>
<!-- The NIO implemenation is not working properly on OS X.. --> <!-- The NIO implemenation is not working properly on OS X.. -->
<exclude>**/nio/**</exclude> <exclude>**/nio/**</exclude>
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>

5
activemq-core/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java
View File

@ -185,11 +185,12 @@ public class JmsMultipleClientsTestSupport extends CombinationTestSupport {
} }
protected ActiveMQDestination createDestination() throws JMSException { protected ActiveMQDestination createDestination() throws JMSException {
String name = "." + getClass().getName() + "." + getName();
if (topic) { if (topic) {
destination = new ActiveMQTopic("Topic"); destination = new ActiveMQTopic("Topic" + name);
return (ActiveMQDestination)destination; return (ActiveMQDestination)destination;
} else { } else {
destination = new ActiveMQQueue("Queue"); destination = new ActiveMQQueue("Queue" + name);
return (ActiveMQDestination)destination; return (ActiveMQDestination)destination;
} }
} }

14
activemq-core/src/test/java/org/apache/activemq/broker/QueueSubscriptionTest.java
View File

@ -47,12 +47,9 @@ public class QueueSubscriptionTest extends JmsMultipleClientsTestSupport {
consumerCount = 2; consumerCount = 2;
producerCount = 1; producerCount = 1;
messageCount = 1000; messageCount = 1000;
prefetchCount = 1;
messageSize = 1024; // 1 Kb messageSize = 1024; // 1 Kb
configurePrefetchOfOne();
// this is gonna be a bit slow what with the low prefetch so bump up the wait time
allMessagesList.setMaximumDuration(allMessagesList.getMaximumDuration() * 20);
doMultipleClientsTest(); doMultipleClientsTest();
assertTotalMessagesReceived(messageCount * producerCount); assertTotalMessagesReceived(messageCount * producerCount);
@ -74,8 +71,8 @@ public class QueueSubscriptionTest extends JmsMultipleClientsTestSupport {
consumerCount = 2; consumerCount = 2;
producerCount = 1; producerCount = 1;
messageCount = 10; messageCount = 10;
prefetchCount = 1;
messageSize = 1024 * 1024 * 1; // 2 MB messageSize = 1024 * 1024 * 1; // 2 MB
configurePrefetchOfOne();
doMultipleClientsTest(); doMultipleClientsTest();
@ -130,6 +127,13 @@ public class QueueSubscriptionTest extends JmsMultipleClientsTestSupport {
assertTotalMessagesReceived(messageCount * producerCount); assertTotalMessagesReceived(messageCount * producerCount);
} }
protected void configurePrefetchOfOne() {
prefetchCount = 1;
// this is gonna be a bit slow what with the low prefetch so bump up the wait time
allMessagesList.setMaximumDuration(allMessagesList.getMaximumDuration() * 20);
}
public void doMultipleClientsTest() throws Exception { public void doMultipleClientsTest() throws Exception {
// Create destination // Create destination
final ActiveMQDestination dest = createDestination(); final ActiveMQDestination dest = createDestination();