[jboss-cvs] JBoss Messaging SVN: r7680 - trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover.

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

Author: clebert.suconic at jboss.com
Date: 2009-08-07 01:58:52 -0400 (Fri, 07 Aug 2009)
New Revision: 7680

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java
   trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java
Log:
tweaks

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-08-07 05:26:45 UTC (rev 7679)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java	2009-08-07 05:58:52 UTC (rev 7680)
@@ -126,15 +126,8 @@
          backupConf.setJournalCompactPercentage(0);
 
          backupConf.setJournalType(JournalType.ASYNCIO);
-
          
-         
          backupServer = Messaging.newMessagingServer(backupConf);
-
-         AddressSettings defaultSetting = new AddressSettings();
-         defaultSetting.setPageSizeBytes(pageSize);
-         defaultSetting.setMaxSizeBytes(maxAddressSize);
-         backupServer.getAddressSettingsRepository().addMatch("#", defaultSetting);
       }
       else
       {
@@ -175,12 +168,6 @@
       if (fileBased)
       {
          liveServer = Messaging.newMessagingServer(liveConf);
-         
-         AddressSettings defaultSetting = new AddressSettings();
-         defaultSetting.setPageSizeBytes(pageSize);
-         defaultSetting.setMaxSizeBytes(maxAddressSize);
-         liveServer.getAddressSettingsRepository().addMatch("#", defaultSetting);
-
       }
       else
       {
@@ -189,6 +176,8 @@
 
       AddressSettings settings = new AddressSettings();
       settings.setPageSizeBytes(pageSize);
+      settings.setMaxSizeBytes(maxAddressSize);
+      settings.setPageSizeBytes(pageSize);
 
       liveServer.getAddressSettingsRepository().addMatch("#", settings);
       backupServer.getAddressSettingsRepository().addMatch("#", settings);

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java	2009-08-07 05:26:45 UTC (rev 7679)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverTest.java	2009-08-07 05:58:52 UTC (rev 7680)
@@ -243,12 +243,12 @@
    
    protected int getMaxGlobal()
    {
-      return 1024;
+      return 10024;
    }
    
    protected int getPageSize()
    {
-      return 512;
+      return 5120;
    }
    
    protected void fail(final ClientSession session) throws Exception