summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2017-09-14 11:29:43 +0200
committerMartin Polden <mpolden@mpolden.no>2017-09-14 11:29:43 +0200
commit3af20f0ae7d55d11d390ace0b2543703562869a6 (patch)
tree3ab7ab10b8c929ecc84dc835ebb75e7983818651
parent7317d61fe11c7af2d2bdd6505926e4ca549d5dd8 (diff)
Ignore system time zone in tests
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java11
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));
}
}