Author: aco
Date: Sat May 13 14:01:17 2006
New Revision: 406150
URL: http://svn.apache.org/viewcvs?rev=406150&view=rev
Log:
- Made the consumers in some of the test cases retroactive to enable it to
receive messages that was sent before its registration can be processed.
- Enabled SslTransportBrokerTest
Modified:
incubator/activemq/trunk/activemq-core/project.xml
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportBrokerTest.java
Modified: incubator/activemq/trunk/activemq-core/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/project.xml?rev=406150&r1=406149&r2=406150&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/project.xml (original)
+++ incubator/activemq/trunk/activemq-core/project.xml Sat May 13 14:01:17 2006
@@ -370,7 +370,7 @@
<exclude>**/MultipleTestsWithSpringXBeanFactoryBeanTest.*</exclude>
<!-- https://issues.apache.org/activemq/browse/AMQ-667 -->
- <exclude>**/SslTransportBrokerTest.*</exclude>
+ <!--exclude>**/SslTransportBrokerTest.*</exclude-->
<!-- TODO FIX ME ASAP -->
Modified:
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java?rev=406150&r1=406149&r2=406150&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java
Sat May 13 14:01:17 2006
@@ -68,7 +68,7 @@
destination = createDestinationInfo(connection, connectionInfo,
destinationType);
- ConsumerInfo consumerInfo = createConsumerInfo(sessionInfo,
destination);
+ ConsumerInfo consumerInfo = createConsumerInfo(sessionInfo,
destination);
consumerInfo.setPrefetchSize(1);
connection.send(consumerInfo);
@@ -786,6 +786,7 @@
// setup the composite consumer.
ActiveMQDestination compositeDestination =
ActiveMQDestination.createDestination("A,B", destinationType);
ConsumerInfo consumerInfo1 = createConsumerInfo(sessionInfo1,
compositeDestination);
+ consumerInfo1.setRetroactive(true);
consumerInfo1.setPrefetchSize(100);
connection1.send(consumerInfo1);
@@ -829,6 +830,7 @@
ActiveMQDestination destinationA =
ActiveMQDestination.createDestination("A", destinationType);
ConsumerInfo consumerInfo1 = createConsumerInfo(sessionInfo1,
destinationA);
+ consumerInfo1.setRetroactive(true);
consumerInfo1.setPrefetchSize(100);
connection1.send(consumerInfo1);
@@ -841,6 +843,7 @@
ActiveMQDestination destinationB =
ActiveMQDestination.createDestination("B", destinationType);
ConsumerInfo consumerInfo2 = createConsumerInfo(sessionInfo2,
destinationB);
+ consumerInfo2.setRetroactive(true);
consumerInfo2.setPrefetchSize(100);
connection2.send(consumerInfo2);
@@ -1055,6 +1058,7 @@
connection1.send(producerInfo1);
ConsumerInfo consumerInfo1 = createConsumerInfo(sessionInfo1,
destination);
+ consumerInfo1.setRetroactive(true);
consumerInfo1.setPrefetchSize(100);
consumerInfo1.setNoLocal(true);
connection1.send(consumerInfo1);
@@ -1069,6 +1073,7 @@
connection2.send(producerInfo2);
ConsumerInfo consumerInfo2 = createConsumerInfo(sessionInfo2,
destination);
+ consumerInfo2.setRetroactive(true);
consumerInfo2.setPrefetchSize(100);
consumerInfo2.setNoLocal(true);
connection2.send(consumerInfo2);
@@ -1100,7 +1105,7 @@
}
- public void setUpTopicDispatchIsBroadcast() {
+ public void initCombosForTopicDispatchIsBroadcast() {
addCombinationValues( "deliveryMode", new Object[]{
new Integer(DeliveryMode.NON_PERSISTENT),
new Integer(DeliveryMode.PERSISTENT)} );
@@ -1120,6 +1125,7 @@
connection1.send(producerInfo1);
ConsumerInfo consumerInfo1 = createConsumerInfo(sessionInfo1,
destination);
+ consumerInfo1.setRetroactive(true);
consumerInfo1.setPrefetchSize(100);
connection1.send(consumerInfo1);
@@ -1128,6 +1134,7 @@
ConnectionInfo connectionInfo2 = createConnectionInfo();
SessionInfo sessionInfo2 = createSessionInfo(connectionInfo2);
ConsumerInfo consumerInfo2 = createConsumerInfo(sessionInfo2,
destination);
+ consumerInfo2.setRetroactive(true);
consumerInfo2.setPrefetchSize(100);
connection2.send(connectionInfo2);
connection2.send(sessionInfo2);
@@ -1535,7 +1542,7 @@
destination = createDestinationInfo(connection, connectionInfo,
destinationType);
- ConsumerInfo consumerInfo = createConsumerInfo(sessionInfo,
destination);
+ ConsumerInfo consumerInfo = createConsumerInfo(sessionInfo,
destination);
consumerInfo.setPrefetchSize(1);
connection.send(consumerInfo);
@@ -1574,7 +1581,7 @@
destination = createDestinationInfo(connection, connectionInfo,
destinationType);
- ConsumerInfo consumerInfo = createConsumerInfo(sessionInfo,
destination);
+ ConsumerInfo consumerInfo = createConsumerInfo(sessionInfo,
destination);
consumerInfo.setPrefetchSize(2);
connection.send(consumerInfo);
@@ -1616,7 +1623,7 @@
destination = createDestinationInfo(connection, connectionInfo,
destinationType);
- ConsumerInfo consumerInfo = createConsumerInfo(sessionInfo,
destination);
+ ConsumerInfo consumerInfo = createConsumerInfo(sessionInfo,
destination);
consumerInfo.setPrefetchSize(1);
connection.send(consumerInfo);
Modified:
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportBrokerTest.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportBrokerTest.java?rev=406150&r1=406149&r2=406150&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportBrokerTest.java
(original)
+++
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportBrokerTest.java
Sat May 13 14:01:17 2006
@@ -36,7 +36,7 @@
System.setProperty("javax.net.ssl.keyStoreType", "jks");
//System.setProperty("javax.net.debug",
"ssl,handshake,data,trustmanager");
- MAX_WAIT = 2000;
+ MAX_WAIT = 10000;
super.setUp();
}
