[jboss-cvs] JBoss Messaging SVN: r2044 - in trunk: tests and 2 other directories.

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

Author: timfox
Date: 2007-01-24 19:05:49 -0500 (Wed, 24 Jan 2007)
New Revision: 2044

Modified:
   trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
   trunk/tests/build.xml
   trunk/tests/src/org/jboss/test/messaging/jms/DurableSubscriberTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/SessionTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/JMSPriorityHeaderTest.java
Log:
fix test



Modified: trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2007-01-24 22:00:21 UTC (rev 2043)
+++ trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2007-01-25 00:05:49 UTC (rev 2044)
@@ -127,7 +127,7 @@
          // use our own direct thread pool that basically does nothing
          metadata.put(ServerInvoker.ONEWAY_THREAD_POOL_CLASS_KEY,
                       "org.jboss.jms.server.remoting.DirectThreadPool");
-
+         
          String bindAddress = System.getProperty("jboss.messaging.callback.bind.address");
          if (bindAddress != null)
          {

Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml	2007-01-24 22:00:21 UTC (rev 2043)
+++ trunk/tests/build.xml	2007-01-25 00:05:49 UTC (rev 2044)
@@ -610,7 +610,12 @@
 
             <fileset dir="${build.tests.classes}">
                <include name="**/jms/**/*Test.class"/>
+               <exclude name="**/jms/bridge/**"/>
+
+<!--
                <include name="**/thirdparty/**/*Test.class"/>
+-->
+
                <exclude name="**/jms/stress/**"/>
                <exclude name="**/jms/server/**"/>
                <exclude name="**/jms/persistence/**"/>
@@ -622,6 +627,8 @@
                <exclude name="**/jms/JCAWrapperTest.class"/>
                <exclude name="**/jms/manual/**/*Test.class"/>
                <exclude name="**/jms/clustering/*Test.class"/>
+
+
             </fileset>
          </batchtest>
       </junit>

Modified: trunk/tests/src/org/jboss/test/messaging/jms/DurableSubscriberTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/DurableSubscriberTest.java	2007-01-24 22:00:21 UTC (rev 2043)
+++ trunk/tests/src/org/jboss/test/messaging/jms/DurableSubscriberTest.java	2007-01-25 00:05:49 UTC (rev 2044)
@@ -386,6 +386,10 @@
 
       prod.send(s.createTextMessage("one"));
       prod.send(s.createTextMessage("two"));
+      
+      TextMessage tm = (TextMessage)ds.receive();
+      assertEquals("one", tm.getText());
+      conn.close();
 
       ServerManagement.undeployTopic("TopicToBeRedeployed");
       log.debug("topic undeployed");
@@ -400,10 +404,6 @@
          // OK
       }
 
-      TextMessage tm = (TextMessage)ds.receive();
-      assertEquals("one", tm.getText());
-      conn.close();
-
       conn = cf.createConnection();
       conn.setClientID("brookeburke");
 

Modified: trunk/tests/src/org/jboss/test/messaging/jms/SessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/SessionTest.java	2007-01-24 22:00:21 UTC (rev 2043)
+++ trunk/tests/src/org/jboss/test/messaging/jms/SessionTest.java	2007-01-25 00:05:49 UTC (rev 2044)
@@ -485,7 +485,7 @@
 
       // Do NOT ACK
 
-      s.close(); // this shouldn cancel the delivery
+      s.close(); // this should cancel the delivery
 
       // get the message again
       s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/JMSPriorityHeaderTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/JMSPriorityHeaderTest.java	2007-01-24 22:00:21 UTC (rev 2043)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/JMSPriorityHeaderTest.java	2007-01-25 00:05:49 UTC (rev 2044)
@@ -73,6 +73,8 @@
       
       ServerManagement.deployQueue("Queue");
       queue = (Queue)initialContext.lookup("/queue/Queue");
+      
+      drainDestination(cf, queue);
           
    }