Author: clebert.suconic(a)jboss.com Date: 2011-07-11 22:03:17 -0400 (Mon, 11 Jul 2011) New Revision: 10966 Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/util/TestableServer.java Log: fixing tests Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2011-07-12 01:58:04 UTC (rev 10965) +++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2011-07-12 02:03:17 UTC (rev 10966) @@ -98,13 +98,15 @@ clearData(); createConfigs(); - liveServer.getServer().setIdentity(this.getClass().getSimpleName() + "/liveServer"); + + + liveServer.setIdentity(this.getClass().getSimpleName() + "/liveServer"); liveServer.start(); if (backupServer != null) { - backupServer.getServer().setIdentity(this.getClass().getSimpleName() + "/backupServer"); + backupServer.setIdentity(this.getClass().getSimpleName() + "/backupServer"); backupServer.start(); } } Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java 2011-07-12 01:58:04 UTC (rev 10965) +++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java 2011-07-12 02:03:17 UTC (rev 10966) @@ -186,4 +186,11 @@ { return null; } + + /* (non-Javadoc) + * @see org.hornetq.tests.integration.cluster.util.TestableServer#setIdentity(java.lang.String) + */ + public void setIdentity(String identity) + { + } } Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java 2011-07-12 01:58:04 UTC (rev 10965) +++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java 2011-07-12 02:03:17 UTC (rev 10966) @@ -54,6 +54,11 @@ //To change body of implemented methods use File | Settings | File Templates. } + public void setIdentity(String identity) + { + server.setIdentity(identity); + } + public boolean isStarted() { return server.isStarted(); Modified: branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/util/TestableServer.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/util/TestableServer.java 2011-07-12 01:58:04 UTC (rev 10965) +++ branches/Branch_2_2_EAP_cluster_clean2/tests/src/org/hornetq/tests/integration/cluster/util/TestableServer.java 2011-07-12 02:03:17 UTC (rev 10966) @@ -28,6 +28,8 @@ { HornetQServer getServer(); + + public void setIdentity(String identity); public void start() throws Exception;