Author: gtully
Date: Mon Feb  6 11:22:04 2012
New Revision: 1240979

URL: http://svn.apache.org/viewvc?rev=1240979&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3695 - fix up two related/inherited tests

Modified:
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java
    activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileSlave.xml

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java?rev=1240979&r1=1240978&r2=1240979&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java Mon Feb  6 11:22:04 2012
@@ -115,7 +115,7 @@ public class QueueMasterSlaveTest extend
 
     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));
         qConsumer.close();
         master.stop();
@@ -124,7 +124,7 @@ public class QueueMasterSlaveTest extend
         final String text = "ForUWhenSlaveKicksIn";
         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);
         assertNotNull("Get message after failover", message);
         assertEquals("correct message", text, ((TextMessage)message).getText());

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileSlave.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileSlave.xml?rev=1240979&r1=1240978&r2=1240979&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileSlave.xml (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/sharedFileSlave.xml Mon Feb  6 11:22:04 2012
@@ -24,7 +24,7 @@
 
   <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>
       <transportConnector uri="tcp://localhost:62002"/>
     </transportConnectors>