diff options
Diffstat (limited to 'config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java')
| -rw-r--r-- | config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java | 48 |
1 files changed, 12 insertions, 36 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 7b571417ef8..ff51c336658 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 @@ -605,15 +605,10 @@ public class DeploymentSpecTest { ); DeploymentSpec spec = DeploymentSpec.fromXml(r); assertEquals("domain", spec.athenzDomain().get().value()); - assertEquals("service", spec.athenzService(InstanceName.from("instance1"), - Environment.prod, - RegionName.from("us-west-1")).get().value()); - assertEquals("service", spec.athenzService(InstanceName.from("non-existent"), - Environment.prod, - RegionName.from("us-west-1")).get().value()); assertEquals("domain", spec.requireInstance("instance1").athenzDomain().get().value()); + assertEquals("service", spec.athenzService().get().value()); assertEquals("service", spec.requireInstance("instance1").athenzService(Environment.prod, - RegionName.from("us-west-1")).get().value()); + RegionName.from("us-west-1")).get().value()); } @Test @@ -633,19 +628,15 @@ public class DeploymentSpecTest { ); DeploymentSpec spec = DeploymentSpec.fromXml(r); assertEquals("domain", spec.athenzDomain().get().value()); - assertEquals("prod-service", spec.athenzService(InstanceName.from("instance1"), - Environment.prod, - RegionName.from("us-west-1")).get().value()); - assertEquals("service", spec.athenzService(InstanceName.from("non-existent"), - Environment.prod, - RegionName.from("us-west-1")).get().value()); + assertEquals("service", spec.athenzService().get().value()); + assertEquals("domain", spec.requireInstance("instance1").athenzDomain().get().value()); assertEquals("prod-service", spec.requireInstance("instance1").athenzService(Environment.prod, - RegionName.from("us-central-1")).get().value()); + RegionName.from("us-central-1")).get().value()); assertEquals("prod-service", spec.requireInstance("instance1").athenzService(Environment.prod, - RegionName.from("us-west-1")).get().value()); + RegionName.from("us-west-1")).get().value()); assertEquals("prod-service", spec.requireInstance("instance1").athenzService(Environment.prod, - RegionName.from("us-east-3")).get().value()); + RegionName.from("us-east-3")).get().value()); } @Test @@ -674,12 +665,6 @@ public class DeploymentSpecTest { ); DeploymentSpec spec = DeploymentSpec.fromXml(r); assertEquals("domain", spec.athenzDomain().get().value()); - assertEquals("service", spec.athenzService(InstanceName.from("instance1"), - Environment.prod, - RegionName.from("us-west-1")).get().value()); - assertEquals("service", spec.athenzService(InstanceName.from("non-existent"), - Environment.prod, - RegionName.from("us-west-1")).get().value()); assertEquals("domain", spec.requireInstance("instance1").athenzDomain().get().value()); assertEquals("service", spec.requireInstance("instance1").athenzService(Environment.prod, RegionName.from("us-west-1")).get().value()); @@ -701,11 +686,10 @@ public class DeploymentSpecTest { "</deployment>" ); DeploymentSpec spec = DeploymentSpec.fromXml(r); + assertEquals(Optional.empty(), spec.athenzDomain()); + assertEquals(Optional.empty(), spec.athenzService()); assertEquals(spec.requireInstance("default").athenzDomain().get().value(), "domain"); assertEquals(spec.requireInstance("default").athenzService(Environment.prod, RegionName.from("us-west-1")).get().value(), "service"); - assertEquals(Optional.empty(), spec.athenzService(InstanceName.from("non-existent"), - Environment.prod, - RegionName.from("us-west-1"))); } @Test @@ -722,17 +706,9 @@ public class DeploymentSpecTest { ); DeploymentSpec spec = DeploymentSpec.fromXml(r); assertEquals(spec.requireInstance("default").athenzDomain().get().value(), "domain"); - assertEquals(spec.athenzService(InstanceName.from("default"), - Environment.prod, - RegionName.from("us-west-1")).get().value(), - "prod-service"); - assertEquals(spec.requireInstance("default").athenzService(Environment.prod, - RegionName.from("us-west-1")).get().value(), - "prod-service"); - assertEquals(spec.athenzService(InstanceName.from("non-existent"), - Environment.prod, - RegionName.from("us-west-1")).get().value(), - "service"); + assertEquals("prod-service", + spec.requireInstance("default").athenzService(Environment.prod, + RegionName.from("us-west-1")).get().value()); } @Test(expected = IllegalArgumentException.class) |