From fd16bcaa9652330c199626464f04660192c7fff1 Mon Sep 17 00:00:00 2001 From: David Roberts Date: Fri, 25 Jan 2019 16:25:53 +0000 Subject: [PATCH] Adjust to changes of #37407 --- .../TimestampFormatFinderTests.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/filestructurefinder/TimestampFormatFinderTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/filestructurefinder/TimestampFormatFinderTests.java index 7557fdb15b961..0374ed6f34175 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/filestructurefinder/TimestampFormatFinderTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/filestructurefinder/TimestampFormatFinderTests.java @@ -285,7 +285,8 @@ protected boolean enableWarningsCheck() { } // This method is using the Joda BWC layer. When that's removed, this method - // can be deleted too - we'll just validate the Java time formats after that. + // can be deleted - we'll just validate the Java time formats after that. + // Also remove enableWarningsCheck() above if this method is removed. private void validateJodaTimestampFormats(List jodaTimestampFormats, String text, long expectedEpochMs) { // All the test times are for Tue May 15 2018 16:14:56 UTC, which is 17:14:56 in London. @@ -300,12 +301,7 @@ private void validateJodaTimestampFormats(List jodaTimestampFormats, Str actualEpochMs = Joda.forPattern("date_optional_time").withZone(defaultZone).parseMillis(text); break; default: - // The Joda BWC layer doesn't support setting a default year, so we - // cannot validate patterns that don't explicitly include a year. - if (timestampFormat.contains("YYYY") == false) { - return; - } - actualEpochMs = Joda.forPattern(timestampFormat).withZone(defaultZone).parseMillis(text); + actualEpochMs = Joda.forPattern(timestampFormat).withYear(2018).withZone(defaultZone).parseMillis(text); break; } if (expectedEpochMs == actualEpochMs) {