Fixing WatchTests

Author: pgomulka

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/actions/ActionStatus.java

@@ -73,6 +73,17 @@ public boolean equals(Object o) {
                 Objects.equals(lastThrottle, that.lastThrottle);
     }
 
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder("ActionStatus{");
+        sb.append("ackStatus=").append(ackStatus);
+        sb.append(", lastExecution=").append(lastExecution);
+        sb.append(", lastSuccessfulExecution=").append(lastSuccessfulExecution);
+        sb.append(", lastThrottle=").append(lastThrottle);
+        sb.append('}');
+        return sb.toString();
+    }
+
     @Override
     public int hashCode() {
         return Objects.hash(ackStatus, lastExecution, lastSuccessfulExecution, lastThrottle);
@@ -216,7 +227,7 @@ static State resolve(byte value) {
         private final State state;
 
         public AckStatus(ZonedDateTime timestamp, State state) {
-            this.timestamp = timestamp.withZoneSameInstant(ZoneOffset.UTC);
+            this.timestamp = timestamp;
             this.state = state;
         }
 
@@ -286,7 +297,7 @@ static void writeTo(AckStatus status, StreamOutput out) throws IOException {
         }
 
         static AckStatus readFrom(StreamInput in) throws IOException {
-            ZonedDateTime timestamp = ZonedDateTime.ofInstant(Instant.ofEpochMilli(in.readLong()), ZoneOffset.UTC);
+            ZonedDateTime timestamp = Instant.ofEpochMilli(in.readLong()).atZone(ZoneOffset.UTC);
             State state = State.resolve(in.readByte());
             return new AckStatus(timestamp, state);
         }

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/watch/WatchParser.java

@@ -112,7 +112,6 @@ public Watch parseWithSecrets(String id, boolean includeStatus, BytesReference s
     private Watch parse(String id, boolean includeStatus, boolean withSecrets, BytesReference source, ZonedDateTime now,
                         XContentType xContentType, boolean allowRedactedPasswords, long sourceSeqNo, long sourcePrimaryTerm)
         throws IOException {
-
         if (logger.isTraceEnabled()) {
             logger.trace("parsing watch [{}] ", source.utf8ToString());
         }

x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/watch/WatchTests.java

@@ -246,8 +246,10 @@ public Trigger parseTrigger(String jobName, XContentParser parser) throws IOExce
             }
         };
 
-        ZonedDateTime now = ZonedDateTime.now(ZoneOffset.UTC);
+        Clock fixedClock = Clock.fixed(Instant.now(), ZoneOffset.UTC);
+
         ClockMock clock = ClockMock.frozen();
+        ZonedDateTime now = Instant.ofEpochMilli(fixedClock.millis()).atZone(ZoneOffset.UTC);
         clock.setTime(now);
 
         List<ActionWrapper> actions = randomActions();
@@ -260,7 +262,7 @@ public Trigger parseTrigger(String jobName, XContentParser parser) throws IOExce
         WatchParser watchParser = new WatchParser(triggerService, actionRegistry, inputRegistry, null, clock);
         XContentBuilder builder = jsonBuilder().startObject().startObject("trigger").endObject().field("status", watchStatus).endObject();
         Watch watch = watchParser.parse("foo", true, BytesReference.bytes(builder), XContentType.JSON, 1L, 1L);
-        assertThat(watch.status().state().getTimestamp().toInstant(), is(clock.millis()));
+        assertThat(watch.status().state().getTimestamp().toInstant().toEpochMilli(), is(clock.millis()));
         for (ActionWrapper action : actions) {
             assertThat(watch.status().actionStatus(action.id()), is(actionsStatuses.get(action.id())));
         }