diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-05-15 16:34:13 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-05-15 16:34:13 +0200 |
commit | 59cefad3cd70b6ece6a6e152176019df040a3e5f (patch) | |
tree | 3e3d35221721cf2af5cf7e33116f795eec3ada0c /config-model/src/test/java/com/yahoo/vespa/model/container/xml | |
parent | a98b18cd45e8fae74a9e71c331698b7ed149ae98 (diff) |
Reapply "Bjorncs/cloud app validation""
Diffstat (limited to 'config-model/src/test/java/com/yahoo/vespa/model/container/xml')
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java index 8b1217758ab..89cce7feacb 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java @@ -243,11 +243,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas Element clusterElem = DomBuilderTest.parse( "<container id='default' version='1.0'>", " <http>", - " <server port='8080' id='ssl'>", - " <ssl>", - " <private-key-file>/foo/key</private-key-file>", - " <certificate-file>/foo/cert</certificate-file>", - " </ssl>", + " <server port='8080' id='default'>", " </server>", " </http>", multiNode, @@ -272,8 +268,8 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas .build(); MockRoot root = new MockRoot("root", deployState); createModel(root, deployState, null, clusterElem); - ConnectorConfig sslProvider = root.getConfig(ConnectorConfig.class, "default/http/jdisc-jetty/ssl"); - assertTrue(sslProvider.ssl().enabled()); + ConnectorConfig sslProvider = root.getConfig(ConnectorConfig.class, "default/http/jdisc-jetty/default"); + assertFalse(sslProvider.ssl().enabled()); assertEquals("", sslProvider.ssl().certificate()); assertEquals("", sslProvider.ssl().privateKey()); |