svn commit: r1650051 - in /tika/trunk/tika-parsers/src: main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java

[nick]

Author: nick
Date: Wed Jan  7 12:39:08 2015
New Revision: 1650051

URL: http://svn.apache.org/r1650051
Log:
TIKA-1445 Use assertContains, and fix a problem with the ForkParser integration 
tests

Modified:
    
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java
    
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java

Modified: 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java?rev=1650051&r1=1650050&r2=1650051&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java
 (original)
+++ 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java
 Wed Jan  7 12:39:08 2015
@@ -197,7 +197,7 @@ public class TesseractOCRParser extends
           new ImageParser(), new JpegParser(), new TiffParser()
       });
       CompositeImageParser() {
-          super(MediaTypeRegistry.getDefaultRegistry(), imageParsers);
+          super(new MediaTypeRegistry(), imageParsers);
       }
   }
 

Modified: 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java?rev=1650051&r1=1650050&r2=1650051&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
 (original)
+++ 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/ocr/TesseractOCRParserTest.java
 Wed Jan  7 12:39:08 2015
@@ -25,7 +25,6 @@ import java.io.InputStream;
 
 import org.apache.tika.TikaTest;
 import org.apache.tika.metadata.Metadata;
-import org.apache.tika.metadata.TikaCoreProperties;
 import org.apache.tika.mime.MediaType;
 import org.apache.tika.parser.AutoDetectParser;
 import org.apache.tika.parser.DefaultParser;
@@ -105,7 +104,7 @@ public class TesseractOCRParserTest exte
 
         try {
             parser.parse(stream, handler, metadata, parseContext);
-            assertTrue(handler.toString().contains("Happy New Year 2003!"));
+            assertContains("Happy New Year 2003!", handler.toString());
         } finally {
             stream.close();
         }
@@ -130,9 +129,9 @@ public class TesseractOCRParserTest exte
         try {
             parser.parse(stream, handler, metadata, parseContext);
 
-            assertTrue(handler.toString().contains("Happy New Year 2003!"));
-            assertTrue(handler.toString().contains("This is some text."));
-            assertTrue(handler.toString().contains("Here is an embedded 
image:"));
+            assertContains("Happy New Year 2003!", handler.toString());
+            assertContains("This is some text.", handler.toString());
+            assertContains("Here is an embedded image:", handler.toString());
         } finally {
             stream.close();
         }