QPID-1923: Fix ack mode for TopicSessionTest, reset system property the right way in FailoverBaseCase

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@787738 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 2 insertions, 5 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
index 9f4c9e53aa..95b90481c7 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
@@ -174,7 +174,7 @@ public class TopicSessionTest extends QpidTestCase
 
         AMQConnection con = (AMQConnection) getConnection("guest", "guest");
         AMQTopic topic = new AMQTopic(con, "MyTopic4");
-        TopicSession session1 = con.createTopicSession(false, AMQSession.NO_ACKNOWLEDGE);
+        TopicSession session1 = con.createTopicSession(false, AMQSession.AUTO_ACKNOWLEDGE);
         TopicPublisher publisher = session1.createPublisher(topic);
         MessageConsumer consumer1 = session1.createConsumer(topic);
         con.start();
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java b/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
index de0fdac2d0..3acfb4a3b7 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
@@ -33,7 +33,6 @@ public class FailoverBaseCase extends QpidTestCase
     protected int failingPort;
     
     private boolean failedOver = false;
-    private String _oldWork;
 
     public FailoverBaseCase()
     {
@@ -57,8 +56,7 @@ public class FailoverBaseCase extends QpidTestCase
         super.setUp();
         cleanBroker();
         FileUtils.deleteDirectory(System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
-        _oldWork = System.getProperty("QPID_WORK");
-        System.setProperty("QPID_WORK", System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
+        setSystemProperty("QPID_WORK", System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
         startBroker(getFailingPort());
     }
 
@@ -79,7 +77,6 @@ public class FailoverBaseCase extends QpidTestCase
     public void tearDown() throws Exception
     {
         stopBroker(getFailingPort());
-        System.setProperty("QPID_WORK", _oldWork);
         super.tearDown();
         FileUtils.deleteDirectory(System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
     }