Changed session mode to AUTO_ACK so mesages are removed from broker between two tests.

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

2 files changed, 11 insertions, 11 deletions

diff --git a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
index 2145a44986..cae8634f37 100644
--- a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
@@ -462,15 +462,15 @@ public class CommitRollbackTest extends QpidTestCase
 
         result = _consumer.receive(1000);
 
-       // if( isBroker08() )
-       // {
-             assertNotNull("test message was consumed and rolled back, but is gone", result);
-           //  assertTrue("Messasge is not marked as redelivered" + result, result.getJMSRedelivered());
-       // }
-       // else
-       // {
-        //    assertNull("test message was consumed and not rolled back, but is redelivered", result);
-       // }
+        if (isBroker08())
+        {
+            assertNotNull("test message was consumed and rolled back, but is gone", result);
+           // assertTrue("Messasge is not marked as redelivered" + result, result.getJMSRedelivered());
+        }
+        else
+        {
+            assertNull("test message was consumed and not rolled back, but is redelivered", result);
+        }
 
         result = _consumer.receive(1000);
         assertNull("test message should be null:" + result, result);
diff --git a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
index 93f80645d5..1339cf9060 100644
--- a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
@@ -89,7 +89,7 @@ public class TransactedTest extends QpidTestCase
             prepCon = (AMQConnection) getConnection("guest", "guest");
 
             _logger.info("Create prep session");
-            prepSession = prepCon.createSession(false, AMQSession.NO_ACKNOWLEDGE);
+            prepSession = prepCon.createSession(false, AMQSession.AUTO_ACKNOWLEDGE);
 
             _logger.info("Create prep producer to Q1");
             prepProducer1 = prepSession.createProducer(queue1);
@@ -100,7 +100,7 @@ public class TransactedTest extends QpidTestCase
             _logger.info("Create test connection");
             testCon = (AMQConnection) getConnection("guest", "guest");
             _logger.info("Create test session");
-            testSession = testCon.createSession(false, AMQSession.NO_ACKNOWLEDGE);
+            testSession = testCon.createSession(false, AMQSession.AUTO_ACKNOWLEDGE);
             _logger.info("Create test consumer of q2");
             testConsumer2 = testSession.createConsumer(queue2);
         }