diff options
Diffstat (limited to 'config-model/src/test/java/com')
2 files changed, 6 insertions, 5 deletions
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 e557e3674b5..27301ab60b2 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 @@ -30,7 +30,7 @@ import java.util.Optional; */ public class ContentClusterUtils { - public static MockRoot createMockRoot(String[] hosts) throws Exception { + public static MockRoot createMockRoot(String[] hosts) { return createMockRoot(hosts, SearchDefinitionBuilder.createSearchDefinitions("test")); } @@ -46,7 +46,7 @@ public class ContentClusterUtils { return new MockRoot("", deployStateBuilder.build()); } - public static MockRoot createMockRoot(String[] hosts, List<String> searchDefinitions) throws Exception { + public static MockRoot createMockRoot(String[] hosts, List<String> searchDefinitions) { return createMockRoot(new InMemoryProvisioner(true, hosts), searchDefinitions); } @@ -58,10 +58,11 @@ public class ContentClusterUtils { return createMockRoot(new SingleNodeProvisioner(), searchDefinitions, deployStateBuilder); } - public static ContentCluster createCluster(String clusterXml, MockRoot root) throws Exception { + public static ContentCluster createCluster(String clusterXml, MockRoot root) { Document doc = XML.getDocument(clusterXml); Admin admin = new Admin(root, new DefaultMonitoring("vespa", 60), new Metrics(), Collections.emptyMap(), false, - new FileDistributionConfigProducer.Builder(FileDistributionOptions.defaultOptions()).build(root, new MockFileRegistry())); + new FileDistributionConfigProducer.Builder(FileDistributionOptions.defaultOptions()) + .build(root, new MockFileRegistry(), null)); ConfigModelContext context = ConfigModelContext.create(null, root.getDeployState(), null, root, null); return new ContentCluster.Builder(admin).build(Collections.emptyList(), context, doc.getDocumentElement()); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/FileDistributorTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/FileDistributorTestCase.java index 9b4853d4224..26d08bc1677 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/FileDistributorTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/FileDistributorTestCase.java @@ -20,7 +20,7 @@ public class FileDistributorTestCase { public void fileDistributor() { MockHosts hosts = new MockHosts(); - FileDistributor fileDistributor = new FileDistributor(new MockFileRegistry()); + FileDistributor fileDistributor = new FileDistributor(new MockFileRegistry(), null); FileReference ref1 = fileDistributor.sendFileToHosts("components/path1", Arrays.asList(hosts.host1, hosts.host2)); FileReference ref2 = fileDistributor.sendFileToHosts("path2", Arrays.asList(hosts.host3)); |