[hornetq-commits] JBoss hornetq SVN: r10863 - in trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster: distribution and 1 other directories.

[do-not-reply at jboss.org]

Author: borges
Date: 2011-06-21 06:13:05 -0400 (Tue, 21 Jun 2011)
New Revision: 10863

Modified:
   trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java
   trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
   trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
   trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java
   trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedFailoverTest.java
Log:
HORNETQ-720 Fix NPEs in Replication tests

Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java	2011-06-20 18:02:25 UTC (rev 10862)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java	2011-06-21 10:13:05 UTC (rev 10863)
@@ -20,7 +20,6 @@
 
 import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.core.config.Configuration;
-import org.hornetq.core.config.impl.ConfigurationImpl;
 import org.hornetq.core.remoting.impl.invm.InVMConnector;
 import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory;
 import org.hornetq.core.server.HornetQServer;

Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java	2011-06-20 18:02:25 UTC (rev 10862)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java	2011-06-21 10:13:05 UTC (rev 10863)
@@ -38,7 +38,6 @@
 import org.hornetq.core.config.BroadcastGroupConfiguration;
 import org.hornetq.core.config.ClusterConnectionConfiguration;
 import org.hornetq.core.config.Configuration;
-import org.hornetq.core.config.impl.ConfigurationImpl;
 import org.hornetq.core.logging.Logger;
 import org.hornetq.core.postoffice.Binding;
 import org.hornetq.core.postoffice.Bindings;

Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java	2011-06-20 18:02:25 UTC (rev 10862)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java	2011-06-21 10:13:05 UTC (rev 10863)
@@ -167,6 +167,7 @@
       config1.setSecurityEnabled(false);
       config1.setSharedStore(false);
       config1.setBackup(true);
+      backupConfig = config1;
       backupServer = createBackupServer();
 
       Configuration config0 = super.createDefaultConfig();
@@ -177,6 +178,7 @@
       //liveConfig.setBackupConnectorName("toBackup");
       config0.setSecurityEnabled(false);
       config0.setSharedStore(false);
+      liveConfig = config0;
       liveServer = createLiveServer();
 
       backupServer.start();

Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java	2011-06-20 18:02:25 UTC (rev 10862)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java	2011-06-21 10:13:05 UTC (rev 10863)
@@ -46,13 +46,13 @@
    {
       return new SameProcessHornetQServer(createServer(true, liveConfig));
    }
-   
+
    @Override
    protected TestableServer createBackupServer()
    {
       return new SameProcessHornetQServer(createServer(true, backupConfig));
    }
-   
+
    @Override
    protected void createConfigs() throws Exception
    {
@@ -64,8 +64,9 @@
       config1.setSecurityEnabled(false);
       config1.setSharedStore(false);
       config1.setBackup(true);
+      backupConfig = config1;
       backupServer = createBackupServer();
-      
+
       Configuration config0 = super.createDefaultConfig();
       config0.getAcceptorConfigurations().clear();
       config0.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(true));
@@ -74,8 +75,9 @@
       liveConfig.setBackupConnectorName("toBackup");*/
       config0.setSecurityEnabled(false);
       config0.setSharedStore(false);
+      liveConfig = config0;
       liveServer = createLiveServer();
-      
+
       backupServer.start();
       liveServer.start();
    }

Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedFailoverTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedFailoverTest.java	2011-06-20 18:02:25 UTC (rev 10862)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedFailoverTest.java	2011-06-21 10:13:05 UTC (rev 10863)
@@ -13,6 +13,8 @@
 
 package org.hornetq.tests.integration.cluster.failover;
 
+import org.hornetq.core.server.impl.InVMNodeManager;
+
 /**
  * A ReplicatedFailoverTest
  *
@@ -38,6 +40,13 @@
    // Protected -----------------------------------------------------
 
    @Override
+   protected void setUp() throws Exception
+   {
+      nodeManager = new InVMNodeManager();
+      super.setUp();
+   }
+
+   @Override
    protected void createConfigs() throws Exception
    {
       createReplicatedConfigs();