@@ -113,18 +113,17 @@ public void testExpression_EscapeDateFormat() throws Exception {
113
113
equalTo (".marvel-" + DateTimeFormat .forPattern ("'{year}'yyyy" ).print (new DateTime (context .getStartTime (), UTC ))));
114
114
}
115
115
116
- @ AwaitsFix (bugUrl = "https://github.com/elastic/elasticsearch/pull/66914" )
117
116
public void testExpression_MixedArray () throws Exception {
118
117
List <String > result = expressionResolver .resolve (context , Arrays .asList (
119
- "name1" , "<.marvel-{now/d}>" , "name2" , "<.logstash-{now/M{YYYY .MM}}>"
118
+ "name1" , "<.marvel-{now/d}>" , "name2" , "<.logstash-{now/M{uuuu .MM}}>"
120
119
));
121
120
assertThat (result .size (), equalTo (4 ));
122
121
assertThat (result .get (0 ), equalTo ("name1" ));
123
122
assertThat (result .get (1 ),
124
- 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 ))));
125
124
assertThat (result .get (2 ), equalTo ("name2" ));
126
125
assertThat (result .get (3 ), equalTo (".logstash-" +
127
- 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 ))));
128
127
}
129
128
130
129
public void testExpression_CustomTimeZoneInIndexName () throws Exception {
0 commit comments