Skip to content

Commit 9859051

Browse files
authored
Convert some more mapping tests to MapperServiceTestCase (#62089)
We don't need to extend ESSingleNodeTestCase for all these tests.
1 parent fbe8127 commit 9859051

File tree

7 files changed

+1409
-1842
lines changed

7 files changed

+1409
-1842
lines changed

server/src/test/java/org/elasticsearch/index/mapper/CamelCaseFieldNameTests.java

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,37 +19,23 @@
1919

2020
package org.elasticsearch.index.mapper;
2121

22-
import org.elasticsearch.common.Strings;
23-
import org.elasticsearch.common.bytes.BytesReference;
24-
import org.elasticsearch.common.xcontent.XContentFactory;
25-
import org.elasticsearch.common.xcontent.XContentType;
26-
import org.elasticsearch.index.IndexService;
27-
import org.elasticsearch.test.ESSingleNodeTestCase;
28-
29-
public class CamelCaseFieldNameTests extends ESSingleNodeTestCase {
22+
public class CamelCaseFieldNameTests extends MapperServiceTestCase {
23+
3024
public void testCamelCaseFieldNameStaysAsIs() throws Exception {
31-
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("_doc")
32-
.endObject().endObject());
3325

34-
IndexService index = createIndex("test");
35-
client().admin().indices().preparePutMapping("test").setSource(mapping, XContentType.JSON).get();
36-
DocumentMapper documentMapper = index.mapperService().documentMapper();
26+
MapperService mapperService = createMapperService(mapping(b -> {}));
3727

38-
ParsedDocument doc = documentMapper.parse(new SourceToParse("test", "1",
39-
BytesReference.bytes(XContentFactory.jsonBuilder().startObject()
40-
.field("thisIsCamelCase", "value1")
41-
.endObject()),
42-
XContentType.JSON));
28+
ParsedDocument doc = mapperService.documentMapper().parse(source(b -> b.field("thisIsCamelCase", "value1")));
4329

4430
assertNotNull(doc.dynamicMappingsUpdate());
45-
client().admin().indices().preparePutMapping("test")
46-
.setSource(doc.dynamicMappingsUpdate().toString(), XContentType.JSON).get();
4731

48-
documentMapper = index.mapperService().documentMapper();
32+
merge(mapperService, dynamicMapping(doc.dynamicMappingsUpdate()));
33+
34+
DocumentMapper documentMapper = mapperService.documentMapper();
4935
assertNotNull(documentMapper.mappers().getMapper("thisIsCamelCase"));
5036
assertNull(documentMapper.mappers().getMapper("this_is_camel_case"));
5137

52-
documentMapper = index.mapperService().documentMapperParser().parse("_doc", documentMapper.mappingSource());
38+
documentMapper = mapperService.documentMapperParser().parse("_doc", documentMapper.mappingSource());
5339

5440
assertNotNull(documentMapper.mappers().getMapper("thisIsCamelCase"));
5541
assertNull(documentMapper.mappers().getMapper("this_is_camel_case"));

0 commit comments

Comments
 (0)