You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ni...@apache.org on 2018/03/19 10:44:31 UTC
[tika] branch multiple-parsers updated (12a98b6 -> 50f8591)
This is an automated email from the ASF dual-hosted git repository.
nick pushed a change to branch multiple-parsers
in repository https://gitbox.apache.org/repos/asf/tika.git.
from 12a98b6 Keep all implemented and unit test
new f1f3067 Remove un-used reference
new 50f8591 Fix test references to embedded exception property definition
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/tika/parser/multiple/PickBestTextEncodingParser.java | 1 -
.../java/org/apache/tika/parser/RecursiveParserWrapperTest.java | 3 ++-
.../src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java | 6 +++---
.../apache/tika/parser/microsoft/POIContainerExtractionTest.java | 4 ++--
.../tika/parser/microsoft/ooxml/OOXMLContainerExtractionTest.java | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
--
To stop receiving notification emails like this one, please contact
nick@apache.org.
[tika] 02/02: Fix test references to embedded exception property
definition
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nick pushed a commit to branch multiple-parsers
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 50f8591c6c87b756d6d8881c95f9794c51ffa240
Author: Nick Burch <ni...@gagravarr.org>
AuthorDate: Mon Mar 19 10:42:01 2018 +0000
Fix test references to embedded exception property definition
---
.../java/org/apache/tika/parser/RecursiveParserWrapperTest.java | 3 ++-
.../src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java | 6 +++---
.../apache/tika/parser/microsoft/POIContainerExtractionTest.java | 4 ++--
.../tika/parser/microsoft/ooxml/OOXMLContainerExtractionTest.java | 4 ++--
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
index 1a853d9..b1b72ca 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
+++ b/tika-parsers/src/test/java/org/apache/tika/parser/RecursiveParserWrapperTest.java
@@ -36,6 +36,7 @@ import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.parser.utils.CommonsDigester;
import org.apache.tika.sax.BasicContentHandlerFactory;
import org.apache.tika.sax.ContentHandlerFactory;
+import org.apache.tika.utils.ParserUtils;
import org.junit.Test;
import org.xml.sax.helpers.DefaultHandler;
@@ -206,7 +207,7 @@ public class RecursiveParserWrapperTest {
//is to catch the exception
assertEquals(13, list.size());
Metadata mockNPEMetadata = list.get(10);
- assertContains("java.lang.NullPointerException", mockNPEMetadata.get(RecursiveParserWrapper.EMBEDDED_EXCEPTION));
+ assertContains("java.lang.NullPointerException", mockNPEMetadata.get(ParserUtils.EMBEDDED_EXCEPTION));
metadata = new Metadata();
metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, "test_recursive_embedded_npe.docx");
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
index d69c621..7f92163 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
+++ b/tika-parsers/src/test/java/org/apache/tika/parser/crypto/TSDParserTest.java
@@ -26,8 +26,8 @@ import java.util.List;
import org.apache.tika.TikaTest;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.RecursiveParserWrapper;
import org.apache.tika.sax.BodyContentHandler;
+import org.apache.tika.utils.ParserUtils;
import org.junit.Test;
import org.xml.sax.ContentHandler;
@@ -173,7 +173,7 @@ public class TSDParserTest extends TikaTest {
List<Metadata> list = getRecursiveMetadata("testTSD_broken_pdf.tsd");
assertEquals(2, list.size());
assertEquals("application/pdf", list.get(1).get(Metadata.CONTENT_TYPE));
- assertNotNull(list.get(1).get(RecursiveParserWrapper.EMBEDDED_EXCEPTION));
- assertContains("org.apache.pdfbox.pdmodel.PDDocument.load", list.get(1).get(RecursiveParserWrapper.EMBEDDED_EXCEPTION));
+ assertNotNull(list.get(1).get(ParserUtils.EMBEDDED_EXCEPTION));
+ assertContains("org.apache.pdfbox.pdmodel.PDDocument.load", list.get(1).get(ParserUtils.EMBEDDED_EXCEPTION));
}
}
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
index d95333d..148efec 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
+++ b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/POIContainerExtractionTest.java
@@ -27,7 +27,7 @@ import org.apache.tika.extractor.ParserContainerExtractor;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.mime.MediaType;
-import org.apache.tika.parser.RecursiveParserWrapper;
+import org.apache.tika.utils.ParserUtils;
import org.junit.Test;
/**
@@ -374,7 +374,7 @@ public class POIContainerExtractionTest extends AbstractPOIContainerExtractionTe
if (m.get(Metadata.CONTENT_TYPE).equals(POIFSContainerDetector.MS_GRAPH_CHART.toString())) {
found = true;
}
- assertNull(m.get(RecursiveParserWrapper.EMBEDDED_EXCEPTION));
+ assertNull(m.get(ParserUtils.EMBEDDED_EXCEPTION));
}
assertTrue("didn't find chart in "+suffix, found);
}
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLContainerExtractionTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLContainerExtractionTest.java
index 9cc300b..9c594ee 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLContainerExtractionTest.java
+++ b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLContainerExtractionTest.java
@@ -26,9 +26,9 @@ import org.apache.tika.Tika;
import org.apache.tika.extractor.ContainerExtractor;
import org.apache.tika.extractor.ParserContainerExtractor;
import org.apache.tika.metadata.Metadata;
-import org.apache.tika.parser.RecursiveParserWrapper;
import org.apache.tika.parser.microsoft.AbstractPOIContainerExtractionTest;
import org.apache.tika.parser.microsoft.POIFSContainerDetector;
+import org.apache.tika.utils.ParserUtils;
import org.junit.Before;
import org.junit.Test;
@@ -317,7 +317,7 @@ public class OOXMLContainerExtractionTest extends AbstractPOIContainerExtraction
if (m.get(Metadata.CONTENT_TYPE).equals(POIFSContainerDetector.MS_GRAPH_CHART.toString())) {
found = true;
}
- assertNull(m.get(RecursiveParserWrapper.EMBEDDED_EXCEPTION));
+ assertNull(m.get(ParserUtils.EMBEDDED_EXCEPTION));
}
assertTrue("didn't find chart in "+suffix, found);
}
--
To stop receiving notification emails like this one, please contact
nick@apache.org.
[tika] 01/02: Remove un-used reference
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nick pushed a commit to branch multiple-parsers
in repository https://gitbox.apache.org/repos/asf/tika.git
commit f1f30673fea0d08f138488154c27f2c2205dd14f
Author: Nick Burch <ni...@gagravarr.org>
AuthorDate: Mon Mar 19 08:55:43 2018 +0000
Remove un-used reference
---
.../java/org/apache/tika/parser/multiple/PickBestTextEncodingParser.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/tika-core/src/main/java/org/apache/tika/parser/multiple/PickBestTextEncodingParser.java b/tika-core/src/main/java/org/apache/tika/parser/multiple/PickBestTextEncodingParser.java
index 6cc81af..f043a5a 100644
--- a/tika-core/src/main/java/org/apache/tika/parser/multiple/PickBestTextEncodingParser.java
+++ b/tika-core/src/main/java/org/apache/tika/parser/multiple/PickBestTextEncodingParser.java
@@ -34,7 +34,6 @@ import org.apache.tika.mime.MediaTypeRegistry;
import org.apache.tika.parser.EmptyParser;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
-import org.apache.tika.parser.txt.TXTParser;
import org.apache.tika.sax.BodyContentHandler;
import org.apache.tika.sax.ContentHandlerFactory;
import org.xml.sax.ContentHandler;
--
To stop receiving notification emails like this one, please contact
nick@apache.org.