svn commit: r1650111 - /tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaMimeTypesTest.java

[tallison]

Author: tallison
Date: Wed Jan  7 16:35:33 2015
New Revision: 1650111

URL: http://svn.apache.org/r1650111
Log:
TIKA-1445: need to fix TikaMimeTypesTest in tika-server to accomodate two 
options for parser

Modified:
    
tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaMimeTypesTest.java

Modified: 
tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaMimeTypesTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaMimeTypesTest.java?rev=1650111&r1=1650110&r2=1650111&view=diff
==============================================================================
--- 
tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaMimeTypesTest.java
 (original)
+++ 
tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaMimeTypesTest.java
 Wed Jan  7 16:35:33 2015
@@ -18,6 +18,7 @@
 package org.apache.tika.server;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.InputStream;
 import java.util.Map;
@@ -106,7 +107,10 @@ public class TikaMimeTypesTest extends C
        Object[] aliases = (Object[])bmp.get("alias");
        assertEquals(1, aliases.length);
        assertEquals("image/bmp", aliases[0]);
-       assertEquals("org.apache.tika.parser.ocr.TesseractOCRParser", 
bmp.get("parser"));
+
+       String whichParser = bmp.get("parser").toString();
+       assertTrue("Which parser", 
whichParser.equals("org.apache.tika.parser.ocr.TesseractOCRParser") ||
+               whichParser.equals("org.apache.tika.parser.image.ImageParser"));
 
        Map<String,Object> ogm = json.get("video/x-ogm");
        assertEquals("video/ogg", ogm.get("supertype"));