Do not use null as arguments in tests

4 files changed, 28 insertions, 28 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
index 64ed53795b9..43659498a40 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
@@ -13,9 +13,9 @@ import com.yahoo.text.XML;
 import com.yahoo.vespa.defaults.Defaults;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
 import com.yahoo.vespa.model.content.storagecluster.StorageCluster;
+import com.yahoo.vespa.model.content.utils.ContentClusterUtils;
 import org.junit.Test;
 import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 
 import java.util.Collections;
 
@@ -23,7 +23,7 @@ import static org.junit.Assert.*;
 
 public class StorageClusterTest {
 
-    StorageCluster parse(String xml) {
+    StorageCluster parse(String xml) throws Exception {
         MockRoot root = new MockRoot();
         root.getDeployState().getDocumentModel().getDocumentManager().add(
                 new NewDocumentType(new NewDocumentType.Name("music"))
@@ -31,16 +31,14 @@ public class StorageClusterTest {
         root.getDeployState().getDocumentModel().getDocumentManager().add(
                 new NewDocumentType(new NewDocumentType.Name("movies"))
         );
-        Document doc = XML.getDocument(xml);
-        Element clusterElem = doc.getDocumentElement();
-        ContentCluster cluster = new ContentCluster.Builder(null, null).build(Collections.emptyList(), root, clusterElem);
+        ContentCluster cluster = ContentClusterUtils.createCluster(xml, root);
 
         root.freezeModelTopology();
         return cluster.getStorageNodes();
     }
 
     @Test
-    public void testBasics() {
+    public void testBasics() throws Exception {
         StorServerConfig.Builder builder = new StorServerConfig.Builder();
         parse("<content id=\"foofighters\"><documents/>\n" +
               "  <group>" +
@@ -55,7 +53,7 @@ public class StorageClusterTest {
     }
 
     @Test
-    public void testMerges() {
+    public void testMerges() throws Exception {
         StorServerConfig.Builder builder = new StorServerConfig.Builder();
         parse("" +
                 "<content id=\"foofighters\">\n" +
@@ -75,7 +73,7 @@ public class StorageClusterTest {
     }
 
     @Test
-    public void testVisitors() {
+    public void testVisitors() throws Exception {
         StorVisitorConfig.Builder builder = new StorVisitorConfig.Builder();
         parse(
                 "<cluster id=\"bees\">\n" +
@@ -99,7 +97,7 @@ public class StorageClusterTest {
     }
 
     @Test
-    public void testPersistenceThreads() {
+    public void testPersistenceThreads() throws Exception {
         StorFilestorConfig.Builder builder = new StorFilestorConfig.Builder();
         parse(
                 "<cluster id=\"bees\">\n" +
@@ -132,7 +130,7 @@ public class StorageClusterTest {
     }
 
     @Test
-    public void testNoPersistenceThreads() {
+    public void testNoPersistenceThreads() throws Exception {
         StorFilestorConfig.Builder builder = new StorFilestorConfig.Builder();
         parse(
                 "<cluster id=\"bees\">\n" +
@@ -151,7 +149,7 @@ public class StorageClusterTest {
     }
 
     @Test
-    public void maintenance_tuning_is_honored_for_vds_provider() {
+    public void maintenance_tuning_is_honored_for_vds_provider() throws Exception {
         StorIntegritycheckerConfig.Builder builder = new StorIntegritycheckerConfig.Builder();
         parse(
                 "<cluster id=\"bees\">\n" +
@@ -175,7 +173,7 @@ public class StorageClusterTest {
     }
 
     @Test
-    public void integrity_checker_explicitly_disabled_when_not_running_with_vds_provider() {
+    public void integrity_checker_explicitly_disabled_when_not_running_with_vds_provider() throws Exception {
         StorIntegritycheckerConfig.Builder builder = new StorIntegritycheckerConfig.Builder();
         parse(
                 "<cluster id=\"bees\">\n" +
@@ -191,7 +189,7 @@ public class StorageClusterTest {
     }
 
     @Test
-    public void integrity_checker_not_explicitly_disabled_when_running_with_vds_provider() {
+    public void integrity_checker_not_explicitly_disabled_when_running_with_vds_provider() throws Exception {
         StorIntegritycheckerConfig.Builder builder = new StorIntegritycheckerConfig.Builder();
         parse(
                 "<cluster id=\"bees\">\n" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java
index f1768ab6927..db8a0900939 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java
@@ -1,14 +1,11 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.content;
 
-import com.yahoo.vespa.config.content.StorDistributionConfig;
 import com.yahoo.config.model.test.MockRoot;
-import com.yahoo.text.XML;
+import com.yahoo.vespa.config.content.StorDistributionConfig;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
+import com.yahoo.vespa.model.content.utils.ContentClusterUtils;
 import org.junit.Test;
-import org.w3c.dom.Document;
-
-import java.util.Collections;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -18,13 +15,12 @@ import static org.junit.Assert.assertTrue;
  */
 public class StorageGroupTest {
 
-    ContentCluster parse(String xml) {
-        Document doc = XML.getDocument(xml);
-        return new ContentCluster.Builder(null, null).build(Collections.emptyList(), new MockRoot(), doc.getDocumentElement());
+    ContentCluster parse(String xml) throws Exception {
+        return ContentClusterUtils.createCluster(xml, new MockRoot());
     }
 
     @Test
-    public void testSingleGroup() {
+    public void testSingleGroup() throws Exception {
         StorDistributionConfig.Builder builder = new StorDistributionConfig.Builder();
         ContentCluster cluster = parse(
                 "<content id=\"storage\">\n" +
@@ -80,7 +76,7 @@ public class StorageGroupTest {
     }
 
     @Test
-    public void testNestedGroups() {
+    public void testNestedGroups() throws Exception {
         StorDistributionConfig.Builder builder = new StorDistributionConfig.Builder();
         parse(
                 "<content version=\"1.0\" id=\"storage\">\n" +
@@ -134,7 +130,7 @@ public class StorageGroupTest {
     }
 
     @Test
-    public void testGroupCapacity() {
+    public void testGroupCapacity() throws Exception {
         StorDistributionConfig.Builder builder = new StorDistributionConfig.Builder();
         parse(
                 "<content version=\"1.0\" id=\"storage\">\n" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java
index 808c9a97287..9d686250254 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java
@@ -7,7 +7,6 @@ import com.yahoo.vespa.model.content.cluster.ContentCluster;
 import org.w3c.dom.Document;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -71,9 +70,9 @@ public class ContentClusterBuilder {
         return this;
     }
 
-    public ContentCluster build(MockRoot root) {
+    public ContentCluster build(MockRoot root) throws Exception {
         Document doc = XML.getDocument(getXml());
-        return new ContentCluster.Builder(null, null).build(Collections.emptyList(), root, doc.getDocumentElement());
+        return ContentClusterUtils.createCluster(getXml(), root);
     }
 
     public String getXml() {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java
index f2f9ff482c1..43875403cc2 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java
@@ -2,13 +2,18 @@
 package com.yahoo.vespa.model.content.utils;
 
 import com.yahoo.config.application.api.ApplicationPackage;
+import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.model.api.HostProvisioner;
+import com.yahoo.config.model.application.provider.BaseDeployLogger;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.provision.InMemoryProvisioner;
 import com.yahoo.config.model.provision.SingleNodeProvisioner;
 import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.text.XML;
+import com.yahoo.vespa.model.admin.Admin;
+import com.yahoo.vespa.model.admin.monitoring.Yamas;
+import com.yahoo.vespa.model.admin.monitoring.builder.Metrics;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
 import com.yahoo.vespa.model.test.utils.ApplicationPackageUtils;
 import org.w3c.dom.Document;
@@ -46,7 +51,9 @@ public class ContentClusterUtils {
 
     public static ContentCluster createCluster(String clusterXml, MockRoot root) throws Exception {
         Document doc = XML.getDocument(clusterXml);
-        return new ContentCluster.Builder(null, null).build(Collections.emptyList(), root, doc.getDocumentElement());
+        Admin admin = new Admin(new MockRoot(), new Yamas("vespa", 60), new Metrics(), Collections.emptyMap(), false);
+        DeployLogger deployLogger = new BaseDeployLogger();
+        return new ContentCluster.Builder(admin, deployLogger).build(Collections.emptyList(), root, doc.getDocumentElement());
     }
 
     public static ContentCluster createCluster(String clusterXml, List<String> searchDefinitions) throws Exception {