activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r516031 - in /activemq/trunk/activemq-core: pom.xml src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java src/test/java/org/apache/activemq/broker/QueueSubscriptionTest.java
Date Thu, 08 Mar 2007 13:11:13 GMT
Author: jstrachan
Date: Thu Mar  8 05:11:12 2007
New Revision: 516031

URL: http://svn.apache.org/viewvc?view=rev&rev=516031
Log:
re-enabled some tests and tinkered to make a frew work better

Modified:
    activemq/trunk/activemq-core/pom.xml
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/QueueSubscriptionTest.java

Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?view=diff&rev=516031&r1=516030&r2=516031
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Thu Mar  8 05:11:12 2007
@@ -214,11 +214,11 @@
             <exclude>**/MultipleTestsWithSpringXBeanFactoryBeanTest.*</exclude>
 
             <!--  these seem to fail only in m2 -->
-            <exclude>**/TransactedTopicMasterSlaveTest.*</exclude>
+            <!--<exclude>**/TransactedTopicMasterSlaveTest.*</exclude>-->
 
             <!-- Kaha in flux - removing tests -->
-            <exclude>**/KahaXARecoveryBrokerTest.*</exclude>
-            <exclude>**/KahaRecoveryBrokerTest.*</exclude>
+            <!--<exclude>**/KahaXARecoveryBrokerTest.*</exclude>-->
+            <!--<exclude>**/KahaRecoveryBrokerTest.*</exclude>-->
 
             <!-- Multicast and UDP based tests fail on GBuild -->
             <exclude>**/PeerTransportTest.*</exclude>
@@ -238,10 +238,6 @@
             <exclude>**/UdpSendReceiveWithTwoConnectionsTest.*</exclude>
             <exclude>**/UdpSendReceiveWithTwoConnectionsAndLargeMessagesTest.*</exclude>
 
-            <!-- http://issues.apache.org/activemq/browse/AMQ-724  -->
-            <exclude>**/StompSubscriptionRemoveTest.*</exclude>
-
-
             <!-- m2 tests failing since move from assembly  -->
             <exclude>**/TwoBrokerMessageNotSentToRemoteWhenNoConsumerTest.*</exclude>
             <exclude>**/TwoBrokerQueueClientsReconnectTest.*</exclude>
@@ -257,20 +253,18 @@
 
             <!-- This test only works on machines which have ssh propertly configured
-->
             <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 -->
             <!--  have not yet figured out the way to configure ApacheDS via Spring  -->
             <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 -->
             <exclude>**/FailoverConsumerTest.*</exclude>
 
             <!-- The NIO implemenation is not working properly on OS X.. -->
             <exclude>**/nio/**</exclude>
-
           </excludes>
         </configuration>
       </plugin>

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java?view=diff&rev=516031&r1=516030&r2=516031
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java
Thu Mar  8 05:11:12 2007
@@ -185,11 +185,12 @@
     }
 
     protected ActiveMQDestination createDestination() throws JMSException {
+        String name =  "." + getClass().getName() + "." + getName();
         if (topic) {
-            destination = new ActiveMQTopic("Topic");
+            destination = new ActiveMQTopic("Topic" + name);
             return (ActiveMQDestination)destination;
         } else {
-            destination = new ActiveMQQueue("Queue");
+            destination = new ActiveMQQueue("Queue" + name);
             return (ActiveMQDestination)destination;
         }
     }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/QueueSubscriptionTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/QueueSubscriptionTest.java?view=diff&rev=516031&r1=516030&r2=516031
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/QueueSubscriptionTest.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/QueueSubscriptionTest.java
Thu Mar  8 05:11:12 2007
@@ -47,12 +47,9 @@
         consumerCount = 2;
         producerCount = 1;
         messageCount  = 1000;
-        prefetchCount = 1;
         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();
 
         assertTotalMessagesReceived(messageCount * producerCount);
@@ -74,8 +71,8 @@
         consumerCount = 2;
         producerCount = 1;
         messageCount  = 10;
-        prefetchCount = 1;
         messageSize   = 1024 * 1024 * 1; // 2 MB
+        configurePrefetchOfOne();
 
         doMultipleClientsTest();
 
@@ -128,6 +125,13 @@
         doMultipleClientsTest();
 
         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 {



Mime
View raw message