svn commit: r930950 - in /lucene/tika/trunk: CHANGES.txt tika-parsers/src/test/java/org/apache/tika/TestParsers.java

[ma...@apache.org]

Author: mattmann
Date: Mon Apr  5 20:19:03 2010
New Revision: 930950

URL: http://svn.apache.org/viewvc?rev=930950&view=rev
Log:
- patch for TIKA-398 TestParsers fails when classpathh contains special characters like spaces (Uwe Schindler via mattmann)

Modified:
    lucene/tika/trunk/CHANGES.txt
    lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/TestParsers.java

Modified: lucene/tika/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/CHANGES.txt?rev=930950&r1=930949&r2=930950&view=diff
==============================================================================
--- lucene/tika/trunk/CHANGES.txt (original)
+++ lucene/tika/trunk/CHANGES.txt Mon Apr  5 20:19:03 2010
@@ -4,7 +4,8 @@ Release 0.8 - Current Development
 
 The most notable changes in Tika 0.8 over previous releases are:
 
-TODO
+ * Unit tests for Windows have been fixed, allowing TestParsers
+   to complete. (TIKA-398)
 
 Tika relies on the current set of major dependencies (generated using 
 mvn dependency:tree from the top-level tika src dir):

Modified: lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/TestParsers.java
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/TestParsers.java?rev=930950&r1=930949&r2=930950&view=diff
==============================================================================
--- lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/TestParsers.java (original)
+++ lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/TestParsers.java Mon Apr  5 20:19:03 2010
@@ -19,6 +19,7 @@ package org.apache.tika;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import java.net.URISyntaxException;
 import java.net.URL;
 
 import junit.framework.TestCase;
@@ -180,22 +181,18 @@ public class TestParsers extends TestCas
      * @return an absolute path incl. the name which is in the same directory as
      *         the the class you've called it from.
      */
-    public String getFileResource(String name) {
+    public File getResourceAsFile(String name) throws URISyntaxException {
         URL url = this.getClass().getResource(name);
         if (url != null) {
-            return url.getFile();
+            return new File(url.toURI());
         } else {
             // We have a file which does not exists
             // We got the path
             url = this.getClass().getResource(".");
-            return url.getFile() + name;
+            return new File(new File(url.toURI()), name);
         }
     }
 
-    public File getResourceAsFile(String filename) {
-        return new File(getFileResource(filename));
-    }
-
     public InputStream getResourceAsStream(String name) {
         return this.getClass().getResourceAsStream(name);
     }