You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ju...@apache.org on 2011/09/01 15:23:13 UTC
svn commit: r1164073 - in /tika/trunk:
tika-core/src/test/java/org/apache/tika/language/
tika-parsers/src/main/java/org/apache/tika/parser/chm/
tika-parsers/src/main/java/org/apache/tika/parser/chm/core/
tika-parsers/src/test/java/org/apache/tika/parse...
Author: jukka
Date: Thu Sep 1 13:23:12 2011
New Revision: 1164073
URL: http://svn.apache.org/viewvc?rev=1164073&view=rev
Log:
TIKA-701: Fix problems with TemporaryFiles
Various stream handling cleanups
Modified:
tika/trunk/tika-core/src/test/java/org/apache/tika/language/LanguageProfilerBuilderTest.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/CHMDocumentInformation.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmCommons.java
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmExtractor.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmDocumentInformation.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java
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/TestChmItsfHeader.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItspHeader.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/TestChmLzxcControlData.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcResetTable.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestParameters.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmgiHeader.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmglHeader.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestUtils.java
Modified: tika/trunk/tika-core/src/test/java/org/apache/tika/language/LanguageProfilerBuilderTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/test/java/org/apache/tika/language/LanguageProfilerBuilderTest.java?rev=1164073&r1=1164072&r2=1164073&view=diff
==============================================================================
--- tika/trunk/tika-core/src/test/java/org/apache/tika/language/LanguageProfilerBuilderTest.java (original)
+++ tika/trunk/tika-core/src/test/java/org/apache/tika/language/LanguageProfilerBuilderTest.java Thu Sep 1 13:23:12 2011
@@ -29,7 +29,6 @@ import java.net.URISyntaxException;
import junit.framework.Assert;
import junit.framework.TestCase;
import org.apache.tika.exception.TikaException;
-import org.apache.tika.io.TikaInputStream;
public class LanguageProfilerBuilderTest extends TestCase {
/* Test members */
@@ -44,8 +43,14 @@ public class LanguageProfilerBuilderTest
private final int maxlen = 1000;
public void testCreateProfile() throws TikaException, IOException, URISyntaxException {
- TikaInputStream is = TikaInputStream.get(LanguageProfilerBuilderTest.class.getResourceAsStream(corpusName));
- ngramProfile = LanguageProfilerBuilder.create(profileName, is , encoding);
+ InputStream is =
+ LanguageProfilerBuilderTest.class.getResourceAsStream(corpusName);
+ try {
+ ngramProfile = LanguageProfilerBuilder.create(profileName, is , encoding);
+ } finally {
+ is.close();
+ }
+
File f = new File(profileName + "." + FILE_EXTENSION);
FileOutputStream fos = new FileOutputStream(f);
ngramProfile.save(fos);
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/CHMDocumentInformation.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/CHMDocumentInformation.java?rev=1164073&r1=1164072&r2=1164073&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/CHMDocumentInformation.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/CHMDocumentInformation.java Thu Sep 1 13:23:12 2011
@@ -49,22 +49,9 @@ public class CHMDocumentInformation {
* @throws IOException
*/
public static CHMDocumentInformation load(InputStream is) throws TikaException, IOException {
- return new CHMDocumentInformation().getInstance(is);
- }
-
- /**
- * Returns instance of chm document information
- *
- * @param is
- * InputStream
- *
- * @return
- * @throws TikaException
- * @throws IOException
- */
- private CHMDocumentInformation getInstance(InputStream is) throws TikaException, IOException {
- setChmExtractor(new ChmExtractor(is));
- return this;
+ CHMDocumentInformation document = new CHMDocumentInformation();
+ document.setChmExtractor(new ChmExtractor(is));
+ return document;
}
/**
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmCommons.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmCommons.java?rev=1164073&r1=1164072&r2=1164073&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmCommons.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmCommons.java Thu Sep 1 13:23:12 2011
@@ -16,11 +16,9 @@
*/
package org.apache.tika.parser.chm.core;
-import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.util.Iterator;
import java.util.List;
@@ -255,37 +253,6 @@ public class ChmCommons {
}
/**
- * Returns byte array Closes the InputStream
- *
- * @param is
- * InputStream of chm file
- *
- * @return byte array
- *
- * @throws IOException
- * @throws TikaException
- */
- public static byte[] toByteArray(InputStream is) throws IOException, TikaException {
- if (is != null) {
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- int nRead;
- byte[] data = new byte[16384];
- while ((nRead = is.read(data, 0, data.length)) != -1) {
- buffer.write(data, 0, nRead);
- }
- buffer.flush();
- try {
- is.close();
- buffer.close();
- } catch (Exception e) {
- throw new TikaException(e.getMessage());
- }
- return buffer.toByteArray();
- } else
- throw new IOException("InputStream is null");
- }
-
- /**
* Returns an index of the reset table
*
* @param text
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmExtractor.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmExtractor.java?rev=1164073&r1=1164072&r2=1164073&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmExtractor.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/chm/core/ChmExtractor.java Thu Sep 1 13:23:12 2011
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.apache.tika.exception.TikaException;
+import org.apache.tika.io.IOUtils;
import org.apache.tika.parser.chm.accessor.ChmDirectoryListingSet;
import org.apache.tika.parser.chm.accessor.ChmItsfHeader;
import org.apache.tika.parser.chm.accessor.ChmItspHeader;
@@ -145,7 +146,7 @@ public class ChmExtractor {
public ChmExtractor(InputStream is) throws TikaException, IOException {
ChmAssert.assertInputStreamNotNull(is);
try {
- setData(ChmCommons.toByteArray(is));
+ setData(IOUtils.toByteArray(is));
/* Creates and parses chm itsf header */
setChmItsfHeader(new ChmItsfHeader());
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java?rev=1164073&r1=1164072&r2=1164073&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmBlockInfo.java Thu Sep 1 13:23:12 2011
@@ -21,7 +21,6 @@ import java.util.Iterator;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tika.io.TikaInputStream;
import org.apache.tika.parser.chm.accessor.ChmDirectoryListingSet;
import org.apache.tika.parser.chm.accessor.ChmItsfHeader;
import org.apache.tika.parser.chm.accessor.ChmItspHeader;
@@ -44,8 +43,7 @@ public class TestChmBlockInfo extends Te
private ChmLzxcControlData chmLzxcControlData = null;
public void setUp() throws Exception {
- data = TestUtils.toByteArray(TikaInputStream.get(TestChmBlockInfo.class
- .getResource(TestParameters.chmFile)));
+ data = TestParameters.chmData;
/* Creates and parses itsf header */
ChmItsfHeader chmItsHeader = new ChmItsfHeader();
// chmItsHeader.parse(Arrays.copyOfRange(data, 0,
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmDocumentInformation.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmDocumentInformation.java?rev=1164073&r1=1164072&r2=1164073&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmDocumentInformation.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmDocumentInformation.java Thu Sep 1 13:23:12 2011
@@ -17,22 +17,21 @@
package org.apache.tika.parser.chm;
+import java.io.ByteArrayInputStream;
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.metadata.Metadata;
public class TestChmDocumentInformation extends TestCase {
private CHMDocumentInformation chmDoc = null;
public void setUp() throws Exception {
- chmDoc = CHMDocumentInformation
- .load(TikaInputStream.get(TestChmBlockInfo.class
- .getResource(TestParameters.chmFile)));
+ chmDoc = CHMDocumentInformation.load(
+ new ByteArrayInputStream(TestParameters.chmData));
}
public void testGetCHMDocInformation() throws TikaException, IOException {
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java?rev=1164073&r1=1164072&r2=1164073&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmExtraction.java Thu Sep 1 13:23:12 2011
@@ -17,7 +17,6 @@
package org.apache.tika.parser.chm;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
@@ -29,8 +28,6 @@ import java.util.concurrent.locks.Reentr
import junit.framework.TestCase;
-import org.apache.tika.exception.TikaException;
-import org.apache.tika.io.TikaInputStream;
import org.apache.tika.metadata.Metadata;
public class TestChmExtraction extends TestCase {
@@ -52,9 +49,7 @@ public class TestChmExtraction extends T
for (String fileName : files) {
InputStream stream = null;
try {
- stream = TikaInputStream
- .get(TestChmExtraction.class
- .getResource(fileName));
+ stream = TestChmExtraction.class.getResourceAsStream(fileName);
CHMDocumentInformation chmDocInfo = CHMDocumentInformation
.load(stream);
@@ -64,11 +59,7 @@ public class TestChmExtraction extends T
chmDocInfo.getCHMDocInformation(md);
assertEquals(TestParameters.VP_CHM_MIME_TYPE, md.toString().trim());
assertTrue(text.length() > 0);
- } catch (TikaException e) {
- e.printStackTrace();
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- } catch (IOException e) {
+ } catch (Exception e) {
e.printStackTrace();
} finally {
try {
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=1164073&r1=1164072&r2=1164073&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 Thu Sep 1 13:23:12 2011
@@ -16,6 +16,7 @@
*/
package org.apache.tika.parser.chm;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
@@ -37,8 +38,7 @@ public class TestChmExtractor extends Te
public void setUp() throws Exception {
chmExtractor = new ChmExtractor(
- TikaInputStream.get(TestChmBlockInfo.class
- .getResource(TestParameters.chmFile)));
+ new ByteArrayInputStream(TestParameters.chmData));
}
public void testEnumerateChm() {
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItsfHeader.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItsfHeader.java?rev=1164073&r1=1164072&r2=1164073&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItsfHeader.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItsfHeader.java Thu Sep 1 13:23:12 2011
@@ -19,7 +19,6 @@ package org.apache.tika.parser.chm;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tika.io.TikaInputStream;
import org.apache.tika.parser.chm.accessor.ChmItsfHeader;
import org.apache.tika.parser.chm.core.ChmCommons;
import org.apache.tika.parser.chm.core.ChmConstants;
@@ -33,9 +32,7 @@ public class TestChmItsfHeader extends T
public void setUp() throws Exception {
chmItsfHeader = new ChmItsfHeader();
- byte[] data = TestUtils
- .toByteArray(TikaInputStream.get(TestChmBlockInfo.class
- .getResource(TestParameters.chmFile)));
+ byte[] data = TestParameters.chmData;
// chmItsfHeader.parse(Arrays.copyOfRange(data, 0,
// ChmConstants.CHM_ITSF_V3_LEN - 1), chmItsfHeader);
chmItsfHeader.parse(ChmCommons.copyOfRange(data, 0,
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItspHeader.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItspHeader.java?rev=1164073&r1=1164072&r2=1164073&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItspHeader.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmItspHeader.java Thu Sep 1 13:23:12 2011
@@ -19,7 +19,6 @@ package org.apache.tika.parser.chm;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tika.io.TikaInputStream;
import org.apache.tika.parser.chm.accessor.ChmItsfHeader;
import org.apache.tika.parser.chm.accessor.ChmItspHeader;
import org.apache.tika.parser.chm.core.ChmCommons;
@@ -33,9 +32,7 @@ public class TestChmItspHeader extends T
private ChmItspHeader chmItspHeader = null;
public void setUp() throws Exception {
- byte[] data = TestUtils
- .toByteArray(TikaInputStream.get(TestChmBlockInfo.class
- .getResource(TestParameters.chmFile)));
+ byte[] data = TestParameters.chmData;
ChmItsfHeader chmItsfHeader = new ChmItsfHeader();
// chmItsfHeader.parse(Arrays.copyOfRange(data, 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=1164073&r1=1164072&r2=1164073&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 Thu Sep 1 13:23:12 2011
@@ -16,12 +16,10 @@
*/
package org.apache.tika.parser.chm;
-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;
import org.apache.tika.parser.chm.accessor.ChmItspHeader;
@@ -35,55 +33,49 @@ public class TestChmLzxState extends Tes
private int windowSize;
public void setUp() throws Exception {
- try {
- byte[] data = TestUtils.toByteArray(TikaInputStream
- .get(TestChmBlockInfo.class
- .getResource(TestParameters.chmFile)));
-
- /* Creates and parses itsf header */
- ChmItsfHeader chmItsHeader = new ChmItsfHeader();
- // chmItsHeader.parse(Arrays.copyOfRange(data, 0,
- // ChmConstants.CHM_ITSF_V3_LEN - 1), chmItsHeader);
- chmItsHeader.parse(ChmCommons.copyOfRange(data, 0,
- ChmConstants.CHM_ITSF_V3_LEN - 1), chmItsHeader);
- /* Creates and parses itsp block */
- ChmItspHeader chmItspHeader = new ChmItspHeader();
- // chmItspHeader.parse(Arrays.copyOfRange( data, (int)
- // chmItsHeader.getDirOffset(),
- // (int) chmItsHeader.getDirOffset()
- // + ChmConstants.CHM_ITSP_V1_LEN), chmItspHeader);
- chmItspHeader.parse(ChmCommons.copyOfRange(data,
- (int) chmItsHeader.getDirOffset(),
- (int) chmItsHeader.getDirOffset()
- + ChmConstants.CHM_ITSP_V1_LEN), chmItspHeader);
-
- /* Creating instance of ChmDirListingContainer */
- ChmDirectoryListingSet chmDirListCont = new ChmDirectoryListingSet(
- data, chmItsHeader, chmItspHeader);
- int indexOfControlData = ChmCommons.indexOf(
- chmDirListCont.getDirectoryListingEntryList(),
- ChmConstants.CONTROL_DATA);
-
- int indexOfResetTable = ChmCommons.indexOfResetTableBlock(data,
- ChmConstants.LZXC.getBytes());
- byte[] dir_chunk = null;
- if (indexOfResetTable > 0) {
- // dir_chunk = Arrays.copyOfRange( data, indexOfResetTable,
- // indexOfResetTable
- // +
- // chmDirListCont.getDirectoryListingEntryList().get(indexOfControlData).getLength());
- dir_chunk = ChmCommons.copyOfRange(data, indexOfResetTable,
- indexOfResetTable
- + chmDirListCont.getDirectoryListingEntryList()
- .get(indexOfControlData).getLength());
- }
-
- ChmLzxcControlData clcd = new ChmLzxcControlData();
- clcd.parse(dir_chunk, clcd);
- windowSize = (int) clcd.getWindowSize();
- } catch (IOException e) {
- e.printStackTrace();
+ byte[] data = TestParameters.chmData;
+
+ /* Creates and parses itsf header */
+ ChmItsfHeader chmItsHeader = new ChmItsfHeader();
+ // chmItsHeader.parse(Arrays.copyOfRange(data, 0,
+ // ChmConstants.CHM_ITSF_V3_LEN - 1), chmItsHeader);
+ chmItsHeader.parse(ChmCommons.copyOfRange(data, 0,
+ ChmConstants.CHM_ITSF_V3_LEN - 1), chmItsHeader);
+ /* Creates and parses itsp block */
+ ChmItspHeader chmItspHeader = new ChmItspHeader();
+ // chmItspHeader.parse(Arrays.copyOfRange( data, (int)
+ // chmItsHeader.getDirOffset(),
+ // (int) chmItsHeader.getDirOffset()
+ // + ChmConstants.CHM_ITSP_V1_LEN), chmItspHeader);
+ chmItspHeader.parse(ChmCommons.copyOfRange(data,
+ (int) chmItsHeader.getDirOffset(),
+ (int) chmItsHeader.getDirOffset()
+ + ChmConstants.CHM_ITSP_V1_LEN), chmItspHeader);
+
+ /* Creating instance of ChmDirListingContainer */
+ ChmDirectoryListingSet chmDirListCont = new ChmDirectoryListingSet(
+ data, chmItsHeader, chmItspHeader);
+ int indexOfControlData = ChmCommons.indexOf(
+ chmDirListCont.getDirectoryListingEntryList(),
+ ChmConstants.CONTROL_DATA);
+
+ int indexOfResetTable = ChmCommons.indexOfResetTableBlock(data,
+ ChmConstants.LZXC.getBytes());
+ byte[] dir_chunk = null;
+ if (indexOfResetTable > 0) {
+ // dir_chunk = Arrays.copyOfRange( data, indexOfResetTable,
+ // indexOfResetTable
+ // +
+ // chmDirListCont.getDirectoryListingEntryList().get(indexOfControlData).getLength());
+ dir_chunk = ChmCommons.copyOfRange(data, indexOfResetTable,
+ indexOfResetTable
+ + chmDirListCont.getDirectoryListingEntryList()
+ .get(indexOfControlData).getLength());
}
+
+ ChmLzxcControlData clcd = new ChmLzxcControlData();
+ clcd.parse(dir_chunk, clcd);
+ windowSize = (int) clcd.getWindowSize();
}
public void testChmLzxStateConstructor() throws TikaException {
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcControlData.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcControlData.java?rev=1164073&r1=1164072&r2=1164073&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcControlData.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcControlData.java Thu Sep 1 13:23:12 2011
@@ -19,7 +19,6 @@ package org.apache.tika.parser.chm;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tika.io.TikaInputStream;
import org.apache.tika.parser.chm.accessor.ChmDirectoryListingSet;
import org.apache.tika.parser.chm.accessor.ChmItsfHeader;
import org.apache.tika.parser.chm.accessor.ChmItspHeader;
@@ -34,9 +33,7 @@ public class TestChmLzxcControlData exte
private ChmLzxcControlData chmLzxcControlData = null;
public void setUp() throws Exception {
- byte[] data = TestUtils
- .toByteArray(TikaInputStream.get(TestChmBlockInfo.class
- .getResource(TestParameters.chmFile)));
+ byte[] data = TestParameters.chmData;
/* Creates and parses itsf header */
ChmItsfHeader chmItsHeader = new ChmItsfHeader();
// chmItsHeader.parse(Arrays.copyOfRange(data, 0,
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcResetTable.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcResetTable.java?rev=1164073&r1=1164072&r2=1164073&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcResetTable.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestChmLzxcResetTable.java Thu Sep 1 13:23:12 2011
@@ -19,7 +19,7 @@ package org.apache.tika.parser.chm;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tika.io.TikaInputStream;
+
import org.apache.tika.parser.chm.accessor.ChmDirectoryListingSet;
import org.apache.tika.parser.chm.accessor.ChmItsfHeader;
import org.apache.tika.parser.chm.accessor.ChmItspHeader;
@@ -33,9 +33,7 @@ public class TestChmLzxcResetTable exten
private ChmLzxcResetTable chmLzxcResetTable = null;
public void setUp() throws Exception {
- byte[] data = TestUtils
- .toByteArray(TikaInputStream.get(TestChmBlockInfo.class
- .getResource(TestParameters.chmFile)));
+ byte[] data = TestParameters.chmData;
/* Creates and parses itsf header */
ChmItsfHeader chmItsfHeader = new ChmItsfHeader();
// chmItsfHeader.parse(Arrays.copyOfRange(data, 0,
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestParameters.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestParameters.java?rev=1164073&r1=1164072&r2=1164073&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestParameters.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestParameters.java Thu Sep 1 13:23:12 2011
@@ -16,6 +16,10 @@
*/
package org.apache.tika.parser.chm;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.tika.io.IOUtils;
import org.apache.tika.parser.chm.core.ChmCommons.EntryType;
/**
@@ -36,7 +40,20 @@ public class TestParameters {
static final int BUFFER_SIZE = 16384;
- static final String chmFile = "/test-documents/testChm.chm";
+ static final byte[] chmData = readResource("/test-documents/testChm.chm");
+
+ private static byte[] readResource(String name) {
+ try {
+ InputStream stream = TestParameters.class.getResourceAsStream(name);
+ try {
+ return IOUtils.toByteArray(stream);
+ } finally {
+ stream.close();
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
/* Verification points */
static final String VP_CHM_MIME_TYPE = "Content-Type=application/x-chm";
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmgiHeader.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmgiHeader.java?rev=1164073&r1=1164072&r2=1164073&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmgiHeader.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmgiHeader.java Thu Sep 1 13:23:12 2011
@@ -14,23 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.tika.parser.chm;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tika.io.TikaInputStream;
+
import org.apache.tika.parser.chm.accessor.ChmPmgiHeader;
-import org.apache.tika.parser.chm.core.ChmCommons;
public class TestPmgiHeader extends TestCase {
ChmPmgiHeader chmPmgiHeader = null;
public void setUp() throws Exception {
- byte[] data = ChmCommons
- .toByteArray(TikaInputStream.get(TestChmBlockInfo.class
- .getResource(TestParameters.chmFile)));
+ byte[] data = TestParameters.chmData;
chmPmgiHeader = new ChmPmgiHeader();
chmPmgiHeader.parse(data, chmPmgiHeader);
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmglHeader.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmglHeader.java?rev=1164073&r1=1164072&r2=1164073&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmglHeader.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/chm/TestPmglHeader.java Thu Sep 1 13:23:12 2011
@@ -14,12 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tika.parser.chm;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tika.io.TikaInputStream;
+
import org.apache.tika.parser.chm.accessor.ChmPmglHeader;
import org.apache.tika.parser.chm.core.ChmCommons;
import org.apache.tika.parser.chm.core.ChmConstants;
@@ -28,9 +27,7 @@ public class TestPmglHeader extends Test
ChmPmglHeader chmPmglHeader = null;
public void setUp() throws Exception {
- byte[] data = ChmCommons
- .toByteArray(TikaInputStream.get(TestChmBlockInfo.class
- .getResource(TestParameters.chmFile)));
+ byte[] data = TestParameters.chmData;
chmPmglHeader = new ChmPmglHeader();
chmPmglHeader.parse(ChmCommons.copyOfRange(data,
ChmConstants.START_PMGL, ChmConstants.START_PMGL