From d8e595b76a03a00bf8668ed95de23ec26154628d Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Wed, 13 May 2015 17:05:33 -0700 Subject: [PATCH] Fix attachment mapper tests to pass id through api instead of _id in a document --- .../attachment/test/standalone/StandaloneRunner.java | 4 ++-- .../attachment/test/unit/EncryptedDocMapperTest.java | 9 +++------ .../unit/LanguageDetectionAttachmentMapperTests.java | 6 ++---- .../mapper/attachment/test/unit/MetadataMapperTest.java | 3 +-- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/test/java/org/elasticsearch/index/mapper/attachment/test/standalone/StandaloneRunner.java b/src/test/java/org/elasticsearch/index/mapper/attachment/test/standalone/StandaloneRunner.java index 4dd3ebb0c38..989c5406cd7 100644 --- a/src/test/java/org/elasticsearch/index/mapper/attachment/test/standalone/StandaloneRunner.java +++ b/src/test/java/org/elasticsearch/index/mapper/attachment/test/standalone/StandaloneRunner.java @@ -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 -----------------------"); diff --git a/src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/EncryptedDocMapperTest.java b/src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/EncryptedDocMapperTest.java index 80bbabdbe82..a17549f373e 100644 --- a/src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/EncryptedDocMapperTest.java +++ b/src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/EncryptedDocMapperTest.java @@ -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()); diff --git a/src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/LanguageDetectionAttachmentMapperTests.java b/src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/LanguageDetectionAttachmentMapperTests.java index 7212dd64e0c..dc3a0158e65 100644 --- a/src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/LanguageDetectionAttachmentMapperTests.java +++ b/src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/LanguageDetectionAttachmentMapperTests.java @@ -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")); diff --git a/src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/MetadataMapperTest.java b/src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/MetadataMapperTest.java index 0cf5212cb41..75891dcaeab 100644 --- a/src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/MetadataMapperTest.java +++ b/src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/MetadataMapperTest.java @@ -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) {