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

- 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

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@406150 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Adrian T. Co 2006-05-13 21:01:17 +00:00
parent a522d3abf7
commit e5bbcb532b
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-core/project.xml
View File

@ -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 -->

9
activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java
View File

@ -786,6 +786,7 @@ public class BrokerTest extends BrokerTestSupport {
// 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 @@ public class BrokerTest extends BrokerTestSupport {
ActiveMQDestination destinationA = ActiveMQDestination.createDestination("A", destinationType);
ConsumerInfo consumerInfo1 = createConsumerInfo(sessionInfo1, destinationA);
consumerInfo1.setRetroactive(true);
consumerInfo1.setPrefetchSize(100);
connection1.send(consumerInfo1);
@ -841,6 +843,7 @@ public class BrokerTest extends BrokerTestSupport {
ActiveMQDestination destinationB = ActiveMQDestination.createDestination("B", destinationType);
ConsumerInfo consumerInfo2 = createConsumerInfo(sessionInfo2, destinationB);
consumerInfo2.setRetroactive(true);
consumerInfo2.setPrefetchSize(100);
connection2.send(consumerInfo2);
@ -1055,6 +1058,7 @@ public class BrokerTest extends BrokerTestSupport {
connection1.send(producerInfo1);
ConsumerInfo consumerInfo1 = createConsumerInfo(sessionInfo1, destination);
consumerInfo1.setRetroactive(true);
consumerInfo1.setPrefetchSize(100);
consumerInfo1.setNoLocal(true);
connection1.send(consumerInfo1);
@ -1069,6 +1073,7 @@ public class BrokerTest extends BrokerTestSupport {
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 class BrokerTest extends BrokerTestSupport {
}
public void setUpTopicDispatchIsBroadcast() {
public void initCombosForTopicDispatchIsBroadcast() {
addCombinationValues( "deliveryMode", new Object[]{
new Integer(DeliveryMode.NON_PERSISTENT),
new Integer(DeliveryMode.PERSISTENT)} );
@ -1120,6 +1125,7 @@ public class BrokerTest extends BrokerTestSupport {
connection1.send(producerInfo1);
ConsumerInfo consumerInfo1 = createConsumerInfo(sessionInfo1, destination);
consumerInfo1.setRetroactive(true);
consumerInfo1.setPrefetchSize(100);
connection1.send(consumerInfo1);
@ -1128,6 +1134,7 @@ public class BrokerTest extends BrokerTestSupport {
ConnectionInfo connectionInfo2 = createConnectionInfo();
SessionInfo sessionInfo2 = createSessionInfo(connectionInfo2);
ConsumerInfo consumerInfo2 = createConsumerInfo(sessionInfo2, destination);
consumerInfo2.setRetroactive(true);
consumerInfo2.setPrefetchSize(100);
connection2.send(connectionInfo2);
connection2.send(sessionInfo2);

2
activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportBrokerTest.java
View File

@ -36,7 +36,7 @@ public class SslTransportBrokerTest extends TransportBrokerTestSupport {
System.setProperty("javax.net.ssl.keyStoreType", "jks");
//System.setProperty("javax.net.debug", "ssl,handshake,data,trustmanager");
MAX_WAIT = 2000;
MAX_WAIT = 10000;
super.setUp();
}