From bd2cd6f6e6f9b9c6f0a82907a9bd4e0c6f62ee68 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Fri, 14 Jun 2019 12:43:43 +0200 Subject: Use correct field name when deserialising test config --- .../java/ai/vespa/hosted/api/TestConfigTest.java | 37 ++++++++++++++++++++++ hosted-api/src/test/resources/test-config.json | 13 ++++++++ 2 files changed, 50 insertions(+) create mode 100644 hosted-api/src/test/java/ai/vespa/hosted/api/TestConfigTest.java create mode 100644 hosted-api/src/test/resources/test-config.json (limited to 'hosted-api/src/test') diff --git a/hosted-api/src/test/java/ai/vespa/hosted/api/TestConfigTest.java b/hosted-api/src/test/java/ai/vespa/hosted/api/TestConfigTest.java new file mode 100644 index 00000000000..51fb7a8cf4a --- /dev/null +++ b/hosted-api/src/test/java/ai/vespa/hosted/api/TestConfigTest.java @@ -0,0 +1,37 @@ +package ai.vespa.hosted.api; + +import com.yahoo.config.provision.ApplicationId; +import com.yahoo.config.provision.SystemName; +import com.yahoo.config.provision.zone.ZoneId; +import org.junit.Test; + +import java.io.IOException; +import java.net.URI; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.Map; + +import static org.junit.Assert.assertEquals; + +/** + * @author jonmv + */ +public class TestConfigTest { + + @Test + public void testDeserialization() throws IOException { + TestConfig config = TestConfig.fromJson(Files.readAllBytes(Paths.get("src/test/resources/test-config.json"))); + assertEquals(ApplicationId.from("t", "a", "i"), + config.application()); + assertEquals(ZoneId.from("dev", "aws-us-east-1c"), + config.zone()); + assertEquals(SystemName.PublicCd, + config.system()); + assertEquals(Map.of(ZoneId.from("dev", "aws-us-east-1c"), + Map.of("default", URI.create("https://dev.endpoint:443/")), + ZoneId.from("prod", "aws-us-east-1a"), + Map.of("default", URI.create("https://prod.endpoint:443/"))), + config.deployments()); + } + +} diff --git a/hosted-api/src/test/resources/test-config.json b/hosted-api/src/test/resources/test-config.json new file mode 100644 index 00000000000..9d36f9496a0 --- /dev/null +++ b/hosted-api/src/test/resources/test-config.json @@ -0,0 +1,13 @@ +{ + "application": "t:a:i", + "zone": "dev.aws-us-east-1c", + "system": "publiccd", + "zoneEndpoints": { + "dev.aws-us-east-1c": { + "default": "https://dev.endpoint:443/" + }, + "prod.aws-us-east-1a": { + "default": "https://prod.endpoint:443/" + } + } +} -- cgit v1.2.3