diff options
author | gjoranv <gjoranv@gmail.com> | 2017-09-14 11:33:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-14 11:33:50 +0200 |
commit | 3e89de9455632e4ba2d21908baa95b622f48aa8f (patch) | |
tree | 3a9a136f98422011297d755b78b1ffac2dd3c8e0 | |
parent | 3285fe64e22d2722a2cda8131b031e9464951a6c (diff) | |
parent | 3af20f0ae7d55d11d390ace0b2543703562869a6 (diff) |
Merge pull request #3408 from vespa-engine/mpolden/ignore-tz-in-test
Ignore system time zone in tests
-rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java index 23451c60f08..29cd35d1efc 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java @@ -9,11 +9,11 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UncheckedIOException; import java.nio.charset.StandardCharsets; +import java.text.SimpleDateFormat; import java.time.Duration; import java.time.Instant; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; import java.util.Arrays; +import java.util.Date; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -62,7 +62,7 @@ public class ApplicationPackageBuilder { public ApplicationPackageBuilder allow(ValidationId validationId) { validationOverridesBody.append(" <allow until='"); - validationOverridesBody.append(asIso8601String(Instant.now().plus(Duration.ofDays(29)))); + validationOverridesBody.append(asIso8601Date(Instant.now().plus(Duration.ofDays(29)))); validationOverridesBody.append("'>"); validationOverridesBody.append(validationId.value()); validationOverridesBody.append("</allow>\n"); @@ -113,9 +113,8 @@ public class ApplicationPackageBuilder { return new ApplicationPackage(zip.toByteArray()); } - private static String asIso8601String(Instant instant) { - DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE.withZone(ZoneId.systemDefault() ); - return formatter.format(instant); + private static String asIso8601Date(Instant instant) { + return new SimpleDateFormat("yyyy-MM-dd").format(Date.from(instant)); } } |