diff --git a/muted-tests.yml b/muted-tests.yml index 8c0967aa83b3b..cc9421439b992 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -498,9 +498,6 @@ tests: - class: org.elasticsearch.search.CCSDuelIT method: testTermsAggsWithProfile issue: https://github.com/elastic/elasticsearch/issues/132880 -- class: org.elasticsearch.index.mapper.LongFieldMapperTests - method: testFetchMany - issue: https://github.com/elastic/elasticsearch/issues/132948 - class: org.elasticsearch.index.mapper.LongFieldMapperTests method: testFetch issue: https://github.com/elastic/elasticsearch/issues/132956 diff --git a/server/src/test/java/org/elasticsearch/index/mapper/LongFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/LongFieldMapperTests.java index e531034f0725e..a9330955b5e70 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/LongFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/LongFieldMapperTests.java @@ -10,11 +10,13 @@ package org.elasticsearch.index.mapper; import org.elasticsearch.common.bytes.BytesArray; +import org.elasticsearch.datageneration.FieldType; import org.elasticsearch.script.LongFieldScript; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptContext; import org.elasticsearch.xcontent.XContentBuilder; import org.elasticsearch.xcontent.XContentType; +import org.junit.Before; import java.io.IOException; import java.math.BigInteger; @@ -26,6 +28,15 @@ public class LongFieldMapperTests extends WholeNumberFieldMapperTests { + private FieldType fieldType; + + @Before + public void pickNumberType() { + // randomly select between long and double to use for generating random numbers + boolean shouldUseLong = randomBoolean(); + fieldType = shouldUseLong ? FieldType.LONG : FieldType.DOUBLE; + } + @Override protected Number missingValue() { return 123L; @@ -45,7 +56,7 @@ protected List outOfRangeSpecs() { @Override protected void minimalMapping(XContentBuilder b) throws IOException { - b.field("type", "long"); + b.field("type", fieldType.toString()); } @Override @@ -105,7 +116,8 @@ public void testLongIndexingCoercesIntoRange() throws Exception { @Override protected Number randomNumber() { - if (randomBoolean()) { + // we must be consistent with the type of each number that we generate + if (fieldType.equals(FieldType.LONG)) { return randomLong(); } if (randomBoolean()) {