Add test and fix loadbalancer selection.

2 files changed, 15 insertions, 2 deletions

diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LoadBalancerPolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LoadBalancerPolicy.java
index d666a5d811d..4f955f3649e 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LoadBalancerPolicy.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LoadBalancerPolicy.java
@@ -49,9 +49,9 @@ public class LoadBalancerPolicy extends SlobrokPolicy {
 
         pattern = cluster + "/*/" + session;
         String type = params.get("type");
-        if (type == "adaptive") {
+        if ("adaptive".equals(type)) {
             loadBalancer = new AdaptiveLoadBalancer(cluster);
-        } else if (type == "legacy") {
+        } else if ("legacy".equals(type)) {
             loadBalancer = new LegacyLoadBalancer(cluster);
         } else {
             loadBalancer = new LegacyLoadBalancer(cluster);
@@ -102,4 +102,7 @@ public class LoadBalancerPolicy extends SlobrokPolicy {
     public void destroy() {
 
     }
+
+    // For testing
+    LoadBalancer getLoadBalancer() { return loadBalancer; }
 }
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/LoadBalancerTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/LoadBalancerTestCase.java
index 225345afbec..770665e825c 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/LoadBalancerTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/LoadBalancerTestCase.java
@@ -41,6 +41,16 @@ public class LoadBalancerTestCase {
     }
 
     @Test
+    public void testLoadBalancerCreation() {
+        LoadBalancerPolicy lbp = new LoadBalancerPolicy("cluster=docproc/cluster.mobile.indexing;session=chain.mobile.indexing");
+        assertTrue(lbp.getLoadBalancer() instanceof LegacyLoadBalancer);
+        lbp = new LoadBalancerPolicy("cluster=docproc/cluster.mobile.indexing;session=chain.mobile.indexing;type=legacy");
+        assertTrue(lbp.getLoadBalancer() instanceof LegacyLoadBalancer);
+        lbp = new LoadBalancerPolicy("cluster=docproc/cluster.mobile.indexing;session=chain.mobile.indexing;type=adaptive");
+        assertTrue(lbp.getLoadBalancer() instanceof AdaptiveLoadBalancer);
+    }
+
+    @Test
     public void testAdaptiveLoadBalancer() {
         LoadBalancer lb = new AdaptiveLoadBalancer("foo");