[jboss-cvs] JBoss Messaging SVN: r5611 - branches/Branch_Failover_Page/tests/src/org/jboss/messaging/tests/integration/cluster/failover.

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

Author: clebert.suconic at jboss.com
Date: 2009-01-10 13:03:56 -0500 (Sat, 10 Jan 2009)
New Revision: 5611

Modified:
   branches/Branch_Failover_Page/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java
Log:
adding a test

Modified: branches/Branch_Failover_Page/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java
===================================================================
--- branches/Branch_Failover_Page/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java	2009-01-09 18:46:38 UTC (rev 5610)
+++ branches/Branch_Failover_Page/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java	2009-01-10 18:03:56 UTC (rev 5611)
@@ -60,35 +60,46 @@
    // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
-   public void testPaging() throws Exception
+   
+   
+   public void testFailoverOnPaging() throws Exception
    {
+      testPaging(true);
+   }
+   
+   
+   public void testReplicationOnPaging() throws Exception
+   {
+      testPaging(false);
+   }
+   
+   private void testPaging(boolean fail) throws Exception
+   {
       ClientSession session = null;
       try
       {
          ClientSessionFactory sf1 = createFailoverFactory();
-         
-         sf1.setBlockOnAcknowledge(true);
-         sf1.setBlockOnNonPersistentSend(true);
-         sf1.setBlockOnPersistentSend(true);
-         
-         //sf1.setMinLargeMessageSize(10 * 1024);
 
+         // sf1.setBlockOnAcknowledge(true);
+         // sf1.setBlockOnNonPersistentSend(true);
+         // sf1.setBlockOnPersistentSend(true);
+
+         // sf1.setMinLargeMessageSize(10 * 1024);
+
          session = sf1.createSession(null, null, false, true, true, false, 0);
 
          session.createQueue(ADDRESS, ADDRESS, null, true, false);
 
-         session.start();
-
          ClientProducer producer = session.createProducer(ADDRESS);
 
          final int numMessages = 50000;
-         
+
          PagingManager pmLive = liveService.getServer().getPostOffice().getPagingManager();
          PagingStore storeLive = pmLive.getPageStore(ADDRESS);
-         
+
          PagingManager pmBackup = backupService.getServer().getPostOffice().getPagingManager();
-         PagingStore storeBackup = pmBackup.getPageStore(ADDRESS); 
-         
+         PagingStore storeBackup = pmBackup.getPageStore(ADDRESS);
+
          for (int i = 0; i < numMessages; i++)
          {
             ClientMessage message = session.createClientMessage(true);
@@ -101,48 +112,61 @@
             message.setBody(new ByteBufferWrapper(buffer));
 
             producer.send(message);
-            
+
             if (storeLive.isPaging())
             {
                assertTrue(storeBackup.isPaging());
             }
-        }
+         }
 
+         session.close();
+         session = sf1.createSession(null, null, false, true, true, false, 0);
+         session.start();
+
          final RemotingConnection conn = ((ClientSessionImpl)session).getConnection();
 
          assertEquals("GloblSize", pmLive.getGlobalSize(), pmBackup.getGlobalSize());
 
+         assertEquals("PageSizeLive", storeLive.getAddressSize(), pmLive.getGlobalSize());
+
+         assertEquals("PageSizeBackup", storeBackup.getAddressSize(), pmBackup.getGlobalSize());
+
          ClientConsumer consumer = session.createConsumer(ADDRESS);
 
          for (int i = 0; i < numMessages; i++)
          {
-            
-            if (i == numMessages / 2)
+
+            if (fail && i == numMessages / 2)
             {
                System.out.println("Failing");
                conn.fail(new MessagingException(MessagingException.NOT_CONNECTED));
             }
 
             ClientMessage message = consumer.receive(1000);
-            
-            //System.out.println("message = " + message);
-            
+
+            // System.out.println("message = " + message);
+
             assertNotNull(message);
 
             message.acknowledge();
-            //session.commit();
+            // session.commit();
 
             message.getBody().rewind();
-            
+
             assertEquals(i, message.getBody().getInt());
 
          }
+         
+         session.close();
+         session = null;
 
-         assertNull(consumer.receive(100));
-         
-         
-//         assertEquals(0, pmLive.getGlobalSize());
+         if (!fail)
+         {
+            assertEquals(0, pmLive.getGlobalSize());
+            assertEquals(0, storeLive.getAddressSize());
+         }
          assertEquals(0, pmBackup.getGlobalSize());
+         assertEquals(0, storeBackup.getAddressSize());
 
       }
       finally
@@ -168,14 +192,14 @@
 
    protected void tearDown() throws Exception
    {
-      //super.tearDown();
+      super.tearDown();
    }
-   
+
    protected void setUp() throws Exception
    {
       super.setUp();
       setUpFileBased(100 * 1024);
-      
+
    }
 
    // Private -------------------------------------------------------