You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by tp...@apache.org on 2014/10/24 18:56:07 UTC
svn commit: r1634094 -
/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
Author: tpalsulich
Date: Fri Oct 24 16:56:07 2014
New Revision: 1634094
URL: http://svn.apache.org/r1634094
Log:
TIKA-1422. Skip checking the number of some handler invocations in the RFC822ParserTest if Tesseract is installed.
Modified:
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java?rev=1634094&r1=1634093&r2=1634094&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mail/RFC822ParserTest.java Fri Oct 24 16:56:07 2014
@@ -84,14 +84,14 @@ public class RFC822ParserTest {
try {
parser.parse(stream, handler, metadata, new ParseContext());
verify(handler).startDocument();
- int bodyExpectedTimes = 4, multipackExpectedTimes = 5;;
- int invokingTimes = bodyExpectedTimes;
- if (TesseractOCRParserTest.canRun()) {
- invokingTimes = multipackExpectedTimes;
+ int bodyExpectedTimes = 4, multipackExpectedTimes = 5;
+ // TIKA-1422. TesseractOCRParser interferes with the number of times the handler is invoked.
+ // But, different versions of Tesseract lead to a different number of invocations. So, we
+ // only verify the handler if Tesseract cannot run.
+ if (!TesseractOCRParserTest.canRun()) {
+ verify(handler, times(bodyExpectedTimes)).startElement(eq(XHTMLContentHandler.XHTML), eq("div"), eq("div"), any(Attributes.class));
+ verify(handler, times(bodyExpectedTimes)).endElement(XHTMLContentHandler.XHTML, "div", "div");
}
-
- verify(handler, times(invokingTimes)).startElement(eq(XHTMLContentHandler.XHTML), eq("div"), eq("div"), any(Attributes.class));
- verify(handler, times(invokingTimes)).endElement(XHTMLContentHandler.XHTML, "div", "div");
verify(handler, times(multipackExpectedTimes)).startElement(eq(XHTMLContentHandler.XHTML), eq("p"), eq("p"), any(Attributes.class));
verify(handler, times(multipackExpectedTimes)).endElement(XHTMLContentHandler.XHTML, "p", "p");
verify(handler).endDocument();