summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorArne Juul <arnej@yahooinc.com>2022-10-27 08:50:25 +0000
committerArne Juul <arnej@yahooinc.com>2022-10-27 08:56:49 +0000
commit0c23bdd8ed90e317089318e19eec4df9a7da0f8d (patch)
tree730f371b10238ddc8185468d3e7e8bfe8bf95af5 /config-model
parentabe8f597b50d5fcfb379c136abc6462044f90e0c (diff)
use imported getDefaults()
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java2
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java4
2 files changed, 3 insertions, 3 deletions
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 {
"</container>");
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());
}
}