[jboss-cvs] JBoss Messaging SVN: r5907 - in trunk/tests/src/org/jboss/messaging/tests/integration: consumer and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2009-02-19 20:06:25 -0500 (Thu, 19 Feb 2009)
New Revision: 5907

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java
   trunk/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java
Log:
Tweaks on page tests (missing the default config)
and reverting ConsumerTest which I didn't mean to commit it before

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java	2009-02-19 22:48:29 UTC (rev 5906)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java	2009-02-20 01:06:25 UTC (rev 5907)
@@ -36,6 +36,7 @@
 import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
 import org.jboss.messaging.core.server.Messaging;
 import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.core.settings.impl.AddressSettings;
 import org.jboss.messaging.tests.util.ServiceTestBase;
 
 /**
@@ -136,6 +137,12 @@
       liveConf.setConnectorConfigurations(connectors);
       liveConf.setBackupConnectorName(backupTC.getName());
       liveService = Messaging.newMessagingService(liveConf);
+      
+      AddressSettings settings = new AddressSettings();
+      settings.setPageSizeBytes(pageSize);
+      
+      liveService.getServer().getAddressSettingsRepository().addMatch("#", settings);
+      backupService.getServer().getAddressSettingsRepository().addMatch("#", settings);
 
       clearData(getTestDir() + "/live");
 

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java	2009-02-19 22:48:29 UTC (rev 5906)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java	2009-02-20 01:06:25 UTC (rev 5907)
@@ -32,7 +32,6 @@
 import org.jboss.messaging.core.config.TransportConfiguration;
 import org.jboss.messaging.core.config.impl.ConfigurationImpl;
 import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.message.impl.MessageImpl;
 import org.jboss.messaging.core.server.Messaging;
 import org.jboss.messaging.core.server.MessagingService;
 import org.jboss.messaging.core.server.Queue;
@@ -287,21 +286,16 @@
 
    public void testConsumerBrowserMessages() throws Exception
    {
-      testConsumerBrowserMessagesArentAcked(false, 0);
+      testConsumerBrowserMessagesArentAcked(false);
    }
    
    public void testConsumerBrowserMessagesPreACK() throws Exception
    {
-      testConsumerBrowserMessagesArentAcked(true, 0);
+      testConsumerBrowserMessagesArentAcked(false);
    }
    
-   public void testConsumerBrowserMessagesDelayedDelivery() throws Exception
-   {
-      testConsumerBrowserMessagesArentAcked(false, 100);
-   }
-   
 
-   private void testConsumerBrowserMessagesArentAcked(boolean preACK, long delayedDelivery) throws Exception
+   private void testConsumerBrowserMessagesArentAcked(boolean preACK) throws Exception
    {
       ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory"));
 
@@ -316,14 +310,8 @@
       for (int i = 0; i < numMessages; i++)
       {
          ClientMessage message = createMessage(session, "m" + i);
-         if (delayedDelivery > 0)
-         {
-            message.putLongProperty(MessageImpl.HDR_SCHEDULED_DELIVERY_TIME, System.currentTimeMillis() + delayedDelivery);
-         }
          producer.send(message);
       }
-      
-      Thread.sleep(100);
 
       ClientConsumer consumer = session.createConsumer(QUEUE, null, true);
 
@@ -331,7 +319,6 @@
       {
          ClientMessage message2 = consumer.receive(1000);
 
-         assertNotNull(message2);
          assertEquals("m" + i, message2.getBody().getString());
       }
       // assert that all the messages are there and none have been acked