svn commit: r1134618 - in /tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm: TestChmExtractor.java TestChmLzxState.java TestUtils.java

[ol...@apache.org]

Author: oleg
Date: Sat Jun 11 13:03:32 2011
New Revision: 1134618

URL: http://svn.apache.org/viewvc?rev=1134618&view=rev
Log:
(TIKA-672) added to the chm tests more sophisticated error handling

Modified:
    tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtractor.java
    tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxState.java
    tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestUtils.java

Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtractor.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtractor.java?rev=1134618&r1=1134617&r2=1134618&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtractor.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtractor.java Sat Jun 11 13:03:32 2011
@@ -51,7 +51,7 @@ public class TestChmExtractor extends Te
         Assert.assertNotNull(chmExtractor.getChmDirList());
     }
 
-    public void testExtractChmEntry() {
+    public void testExtractChmEntry() throws TikaException {
         ChmDirectoryListingSet entries = chmExtractor.getChmDirList();
         byte[][] localFile;
         int count = 0;

Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxState.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxState.java?rev=1134618&r1=1134617&r2=1134618&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxState.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxState.java Sat Jun 11 13:03:32 2011
@@ -20,6 +20,7 @@ import java.io.IOException;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.apache.tika.exception.TikaException;
 import org.apache.tika.io.TikaInputStream;
 import org.apache.tika.parser.chm.accessor.ChmDirectoryListingSet;
 import org.apache.tika.parser.chm.accessor.ChmItsfHeader;
@@ -85,12 +86,12 @@ public class TestChmLzxState extends Tes
         }
     }
 
-    public void testChmLzxStateConstructor() {
+    public void testChmLzxStateConstructor() throws TikaException {
         chmLzxState = new ChmLzxState(windowSize);
         Assert.assertNotNull(chmLzxState);
     }
 
-    public void testToString() {
+    public void testToString() throws TikaException {
         if (chmLzxState == null)
             testChmLzxStateConstructor();
         Assert.assertTrue(chmLzxState.toString().length() > 20);

Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestUtils.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestUtils.java?rev=1134618&r1=1134617&r2=1134618&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestUtils.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestUtils.java Sat Jun 11 13:03:32 2011
@@ -20,7 +20,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.tika.parser.chm.exception.ChmParsingException;
+import org.apache.tika.exception.TikaException;
 
 public class TestUtils {
     /**
@@ -31,8 +31,9 @@ public class TestUtils {
      * @return byte[]
      * 
      * @throws IOException
+     * @throws TikaException 
      */
-    public static byte[] toByteArray(InputStream is) throws IOException {
+    public static byte[] toByteArray(InputStream is) throws IOException, TikaException {
         synchronized (is) {
             if (is != null) {
                 ByteArrayOutputStream buffer = new ByteArrayOutputStream();
@@ -46,11 +47,11 @@ public class TestUtils {
                     is.close();
                     buffer.close();
                 } catch (Exception e) {
-                    System.err.println(e.getMessage());
+                    new TikaException(e.getMessage());
                 }
                 return buffer.toByteArray();
             } else
-                throw new ChmParsingException("InputStream is null");
+                throw new IOException("InputStream is null");
         }
     }
 }