diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-01-18 10:05:40 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-01-18 10:05:40 +0100 |
commit | d5f25f931971b43819f7677c8dbecf55e189df2b (patch) | |
tree | 84cacb0bfc74e6e325942e885cdacaedeac31c64 /config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java | |
parent | c61907a3458d565910b0a3b4286c87759469da12 (diff) |
Add test for no nodes
Diffstat (limited to 'config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java')
-rw-r--r-- | config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java | 28 |
1 files changed, 24 insertions, 4 deletions
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() { |