From 0c23bdd8ed90e317089318e19eec4df9a7da0f8d Mon Sep 17 00:00:00 2001 From: Arne Juul Date: Thu, 27 Oct 2022 08:50:25 +0000 Subject: use imported getDefaults() --- .../java/com/yahoo/vespa/model/container/xml/AccessControlTest.java | 2 +- .../yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'config-model') diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java index faeac12f508..0db52bf8eb5 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java @@ -328,7 +328,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { assertTrue(actualBindings.isEmpty()); ConnectorFactory connectorFactory = http.getHttpServer().get().getConnectorFactories().stream() - .filter(cf -> cf.getListenPort() == Defaults.getDefaults().vespaWebServicePort()) + .filter(cf -> cf.getListenPort() == getDefaults().vespaWebServicePort()) .findAny() .get(); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java index cf6b6365792..562b1c25b6c 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java @@ -123,7 +123,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { ""); createModel(root, clusterElem); AbstractService container = (AbstractService) root.getProducer("container/container.0"); - assertEquals(Defaults.getDefaults().vespaWebServicePort(), container.getRelativePort(0)); + assertEquals(getDefaults().vespaWebServicePort(), container.getRelativePort(0)); } @Test @@ -153,7 +153,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { } catch (IllegalArgumentException e) { // Success - assertEquals("Illegal port 9000 in http server 'foo': Port must be set to " + Defaults.getDefaults().vespaWebServicePort(), + assertEquals("Illegal port 9000 in http server 'foo': Port must be set to " + getDefaults().vespaWebServicePort(), e.getMessage()); } } -- cgit v1.2.3