[tika] branch branch_1x updated: TIKA-3357 -- add unit test

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/branch_1x by this push:
     new 3fa1953  TIKA-3357 -- add unit test
3fa1953 is described below

commit 3fa19532b1ec78b57d1e238c2192d54df7572285
Author: tallison <ta...@apache.org>
AuthorDate: Mon Apr 19 09:45:55 2021 -0400

    TIKA-3357 -- add unit test
---
 .../org/apache/tika/server/TikaResourceTest.java   | 49 +++++++++++++---------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java b/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java
index 8940a18..68d537d 100644
--- a/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java
+++ b/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java
@@ -17,6 +17,23 @@
 
 package org.apache.tika.server;
 
+import static org.apache.cxf.helpers.HttpHeaderHelper.CONTENT_ENCODING;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
 import org.apache.cxf.attachment.AttachmentUtil;
@@ -26,9 +43,9 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.ContentDisposition;
 import org.apache.cxf.jaxrs.ext.multipart.MultipartBody;
 import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
+import org.junit.Test;
 
 import org.apache.tika.metadata.Metadata;
-import org.apache.tika.metadata.TikaCoreProperties;
 import org.apache.tika.metadata.serialization.JsonMetadata;
 import org.apache.tika.parser.ocr.TesseractOCRConfig;
 import org.apache.tika.parser.ocr.TesseractOCRParser;
@@ -36,25 +53,6 @@ import org.apache.tika.sax.AbstractRecursiveParserWrapperHandler;
 import org.apache.tika.server.resource.TikaResource;
 import org.apache.tika.server.writer.JSONMessageBodyWriter;
 
-import org.junit.Test;
-
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import static org.apache.cxf.helpers.HttpHeaderHelper.CONTENT_ENCODING;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 public class TikaResourceTest extends CXFTestBase {
     public static final String TEST_DOC = "test.doc";
     public static final String TEST_PASSWORD_PROTECTED = "password.xls";
@@ -83,6 +81,7 @@ public class TikaResourceTest extends CXFTestBase {
         sf.setResourceClasses(TikaResource.class);
         sf.setResourceProvider(TikaResource.class,
                 new SingletonResourceProvider(new TikaResource()));
+        sf.setResourceComparator(new ProduceTypeResourceComparator());
     }
 
     @Override
@@ -113,6 +112,16 @@ public class TikaResourceTest extends CXFTestBase {
     }
 
     @Test
+    public void testResourceComparator() throws Exception {
+        Response response = WebClient.create(endPoint + TIKA_PATH)
+                .put(ClassLoader.getSystemResourceAsStream(TEST_DOC));
+        String responseMsg = getStringFromInputStream((InputStream) response.getEntity());
+        //test that xml markup is the default
+        assertTrue(
+                responseMsg.contains("<meta name=\"meta:author\" content=\"Maxim Valyanskiy\"/>"));
+    }
+
+    @Test
     public void testWordGzipIn() throws Exception {
         Response response = WebClient.create(endPoint + TIKA_PATH)
                 .type("application/msword")