diff options
| author | jonmv <venstad@gmail.com> | 2023-06-02 16:23:35 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2023-06-02 16:23:35 +0200 |
| commit | 3fa0461f0378b1d7566b8536f374f976e69bffa4 (patch) | |
| tree | 717be3664ce484e8abb5dedecc641627cd1a2e7d /config-model-api/src/test/java/com/yahoo/config/application/api | |
| parent | a82b87143f8dcc1218a0ce5718fcf09c73c1485c (diff) | |
Revert signature
Diffstat (limited to 'config-model-api/src/test/java/com/yahoo/config/application/api')
| -rw-r--r-- | config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java | 12 |
1 files changed, 6 insertions, 6 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 013c161ad9b..e5578723612 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 @@ -778,9 +778,9 @@ public class DeploymentSpecWithoutInstanceTest { DeploymentSpec spec = DeploymentSpec.fromXml(r); assertEquals(Optional.of(Duration.ofDays(1)), spec.hostTTL()); DeploymentInstanceSpec instance = spec.requireInstance("default"); - assertEquals(Optional.of(Duration.ofMinutes(1)), instance.hostTTL(prod, RegionName.from("us-east-1"))); - assertEquals(Optional.of(Duration.ofDays(1)), instance.hostTTL(prod, RegionName.from("us-west-1"))); - assertEquals(Optional.of(Duration.ofDays(1)), instance.hostTTL(test, RegionName.defaultName())); + assertEquals(Optional.of(Duration.ofMinutes(1)), instance.hostTTL(prod, Optional.of(RegionName.from("us-east-1")))); + assertEquals(Optional.of(Duration.ofDays(1)), instance.hostTTL(prod, Optional.of(RegionName.from("us-west-1")))); + assertEquals(Optional.of(Duration.ofDays(1)), instance.hostTTL(test, Optional.empty())); r = """ <deployment version='1.0' cloud-account='012345678912'> @@ -793,9 +793,9 @@ public class DeploymentSpecWithoutInstanceTest { spec = DeploymentSpec.fromXml(r); assertEquals(Optional.empty(), spec.hostTTL()); instance = spec.requireInstance("default"); - assertEquals(Optional.of(Duration.ofMinutes(1)), instance.hostTTL(prod, RegionName.from("us-east-1"))); - assertEquals(Optional.of(Duration.ofDays(1)), instance.hostTTL(prod, RegionName.from("us-west-1"))); - assertEquals(Optional.empty(), instance.hostTTL(test, RegionName.defaultName())); + assertEquals(Optional.of(Duration.ofMinutes(1)), instance.hostTTL(prod, Optional.of(RegionName.from("us-east-1")))); + assertEquals(Optional.of(Duration.ofDays(1)), instance.hostTTL(prod, Optional.of(RegionName.from("us-west-1")))); + assertEquals(Optional.empty(), instance.hostTTL(test, Optional.empty())); } private static Set<String> endpointRegions(String endpointId, DeploymentSpec spec) { |