|
19 | 19 |
|
20 | 20 | package org.elasticsearch.index.mapper;
|
21 | 21 |
|
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 | + |
30 | 24 | public void testCamelCaseFieldNameStaysAsIs() throws Exception {
|
31 |
| - String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("_doc") |
32 |
| - .endObject().endObject()); |
33 | 25 |
|
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 -> {})); |
37 | 27 |
|
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"))); |
43 | 29 |
|
44 | 30 | assertNotNull(doc.dynamicMappingsUpdate());
|
45 |
| - client().admin().indices().preparePutMapping("test") |
46 |
| - .setSource(doc.dynamicMappingsUpdate().toString(), XContentType.JSON).get(); |
47 | 31 |
|
48 |
| - documentMapper = index.mapperService().documentMapper(); |
| 32 | + merge(mapperService, dynamicMapping(doc.dynamicMappingsUpdate())); |
| 33 | + |
| 34 | + DocumentMapper documentMapper = mapperService.documentMapper(); |
49 | 35 | assertNotNull(documentMapper.mappers().getMapper("thisIsCamelCase"));
|
50 | 36 | assertNull(documentMapper.mappers().getMapper("this_is_camel_case"));
|
51 | 37 |
|
52 |
| - documentMapper = index.mapperService().documentMapperParser().parse("_doc", documentMapper.mappingSource()); |
| 38 | + documentMapper = mapperService.documentMapperParser().parse("_doc", documentMapper.mappingSource()); |
53 | 39 |
|
54 | 40 | assertNotNull(documentMapper.mappers().getMapper("thisIsCamelCase"));
|
55 | 41 | assertNull(documentMapper.mappers().getMapper("this_is_camel_case"));
|
|
0 commit comments