Author: ataylor Date: 2010-11-28 04:44:08 -0500 (Sun, 28 Nov 2010) New Revision: 9936 Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/util/TestableServer.java Log: test fix Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2010-11-27 12:09:17 UTC (rev 9935) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2010-11-28 09:44:08 UTC (rev 9936) @@ -2023,7 +2023,7 @@ try { - //liveServer.getRemotingService().addInterceptor(interceptor); + liveServer.addInterceptor(interceptor); session.commit(); } @@ -2033,7 +2033,7 @@ { // Ok - now we retry the commit after removing the interceptor - //liveServer.getRemotingService().removeInterceptor(interceptor); + liveServer.removeInterceptor(interceptor); try { Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java 2010-11-27 12:09:17 UTC (rev 9935) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java 2010-11-28 09:44:08 UTC (rev 9936) @@ -19,6 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.SessionFailureListener; @@ -80,6 +81,16 @@ return started; } + public void addInterceptor(Interceptor interceptor) + { + throw new UnsupportedOperationException("can't do this with a remote server"); + } + + public void removeInterceptor(Interceptor interceptor) + { + throw new UnsupportedOperationException("can't do this with a remote server"); + } + public void setInitialised(boolean initialised) { this.initialised = initialised; Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java 2010-11-27 12:09:17 UTC (rev 9935) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java 2010-11-28 09:44:08 UTC (rev 9936) @@ -19,6 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.SessionFailureListener; import org.hornetq.core.server.HornetQServer; @@ -56,6 +57,16 @@ return server.isStarted(); } + public void addInterceptor(Interceptor interceptor) + { + server.getRemotingService().addInterceptor(interceptor); + } + + public void removeInterceptor(Interceptor interceptor) + { + server.getRemotingService().removeInterceptor(interceptor); + } + public void start() throws Exception { server.start(); Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/util/TestableServer.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/util/TestableServer.java 2010-11-27 12:09:17 UTC (rev 9935) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/util/TestableServer.java 2010-11-28 09:44:08 UTC (rev 9936) @@ -13,6 +13,7 @@ package org.hornetq.tests.integration.cluster.util; +import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.client.ClientSession; /** @@ -35,4 +36,8 @@ void destroy(); boolean isStarted(); + + void addInterceptor(Interceptor interceptor); + + void removeInterceptor(Interceptor interceptor); }