[hornetq-commits] JBoss hornetq SVN: r9568 - in branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests: util and 1 other directory.

[do-not-reply at jboss.org]

Author: ataylor
Date: 2010-08-20 04:17:24 -0400 (Fri, 20 Aug 2010)
New Revision: 9568

Added:
   branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/util/FakeLockHornetQServer.java
Modified:
   branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
   branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/util/ServiceTestBase.java
Log:
added fake lock server

Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java	2010-08-20 08:16:38 UTC (rev 9567)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java	2010-08-20 08:17:24 UTC (rev 9568)
@@ -101,7 +101,7 @@
       config1.setSecurityEnabled(false);
       config1.setSharedStore(true);
       config1.setBackup(true);
-      server1Service = createServer(true, config1);
+      server1Service = createFakeLockServer(true, config1);
       
       server1Service.registerActivateCallback(new ActivateCallback()
       {
@@ -128,7 +128,7 @@
       config0.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(true));
       config0.setSecurityEnabled(false);
       config0.setSharedStore(true);
-      server0Service = createServer(true, config0);
+      server0Service = createFakeLockServer(true, config0);
 
    }
 

Added: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/util/FakeLockHornetQServer.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/util/FakeLockHornetQServer.java	                        (rev 0)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/util/FakeLockHornetQServer.java	2010-08-20 08:17:24 UTC (rev 9568)
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ *  Red Hat licenses this file to you under the Apache License, version
+ *  2.0 (the "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ *  implied.  See the License for the specific language governing
+ *  permissions and limitations under the License.
+ */
+package org.hornetq.tests.util;
+
+import org.hornetq.core.config.Configuration;
+import org.hornetq.core.server.cluster.LockFile;
+import org.hornetq.core.server.cluster.impl.FakeLockFile;
+import org.hornetq.core.server.impl.HornetQServerImpl;
+import org.hornetq.spi.core.security.HornetQSecurityManager;
+
+import javax.management.MBeanServer;
+
+/**
+ * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
+ *         Created Jul 23, 2010
+ */
+public class FakeLockHornetQServer extends HornetQServerImpl
+{
+   public FakeLockHornetQServer()
+   {
+      super();    //To change body of overridden methods use File | Settings | File Templates.
+   }
+
+   public FakeLockHornetQServer(Configuration configuration)
+   {
+      super(configuration);    //To change body of overridden methods use File | Settings | File Templates.
+   }
+
+   public FakeLockHornetQServer(Configuration configuration, MBeanServer mbeanServer)
+   {
+      super(configuration, mbeanServer);    //To change body of overridden methods use File | Settings | File Templates.
+   }
+
+   public FakeLockHornetQServer(Configuration configuration, HornetQSecurityManager securityManager)
+   {
+      super(configuration, securityManager);    //To change body of overridden methods use File | Settings | File Templates.
+   }
+
+   public FakeLockHornetQServer(Configuration configuration, MBeanServer mbeanServer, HornetQSecurityManager securityManager)
+   {
+      super(configuration, mbeanServer, securityManager);    //To change body of overridden methods use File | Settings | File Templates.
+   }
+
+   @Override
+   protected LockFile createLockFile(String fileName, String directory)
+   {
+      return new FakeLockFile(fileName, directory);
+   }
+}

Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/util/ServiceTestBase.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/util/ServiceTestBase.java	2010-08-20 08:16:38 UTC (rev 9567)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/util/ServiceTestBase.java	2010-08-20 08:17:24 UTC (rev 9568)
@@ -42,6 +42,7 @@
 import org.hornetq.jms.client.HornetQBytesMessage;
 import org.hornetq.jms.client.HornetQTextMessage;
 import org.hornetq.spi.core.security.HornetQSecurityManager;
+import org.hornetq.spi.core.security.HornetQSecurityManagerImpl;
 
 import static org.hornetq.tests.util.ServiceTestBase.*;
 
@@ -161,6 +162,47 @@
       return createServer(realFiles, configuration, -1, -1, new HashMap<String, AddressSettings>());
    }
 
+   protected HornetQServer createFakeLockServer(final boolean realFiles)
+   {
+      return createFakeLockServer(realFiles, false);
+   }
+
+   protected HornetQServer createFakeLockServer(final boolean realFiles, final boolean netty)
+   {
+      return createFakeLockServer(realFiles, createDefaultConfig(netty), -1, -1, new HashMap<String, AddressSettings>());
+   }
+
+   protected HornetQServer createFakeLockServer(final boolean realFiles, final Configuration configuration)
+   {
+      return createFakeLockServer(realFiles, configuration, -1, -1, new HashMap<String, AddressSettings>());
+   }
+
+   protected HornetQServer createFakeLockServer(final boolean realFiles,
+                                           final Configuration configuration,
+                                           final int pageSize,
+                                           final int maxAddressSize,
+                                           final Map<String, AddressSettings> settings)
+   {
+      HornetQServer server;
+      HornetQSecurityManager securityManager = new HornetQSecurityManagerImpl();
+      configuration.setPersistenceEnabled(realFiles);
+      server = new FakeLockHornetQServer(configuration,ManagementFactory.getPlatformMBeanServer(),securityManager);
+
+
+      for (Map.Entry<String, AddressSettings> setting : settings.entrySet())
+      {
+         server.getAddressSettingsRepository().addMatch(setting.getKey(), setting.getValue());
+      }
+
+      AddressSettings defaultSetting = new AddressSettings();
+      defaultSetting.setPageSizeBytes(pageSize);
+      defaultSetting.setMaxSizeBytes(maxAddressSize);
+
+      server.getAddressSettingsRepository().addMatch("#", defaultSetting);
+
+      return server;
+   }
+
    protected HornetQServer createServer(final boolean realFiles,
                                         final Configuration configuration,
                                         final HornetQSecurityManager securityManager)