[jboss-cvs] JBoss Messaging SVN: r1400 - in trunk: docs/clustering/en/modules tests/src/org/jboss/test/messaging/jms

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

Author: timfox
Date: 2006-09-29 11:07:42 -0400 (Fri, 29 Sep 2006)
New Revision: 1400

Modified:
   trunk/docs/clustering/en/modules/configuration.xml
   trunk/tests/src/org/jboss/test/messaging/jms/DurableSubscriberTest.java
Log:
Fixed tests, plus some docs


Modified: trunk/docs/clustering/en/modules/configuration.xml
===================================================================
--- trunk/docs/clustering/en/modules/configuration.xml	2006-09-29 14:22:17 UTC (rev 1399)
+++ trunk/docs/clustering/en/modules/configuration.xml	2006-09-29 15:07:42 UTC (rev 1400)
@@ -3,4 +3,5 @@
    <title>JBoss Messaging Clustering Configuration</title>
 
 
+
 </chapter>

Modified: trunk/tests/src/org/jboss/test/messaging/jms/DurableSubscriberTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/DurableSubscriberTest.java	2006-09-29 14:22:17 UTC (rev 1399)
+++ trunk/tests/src/org/jboss/test/messaging/jms/DurableSubscriberTest.java	2006-09-29 15:07:42 UTC (rev 1400)
@@ -422,7 +422,7 @@
       conn.setClientID("ak47");
 
       Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-      s.createDurableSubscriber(topic, "uzzi");
+      MessageConsumer cons = s.createDurableSubscriber(topic, "uzzi");
       MessageProducer prod = s.createProducer(topic);
       prod.setDeliveryMode(DeliveryMode.PERSISTENT);
 
@@ -430,6 +430,7 @@
 
       log.debug("unsubscribing ...");
 
+      cons.close();
       s.unsubscribe("uzzi");
 
       log.debug("resubscribing ...");
@@ -461,40 +462,7 @@
       }
    }
 
-   /**
-    * See http://jira.jboss.org/jira/browse/JBMESSAGING-564
-    * 
-    * Tim - this is an invalid test - see section 6.11 of jms spec:
-    *  "It is erroneous for a client to delete a
-    *  durable subscription while it has an active TopicSubscriber for it or while a
-    *  message received by it is part of a current transaction or has not been
-    *  acknowledged in the session."
-    *  
-    *  Need to remove it
-    * 
-    */
-   public void testUnsubscribe() throws Exception
-   {
-      ConnectionFactory cf = (ConnectionFactory)ic.lookup("ConnectionFactory");
-      Topic topic = (Topic)ic.lookup("/topic/Topic");
 
-      Connection conn = cf.createConnection();
-      conn.setClientID("zeke");
-
-      Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-      TopicSubscriber dursub = s.createDurableSubscriber(topic, "dursub0");
-
-      s.unsubscribe("dursub0");
-
-      // TODO - what happens with dursub? It is not closed, but its associated subscriber does
-      //        not exist anymore.
-
-      dursub.close();
-
-      conn.close();
-   }
-   
    //See JMS 1.1. spec sec 6.11
    public void testUnsubscribeWithActiveConsumer() throws Exception
    {