summaryrefslogtreecommitdiffstats
path: root/config-model-api/src/test/java/com
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-06-01 15:41:00 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2017-06-01 15:41:00 +0200
commita601c05887df1fd729e600e46ff264f920b79782 (patch)
tree73a3b29e95452d4bd782c9d7e91636263d3d72fe /config-model-api/src/test/java/com
parent8100948a577da7e399427695d6911c09d038ac04 (diff)
Add required steps at construction
Diffstat (limited to 'config-model-api/src/test/java/com')
-rw-r--r--config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java23
1 files changed, 14 insertions, 9 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 ffde5b21458..76d395ef95b 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
@@ -44,8 +44,9 @@ public class DeploymentSpecTest {
);
DeploymentSpec spec = DeploymentSpec.fromXml(r);
- assertEquals(1, spec.zones().size());
- assertEquals(Environment.staging, spec.zones().get(0).environment());
+ assertEquals(2, spec.zones().size());
+ assertEquals(Environment.test, spec.zones().get(0).environment());
+ assertEquals(Environment.staging, spec.zones().get(1).environment());
assertTrue(spec.includes(Environment.test, Optional.empty()));
assertFalse(spec.includes(Environment.test, Optional.of(RegionName.from("region1"))));
assertTrue(spec.includes(Environment.staging, Optional.empty()));
@@ -65,15 +66,19 @@ public class DeploymentSpecTest {
);
DeploymentSpec spec = DeploymentSpec.fromXml(r);
- assertEquals(2, spec.zones().size());
+ assertEquals(4, spec.zones().size());
+
+ assertEquals(Environment.test, spec.zones().get(0).environment());
- assertEquals(Environment.prod, spec.zones().get(0).environment());
- assertEquals("us-east1", spec.zones().get(0).region().get().value());
- assertFalse(spec.zones().get(0).active());
+ assertEquals(Environment.staging, spec.zones().get(1).environment());
+
+ assertEquals(Environment.prod, spec.zones().get(2).environment());
+ assertEquals("us-east1", spec.zones().get(2).region().get().value());
+ assertFalse(spec.zones().get(2).active());
- assertEquals(Environment.prod, spec.zones().get(1).environment());
- assertEquals("us-west1", spec.zones().get(1).region().get().value());
- assertTrue(spec.zones().get(1).active());
+ assertEquals(Environment.prod, spec.zones().get(3).environment());
+ assertEquals("us-west1", spec.zones().get(3).region().get().value());
+ assertTrue(spec.zones().get(3).active());
assertTrue(spec.includes(Environment.test, Optional.empty()));
assertFalse(spec.includes(Environment.test, Optional.of(RegionName.from("region1"))));