svn commit: r787738 - in /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test: unit/topic/TopicSessionTest.java utils/FailoverBaseCase.java

[aidan]

Author: aidan
Date: Tue Jun 23 15:59:46 2009
New Revision: 787738

URL: http://svn.apache.org/viewvc?rev=787738&view=rev
Log:
QPID-1923: Fix ack mode for TopicSessionTest, reset system property the right 
way in FailoverBaseCase

Modified:
    
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
    
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java?rev=787738&r1=787737&r2=787738&view=diff
==============================================================================
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
 Tue Jun 23 15:59:46 2009
@@ -174,7 +174,7 @@
 
         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();

Modified: 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java?rev=787738&r1=787737&r2=787738&view=diff
==============================================================================
--- 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
 (original)
+++ 
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
 Tue Jun 23 15:59:46 2009
@@ -33,7 +33,6 @@
     protected int failingPort;
     
     private boolean failedOver = false;
-    private String _oldWork;
 
     public FailoverBaseCase()
     {
@@ -57,8 +56,7 @@
         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 void tearDown() throws Exception
     {
         stopBroker(getFailingPort());
-        System.setProperty("QPID_WORK", _oldWork);
         super.tearDown();
         
FileUtils.deleteDirectory(System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
     }



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org