moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Force OPOIFS test to explicitly create OPOIFS instance

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1681803 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2015-05-26 18:03:29 +00:00
parent 8878be359a
commit b8d9c978ad
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
View File

@ -35,7 +35,7 @@ import org.apache.poi.poifs.storage.HeaderBlock;
import org.apache.poi.poifs.storage.RawDataBlockList; import org.apache.poi.poifs.storage.RawDataBlockList;
/** /**
* Tests for POIFSFileSystem * Tests for the older OPOIFS-based POIFSFileSystem
*/ */
public final class TestPOIFSFileSystem extends TestCase { public final class TestPOIFSFileSystem extends TestCase {
private POIDataSamples _samples = POIDataSamples.getPOIFSInstance(); private POIDataSamples _samples = POIDataSamples.getPOIFSInstance();
@ -104,7 +104,7 @@ public final class TestPOIFSFileSystem extends TestCase {
// Normal case - read until EOF and close // Normal case - read until EOF and close
testIS = new TestIS(openSampleStream("13224.xls"), -1); testIS = new TestIS(openSampleStream("13224.xls"), -1);
try { try {
new POIFSFileSystem(testIS); new OPOIFSFileSystem(testIS);
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -113,7 +113,7 @@ public final class TestPOIFSFileSystem extends TestCase {
// intended to crash after reading 10000 bytes // intended to crash after reading 10000 bytes
testIS = new TestIS(openSampleStream("13224.xls"), 10000); testIS = new TestIS(openSampleStream("13224.xls"), 10000);
try { try {
new POIFSFileSystem(testIS); new OPOIFSFileSystem(testIS);
fail("ex should have been thrown"); fail("ex should have been thrown");
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
@ -141,7 +141,7 @@ public final class TestPOIFSFileSystem extends TestCase {
for(int i=0; i<files.length; i++) { for(int i=0; i<files.length; i++) {
// Open the file up // Open the file up
POIFSFileSystem fs = new POIFSFileSystem( OPOIFSFileSystem fs = new OPOIFSFileSystem(
_samples.openResourceAsStream(files[i]) _samples.openResourceAsStream(files[i])
); );
@ -163,7 +163,7 @@ public final class TestPOIFSFileSystem extends TestCase {
try { try {
InputStream stream = _samples.openResourceAsStream("ReferencesInvalidSectors.mpp"); InputStream stream = _samples.openResourceAsStream("ReferencesInvalidSectors.mpp");
try { try {
new POIFSFileSystem(stream); new OPOIFSFileSystem(stream);
fail("File is corrupt and shouldn't have been opened"); fail("File is corrupt and shouldn't have been opened");
} finally { } finally {
stream.close(); stream.close();
@ -182,7 +182,7 @@ public final class TestPOIFSFileSystem extends TestCase {
*/ */
public void testBATandXBAT() throws Exception { public void testBATandXBAT() throws Exception {
byte[] hugeStream = new byte[8*1024*1024]; byte[] hugeStream = new byte[8*1024*1024];
POIFSFileSystem fs = new POIFSFileSystem(); OPOIFSFileSystem fs = new OPOIFSFileSystem();
fs.getRoot().createDocument( fs.getRoot().createDocument(
"BIG", new ByteArrayInputStream(hugeStream) "BIG", new ByteArrayInputStream(hugeStream)
); );
@ -226,7 +226,7 @@ public final class TestPOIFSFileSystem extends TestCase {
// Now load it and check // Now load it and check
fs = null; fs = null;
fs = new POIFSFileSystem( fs = new OPOIFSFileSystem(
new ByteArrayInputStream(fsData) new ByteArrayInputStream(fsData)
); );
@ -260,7 +260,7 @@ public final class TestPOIFSFileSystem extends TestCase {
assertEquals(15, data_blocks.blockCount()); assertEquals(15, data_blocks.blockCount());
// Now try and open properly // Now try and open properly
POIFSFileSystem fs = new POIFSFileSystem( OPOIFSFileSystem fs = new OPOIFSFileSystem(
_samples.openResourceAsStream("BlockSize4096.zvi")); _samples.openResourceAsStream("BlockSize4096.zvi"));
assertTrue(fs.getRoot().getEntryCount() > 3); assertTrue(fs.getRoot().getEntryCount() > 3);
@ -268,7 +268,7 @@ public final class TestPOIFSFileSystem extends TestCase {
checkAllDirectoryContents(fs.getRoot()); checkAllDirectoryContents(fs.getRoot());
// Finally, check we can do a similar 512byte one too // Finally, check we can do a similar 512byte one too
fs = new POIFSFileSystem( fs = new OPOIFSFileSystem(
_samples.openResourceAsStream("BlockSize512.zvi")); _samples.openResourceAsStream("BlockSize512.zvi"));
assertTrue(fs.getRoot().getEntryCount() > 3); assertTrue(fs.getRoot().getEntryCount() > 3);
checkAllDirectoryContents(fs.getRoot()); checkAllDirectoryContents(fs.getRoot());