[jboss-cvs] JBoss Messaging SVN: r2081 - in trunk/tests: etc and 1 other directories.

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

Author: timfox
Date: 2007-01-27 09:17:00 -0500 (Sat, 27 Jan 2007)
New Revision: 2081

Modified:
   trunk/tests/build.xml
   trunk/tests/etc/container.xml
   trunk/tests/src/org/jboss/test/messaging/jms/ScheduledDeliveryTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java
Log:
More tweaks


Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml	2007-01-27 14:05:29 UTC (rev 2080)
+++ trunk/tests/build.xml	2007-01-27 14:17:00 UTC (rev 2081)
@@ -57,7 +57,7 @@
         Functional tests.
    -->
 
-   <property name="functional.tests.database" value="hsqldb"/>
+   <property name="functional.tests.database" value="mysql"/>
    <property name="functional.tests.serialization" value="jms"/>
 
    <!--

Modified: trunk/tests/etc/container.xml
===================================================================
--- trunk/tests/etc/container.xml	2007-01-27 14:05:29 UTC (rev 2080)
+++ trunk/tests/etc/container.xml	2007-01-27 14:17:00 UTC (rev 2081)
@@ -9,7 +9,7 @@
    <!--
         The value of "test.database" system property, if set, takes precedence.
    -->
-   <database>hsqldb</database>
+   <database>mysql</database>
 
    <database-configurations>
 

Modified: trunk/tests/src/org/jboss/test/messaging/jms/ScheduledDeliveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ScheduledDeliveryTest.java	2007-01-27 14:05:29 UTC (rev 2080)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ScheduledDeliveryTest.java	2007-01-27 14:17:00 UTC (rev 2081)
@@ -391,12 +391,16 @@
             
             prod.send(tm);
          }
+
+         log.info("Sent messages");
          
          Session sess2 = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
          
          MessageConsumer cons = sess2.createConsumer(queue);
          
          conn.start();
+
+         log.info("Started connection");
          
          for (int i = 0; i < NUM_MESSAGES; i++)
          {
@@ -404,6 +408,8 @@
             
             assertNotNull(tm);
             
+	    log.info("Got message:" + tm.getText());
+
             assertEquals("message" + i, tm.getText());
          }
          
@@ -413,6 +419,8 @@
          long now = System.currentTimeMillis();
          
          sess2.close();
+
+         log.info("Closed session");
          
          Session sess3 = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
          
@@ -420,17 +428,19 @@
          
          for (int i = 0; i < NUM_MESSAGES; i++)
          {
-            TextMessage tm = (TextMessage)cons2.receive(delay + 500);
+            TextMessage tm = (TextMessage)cons2.receive(delay + 1000);
             
+            assertNotNull(tm);
+
+            log.info("Got message 2nd time: " + tm.getText());
+
             long time = System.currentTimeMillis();
             
             assertTrue(time - now >= delay);
-            assertTrue(time - now < delay + 250);
-            
-            assertNotNull(tm);
+            assertTrue(time - now < delay + 1000);
          }
          
-         TextMessage tm = (TextMessage)cons2.receive(500);
+         TextMessage tm = (TextMessage)cons2.receive(1000);
          
          assertNull(tm);
       }
@@ -506,17 +516,17 @@
          
          for (int i = 0; i < NUM_MESSAGES; i++)
          {
-            TextMessage tm = (TextMessage)cons2.receive(delay + 500);
+            TextMessage tm = (TextMessage)cons2.receive(delay + 1000);
             
             long time = System.currentTimeMillis();
             
             assertTrue(time - now >= delay);
-            assertTrue(time - now < delay + 250);
+            assertTrue(time - now < delay + 1000);
             
             assertNotNull(tm);
          }
          
-         TextMessage tm = (TextMessage)cons2.receive(500);
+         TextMessage tm = (TextMessage)cons2.receive(1000);
          
          assertNull(tm);
       }

Modified: trunk/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java	2007-01-27 14:05:29 UTC (rev 2080)
+++ trunk/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java	2007-01-27 14:17:00 UTC (rev 2081)
@@ -83,7 +83,7 @@
    public void setUp() throws Exception
    {
       super.setUp();
-      ServerManagement.start("all,-transaction, jbossjta");     
+      ServerManagement.start("all");     
       
       initialContext = new InitialContext(ServerManagement.getJNDIEnvironment());
       cf = (JBossConnectionFactory)initialContext.lookup("/ConnectionFactory");