1 files changed, 35 insertions, 41 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/TldTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/TldTest.java
index c3cbc58860b..4d766b776b3 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/TldTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/TldTest.java
@@ -59,17 +59,17 @@ public class TldTest {
         assertEquals(1, config.dataset(0).engine().size());
     }
 
-  @Test
-  public void requireThatUseLocalPolicyIsOk() {
-    ApplicationPackage app = new MockApplicationPackage.Builder()
+    @Test
+    public void requireThatUseLocalPolicyIsOk() {
+        ApplicationPackage app = new MockApplicationPackage.Builder()
             .withHosts(
-            "<hosts>" +
-                    "<host name='search.node1'><alias>search1</alias></host>" +
-                    "<host name='search.node2'><alias>search2</alias></host>" +
-                    "<host name='jdisc.host.other'><alias>gateway</alias></host>" +
-            "</hosts>")
+                    "<hosts>" +
+                    "  <host name='search.node1'><alias>search1</alias></host>" +
+                    "  <host name='search.node2'><alias>search2</alias></host>" +
+                    "  <host name='jdisc.host.other'><alias>gateway</alias></host>" +
+                    "</hosts>")
             .withServices(
-            "<services>" +
+                    "<services>" +
                     "  <admin version='2.0'>" +
                     "    <adminserver hostalias='gateway' />" +
                     "  </admin>" +
@@ -110,43 +110,37 @@ public class TldTest {
             .withSearchDefinition(MockApplicationPackage.MUSIC_SEARCHDEFINITION)
             .build();
 
-    PartitionsConfig.Builder builder = new PartitionsConfig.Builder();
-    new TestDriver(true).buildModel(app).getConfig(builder, "foo/search/cluster.foo/tlds/gw.0.tld.0");
-    PartitionsConfig config = new PartitionsConfig(builder);
-
-    assertEquals(1, config.dataset().size());
-    //gateway TLD with no local search node gets all search nodes
-    assertEquals(2, config.dataset(0).engine().size());
+        PartitionsConfig.Builder builder = new PartitionsConfig.Builder();
+        new TestDriver(true).buildModel(app).getConfig(builder, "foo/search/cluster.foo/tlds/gw.0.tld.0");
+        PartitionsConfig config = new PartitionsConfig(builder);
 
-    assertEquals("rowid not equal 0",0,config.dataset(0).engine(0).rowid()); //Load Balance row 0
-    assertEquals("partid not equal 0",0,config.dataset(0).engine(0).partid());
-    assertTrue("Not configured with correct search node",config.dataset(0).engine(0).name_and_port().contains("search.node1"));
+        // No tld if no search
+        assertEquals(0, config.dataset().size());
 
-    assertEquals("rowid not equal to 1",1,config.dataset(0).engine(1).rowid()); //Load Balance row 1
-    assertEquals("partid no equal to 0",0,config.dataset(0).engine(1).partid());
-    assertTrue("Not configured with correct search node",config.dataset(0).engine(1).name_and_port().contains("search.node2"));
+        // First container with a local search node
+        builder = new PartitionsConfig.Builder();
+        new TestDriver(true).buildModel(app).getConfig(builder, "foo/search/cluster.foo/tlds/default.0.tld.0");
+        config = new PartitionsConfig(builder);
 
-    //First container with a local search node
-    builder = new PartitionsConfig.Builder();
-    new TestDriver(true).buildModel(app).getConfig(builder, "foo/search/cluster.foo/tlds/default.0.tld.0");
-    config = new PartitionsConfig(builder);
+        assertEquals(1, config.dataset().size());
+        assertEquals(1, config.dataset(0).engine().size());
+        assertEquals(0,config.dataset(0).engine(0).rowid());
+        assertEquals(0,config.dataset(0).engine(0).partid());
+        assertTrue("Configured with local search node as engine",
+                   config.dataset(0).engine(0).name_and_port().contains("search.node1"));
 
-    assertEquals(1, config.dataset().size());
-    assertEquals(1, config.dataset(0).engine().size());
-    assertEquals(0,config.dataset(0).engine(0).rowid());
-    assertEquals(0,config.dataset(0).engine(0).partid());
-    assertTrue("Not configured with local search node as engine",config.dataset(0).engine(0).name_and_port().contains("search.node1"));
+        // Second container with a local search node
+        builder = new PartitionsConfig.Builder();
+        new TestDriver(true).buildModel(app).getConfig(builder, "foo/search/cluster.foo/tlds/default.1.tld.1");
+        config = new PartitionsConfig(builder);
 
-    //Second container with a local search node
-    builder = new PartitionsConfig.Builder();
-    new TestDriver(true).buildModel(app).getConfig(builder, "foo/search/cluster.foo/tlds/default.1.tld.1");
-    config = new PartitionsConfig(builder);
+        assertEquals(1, config.dataset().size());
+        assertEquals(1, config.dataset(0).engine().size());
 
-    assertEquals(1, config.dataset().size());
-    assertEquals(1, config.dataset(0).engine().size());
-    assertEquals(0,config.dataset(0).engine(0).rowid());
-    assertEquals(0,config.dataset(0).engine(0).partid());
-    assertTrue("Not configured with local search node as engine",config.dataset(0).engine(0).name_and_port().contains("search.node2"));
+        assertEquals("rowid equals 0",0, config.dataset(0).engine(0).rowid()); // Load Balance row 0
+        assertEquals("partid equals 0",0, config.dataset(0).engine(0).partid());
+        assertTrue("Configured with correct search node",
+                   config.dataset(0).engine(0).name_and_port().contains("search.node2"));
+    }
 
-  }
 }