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
commit 5877c4c8702a10a76b6c3ee59fbae7daf3c9b062 Author: tballison <[email protected]> AuthorDate: Mon Mar 27 10:13:56 2017 -0400 TIKA-2302 -- make extraction of macros optional in OfficeParsers and set default to false --- .../test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java | 2 +- .../test/java/org/apache/tika/parser/microsoft/WordParserTest.java | 2 +- .../org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java | 6 +++--- .../org/apache/tika/parser/microsoft/ooxml/SXSLFExtractorTest.java | 2 +- .../org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java index 3efaa7c..cea5e9f 100644 --- a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java +++ b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ExcelParserTest.java @@ -484,7 +484,7 @@ public class ExcelParserTest extends TikaTest { //test default is "don't extract macros" for (Metadata metadata : getRecursiveMetadata("testEXCEL_macro.xls")) { if (metadata.get(Metadata.CONTENT_TYPE).equals("text/x-vbasic")) { - fail("Shouldn't have extract macros as default"); + fail("Shouldn't have extracted macros as default"); } } diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java index 1dd8bbf..df6d807 100644 --- a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java +++ b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/WordParserTest.java @@ -531,7 +531,7 @@ public class WordParserTest extends TikaTest { //test default is "don't extract macros" for (Metadata metadata : getRecursiveMetadata("testWORD_macros.doc")) { if (metadata.get(Metadata.CONTENT_TYPE).equals("text/x-vbasic")) { - fail("Shouldn't have extract macros as default"); + fail("Shouldn't have extracted macros as default"); } } diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java index 635b99c..0b9cb18 100644 --- a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java +++ b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/OOXMLParserTest.java @@ -1293,7 +1293,7 @@ public class OOXMLParserTest extends TikaTest { //test default is "don't extract macros" for (Metadata metadata : getRecursiveMetadata("testWORD_macros.docm")) { if (metadata.get(Metadata.CONTENT_TYPE).equals("text/x-vbasic")) { - fail("Shouldn't have extract macros as default"); + fail("Shouldn't have extracted macros as default"); } } @@ -1326,7 +1326,7 @@ public class OOXMLParserTest extends TikaTest { //test default is "don't extract macros" for (Metadata metadata : getRecursiveMetadata("testPPT_macros.pptm")) { if (metadata.get(Metadata.CONTENT_TYPE).equals("text/x-vbasic")) { - fail("Shouldn't have extract macros as default"); + fail("Shouldn't have extracted macros as default"); } } @@ -1358,7 +1358,7 @@ public class OOXMLParserTest extends TikaTest { //test default is "don't extract macros" for (Metadata metadata : getRecursiveMetadata("testEXCEL_macro.xlsm")) { if (metadata.get(Metadata.CONTENT_TYPE).equals("text/x-vbasic")) { - fail("Shouldn't have extract macros as default"); + fail("Shouldn't have extracted macros as default"); } } diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXSLFExtractorTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXSLFExtractorTest.java index 6d19c48..daee2b9 100644 --- a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXSLFExtractorTest.java +++ b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXSLFExtractorTest.java @@ -533,7 +533,7 @@ public class SXSLFExtractorTest extends TikaTest { //test default is "don't extract macros" for (Metadata metadata : metadataList) { if (metadata.get(Metadata.CONTENT_TYPE).equals("text/x-vbasic")) { - fail("Shouldn't have extract macros as default"); + fail("Shouldn't have extracted macros as default"); } } diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java index 883681e..206385a 100644 --- a/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java +++ b/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/ooxml/SXWPFExtractorTest.java @@ -712,7 +712,7 @@ public class SXWPFExtractorTest extends TikaTest { List<Metadata> metadataList = getRecursiveMetadata("testWORD_macros.docm", parseContext); for (Metadata metadata : metadataList) { if (metadata.get(Metadata.CONTENT_TYPE).equals("text/x-vbasic")) { - fail("Shouldn't have extract macros as default"); + fail("Shouldn't have extracted macros as default"); } } assertContainsAtLeast(parsedBy, metadataList); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
