honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-09 22:45:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix attachment mapper tests to pass id through api instead of _id in a document

Browse Source
This commit is contained in:
Ryan Ernst 2015-05-13 17:05:33 -07:00
parent 9298be93f6
commit d8e595b76a
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/java/org/elasticsearch/index/mapper/attachment/test/standalone/StandaloneRunner.java
View File

@ -92,7 +92,7 @@ public class StandaloneRunner extends CliTool {
@Override
public ExitStatus execute(Settings settings, Environment env) throws Exception {
XContentBuilder builder = jsonBuilder().startObject().field("_id", 1).field("file").startObject();
XContentBuilder builder = jsonBuilder().startObject().field("file").startObject();
if (base64text != null) {
// If base64 is provided
@ -109,7 +109,7 @@ public class StandaloneRunner extends CliTool {
BytesReference json = builder.endObject().endObject().bytes();
ParseContext.Document doc = docMapper.parse(json).rootDoc();
ParseContext.Document doc = docMapper.parse("person", "1", json).rootDoc();
terminal.println("## Extracted text");
terminal.println("--------------------- BEGIN -----------------------");

9
src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/EncryptedDocMapperTest.java
View File

@ -55,12 +55,11 @@ public class EncryptedDocMapperTest extends AttachmentUnitTestCase {
BytesReference json = jsonBuilder()
.startObject()
.field("_id", 1)
.field("file1", html)
.field("file2", pdf)
.endObject().bytes();
ParseContext.Document doc = docMapper.parse(json).rootDoc();
ParseContext.Document doc = docMapper.parse("person", "1", json).rootDoc();
assertThat(doc.get(docMapper.mappers().getMapper("file1.content").names().indexName()), containsString("World"));
assertThat(doc.get(docMapper.mappers().getMapper("file1.title").names().indexName()), equalTo("Hello"));
assertThat(doc.get(docMapper.mappers().getMapper("file1.author").names().indexName()), equalTo("kimchy"));
@ -88,12 +87,11 @@ public class EncryptedDocMapperTest extends AttachmentUnitTestCase {
BytesReference json = jsonBuilder()
.startObject()
.field("_id", 1)
.field("file1", pdf)
.field("file2", html)
.endObject().bytes();
ParseContext.Document doc = docMapper.parse(json).rootDoc();
ParseContext.Document doc = docMapper.parse("person", "1", json).rootDoc();
assertThat(doc.get(docMapper.mappers().getMapper("file1").names().indexName()), nullValue());
assertThat(doc.get(docMapper.mappers().getMapper("file1.title").names().indexName()), nullValue());
assertThat(doc.get(docMapper.mappers().getMapper("file1.author").names().indexName()), nullValue());
@ -125,12 +123,11 @@ public class EncryptedDocMapperTest extends AttachmentUnitTestCase {
BytesReference json = jsonBuilder()
.startObject()
.field("_id", 1)
.field("file1", pdf)
.field("file2", html)
.endObject().bytes();
ParseContext.Document doc = docMapper.parse(json).rootDoc();
ParseContext.Document doc = docMapper.parse("person", "1", json).rootDoc();
assertThat(doc.get(docMapper.mappers().getMapper("file1").names().indexName()), nullValue());
assertThat(doc.get(docMapper.mappers().getMapper("file1.title").names().indexName()), nullValue());
assertThat(doc.get(docMapper.mappers().getMapper("file1.author").names().indexName()), nullValue());

6
src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/LanguageDetectionAttachmentMapperTests.java
View File

@ -68,7 +68,6 @@ public class LanguageDetectionAttachmentMapperTests extends AttachmentUnitTestCa
XContentBuilder xcb = jsonBuilder()
.startObject()
.field("_id", 1)
.startObject("file")
.field("_name", filename)
.field("_content", html);
@ -79,7 +78,7 @@ public class LanguageDetectionAttachmentMapperTests extends AttachmentUnitTestCa
xcb.endObject().endObject();
ParseContext.Document doc = docMapper.parse(xcb.bytes()).rootDoc();
ParseContext.Document doc = docMapper.parse("person", "1", xcb.bytes()).rootDoc();
// Our mapping should be kept as a String
assertThat(doc.get(docMapper.mappers().getMapper("file.language").names().indexName()), equalTo(expected));
@ -125,14 +124,13 @@ public class LanguageDetectionAttachmentMapperTests extends AttachmentUnitTestCa
XContentBuilder xcb = jsonBuilder()
.startObject()
.field("_id", 1)
.startObject("file")
.field("_name", "text-in-english.txt")
.field("_content", html)
.field("_detect_language", true)
.endObject().endObject();
ParseContext.Document doc = docMapper.parse(xcb.bytes()).rootDoc();
ParseContext.Document doc = docMapper.parse("person", "1", xcb.bytes()).rootDoc();
// Our mapping should be kept as a String
assertThat(doc.get(docMapper.mappers().getMapper("file.language").names().indexName()), equalTo("en"));

3
src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/MetadataMapperTest.java
View File

@ -58,14 +58,13 @@ public class MetadataMapperTest extends AttachmentUnitTestCase {
BytesReference json = jsonBuilder()
.startObject()
.field("_id", 1)
.startObject("file")
.field("_name", filename)
.field("_content", html)
.endObject()
.endObject().bytes();
ParseContext.Document doc = docMapper.parse(json).rootDoc();
ParseContext.Document doc = docMapper.parse("person", "1", json).rootDoc();
assertThat(doc.get(docMapper.mappers().getMapper("file.content").names().indexName()), containsString("World"));
assertThat(doc.get(docMapper.mappers().getMapper("file.name").names().indexName()), equalTo(filename));
if (expectedDate == null) {