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

https://issues.apache.org/jira/browse/AMQ-3695 - fix up two related/inherited tests 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1240979 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2012-02-06 11:22:04 +00:00
parent 24c4257998
commit c35550f165
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java
View File

@ -115,7 +115,7 @@ public class QueueMasterSlaveTest extends JmsTopicSendReceiveWithTwoConnectionsT
public void testVirtualTopicFailover() throws Exception { public void testVirtualTopicFailover() throws Exception {
MessageConsumer qConsumer = createConsumer(session, new ActiveMQQueue("Consumer.A.VirtualTopic.TA1")); MessageConsumer qConsumer = session.createConsumer(new ActiveMQQueue("Consumer.A.VirtualTopic.TA1"));
assertNull("No message there yet", qConsumer.receive(1000)); assertNull("No message there yet", qConsumer.receive(1000));
qConsumer.close(); qConsumer.close();
master.stop(); master.stop();
@ -124,7 +124,7 @@ public class QueueMasterSlaveTest extends JmsTopicSendReceiveWithTwoConnectionsT
final String text = "ForUWhenSlaveKicksIn"; final String text = "ForUWhenSlaveKicksIn";
producer.send(new ActiveMQTopic("VirtualTopic.TA1"), session.createTextMessage(text)); producer.send(new ActiveMQTopic("VirtualTopic.TA1"), session.createTextMessage(text));
qConsumer = createConsumer(session, new ActiveMQQueue("Consumer.A.VirtualTopic.TA1")); qConsumer = session.createConsumer(new ActiveMQQueue("Consumer.A.VirtualTopic.TA1"));
javax.jms.Message message = qConsumer.receive(4000); javax.jms.Message message = qConsumer.receive(4000);
assertNotNull("Get message after failover", message); assertNotNull("Get message after failover", message);
assertEquals("correct message", text, ((TextMessage)message).getText()); assertEquals("correct message", text, ((TextMessage)message).getText());

2
activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileSlave.xml
View File

@ -24,7 +24,7 @@
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<broker brokerName="shared" useJmx="false" deleteAllMessagesOnStartup="true" xmlns="http://activemq.apache.org/schema/core"> <broker brokerName="shared" useJmx="false" deleteAllMessagesOnStartup="false" xmlns="http://activemq.apache.org/schema/core">
<transportConnectors> <transportConnectors>
<transportConnector uri="tcp://localhost:62002"/> <transportConnector uri="tcp://localhost:62002"/>
</transportConnectors> </transportConnectors>