You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ni...@apache.org on 2010/09/14 22:26:51 UTC

svn commit: r997080 - in /tika/trunk: tika-core/src/test/java/org/apache/tika/parser/ tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java

Author: nick
Date: Tue Sep 14 20:26:50 2010
New Revision: 997080

URL: http://svn.apache.org/viewvc?rev=997080&view=rev
Log:
Move the AutoDetectParser tests from TIKA-514 into the existing AutoDetectParserTest class

Removed:
    tika/trunk/tika-core/src/test/java/org/apache/tika/parser/
Modified:
    tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java

Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java?rev=997080&r1=997079&r2=997080&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java Tue Sep 14 20:26:50 2010
@@ -17,13 +17,20 @@
 package org.apache.tika.parser;
 
 import junit.framework.TestCase;
+
+import org.apache.tika.detect.Detector;
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.metadata.Metadata;
+import org.apache.tika.mime.MediaType;
 import org.apache.tika.sax.BodyContentHandler;
 import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Set;
 
 public class AutoDetectParserTest extends TestCase {
 
@@ -205,7 +212,52 @@ public class AutoDetectParserTest extend
         }
     
     }
+    
+    /**
+     * Test case for TIKA-514. Provide constructor for AutoDetectParser that has explicit
+     * list of supported parsers.
+     * @see <a href="https://issues.apache.org/jira/browse/TIKA-514">TIKA-514</a>
+     */
+    public void testSpecificParserList() throws Exception {
+        AutoDetectParser parser = new AutoDetectParser(new MyDetector(), new MyParser());
+        
+        InputStream is = new ByteArrayInputStream("test".getBytes());
+        Metadata metadata = new Metadata();
+        parser.parse(is, new BodyContentHandler(), metadata, new ParseContext());
+        
+        assertEquals("value", metadata.get("MyParser"));
+    }
+
+    private static final MediaType MY_MEDIA_TYPE = new MediaType("application", "x-myparser");
+    
+    /**
+     * A test detector which always returns the type supported
+     *  by the test parser
+     */
+    @SuppressWarnings("serial")
+    private static class MyDetector implements Detector {
+        public MediaType detect(InputStream input, Metadata metadata) throws IOException {
+            return MY_MEDIA_TYPE;
+        }
+    }
+    
+    @SuppressWarnings("serial")
+    private static class MyParser implements Parser {
+        public Set<MediaType> getSupportedTypes(ParseContext context) {
+            Set<MediaType> supportedTypes = new HashSet<MediaType>();
+            supportedTypes.add(MY_MEDIA_TYPE);
+            return supportedTypes;
+        }
 
+        public void parse(InputStream stream, ContentHandler handler, Metadata metadata, ParseContext context) {
+            metadata.add("MyParser", "value");
+        }
+
+        public void parse(InputStream stream, ContentHandler handler, Metadata metadata) {
+            parse(stream, handler, metadata, new ParseContext());
+        }
+    }
+    
     /**
      * Minimal class to encapsulate all parameters -- the main reason for
      * its existence is to aid in debugging via its toString() method.