Avoid deprecated methods

1 files changed, 9 insertions, 7 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 a7625b42e8d..4923ea396a0 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
@@ -152,7 +152,7 @@ public class DeploymentSpecTest {
         assertFalse(((DeploymentSpec.DeclaredZone)spec.instance("default").steps().get(2)).active());
 
         assertTrue(spec.instance("default").steps().get(3) instanceof DeploymentSpec.Delay);
-        assertEquals(3 * 60 * 60 + 30 * 60, ((DeploymentSpec.Delay)spec.instance("default").steps().get(3)).duration().getSeconds());
+        assertEquals(3 * 60 * 60 + 30 * 60, spec.instance("default").steps().get(3).delay().getSeconds());
 
         assertTrue(spec.instance("default").steps().get(4).deploysTo(Environment.prod, Optional.of(RegionName.from("us-west1"))));
         assertTrue(((DeploymentSpec.DeclaredZone)spec.instance("default").steps().get(4)).active());
@@ -274,7 +274,7 @@ public class DeploymentSpecTest {
 
     @Test
     public void testEmpty() {
-        assertFalse(DeploymentSpec.empty.globalServiceId().isPresent());
+        assertFalse(DeploymentSpec.empty.instance("default").globalServiceId().isPresent());
         assertEquals(DeploymentSpec.UpgradePolicy.defaultPolicy, DeploymentSpec.empty.upgradePolicy());
         assertTrue(DeploymentSpec.empty.steps().isEmpty());
         assertEquals("<deployment version='1.0'/>", DeploymentSpec.empty.xmlForm());
@@ -391,18 +391,20 @@ public class DeploymentSpecTest {
         assertTrue(spec.instance("default").canUpgradeAt(Instant.parse("2017-09-23T10:15:30.00Z")));
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void athenz_config_is_disallowed_on_deployment_if_instances() {
+    @Test
+    public void athenz_config_is_read_from_deployment() {
         StringReader r = new StringReader(
-                "<deployment athenz-domain='domain' athenz-service='service''>" +
-                "   <instance id='default'>" +
+                "<deployment athenz-domain='domain' athenz-service='service'>" +
+                "   <instance id='instance1'>" +
                 "      <prod>" +
                 "         <region active='true'>us-west-1</region>" +
                 "      </prod>" +
                 "   </instance>" +
                 "</deployment>"
         );
-        DeploymentSpec.fromXml(r);
+        DeploymentSpec spec = DeploymentSpec.fromXml(r);
+        assertEquals(spec.instance("instance1").athenzDomain().get().value(), "domain");
+        assertEquals(spec.instance("instance1").athenzService(Environment.prod, RegionName.from("us-west-1")).get().value(), "service");
     }
 
     @Test