Skip to content

Commit 0b7e7be

Browse files
authored
Tests: Fix SearchFieldsIT.testDocValueFields (#31995)
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 4ae4ac0 commit 0b7e7be

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

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

+3-5
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;
@@ -702,7 +701,6 @@ public void testSingleValueFieldDatatField() throws ExecutionException, Interrup
702701
assertThat(fields.get("test_field").getValue(), equalTo("foobar"));
703702
}
704703

705-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/31992")
706704
public void testDocValueFields() throws Exception {
707705
createIndex("test");
708706

@@ -804,8 +802,8 @@ public void testDocValueFields() throws Exception {
804802
assertThat(searchResponse.getHits().getAt(0).getFields().get("long_field").getValue(), equalTo((Object) 4L));
805803
assertThat(searchResponse.getHits().getAt(0).getFields().get("float_field").getValue(), equalTo((Object) 5.0));
806804
assertThat(searchResponse.getHits().getAt(0).getFields().get("double_field").getValue(), equalTo((Object) 6.0d));
807-
assertThat(searchResponse.getHits().getAt(0).getFields().get("date_field").getValue(),
808-
equalTo(new DateTime(date.toInstant().toEpochMilli(), DateTimeZone.UTC)));
805+
BaseDateTime dateField = searchResponse.getHits().getAt(0).getFields().get("date_field").getValue();
806+
assertThat(dateField.getMillis(), equalTo(date.toInstant().toEpochMilli()));
809807
assertThat(searchResponse.getHits().getAt(0).getFields().get("boolean_field").getValue(), equalTo((Object) true));
810808
assertThat(searchResponse.getHits().getAt(0).getFields().get("text_field").getValue(), equalTo("foo"));
811809
assertThat(searchResponse.getHits().getAt(0).getFields().get("keyword_field").getValue(), equalTo("foo"));

0 commit comments

Comments
 (0)