Skip to content

Commit 6cfe39a

Browse files
committed
Fix test
1 parent b318ffe commit 6cfe39a

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/mapper/SemanticInferenceMetadataFieldsMapperTests.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ public void testIsEnabled() {
3737
assertFalse(InferenceMetadataFieldsMapper.isEnabled(settings));
3838

3939
settings = Settings.builder()
40-
.put(IndexMetadata.SETTING_INDEX_VERSION_CREATED.getKey(), getRandomCompatibleIndexVersion(true))
40+
.put(
41+
IndexMetadata.SETTING_INDEX_VERSION_CREATED.getKey(),
42+
getRandomCompatibleIndexVersion(true, IndexVersionUtils.getPreviousVersion(IndexVersions.INFERENCE_METADATA_FIELDS))
43+
)
4144
.put(InferenceMetadataFieldsMapper.USE_LEGACY_SEMANTIC_TEXT_FORMAT.getKey(), false)
4245
.build();
4346
assertFalse(InferenceMetadataFieldsMapper.isEnabled(settings));
@@ -114,14 +117,18 @@ public MappedFieldType getMappedFieldType() {
114117
}
115118

116119
static IndexVersion getRandomCompatibleIndexVersion(boolean useLegacyFormat) {
120+
return getRandomCompatibleIndexVersion(useLegacyFormat, IndexVersion.current());
121+
}
122+
123+
static IndexVersion getRandomCompatibleIndexVersion(boolean useLegacyFormat, IndexVersion maxVersion) {
117124
if (useLegacyFormat) {
118125
if (randomBoolean()) {
119-
return IndexVersionUtils.randomVersionBetween(random(), IndexVersions.UPGRADE_TO_LUCENE_10_0_0, IndexVersion.current());
126+
return IndexVersionUtils.randomVersionBetween(random(), IndexVersions.UPGRADE_TO_LUCENE_10_0_0, maxVersion);
120127
}
121128
return IndexVersionUtils.randomPreviousCompatibleVersion(random(), IndexVersions.INFERENCE_METADATA_FIELDS_BACKPORT);
122129
} else {
123130
if (randomBoolean()) {
124-
return IndexVersionUtils.randomVersionBetween(random(), IndexVersions.INFERENCE_METADATA_FIELDS, IndexVersion.current());
131+
return IndexVersionUtils.randomVersionBetween(random(), IndexVersions.INFERENCE_METADATA_FIELDS, maxVersion);
125132
}
126133
return IndexVersionUtils.randomVersionBetween(
127134
random(),
@@ -130,4 +137,5 @@ static IndexVersion getRandomCompatibleIndexVersion(boolean useLegacyFormat) {
130137
);
131138
}
132139
}
140+
133141
}

0 commit comments

Comments
 (0)