Add test for no nodes

3 files changed, 32 insertions, 11 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index 7697d1123ff..96e5b05aacf 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -104,7 +104,7 @@ import static com.yahoo.container.core.BundleLoaderProperties.DISK_BUNDLE_PREFIX
 
 /**
  * @author gjoranv
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  * @author tonytv
  */
 public final class ContainerCluster
@@ -133,6 +133,7 @@ public final class ContainerCluster
         ServletPathsConfig.Producer,
         RoutingProviderConfig.Producer,
         ConfigserverConfig.Producer {
+
     /**
      * URI prefix used for internal, usually programmatic, APIs. URIs using this
      * prefix should never considered available for direct use by customers, and
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 1d0b4609ec3..1649c937f56 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -1060,8 +1060,7 @@ public class ModelProvisioningTest {
     public void testUsingHostaliasWithProvisioner() {
         String services =
                         "<?xml version='1.0' encoding='utf-8' ?>\n" +
-                        "<services>\n" +
-                        "\n" +
+                        "<services>" +
                         "<admin version='2.0'>" +
                         "  <adminserver hostalias='node1'/>\n"+
                         "</admin>\n" +
@@ -1074,9 +1073,8 @@ public class ModelProvisioningTest {
                         "  </nodes>" +
                         "</jdisc>" +
                         "</services>";
-        int numberOfHosts = 1;
         VespaModelTester tester = new VespaModelTester();
-        tester.addHosts(numberOfHosts);
+        tester.addHosts(1);
         VespaModel model = tester.createModel(services, true);
         assertEquals(1, model.getRoot().getHostSystem().getHosts().size());
         assertEquals(1, model.getAdmin().getSlobroks().size());
@@ -1098,6 +1096,28 @@ public class ModelProvisioningTest {
         assertThat(model.getContainerClusters().size(), is(1));
     }
 
+    @Test
+    public void testNoNodeTagMeans1Node() {
+        String services =
+                "<?xml version='1.0' encoding='utf-8' ?>\n" +
+                "<services>" +
+                "  <jdisc id='mydisc' version='1.0'>" +
+                "    <search/>" +
+                "    <document-api/>" +
+                "  </jdisc>" +
+                "  <content version='1.0' id='foo'>" +
+                "     <documents>" +
+                "       <document type='type1' mode='index'/>" +
+                "     </documents>" +
+                "  </content>" +
+                "</services>";
+        VespaModelTester tester = new VespaModelTester();
+        tester.addHosts(1);
+        VespaModel model = tester.createModel(services, true);
+        assertEquals(1, model.getRoot().getHostSystem().getHosts().size());
+        assertEquals(1, model.getAdmin().getSlobroks().size());
+    }
+
     /** Recreate the combination used in some factory tests */
     @Test
     public void testMultitenantButNotHosted() {
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/parser/IdentifierTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/parser/IdentifierTestCase.java
index 69840bff19e..cd1cfec85b2 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/parser/IdentifierTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/parser/IdentifierTestCase.java
@@ -9,17 +9,16 @@ import java.util.List;
 import static org.junit.Assert.assertEquals;
 
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
 public class IdentifierTestCase {
 
     @Test
     public void requireThatThereAreNoReservedWords() throws ParseException {
         List<String> tokens = Arrays.asList("attribute",
-                                            "base64_decode",
-                                            "base64_encode",
+                                            "base64decode",
+                                            "base64encode",
                                             "clear_state",
-                                            "compact_phrase",
                                             "create_if_non_existent",
                                             "echo",
                                             "exact",
@@ -35,7 +34,7 @@ public class IdentifierTestCase {
                                             "index",
                                             "join",
                                             "linguistics",
-                                            "lower_case",
+                                            "lowercase",
                                             "ngram",
                                             "normalize",
                                             "now",
@@ -47,7 +46,7 @@ public class IdentifierTestCase {
                                             "remove_ctrl_chars",
                                             "remove_if_zero",
                                             "remove_so_si",
-                                            "select_field",
+                                            "select_input",
                                             "set_language",
                                             "set_var",
                                             "split",
@@ -71,4 +70,5 @@ public class IdentifierTestCase {
             assertEquals(str, parser.identifier());
         }
     }
+
 }