[hornetq-commits] JBoss hornetq SVN: r9571 - in branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster: failover and 1 other directory.

[do-not-reply at jboss.org]

Author: jmesnil
Date: 2010-08-20 09:51:18 -0400 (Fri, 20 Aug 2010)
New Revision: 9571

Modified:
   branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
   branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java
   branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java
   branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java
Log:
added methods to create HornetQ servers using fake FileLock
(required to have both live and backup servers running inside the same VM)

Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java	2010-08-20 13:45:58 UTC (rev 9570)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java	2010-08-20 13:51:18 UTC (rev 9571)
@@ -1197,27 +1197,48 @@
    {
       setupServer(node, fileStorage, netty, backup, -1);
    }
+   
+   protected void setupServer(final int node, final boolean fileStorage, final boolean netty, final boolean backup, final boolean useFakeLock)
+   {
+      setupServer(node, fileStorage, netty, backup, -1);
+   }
 
    protected void setupServer(final int node, final boolean fileStorage, final boolean netty, final int backupNode)
    {
-      setupServer(node, fileStorage, netty, false, backupNode);
+      setupServer(node, fileStorage, netty, false, backupNode, false);
    }
 
+   protected void setupServer(final int node, final boolean fileStorage, final boolean netty, final int backupNode, final boolean useFakeLock)
+   {
+      setupServer(node, fileStorage, netty, false, backupNode, useFakeLock);
+   }
+
    protected void setupServer(final int node,
                               final boolean fileStorage,
                               final boolean netty,
                               final boolean backup,
                               final int backupNode)
    {
-      setupServer(node, fileStorage, true, netty, backup, backupNode);
+      setupServer(node, fileStorage, netty, backup, backupNode, false);
    }
+   
+   protected void setupServer(final int node,
+                              final boolean fileStorage,
+                              final boolean netty,
+                              final boolean backup,
+                              final int backupNode,
+                              final boolean useFakeLock)
+   {
+      setupServer(node, fileStorage, true, netty, backup, backupNode, useFakeLock);
+   }
 
    protected void setupServer(final int node,
                               final boolean fileStorage,
                               final boolean sharedStorage,
                               final boolean netty,
                               final boolean backup,
-                              final int backupNode)
+                              final int backupNode,
+                              final boolean useFakeLock)
    {
       if (servers[node] != null)
       {
@@ -1259,11 +1280,25 @@
 
       if (fileStorage)
       {
-         server = HornetQServers.newHornetQServer(configuration);
+         if (useFakeLock)
+         {
+            server = createFakeLockServer(true, configuration);
+         }  
+         else
+         {
+            server = HornetQServers.newHornetQServer(configuration);
+         }
       }
       else
       {
-         server = HornetQServers.newHornetQServer(configuration, false);
+         if (useFakeLock)
+         {
+            server = createFakeLockServer(false, configuration);
+         }
+         else
+         {
+            server = HornetQServers.newHornetQServer(configuration, false);
+         }
       }
       servers[node] = server;
    }

Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java	2010-08-20 13:45:58 UTC (rev 9570)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java	2010-08-20 13:51:18 UTC (rev 9571)
@@ -562,18 +562,18 @@
    protected void setupServers() throws Exception
    {
       // The backups
-      setupServer(5, isFileStorage(), isNetty(), true);
-      setupServer(6, isFileStorage(), isNetty(), true);
-      setupServer(7, isFileStorage(), isNetty(), true);
-      setupServer(8, isFileStorage(), isNetty(), true);
-      setupServer(9, isFileStorage(), isNetty(), true);
+      setupServer(5, isFileStorage(), isNetty(), true, true);
+      setupServer(6, isFileStorage(), isNetty(), true, true);
+      setupServer(7, isFileStorage(), isNetty(), true, true);
+      setupServer(8, isFileStorage(), isNetty(), true, true);
+      setupServer(9, isFileStorage(), isNetty(), true, true);
 
       // The lives
-      setupServer(0, isFileStorage(), isNetty(), 5);
-      setupServer(1, isFileStorage(), isNetty(), 6);
-      setupServer(2, isFileStorage(), isNetty(), 7);
-      setupServer(3, isFileStorage(), isNetty(), 8);
-      setupServer(4, isFileStorage(), isNetty(), 9);
+      setupServer(0, isFileStorage(), isNetty(), 5, true);
+      setupServer(1, isFileStorage(), isNetty(), 6, true);
+      setupServer(2, isFileStorage(), isNetty(), 7, true);
+      setupServer(3, isFileStorage(), isNetty(), 8, true);
+      setupServer(4, isFileStorage(), isNetty(), 9, true);
    }
 
    @Override

Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java	2010-08-20 13:45:58 UTC (rev 9570)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java	2010-08-20 13:51:18 UTC (rev 9571)
@@ -87,6 +87,6 @@
    @Override
    void setupMasterServer(final int i, final boolean fileStorage, final boolean netty)
    {
-      setupServer(i, fileStorage, false, netty, false, 2);
+      setupServer(i, fileStorage, false, netty, false, 2, false);
    }
 }

Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java	2010-08-20 13:45:58 UTC (rev 9570)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java	2010-08-20 13:51:18 UTC (rev 9571)
@@ -267,9 +267,9 @@
    {
       super.setUp();
 
-      setupServer(1, true, isShared(), true, false, -1);
-      setupServer(2, true, isShared(), true, true, -1);
-      setupServer(3, true, isShared(), true, true, 2);
+      setupServer(1, true, isShared(), true, false, -1, false);
+      setupServer(2, true, isShared(), true, true, -1, false);
+      setupServer(3, true, isShared(), true, true, 2, false);
 
       setupClusterConnectionWithBackups("test", "test", false, 1, true, 1, new int[] { 3 }, new int[] { 2 });