[jboss-cvs] JBoss Messaging SVN: r3526 - in branches/BRANCH_JBMESSAGING-681: src/main/org/jboss/jms/delegate and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2008-01-02 16:17:51 -0500 (Wed, 02 Jan 2008)
New Revision: 3526

Modified:
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/SessionEndpoint.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
   branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-681 - Fixing tests

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java	2007-12-21 16:35:13 UTC (rev 3525)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java	2008-01-02 21:17:51 UTC (rev 3526)
@@ -194,6 +194,7 @@
 
    public long closing(long sequence) throws JMSException
    {
+      closeChildren();
       ClosingResponse response = (ClosingResponse) sendBlocking(new ClosingRequest(sequence));
       return response.getID();
    }

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java	2007-12-21 16:35:13 UTC (rev 3525)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java	2008-01-02 21:17:51 UTC (rev 3526)
@@ -206,6 +206,8 @@
    {
       if (trace) { log.trace("handleClosing()"); }
 
+      closeChildren();
+      
       //Sanity check
       if (state.isXA() && !isXAAndConsideredNonTransacted(state))
       {

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/SessionEndpoint.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/SessionEndpoint.java	2007-12-21 16:35:13 UTC (rev 3525)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/SessionEndpoint.java	2008-01-02 21:17:51 UTC (rev 3526)
@@ -118,5 +118,10 @@
     * failover.
     */
    void recoverDeliveries(List createInfos, String oldSessionID) throws JMSException;
+
+
+   int getDupsOKBatchSize();
+
+   public boolean isStrictTck();
 }
 

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-12-21 16:35:13 UTC (rev 3525)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2008-01-02 21:17:51 UTC (rev 3526)
@@ -895,6 +895,17 @@
          throw ExceptionUtil.handleJMSInvocation(t, this + " unsubscribe");
       }
    }
+
+   public int getDupsOKBatchSize()
+   {
+      throw new RuntimeException("information only available on client side");
+   }
+
+   public boolean isStrictTck()
+   {
+      throw new RuntimeException("information only available on client side");
+   }
+
    
    // Public ---------------------------------------------------------------------------------------
    

Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java	2007-12-21 16:35:13 UTC (rev 3525)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java	2008-01-02 21:17:51 UTC (rev 3526)
@@ -21,12 +21,24 @@
   */
 package org.jboss.test.messaging.jms;
 
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.DeliveryMode;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.jms.TopicConnection;
+import javax.jms.TopicPublisher;
+import javax.jms.TopicSession;
+import javax.jms.TopicSubscriber;
+
 import EDU.oswego.cs.dl.util.concurrent.Latch;
 import org.jboss.jms.client.JBossSession;
-import org.jboss.jms.client.delegate.ClientSessionDelegate;
+import org.jboss.jms.delegate.SessionDelegate;
 
-import javax.jms.*;
-
 /**
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  *
@@ -675,7 +687,7 @@
 	      
 	      JBossSession sess = (JBossSession)conn.createSession(false, Session.DUPS_OK_ACKNOWLEDGE);
 	      
-	      ClientSessionDelegate del = (ClientSessionDelegate)sess.getDelegate();
+	      SessionDelegate del = (SessionDelegate)sess.getDelegate();
 	      
 	      assertEquals(1000, del.getDupsOKBatchSize());
       }
@@ -1226,7 +1238,7 @@
                   
             TextMessage tm = (TextMessage)m;
             
-            //log.info("Got message: " + tm.getText());            
+            //log.info("Got message: " + tm.getText());
                       
             // Receive first three messages then recover() session
             // Only last message should be redelivered
@@ -1299,7 +1311,7 @@
             count++;
                   
             TextMessage tm = (TextMessage)m;
-                       
+
             // Receive first three messages then recover() session
             // Only last message should be redelivered
             if (count == 1)