diff options
Diffstat (limited to 'config-model/src/test/java/com')
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/xml/CloudTokenDataPlaneFilterTest.java | 5 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/utils/FileSenderTest.java | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/CloudTokenDataPlaneFilterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/CloudTokenDataPlaneFilterTest.java index 15e1d61c951..b4e2f53bb87 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/CloudTokenDataPlaneFilterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/CloudTokenDataPlaneFilterTest.java @@ -1,6 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.container.xml; +import com.yahoo.config.model.api.ApplicationClusterEndpoint; +import com.yahoo.config.model.api.ContainerEndpoint; import com.yahoo.config.model.api.EndpointCertificateSecrets; import com.yahoo.config.model.builder.xml.test.DomBuilderTest; import com.yahoo.config.model.deploy.DeployState; @@ -27,6 +29,8 @@ import java.time.Instant; import java.util.Collection; import java.util.List; import java.util.Optional; +import java.util.OptionalInt; +import java.util.Set; import static com.yahoo.vespa.model.container.xml.CloudDataPlaneFilterTest.createCertificate; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -99,6 +103,7 @@ public class CloudTokenDataPlaneFilterTest extends ContainerModelBuilderTestBase new DataplaneToken.Version("myfingerprint2", "myaccesshash2", Optional.of(Instant.EPOCH.plus(Duration.ofDays(100000)))))))) .setHostedVespa(true)) .zone(new Zone(SystemName.PublicCd, Environment.dev, RegionName.defaultName())) + .endpoints(Set.of(new ContainerEndpoint("cluster", ApplicationClusterEndpoint.Scope.zone, List.of("name"), OptionalInt.empty(), ApplicationClusterEndpoint.RoutingMethod.exclusive, ApplicationClusterEndpoint.AuthMethod.token))) .build(); return createModel(root, state, null, clusterElem); } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/utils/FileSenderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/utils/FileSenderTest.java index c122aba9cf1..6dc9207a8cc 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/utils/FileSenderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/utils/FileSenderTest.java @@ -4,6 +4,7 @@ package com.yahoo.vespa.model.utils; import com.yahoo.config.FileNode; import com.yahoo.config.FileReference; import com.yahoo.config.ModelReference; +import com.yahoo.config.OptionalPathNode; import com.yahoo.config.UrlReference; import com.yahoo.config.application.api.FileRegistry; import com.yahoo.config.model.application.provider.BaseDeployLogger; @@ -39,7 +40,6 @@ public class FileSenderTest { private List<AbstractService> serviceList; private final MyFileRegistry fileRegistry = new MyFileRegistry(); private ConfigDefinition def; - private TestService service; private static class MyFileRegistry implements FileRegistry { public Map<String, FileReference> pathToRef = new HashMap<>(); @@ -72,7 +72,7 @@ public class FileSenderTest { public void setup() { MockRoot root = new MockRoot(); producer = new SimpleConfigProducer<>(root, "test"); - service = new TestService(root, "service"); + TestService service = new TestService(root, "service"); serviceList = new ArrayList<>(); serviceList.add(service); ConfigDefinitionKey key = new ConfigDefinitionKey("myname", "mynamespace"); @@ -248,6 +248,12 @@ public class FileSenderTest { }); } + @Test + void require_that_empty_optional_paths_are_not_sent() { + def.addOptionalPathDef("optionalPathVal"); + fileSender().sendUserConfiguredFiles(producer); + } + private static class TestService extends AbstractService { public TestService(TreeConfigProducer<?> parent, String name) { |