[tika] branch master updated: modify two ODF tests based on feedback of broken build on user list -- remove parsing of embedded files.

[ta...@apache.org]

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

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

The following commit(s) were added to refs/heads/master by this push:
       new  a9145d8    modify two ODF tests based on feedback of broken build on user list -- remove parsing of embedded files.
a9145d8 is described below

commit a9145d85afb6db5f99df70d6634caf9315ce7346
Author: tballison <ta...@mitre.org>
AuthorDate: Tue Mar 21 12:07:14 2017 -0400

     modify two ODF tests based on feedback of broken build on user list -- remove parsing of embedded files.
---
 .../java/org/apache/tika/parser/odf/ODFParserTest.java     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
index b2c28be..d1ec46e 100644
--- a/tika-parsers/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
+++ b/tika-parsers/src/test/java/org/apache/tika/parser/odf/ODFParserTest.java
@@ -29,6 +29,7 @@ import org.apache.tika.metadata.Office;
 import org.apache.tika.metadata.OfficeOpenXMLCore;
 import org.apache.tika.metadata.TikaCoreProperties;
 import org.apache.tika.parser.AutoDetectParser;
+import org.apache.tika.parser.EmptyParser;
 import org.apache.tika.parser.ParseContext;
 import org.apache.tika.parser.Parser;
 import org.apache.tika.parser.opendocument.OpenOfficeParser;
@@ -363,8 +364,8 @@ public class ODFParserTest extends TikaTest {
         Parser parser = new OpenDocumentParser();
         try (InputStream input = ODFParserTest.class.getResourceAsStream("/test-documents/testODT-TIKA-6000.odt")) {
             Metadata metadata = new Metadata();
-            ContentHandler handler = new BodyContentHandler(-1);
-            parser.parse(input, handler, metadata, new ParseContext());
+            ContentHandler handler = new BodyContentHandler();
+            parser.parse(input, handler, metadata, getNonRecursingParseContext());
 
             assertEquals("application/vnd.oasis.opendocument.text", metadata.get(Metadata.CONTENT_TYPE));
 
@@ -385,7 +386,7 @@ public class ODFParserTest extends TikaTest {
 
     @Test //TIKA-2242
     public void testParagraphLevelFontStyles() throws Exception {
-        String xml = getXML("testODTStyles2.odt").xml;
+        String xml = getXML("testODTStyles2.odt", getNonRecursingParseContext()).xml;
         //test text span font-style properties
         assertContains("<p><b>name</b>, advocaat", xml);
         //test paragraph's font-style properties
@@ -404,5 +405,10 @@ public class ODFParserTest extends TikaTest {
         List<Metadata> metadataList = getRecursiveMetadata("testODTEmbedded.odt");
         assertEquals(3, metadataList.size());
     }
-    
+
+    private ParseContext getNonRecursingParseContext() {
+        ParseContext parseContext = new ParseContext();
+        parseContext.set(Parser.class, new EmptyParser());
+        return parseContext;
+    }
 }

-- 
To stop receiving notification emails like this one, please contact
['"commits@tika.apache.org" <co...@tika.apache.org>'].