[jboss-cvs] JBoss Messaging SVN: r2792 - in trunk: tests/src/org/jboss/test/messaging/jms and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2007-06-19 19:20:44 -0400 (Tue, 19 Jun 2007)
New Revision: 2792

Modified:
   trunk/src/main/org/jboss/jms/client/JBossConnection.java
   trunk/src/main/org/jboss/jms/client/JBossConnectionMetaData.java
   trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-997

Modified: trunk/src/main/org/jboss/jms/client/JBossConnection.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/JBossConnection.java	2007-06-19 18:30:07 UTC (rev 2791)
+++ trunk/src/main/org/jboss/jms/client/JBossConnection.java	2007-06-19 23:20:44 UTC (rev 2792)
@@ -151,7 +151,7 @@
       if (connectionType == TYPE_QUEUE_CONNECTION)
       {
          String msg = "Cannot create a durable connection consumer on a QueueConnection";
-         throw new IllegalStateException(msg);
+         throw new javax.jms.IllegalStateException(msg);
       }
       return delegate.createConnectionConsumer(topic, subscriptionName, messageSelector,
                                                sessionPool, maxMessages);

Modified: trunk/src/main/org/jboss/jms/client/JBossConnectionMetaData.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/JBossConnectionMetaData.java	2007-06-19 18:30:07 UTC (rev 2791)
+++ trunk/src/main/org/jboss/jms/client/JBossConnectionMetaData.java	2007-06-19 23:20:44 UTC (rev 2792)
@@ -103,6 +103,7 @@
       Vector v = new Vector();
       v.add("JMSXGroupID");
       v.add("JMSXGroupSeq");
+      v.add("JMSXDeliveryCount");
       return v.elements();
    }
 

Modified: trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java	2007-06-19 18:30:07 UTC (rev 2791)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java	2007-06-19 23:20:44 UTC (rev 2792)
@@ -32,6 +32,8 @@
 import javax.jms.Session;
 import javax.jms.TopicConnection;
 import javax.jms.TopicConnectionFactory;
+import javax.jms.ServerSessionPool;
+import javax.jms.Topic;
 import javax.naming.InitialContext;
 
 import org.jboss.jms.client.JBossConnection;
@@ -472,6 +474,39 @@
                   
       } 
    }
+
+   /**
+    * This test is similar to a JORAM Test...
+    * (UnifiedTest::testCreateDurableConnectionConsumerOnQueueConnection)
+    *
+    * @throws Exception
+    */
+   public void testDurableSubscriberOnQueueConnection() throws Exception
+   {
+      QueueConnection queueConnection = ((QueueConnectionFactory)cf).createQueueConnection();
+
+      try
+      {
+         queueConnection.createDurableConnectionConsumer((Topic)topic, "subscriptionName", "",
+            (ServerSessionPool) null, 1);
+         fail("Should throw a javax.jms.IllegalStateException");
+      }
+      catch (javax.jms.IllegalStateException e)
+      {
+      }
+      catch (java.lang.IllegalStateException e)
+      {
+         fail ("Should throw a javax.jms.IllegalStateException");
+      }
+      catch (JMSException e)
+      {
+         fail("Should throw a javax.jms.IllegalStateException, not a " + e);
+      }
+      finally
+      {
+         queueConnection.close();
+      }
+   }
    
    // TODO - Decide if valid and uncomment or get rid of it!