[jboss-cvs] JBossAS SVN: r83530 - in projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance: aop and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 27 21:31:12 EST 2009
Author: bstansberry at jboss.com
Date: 2009-01-27 21:31:11 -0500 (Tue, 27 Jan 2009)
New Revision: 83530
Added:
projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/AbstractIdenticalAllProxiesTestCase.java
projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/AbstractLoadBalancePolicyTestCase.java
projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/AbstractStickyLoadBalancePolicyTestCase.java
Modified:
projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/FirstAvailableIdenticalAllProxiesUnitTestCase.java
projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/FirstAvailableUnitTestCase.java
projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/aop/FirstAvailableIdenticalAllProxiesUnitTestCase.java
projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/aop/FirstAvailableUnitTestCase.java
Log:
Refactor load balance policy tests
Added: projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/AbstractIdenticalAllProxiesTestCase.java
===================================================================
--- projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/AbstractIdenticalAllProxiesTestCase.java (rev 0)
+++ projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/AbstractIdenticalAllProxiesTestCase.java 2009-01-28 02:31:11 UTC (rev 83530)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ha.client.loadbalance;
+
+import java.util.Arrays;
+
+import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
+import org.jboss.ha.framework.interfaces.ClusteringTargetsRepository;
+import org.jboss.ha.framework.interfaces.FamilyClusterInfo;
+
+/**
+ * Base test class for sticky load balance policies that are sticky across proxies.
+ *
+ * @author Brian Stansberry
+ *
+ * @version $Revision:$
+ */
+public abstract class AbstractIdenticalAllProxiesTestCase<T extends LoadBalancePolicy>
+ extends
+ AbstractStickyLoadBalancePolicyTestCase<T>
+{
+
+ public AbstractIdenticalAllProxiesTestCase()
+ {
+ super();
+ }
+
+ public AbstractIdenticalAllProxiesTestCase(String name)
+ {
+ super(name);
+ }
+
+ @Override
+ public void testInitialSelection()
+ {
+ testCount++;
+ FamilyClusterInfo fci = ClusteringTargetsRepository.initTarget(FAMILY_BASE + testCount, Arrays.asList(TARGETS));
+
+ LoadBalancePolicy lbp = getLoadBalancePolicy();
+ Object target = lbp.chooseTarget(fci);
+
+ for (int i = 0; i < 10000; i++)
+ {
+ assertSame(target, getLoadBalancePolicy().chooseTarget(fci));
+ }
+
+ }
+
+ public void testIdenticalAfterFailover()
+ {
+ testCount++;
+ FamilyClusterInfo fci = ClusteringTargetsRepository.initTarget(FAMILY_BASE + testCount, Arrays.asList(TARGETS));
+
+ LoadBalancePolicy lbp1 = getLoadBalancePolicy();
+ Object target1 = lbp1.chooseTarget(fci);
+
+ LoadBalancePolicy lbp2 = getLoadBalancePolicy();
+
+ assertSame(target1, lbp2.chooseTarget(fci));
+
+ fci.removeDeadTarget(target1);
+
+ Object target3 = lbp1.chooseTarget(fci);
+
+ assertFalse(target1.equals(target3));
+
+ assertSame(target3, lbp2.chooseTarget(fci));
+
+ }
+
+}
\ No newline at end of file
Property changes on: projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/AbstractIdenticalAllProxiesTestCase.java
___________________________________________________________________
Name: svn:keywords
+
Added: projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/AbstractLoadBalancePolicyTestCase.java
===================================================================
--- projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/AbstractLoadBalancePolicyTestCase.java (rev 0)
+++ projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/AbstractLoadBalancePolicyTestCase.java 2009-01-28 02:31:11 UTC (rev 83530)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ha.client.loadbalance;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
+import org.jboss.ha.framework.interfaces.ClusteringTargetsRepository;
+import org.jboss.ha.framework.interfaces.FamilyClusterInfo;
+
+/**
+ * Base class for load balance policy tests.
+ *
+ * @author Brian Stansberry
+ *
+ * @version $Revision:$
+ * @param <T> the policy impl under test
+ */
+public abstract class AbstractLoadBalancePolicyTestCase<T extends LoadBalancePolicy> extends TestCase
+{
+
+ protected static final String[] TARGETS = { "A", "B", "C" };
+ protected static final String FAMILY_BASE = "testFamily";
+ protected static int testCount = 0;
+
+ public AbstractLoadBalancePolicyTestCase()
+ {
+ super();
+ }
+
+ public AbstractLoadBalancePolicyTestCase(String name)
+ {
+ super(name);
+ }
+
+ protected abstract T getLoadBalancePolicy();
+
+ public void testInitialSelection()
+ {
+ testCount++;
+ FamilyClusterInfo fci = ClusteringTargetsRepository.initTarget(FAMILY_BASE + testCount, Arrays.asList(TARGETS));
+
+ Set<Object> selected = new HashSet<Object>();
+
+ for (int i = 0; i < 10000; i++)
+ {
+ LoadBalancePolicy lbp = getLoadBalancePolicy();
+ selected.add(lbp.chooseTarget(fci));
+ if (selected.size() == TARGETS.length)
+ break;
+ }
+
+ assertEquals(TARGETS.length, selected.size());
+ }
+
+ public void testNoAvailableTargets()
+ {
+ testCount++;
+ FamilyClusterInfo fci = ClusteringTargetsRepository.initTarget(FAMILY_BASE + testCount, new ArrayList<Object>());
+
+ assertNull(getLoadBalancePolicy().chooseTarget(fci));
+ }
+
+}
\ No newline at end of file
Property changes on: projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/AbstractLoadBalancePolicyTestCase.java
___________________________________________________________________
Name: svn:keywords
+
Added: projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/AbstractStickyLoadBalancePolicyTestCase.java
===================================================================
--- projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/AbstractStickyLoadBalancePolicyTestCase.java (rev 0)
+++ projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/AbstractStickyLoadBalancePolicyTestCase.java 2009-01-28 02:31:11 UTC (rev 83530)
@@ -0,0 +1,131 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ha.client.loadbalance;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
+import org.jboss.ha.framework.interfaces.ClusteringTargetsRepository;
+import org.jboss.ha.framework.interfaces.FamilyClusterInfo;
+
+/**
+ * Base class for sticky-session load balance policy tests.
+ *
+ * @author Brian Stansberry
+ *
+ * @version $Revision:$
+ * @param <T> the policy impl under test
+ */
+public abstract class AbstractStickyLoadBalancePolicyTestCase<T extends LoadBalancePolicy>
+ extends AbstractLoadBalancePolicyTestCase<T>
+{
+
+ public AbstractStickyLoadBalancePolicyTestCase()
+ {
+ super();
+ }
+
+ public AbstractStickyLoadBalancePolicyTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testBasicStickiness()
+ {
+ testCount++;
+ List<String> targets = Arrays.asList(TARGETS);
+ FamilyClusterInfo fci = ClusteringTargetsRepository.initTarget(FAMILY_BASE + testCount, targets);
+
+ LoadBalancePolicy lbp = getLoadBalancePolicy();
+ Object target = lbp.chooseTarget(fci);
+
+ assertTrue(targets.contains(target));
+
+ for (int i = 0; i < 10; i++)
+ assertEquals(target, lbp.chooseTarget(fci));
+ }
+
+
+ public void testStickinessAfterFailover()
+ {
+ testCount++;
+ List<String> targets = Arrays.asList(TARGETS);
+ FamilyClusterInfo fci = ClusteringTargetsRepository.initTarget(FAMILY_BASE + testCount, targets);
+
+ LoadBalancePolicy lbp = getLoadBalancePolicy();
+ Object firstTarget;
+ Object target = firstTarget = lbp.chooseTarget(fci);
+
+ assertTrue(targets.contains(target));
+
+ for (int i = 0; i < 5; i++)
+ assertEquals(target, lbp.chooseTarget(fci));
+
+ fci.removeDeadTarget(target);
+ Object secondTarget;
+ target = secondTarget = lbp.chooseTarget(fci);
+
+ assertFalse(firstTarget.equals(secondTarget));
+ assertTrue(targets.contains(target));
+
+ for (int i = 0; i < 5; i++)
+ assertEquals(target, lbp.chooseTarget(fci));
+
+ fci.removeDeadTarget(target);
+ Object thirdTarget;
+ target = thirdTarget = lbp.chooseTarget(fci);
+
+ assertFalse(firstTarget.equals(thirdTarget));
+ assertFalse(secondTarget.equals(thirdTarget));
+ assertTrue(targets.contains(target));
+
+ for (int i = 0; i < 5; i++)
+ assertEquals(target, lbp.chooseTarget(fci));
+
+ fci.removeDeadTarget(target);
+
+ assertNull(lbp.chooseTarget(fci));
+ }
+
+ public void testStickinessAfterTopologyChange()
+ {
+ testCount++;
+ List<String> targets = Arrays.asList(TARGETS);
+ FamilyClusterInfo fci = ClusteringTargetsRepository.initTarget(FAMILY_BASE + testCount, targets);
+
+ LoadBalancePolicy lbp = getLoadBalancePolicy();
+ Object firstTarget;
+ Object target = firstTarget = lbp.chooseTarget(fci);
+
+ assertTrue(targets.contains(target));
+
+ targets = Arrays.asList(new String[]{(String) target, "X", "Y"});
+
+ fci.updateClusterInfo(targets, 1);
+
+ for (int i = 0; i < 5; i++)
+ assertEquals(target, lbp.chooseTarget(fci));
+ }
+
+}
\ No newline at end of file
Property changes on: projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/AbstractStickyLoadBalancePolicyTestCase.java
___________________________________________________________________
Name: svn:keywords
+
Modified: projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/FirstAvailableIdenticalAllProxiesUnitTestCase.java
===================================================================
--- projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/FirstAvailableIdenticalAllProxiesUnitTestCase.java 2009-01-28 01:06:04 UTC (rev 83529)
+++ projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/FirstAvailableIdenticalAllProxiesUnitTestCase.java 2009-01-28 02:31:11 UTC (rev 83530)
@@ -22,12 +22,8 @@
package org.jboss.test.ha.client.loadbalance;
-import java.util.Arrays;
import org.jboss.ha.client.loadbalance.FirstAvailableIdenticalAllProxies;
-import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
-import org.jboss.ha.framework.interfaces.ClusteringTargetsRepository;
-import org.jboss.ha.framework.interfaces.FamilyClusterInfo;
/**
* Tests of the FirstAvailable load balance policy.
@@ -35,7 +31,8 @@
* @author Brian Stansberry
*
*/
-public class FirstAvailableIdenticalAllProxiesUnitTestCase extends FirstAvailableUnitTestCase
+public class FirstAvailableIdenticalAllProxiesUnitTestCase
+ extends AbstractIdenticalAllProxiesTestCase<FirstAvailableIdenticalAllProxies>
{
/**
@@ -51,48 +48,10 @@
@Override
- protected LoadBalancePolicy getLoadBalancePolicy()
+ protected FirstAvailableIdenticalAllProxies getLoadBalancePolicy()
{
return new FirstAvailableIdenticalAllProxies();
}
- @Override
- public void testInitialSelection()
- {
- testCount++;
- FamilyClusterInfo fci = ClusteringTargetsRepository.initTarget(FAMILY_BASE + testCount, Arrays.asList(TARGETS));
-
- LoadBalancePolicy lbp = getLoadBalancePolicy();
- Object target = lbp.chooseTarget(fci);
-
- for (int i = 0; i < 10000; i++)
- {
- assertSame(target, getLoadBalancePolicy().chooseTarget(fci));
- }
-
- }
- public void testIdenticalAfterFailover()
- {
- testCount++;
- FamilyClusterInfo fci = ClusteringTargetsRepository.initTarget(FAMILY_BASE + testCount, Arrays.asList(TARGETS));
-
- LoadBalancePolicy lbp1 = getLoadBalancePolicy();
- Object target1 = lbp1.chooseTarget(fci);
-
- LoadBalancePolicy lbp2 = getLoadBalancePolicy();
-
- assertSame(target1, lbp2.chooseTarget(fci));
-
- fci.removeDeadTarget(target1);
-
- Object target3 = lbp1.chooseTarget(fci);
-
- assertFalse(target1.equals(target3));
-
- assertSame(target3, lbp2.chooseTarget(fci));
-
- }
-
-
}
Modified: projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/FirstAvailableUnitTestCase.java
===================================================================
--- projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/FirstAvailableUnitTestCase.java 2009-01-28 01:06:04 UTC (rev 83529)
+++ projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/FirstAvailableUnitTestCase.java 2009-01-28 02:31:11 UTC (rev 83530)
@@ -22,31 +22,16 @@
package org.jboss.test.ha.client.loadbalance;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import junit.framework.TestCase;
-
import org.jboss.ha.client.loadbalance.FirstAvailable;
-import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
-import org.jboss.ha.framework.interfaces.ClusteringTargetsRepository;
-import org.jboss.ha.framework.interfaces.FamilyClusterInfo;
/**
* Tests of the FirstAvailable load balance policy.
*
* @author Brian Stansberry
*/
-public class FirstAvailableUnitTestCase extends TestCase
+public class FirstAvailableUnitTestCase extends AbstractStickyLoadBalancePolicyTestCase<FirstAvailable>
{
- protected static final String[] TARGETS = { "A", "B", "C" };
- protected static final String FAMILY_BASE = "testFamily";
-
- protected static int testCount = 0;
-
/**
* Create a new FirstAvailableUnitTestCase.
*
@@ -56,94 +41,10 @@
{
super(name);
}
-
- protected LoadBalancePolicy getLoadBalancePolicy()
+
+ protected FirstAvailable getLoadBalancePolicy()
{
return new FirstAvailable();
}
-
- public void testBasicStickiness()
- {
- testCount++;
- List<String> targets = Arrays.asList(TARGETS);
- FamilyClusterInfo fci = ClusteringTargetsRepository.initTarget(FAMILY_BASE + testCount, targets);
-
- LoadBalancePolicy lbp = getLoadBalancePolicy();
- Object target = lbp.chooseTarget(fci);
-
- assertTrue(targets.contains(target));
-
- for (int i = 0; i < 10; i++)
- assertEquals(target, lbp.chooseTarget(fci));
- }
-
- public void testInitialSelection()
- {
- testCount++;
- FamilyClusterInfo fci = ClusteringTargetsRepository.initTarget(FAMILY_BASE + testCount, Arrays.asList(TARGETS));
-
- Set<Object> selected = new HashSet<Object>();
-
- for (int i = 0; i < 10000; i++)
- {
- LoadBalancePolicy lbp = getLoadBalancePolicy();
- selected.add(lbp.chooseTarget(fci));
- if (selected.size() == TARGETS.length)
- break;
- }
-
- assertEquals(TARGETS.length, selected.size());
- }
-
- public void testStickinessAfterFailover()
- {
- testCount++;
- List<String> targets = Arrays.asList(TARGETS);
- FamilyClusterInfo fci = ClusteringTargetsRepository.initTarget(FAMILY_BASE + testCount, targets);
-
- LoadBalancePolicy lbp = getLoadBalancePolicy();
- Object firstTarget;
- Object target = firstTarget = lbp.chooseTarget(fci);
-
- assertTrue(targets.contains(target));
-
- for (int i = 0; i < 5; i++)
- assertEquals(target, lbp.chooseTarget(fci));
-
- fci.removeDeadTarget(target);
- Object secondTarget;
- target = secondTarget = lbp.chooseTarget(fci);
-
- assertFalse(firstTarget.equals(secondTarget));
- assertTrue(targets.contains(target));
-
- for (int i = 0; i < 5; i++)
- assertEquals(target, lbp.chooseTarget(fci));
-
- fci.removeDeadTarget(target);
- Object thirdTarget;
- target = thirdTarget = lbp.chooseTarget(fci);
-
- assertFalse(firstTarget.equals(thirdTarget));
- assertFalse(secondTarget.equals(thirdTarget));
- assertTrue(targets.contains(target));
-
- for (int i = 0; i < 5; i++)
- assertEquals(target, lbp.chooseTarget(fci));
-
- fci.removeDeadTarget(target);
-
- assertNull(lbp.chooseTarget(fci));
- }
-
- public void testNoAvailableTargets()
- {
- testCount++;
- FamilyClusterInfo fci = ClusteringTargetsRepository.initTarget(FAMILY_BASE + testCount, new ArrayList<Object>());
-
- assertNull(getLoadBalancePolicy().chooseTarget(fci));
- }
-
-
}
Modified: projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/aop/FirstAvailableIdenticalAllProxiesUnitTestCase.java
===================================================================
--- projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/aop/FirstAvailableIdenticalAllProxiesUnitTestCase.java 2009-01-28 01:06:04 UTC (rev 83529)
+++ projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/aop/FirstAvailableIdenticalAllProxiesUnitTestCase.java 2009-01-28 02:31:11 UTC (rev 83530)
@@ -22,9 +22,8 @@
package org.jboss.test.ha.client.loadbalance.aop;
-import org.jboss.ha.client.loadbalance.AopLoadBalancePolicy;
-import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
import org.jboss.ha.client.loadbalance.aop.FirstAvailableIdenticalAllProxies;
+import org.jboss.test.ha.client.loadbalance.AbstractIdenticalAllProxiesTestCase;
/**
* Tests of the FirstAvailable aop load balance policy.
@@ -33,7 +32,7 @@
*
*/
public class FirstAvailableIdenticalAllProxiesUnitTestCase
-extends org.jboss.test.ha.client.loadbalance.FirstAvailableIdenticalAllProxiesUnitTestCase
+extends AbstractIdenticalAllProxiesTestCase<FirstAvailableIdenticalAllProxies>
{
/**
* Create a new FirstAvailableIdenticalAllProxiesUnitTestCase.
@@ -46,29 +45,24 @@
}
@Override
- protected LoadBalancePolicy getLoadBalancePolicy()
+ protected FirstAvailableIdenticalAllProxies getLoadBalancePolicy()
{
return new FirstAvailableIdenticalAllProxies();
}
- protected AopLoadBalancePolicy getAopLoadBalancePolicy()
- {
- return (AopLoadBalancePolicy) getLoadBalancePolicy();
- }
-
public void testSelectProvidedTarget()
{
- FirstAvailableUnitTestCase.selectProvidedTargetTest(getAopLoadBalancePolicy());
+ FirstAvailableUnitTestCase.selectProvidedTargetTest(getLoadBalancePolicy());
}
public void testInvalidProvidedTarget()
{
- FirstAvailableUnitTestCase.invalidProvidedTargetTest(getAopLoadBalancePolicy());
+ FirstAvailableUnitTestCase.invalidProvidedTargetTest(getLoadBalancePolicy());
}
public void testStickinessTrumpsProvidedTarget()
{
- FirstAvailableUnitTestCase.stickinessTrumpsProvidedTargetTest(getAopLoadBalancePolicy());
+ FirstAvailableUnitTestCase.stickinessTrumpsProvidedTargetTest(getLoadBalancePolicy());
}
}
Modified: projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/aop/FirstAvailableUnitTestCase.java
===================================================================
--- projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/aop/FirstAvailableUnitTestCase.java 2009-01-28 01:06:04 UTC (rev 83529)
+++ projects/cluster/ha-client/trunk/src/test/java/org/jboss/test/ha/client/loadbalance/aop/FirstAvailableUnitTestCase.java 2009-01-28 02:31:11 UTC (rev 83530)
@@ -29,18 +29,18 @@
import org.jboss.aop.util.PayloadKey;
import org.jboss.aspects.remoting.ClusterConstants;
import org.jboss.ha.client.loadbalance.AopLoadBalancePolicy;
-import org.jboss.ha.client.loadbalance.LoadBalancePolicy;
import org.jboss.ha.client.loadbalance.aop.FirstAvailable;
import org.jboss.ha.framework.interfaces.ClusteringTargetsRepository;
import org.jboss.ha.framework.interfaces.FamilyClusterInfo;
+import org.jboss.test.ha.client.loadbalance.AbstractStickyLoadBalancePolicyTestCase;
/**
* Tests of the FirstAvailable aop load balance policy.
*
* @author Brian Stansberry
*/
-public class FirstAvailableUnitTestCase
-extends org.jboss.test.ha.client.loadbalance.FirstAvailableUnitTestCase
+public class FirstAvailableUnitTestCase
+ extends AbstractStickyLoadBalancePolicyTestCase<FirstAvailable>
{
/**
* Create a new FirstAvailableUnitTestCase.
@@ -52,19 +52,14 @@
super(name);
}
- protected LoadBalancePolicy getLoadBalancePolicy()
+ protected FirstAvailable getLoadBalancePolicy()
{
return new FirstAvailable();
}
- protected AopLoadBalancePolicy getAopLoadBalancePolicy()
- {
- return (AopLoadBalancePolicy) getLoadBalancePolicy();
- }
-
public void testSelectProvidedTarget()
{
- selectProvidedTargetTest(getAopLoadBalancePolicy());
+ selectProvidedTargetTest(getLoadBalancePolicy());
}
public static void selectProvidedTargetTest(AopLoadBalancePolicy lbp)
@@ -81,7 +76,7 @@
public void testInvalidProvidedTarget()
{
- invalidProvidedTargetTest(getAopLoadBalancePolicy());
+ invalidProvidedTargetTest(getLoadBalancePolicy());
}
public static void invalidProvidedTargetTest(AopLoadBalancePolicy lbp)
@@ -102,7 +97,7 @@
public void testStickinessTrumpsProvidedTarget()
{
- stickinessTrumpsProvidedTargetTest(getAopLoadBalancePolicy());
+ stickinessTrumpsProvidedTargetTest(getLoadBalancePolicy());
}
public static void stickinessTrumpsProvidedTargetTest(AopLoadBalancePolicy lbp)
More information about the jboss-cvs-commits
mailing list