[Test] move test package to o.e.index.mapper.attachment

Our package naming for tests is inconsistent.
We should move tests from:

* `o.e.index.mapper.xcontent` to  `o.e.index.mapper.attachment.test.unit`
* `o.e.plugin.mapper.attachments.test` to  `o.e.index.mapper.attachment.test.integration`
* `StandaloneRunner` class to  `o.e.index.mapper.attachment.test.standalone`

Also rename resource dirs to match the test name so it's definitely easier to find mappings used for each test.

Closes elastic#110.

Author: dadoonet

src/test/java/org/elasticsearch/index/mapper/xcontent/MapperTestUtils.java renamed to src/test/java/org/elasticsearch/index/mapper/attachment/test/MapperTestUtils.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper.xcontent;
+package org.elasticsearch.index.mapper.attachment.test;
 
 import org.elasticsearch.Version;
 import org.elasticsearch.cluster.metadata.IndexMetaData;

src/test/java/org/elasticsearch/plugin/mapper/attachments/test/MultipleAttachmentIntegrationTests.java renamed to src/test/java/org/elasticsearch/index/mapper/attachment/test/integration/EncryptedAttachmentIntegrationTests.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.plugin.mapper.attachments.test;
+package org.elasticsearch.index.mapper.attachment.test.integration;
 
 import org.elasticsearch.action.count.CountResponse;
 import org.elasticsearch.common.settings.ImmutableSettings;
@@ -39,7 +39,7 @@
  * Test case for issue https://github.com/elasticsearch/elasticsearch-mapper-attachments/issues/18
  */
 @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE)
-public class MultipleAttachmentIntegrationTests extends ElasticsearchIntegrationTest {
+public class EncryptedAttachmentIntegrationTests extends ElasticsearchIntegrationTest {
     private boolean ignore_errors = true;
 
     @Override
@@ -67,9 +67,9 @@ public void testMultipleAttachmentsWithEncryptedDoc() throws Exception {
         logger.info("creating index [test]");
         createIndex("test");
 
-        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/multipledocs/test-mapping.json");
-        byte[] html = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/xcontent/htmlWithValidDateMeta.html");
-        byte[] pdf = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/xcontent/encrypted.pdf");
+        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/attachment/test/integration/encrypted/test-mapping.json");
+        byte[] html = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/attachment/test/sample-files/htmlWithValidDateMeta.html");
+        byte[] pdf = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/attachment/test/sample-files/encrypted.pdf");
 
         client().admin().indices().putMapping(putMappingRequest("test").type("person").source(mapping)).actionGet();
 
@@ -94,9 +94,9 @@ public void testMultipleAttachmentsWithEncryptedDocNotIgnoringErrors() throws Ex
         logger.info("creating index [test]");
         createIndex("test");
 
-        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/multipledocs/test-mapping.json");
-        byte[] html = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/xcontent/htmlWithValidDateMeta.html");
-        byte[] pdf = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/xcontent/encrypted.pdf");
+        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/attachment/test/integration/encrypted/test-mapping.json");
+        byte[] html = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/attachment/test/sample-files/htmlWithValidDateMeta.html");
+        byte[] pdf = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/attachment/test/sample-files/encrypted.pdf");
 
         client().admin().indices()
                 .putMapping(putMappingRequest("test").type("person").source(mapping)).actionGet();

src/test/java/org/elasticsearch/plugin/mapper/attachments/test/SimpleAttachmentIntegrationTests.java renamed to src/test/java/org/elasticsearch/index/mapper/attachment/test/integration/SimpleAttachmentIntegrationTests.java

@@ -17,14 +17,16 @@
  * under the License.
  */
 
-package org.elasticsearch.plugin.mapper.attachments.test;
+package org.elasticsearch.index.mapper.attachment.test.integration;
 
 import org.elasticsearch.action.count.CountResponse;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.text.Text;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.plugins.PluginsService;
+import org.elasticsearch.search.highlight.HighlightField;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -34,9 +36,10 @@
 import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath;
 import static org.elasticsearch.common.io.Streams.copyToStringFromClasspath;
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
 import static org.elasticsearch.index.query.QueryBuilders.queryStringQuery;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.containsString;
 
 /**
  *
@@ -60,8 +63,8 @@ public void createEmptyIndex() throws Exception {
 
     @Test
     public void testSimpleAttachment() throws Exception {
-        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/xcontent/test-mapping.json");
-        byte[] html = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/xcontent/testXHTML.html");
+        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/attachment/test/integration/simple/test-mapping.json");
+        byte[] html = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/attachment/test/sample-files/testXHTML.html");
 
         client().admin().indices().putMapping(putMappingRequest("test").type("person").source(mapping)).actionGet();
 
@@ -77,8 +80,8 @@ public void testSimpleAttachment() throws Exception {
 
     @Test
     public void testSimpleAttachmentContentLengthLimit() throws Exception {
-        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/xcontent/test-mapping.json");
-        byte[] txt = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/xcontent/testContentLength.txt");
+        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/attachment/test/integration/simple/test-mapping.json");
+        byte[] txt = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/attachment/test/sample-files/testContentLength.txt");
         final int CONTENT_LENGTH_LIMIT = 20;
 
         client().admin().indices().putMapping(putMappingRequest("test").type("person").source(mapping)).actionGet();
@@ -95,8 +98,8 @@ public void testSimpleAttachmentContentLengthLimit() throws Exception {
 
     @Test
     public void testSimpleAttachmentNoContentLengthLimit() throws Exception {
-        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/xcontent/test-mapping.json");
-        byte[] txt = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/xcontent/testContentLength.txt");
+        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/attachment/test/integration/simple/test-mapping.json");
+        byte[] txt = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/attachment/test/sample-files/testContentLength.txt");
         final int CONTENT_LENGTH_LIMIT = -1;
 
         client().admin().indices().putMapping(putMappingRequest("test").type("person").source(mapping)).actionGet();
@@ -118,7 +121,7 @@ public void testSimpleAttachmentNoContentLengthLimit() throws Exception {
      */
     @Test(expected = MapperParsingException.class)
     public void testNoContent() throws Exception {
-       String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/xcontent/test-mapping.json");
+       String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/attachment/test/integration/simple/test-mapping.json");
 
         client().admin().indices().putMapping(putMappingRequest("test").type("person").source(mapping)).actionGet();
 
@@ -129,8 +132,8 @@ public void testNoContent() throws Exception {
     public void testContentTypeAndName() throws Exception {
         String dummyContentType = "text/my-dummy-content-type";
         String dummyName = "my-dummy-name-txt";
-        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/xcontent/test-mapping-store-content-type.json");
-        byte[] txt = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/xcontent/testContentLength.txt");
+        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/attachment/test/integration/simple/test-mapping-store-content-type.json");
+        byte[] txt = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/attachment/test/sample-files/testContentLength.txt");
 
         client().admin().indices().putMapping(putMappingRequest("test").type("person").source(mapping)).actionGet();
 
@@ -156,8 +159,8 @@ public void testContentTypeAndName() throws Exception {
      */
     @Test @Ignore
     public void testCopyTo() throws Exception {
-        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/copy-to/copy-to.json");
-        byte[] txt = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/xcontent/text-in-english.txt");
+        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/attachment/test/integration/simple/copy-to.json");
+        byte[] txt = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/attachment/test/sample-files/text-in-english.txt");
 
         client().admin().indices().putMapping(putMappingRequest("test").type("person").source(mapping)).actionGet();
 
@@ -173,8 +176,8 @@ public void testCopyTo() throws Exception {
 
     @Test
     public void testCopyToSubField() throws Exception {
-        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/copy-to/copy-to-subfield.json");
-        byte[] txt = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/xcontent/text-in-english.txt");
+        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/attachment/test/integration/simple/copy-to-subfield.json");
+        byte[] txt = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/attachment/test/sample-files/text-in-english.txt");
 
         client().admin().indices().putMapping(putMappingRequest("test").type("person").source(mapping)).actionGet();
 
@@ -188,4 +191,31 @@ public void testCopyToSubField() throws Exception {
         assertThat(countResponse.getCount(), equalTo(1l));
     }
 
+    @Test
+    public void testHighlightAttachment() throws Exception {
+        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/attachment/test/integration/simple/test-highlight-mapping.json");
+        byte[] html = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/attachment/test/sample-files/testXHTML.html");
+
+        client().admin().indices().putMapping(putMappingRequest("test").type("person").source(mapping)).actionGet();
+
+        index("test", "person", jsonBuilder().startObject().field("file", html).endObject());
+        refresh();
+
+        SearchResponse searchResponse = client().prepareSearch("test")
+                .setQuery(matchQuery("file", "apache tika"))
+                .addHighlightedField("file")
+                .setNoFields().get();
+
+        logger.info("{}", searchResponse);
+        assertThat(searchResponse.getHits().getTotalHits(), equalTo(1l));
+        assertThat(searchResponse.getHits().getAt(0).getHighlightFields(), notNullValue());
+        assertThat(searchResponse.getHits().getAt(0).getHighlightFields().keySet(), contains("file"));
+        searchResponse.getHits().getAt(0).getHighlightFields();
+        for (HighlightField highlightField : searchResponse.getHits().getAt(0).getHighlightFields().values()) {
+            for (Text fragment : highlightField.getFragments()) {
+                assertThat(fragment.string(), containsString("<em>Apache</em>"));
+                assertThat(fragment.string(), containsString("<em>Tika</em>"));
+            }
+        }
+    }
 }

src/test/java/org/elasticsearch/plugin/mapper/attachments/test/StandaloneRunner.java renamed to src/test/java/org/elasticsearch/index/mapper/attachment/test/standalone/StandaloneRunner.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.plugin.mapper.attachments.test;
+package org.elasticsearch.index.mapper.attachment.test.standalone;
 
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.cli.CliTool;
@@ -32,7 +32,7 @@
 import org.elasticsearch.index.mapper.DocumentMapperParser;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.mapper.attachment.AttachmentMapper;
-import org.elasticsearch.index.mapper.xcontent.MapperTestUtils;
+import org.elasticsearch.index.mapper.attachment.test.MapperTestUtils;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -86,7 +86,7 @@ protected TikaRunner(Terminal terminal, String url, Integer size, String base64t
             DocumentMapperParser mapperParser = MapperTestUtils.newMapperParser();
             mapperParser.putTypeParser(AttachmentMapper.CONTENT_TYPE, new AttachmentMapper.TypeParser());
 
-            String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/xcontent/test-mapping.json");
+            String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/attachment/test/standalone/standalone-mapping.json");
             docMapper = mapperParser.parse(mapping);
         }
 

src/test/java/org/elasticsearch/index/mapper/xcontent/DateAttachmentMapperTests.java renamed to src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/DateAttachmentMapperTests.java

@@ -17,11 +17,12 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper.xcontent;
+package org.elasticsearch.index.mapper.attachment.test.unit;
 
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.DocumentMapperParser;
 import org.elasticsearch.index.mapper.attachment.AttachmentMapper;
+import org.elasticsearch.index.mapper.attachment.test.MapperTestUtils;
 import org.elasticsearch.index.mapper.core.StringFieldMapper;
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.junit.Before;
@@ -45,7 +46,7 @@ public void setupMapperParser() {
 
     @Test
     public void testSimpleMappings() throws Exception {
-        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/date/date-mapping.json");
+        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/attachment/test/unit/date/date-mapping.json");
         DocumentMapper docMapper = mapperParser.parse(mapping);
 
         // Our mapping should be kept as a String

src/test/java/org/elasticsearch/index/mapper/xcontent/EncryptedDocMapperTest.java renamed to src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/EncryptedDocMapperTest.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.index.mapper.xcontent;
+package org.elasticsearch.index.mapper.attachment.test.unit;
 
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.ImmutableSettings;
@@ -26,6 +26,7 @@
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.index.mapper.attachment.AttachmentMapper;
+import org.elasticsearch.index.mapper.attachment.test.MapperTestUtils;
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.junit.Test;
 
@@ -48,10 +49,10 @@ public void testMultipleDocsEncryptedLast() throws IOException {
         DocumentMapperParser mapperParser = MapperTestUtils.newMapperParser();
         mapperParser.putTypeParser(AttachmentMapper.CONTENT_TYPE, new AttachmentMapper.TypeParser());
 
-        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/multipledocs/test-mapping.json");
+        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/attachment/test/unit/encrypted/test-mapping.json");
         DocumentMapper docMapper = mapperParser.parse(mapping);
-        byte[] html = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/xcontent/htmlWithValidDateMeta.html");
-        byte[] pdf = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/xcontent/encrypted.pdf");
+        byte[] html = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/attachment/test/sample-files/htmlWithValidDateMeta.html");
+        byte[] pdf = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/attachment/test/sample-files/encrypted.pdf");
 
         BytesReference json = jsonBuilder()
                 .startObject()
@@ -81,10 +82,10 @@ public void testMultipleDocsEncryptedFirst() throws IOException {
         DocumentMapperParser mapperParser = MapperTestUtils.newMapperParser();
         mapperParser.putTypeParser(AttachmentMapper.CONTENT_TYPE, new AttachmentMapper.TypeParser());
 
-        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/multipledocs/test-mapping.json");
+        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/attachment/test/unit/encrypted/test-mapping.json");
         DocumentMapper docMapper = mapperParser.parse(mapping);
-        byte[] html = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/xcontent/htmlWithValidDateMeta.html");
-        byte[] pdf = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/xcontent/encrypted.pdf");
+        byte[] html = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/attachment/test/sample-files/htmlWithValidDateMeta.html");
+        byte[] pdf = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/attachment/test/sample-files/encrypted.pdf");
 
         BytesReference json = jsonBuilder()
                 .startObject()
@@ -114,10 +115,10 @@ public void testMultipleDocsEncryptedNotIgnoringErrors() throws IOException {
         DocumentMapperParser mapperParser = MapperTestUtils.newMapperParser(ImmutableSettings.builder().put("index.mapping.attachment.ignore_errors", false).build());
         mapperParser.putTypeParser(AttachmentMapper.CONTENT_TYPE, new AttachmentMapper.TypeParser());
 
-        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/multipledocs/test-mapping.json");
+        String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/attachment/test/unit/encrypted/test-mapping.json");
         DocumentMapper docMapper = mapperParser.parse(mapping);
-        byte[] html = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/xcontent/htmlWithValidDateMeta.html");
-        byte[] pdf = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/xcontent/encrypted.pdf");
+        byte[] html = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/attachment/test/sample-files/htmlWithValidDateMeta.html");
+        byte[] pdf = copyToBytesFromClasspath("/org/elasticsearch/index/mapper/attachment/test/sample-files/encrypted.pdf");
 
         BytesReference json = jsonBuilder()
                 .startObject()