diff --git a/server/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java index 5fe55b2212ec8..70bb0061299a6 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java @@ -495,24 +495,29 @@ public void testSubobjectsWithRootObjectMapperNamespaceValidator() throws Except } } }"""; + + final String[] validSubojectsValues = ObjectMapper.SUB_OBJECTS_AUTO_FEATURE_FLAG + ? new String[] { "false", "true", "auto" } + : new String[] { "false", "true" }; + { String json = withSubobjects.replace("", "false").replace("", "_project"); Exception e = expectThrows(IllegalArgumentException.class, () -> createMapperServiceWithNamespaceValidator(json, validator)); assertThat(e.getMessage(), equalTo(errorMessage)); } { - String json = withSubobjects.replace("", randomFrom("true", "auto")).replace("", "_project"); + String json = withSubobjects.replace("", "true").replace("", "_project"); Exception e = expectThrows(IllegalArgumentException.class, () -> createMapperServiceWithNamespaceValidator(json, validator)); assertThat(e.getMessage(), equalTo(errorMessage)); } { - String json = withSubobjects.replace("", randomFrom("false", "true", "auto")) + String json = withSubobjects.replace("", randomFrom(validSubojectsValues)) .replace("", "_project.foo"); Exception e = expectThrows(IllegalArgumentException.class, () -> createMapperServiceWithNamespaceValidator(json, validator)); assertThat(e.getMessage(), equalTo(errorMessage)); } { - String json = withSubobjects.replace("", randomFrom("false", "true", "auto")) + String json = withSubobjects.replace("", randomFrom(validSubojectsValues)) .replace("", "project.foo"); MapperService mapperService = createMapperServiceWithNamespaceValidator(json, validator); assertNotNull(mapperService);