summaryrefslogtreecommitdiffstats
path: root/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java')
-rw-r--r--config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java19
1 files changed, 9 insertions, 10 deletions
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java
index 7805b73cc6a..b5af354aead 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java
@@ -388,16 +388,14 @@ public class DeploymentSpecWithoutInstanceTest {
);
DeploymentSpec spec = DeploymentSpec.fromXml(r);
assertEquals("domain", spec.athenzDomain().get().value());
- assertEquals("prod-service", spec.athenzService(InstanceName.from("default"),
- Environment.prod,
- RegionName.from("us-central-1")).get().value());
- assertEquals("prod-service", spec.athenzService(InstanceName.from("default"),
- Environment.prod,
- RegionName.from("us-west-1")).get().value());
- assertEquals("prod-service", spec.athenzService(InstanceName.from("default"),
- Environment.prod,
- RegionName.from("us-east-3")).get().value());
- assertEquals("domain", spec.athenzDomain().get().value());
+ assertEquals("domain", spec.requireInstance("default").athenzDomain().get().value());
+ assertEquals("service", spec.athenzService().get().value());
+ assertEquals("prod-service", spec.requireInstance("default").athenzService(Environment.prod, RegionName.from("us-central-1"))
+ .get().value());
+ assertEquals("prod-service", spec.requireInstance("default").athenzService(Environment.prod, RegionName.from("us-west-1"))
+ .get().value());
+ assertEquals("prod-service", spec.requireInstance("default").athenzService(Environment.prod, RegionName.from("us-east-3"))
+ .get().value());
}
@Test
@@ -411,6 +409,7 @@ public class DeploymentSpecWithoutInstanceTest {
"</deployment>"
);
DeploymentSpec spec = DeploymentSpec.fromXml(r);
+ assertEquals("service", spec.athenzService().get().value());
assertEquals(spec.requireInstance("default").athenzDomain().get().value(), "domain");
assertEquals(spec.requireInstance("default").athenzService(Environment.prod, RegionName.from("us-west-1")).get().value(), "prod-service");
}