[jboss-cvs] JBoss Messaging SVN: r6194 - trunk/tests/src/org/jboss/messaging/tests/integration/client.

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

Author: clebert.suconic at jboss.com
Date: 2009-03-27 10:04:20 -0400 (Fri, 27 Mar 2009)
New Revision: 6194

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/client/PagingTest.java
Log:
Removing extra (not needed) assertion (depage is async, you could eventually still see an empty page making the assertion false, all that is necessary is checking for all received messages)

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/PagingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/PagingTest.java	2009-03-27 13:19:53 UTC (rev 6193)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/PagingTest.java	2009-03-27 14:04:20 UTC (rev 6194)
@@ -58,7 +58,7 @@
 
    // Constants -----------------------------------------------------
    private static final Logger log = Logger.getLogger(PagingTest.class);
-   
+
    private static final int RECEIVE_TIMEOUT = 30000;
 
    // Attributes ----------------------------------------------------
@@ -116,7 +116,7 @@
             {
                bodyLocal.writeInt(j);
             }
-            
+
             if (body == null)
             {
                body = bodyLocal.array();
@@ -383,12 +383,11 @@
                bodyLocal.writeInt(j);
             }
 
-            
             if (body == null)
             {
                body = bodyLocal.array();
             }
-            
+
             message.setBody(bodyLocal);
             message.putIntProperty(new SimpleString("id"), i);
 
@@ -513,7 +512,6 @@
                bodyLocal.writeInt(j);
             }
 
-
             message.putIntProperty(new SimpleString("id"), i);
 
             producer.send(message);
@@ -582,7 +580,7 @@
          for (int i = 0; i < numberOfMessages; i++)
          {
             message = session.createClientMessage(true);
-            
+
             MessagingBuffer bodyLocal = message.getBody();
 
             for (int j = 1; j <= numberOfIntegers; j++)
@@ -671,7 +669,7 @@
       }
 
       config.setPagingGlobalWatermarkSize(10 * 1024);
- 
+
       MessagingService messagingService = createService(true, config, settings);
 
       messagingService.start();
@@ -922,7 +920,7 @@
       }
 
    }
-   
+
    public void testPagingOneDestinationOnly() throws Exception
    {
       SimpleString PAGED_ADDRESS = new SimpleString("paged");
@@ -1138,7 +1136,6 @@
 
          consumerA.close();
 
-         assertFalse(service.getServer().getPostOffice().getPagingManager().getPageStore(PAGED_ADDRESS_A).isPaging());
          assertTrue(service.getServer().getPostOffice().getPagingManager().getPageStore(PAGED_ADDRESS_B).isPaging());
 
          for (int i = 0; i < NUMBER_OF_MESSAGES; i++)
@@ -1165,13 +1162,11 @@
       }
    }
 
-
    public void testPagingDifferentSizesAndGlobal() throws Exception
    {
       SimpleString PAGED_ADDRESS_A = new SimpleString("paged-a");
       SimpleString PAGED_ADDRESS_B = new SimpleString("paged-b");
       SimpleString PAGED_ADDRESS_GLOBAL = new SimpleString("paged-global");
-      
 
       Configuration configuration = createDefaultConfig();
 
@@ -1277,7 +1272,7 @@
          assertNull(consumerA.receiveImmediate());
 
          consumerA.close();
-         
+
          session.commit();
 
          assertFalse(service.getServer().getPostOffice().getPagingManager().getPageStore(PAGED_ADDRESS_A).isPaging());
@@ -1295,9 +1290,6 @@
 
          consumerB.close();
 
-         assertFalse(service.getServer().getPostOffice().getPagingManager().getPageStore(PAGED_ADDRESS_A).isPaging());
-         assertFalse(service.getServer().getPostOffice().getPagingManager().getPageStore(PAGED_ADDRESS_B).isPaging());
-
          session.close();
 
       }
@@ -1310,8 +1302,6 @@
       }
    }
 
-
-
    // Package protected ---------------------------------------------
 
    // Protected -----------------------------------------------------