Skip to content

Commit cb041c7

Browse files
authored
[Test] Consistent datetime formatting for java and joda time (#66914) (#66974)
This PR fixes the test failure by ensuring consistent datetime formatting between java DateTimeFormatter and joda time.
1 parent dae36e4 commit cb041c7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

server/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,15 @@ public void testExpression_EscapeDateFormat() throws Exception {
115115

116116
public void testExpression_MixedArray() throws Exception {
117117
List<String> result = expressionResolver.resolve(context, Arrays.asList(
118-
"name1", "<.marvel-{now/d}>", "name2", "<.logstash-{now/M{YYYY.MM}}>"
118+
"name1", "<.marvel-{now/d}>", "name2", "<.logstash-{now/M{uuuu.MM}}>"
119119
));
120120
assertThat(result.size(), equalTo(4));
121121
assertThat(result.get(0), equalTo("name1"));
122122
assertThat(result.get(1),
123-
equalTo(".marvel-" + DateTimeFormat.forPattern("YYYY.MM.dd").print(new DateTime(context.getStartTime(), UTC))));
123+
equalTo(".marvel-" + DateTimeFormat.forPattern("yyyy.MM.dd").print(new DateTime(context.getStartTime(), UTC))));
124124
assertThat(result.get(2), equalTo("name2"));
125125
assertThat(result.get(3), equalTo(".logstash-" +
126-
DateTimeFormat.forPattern("YYYY.MM").print(new DateTime(context.getStartTime(), UTC).withDayOfMonth(1))));
126+
DateTimeFormat.forPattern("yyyy.MM").print(new DateTime(context.getStartTime(), UTC).withDayOfMonth(1))));
127127
}
128128

129129
public void testExpression_CustomTimeZoneInIndexName() throws Exception {

0 commit comments

Comments
 (0)