aboutsummaryrefslogtreecommitdiffstats
path: root/config-model-api
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2022-11-11 16:05:01 +0100
committerjonmv <venstad@gmail.com>2022-11-11 16:05:01 +0100
commit780128abb923e4d026891dd903084285cbb8830a (patch)
tree2ac41c86352a9cc1c4698622eb264c45bbf54126 /config-model-api
parentd2ad08b1780072ad6cd0cc3ac8044bbda8389569 (diff)
Accept no test zip
Diffstat (limited to 'config-model-api')
-rw-r--r--config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java49
1 files changed, 25 insertions, 24 deletions
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
index c6dfa0f8cb7..465f35e0b43 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
@@ -1588,30 +1588,31 @@ public class DeploymentSpecTest {
@Test
public void cloudAccount() {
- StringReader r = new StringReader(
- "<deployment version='1.0' cloud-account='100000000000'>" +
- " <instance id='alpha'>" +
- " <prod cloud-account='800000000000'>" +
- " <region>us-east-1</region>" +
- " </prod>" +
- " </instance>" +
- " <instance id='beta' cloud-account='200000000000'>" +
- " <staging cloud-account='600000000000'/>" +
- " <perf cloud-account='700000000000'/>" +
- " <prod>" +
- " <region>us-west-1</region>" +
- " </prod>" +
- " </instance>" +
- " <instance id='main'>" +
- " <test cloud-account='500000000000'/>" +
- " <dev cloud-account='400000000000'/>" +
- " <prod>" +
- " <region cloud-account='300000000000'>us-east-1</region>" +
- " <region>eu-west-1</region>" +
- " </prod>" +
- " </instance>" +
- "</deployment>"
- );
+ String r =
+ """
+ <deployment version='1.0' cloud-account='100000000000'>
+ <instance id='alpha'>
+ <prod cloud-account='800000000000'>
+ <region>us-east-1</region>
+ </prod>
+ </instance>
+ <instance id='beta' cloud-account='200000000000'>
+ <staging cloud-account='600000000000'/>
+ <perf cloud-account='700000000000'/>
+ <prod>
+ <region>us-west-1</region>
+ </prod>
+ </instance>
+ <instance id='main'>
+ <test cloud-account='500000000000'/>
+ <dev cloud-account='400000000000'/>
+ <prod>
+ <region cloud-account='300000000000'>us-east-1</region>
+ <region>eu-west-1</region>
+ </prod>
+ </instance>
+ </deployment>
+ """;
DeploymentSpec spec = DeploymentSpec.fromXml(r);
assertEquals(Optional.of(new CloudAccount("100000000000")), spec.cloudAccount());
assertCloudAccount("800000000000", spec.requireInstance("alpha"), Environment.prod, "us-east-1");