svn commit: r618989 - in /incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted: CommitRollbackTest.java TransactedTest.java

[arnaudsimon]

Author: arnaudsimon
Date: Wed Feb  6 05:40:38 2008
New Revision: 618989

URL: http://svn.apache.org/viewvc?rev=618989&view=rev
Log:
Changed session mode to AUTO_ACK so mesages are removed from broker between two 
tests.

Modified:
    
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
    
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java

Modified: 
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java?rev=618989&r1=618988&r2=618989&view=diff
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
 Wed Feb  6 05:40:38 2008
@@ -462,15 +462,15 @@
 
         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);

Modified: 
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java?rev=618989&r1=618988&r2=618989&view=diff
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
 Wed Feb  6 05:40:38 2008
@@ -89,7 +89,7 @@
             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 @@
             _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);
         }