Skip to content

Commit 2c3040f

Browse files
committed
Tests: Fix SearchFieldsIT.testDocValueFields
This test produced different implementations of joda time classes, depending on if the data was serialized or not (DateTime vs MutableDateTime). This now uses a common base class to extract the milliseconds from the data. Closes #31992
1 parent b3ffd4a commit 2c3040f

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

server/src/test/java/org/elasticsearch/search/fields/SearchFieldsIT.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@
4646
import org.elasticsearch.search.sort.SortOrder;
4747
import org.elasticsearch.test.ESIntegTestCase;
4848
import org.elasticsearch.test.InternalSettingsPlugin;
49-
import org.joda.time.DateTime;
50-
import org.joda.time.DateTimeZone;
49+
import org.joda.time.base.BaseDateTime;
5150

5251
import java.time.ZoneOffset;
5352
import java.time.ZonedDateTime;
@@ -822,8 +821,8 @@ public void testDocValueFields() throws Exception {
822821
assertThat(searchResponse.getHits().getAt(0).getFields().get("long_field").getValue(), equalTo((Object) 4L));
823822
assertThat(searchResponse.getHits().getAt(0).getFields().get("float_field").getValue(), equalTo((Object) 5.0));
824823
assertThat(searchResponse.getHits().getAt(0).getFields().get("double_field").getValue(), equalTo((Object) 6.0d));
825-
assertThat(searchResponse.getHits().getAt(0).getFields().get("date_field").getValue(),
826-
equalTo(new DateTime(date.toInstant().toEpochMilli(), DateTimeZone.UTC)));
824+
BaseDateTime dateField = searchResponse.getHits().getAt(0).getFields().get("date_field").getValue();
825+
assertThat(dateField.getMillis(), equalTo(date.toInstant().toEpochMilli()));
827826
assertThat(searchResponse.getHits().getAt(0).getFields().get("boolean_field").getValue(), equalTo((Object) true));
828827
assertThat(searchResponse.getHits().getAt(0).getFields().get("text_field").getValue(), equalTo("foo"));
829828
assertThat(searchResponse.getHits().getAt(0).getFields().get("keyword_field").getValue(), equalTo("foo"));

0 commit comments

Comments
 (0)