You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2016/07/20 12:01:37 UTC
svn commit: r1753489 - in /poi/trunk/src: java/org/apache/poi/poifs/nio/
testcases/org/apache/poi/hssf/usermodel/
testcases/org/apache/poi/poifs/filesystem/
testcases/org/apache/poi/poifs/nio/
Author: nick
Date: Wed Jul 20 12:01:36 2016
New Revision: 1753489
URL: http://svn.apache.org/viewvc?rev=1753489&view=rev
Log:
Sync the file-based "past-the-end" exception to match the stream one, so that extending works, then tests for HSSF writing to a new empty POIFS file #57919
Modified:
poi/trunk/src/java/org/apache/poi/poifs/nio/FileBackedDataSource.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSFileSystem.java
poi/trunk/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java
Modified: poi/trunk/src/java/org/apache/poi/poifs/nio/FileBackedDataSource.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/nio/FileBackedDataSource.java?rev=1753489&r1=1753488&r2=1753489&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/nio/FileBackedDataSource.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/nio/FileBackedDataSource.java Wed Jul 20 12:01:36 2016
@@ -85,7 +85,7 @@ public class FileBackedDataSource extend
@Override
public ByteBuffer read(int length, long position) throws IOException {
if(position >= size()) {
- throw new IllegalArgumentException("Position " + position + " past the end of the file");
+ throw new IndexOutOfBoundsException("Position " + position + " past the end of the file");
}
// Do we read or map (for read/write?
@@ -103,7 +103,7 @@ public class FileBackedDataSource extend
// Check
if(worked == -1) {
- throw new IllegalArgumentException("Position " + position + " past the end of the file");
+ throw new IndexOutOfBoundsException("Position " + position + " past the end of the file");
}
// Ready it for reading
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java?rev=1753489&r1=1753488&r2=1753489&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java Wed Jul 20 12:01:36 2016
@@ -37,6 +37,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import junit.framework.AssertionFailedError;
+
import org.apache.poi.POIDataSamples;
import org.apache.poi.ddf.EscherBSERecord;
import org.apache.poi.hpsf.ClassID;
@@ -71,11 +73,8 @@ import org.apache.poi.util.IOUtils;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.RecordFormatException;
import org.apache.poi.util.TempFile;
-import org.junit.Ignore;
import org.junit.Test;
-import junit.framework.AssertionFailedError;
-
/**
* Tests for {@link HSSFWorkbook}
*/
@@ -1280,7 +1279,6 @@ public final class TestHSSFWorkbook exte
}
@Test
- @Ignore("Not currently working, bug in POIFS creating empty FS")
public void testWriteToNewFile() throws Exception {
// Open from a Stream
HSSFWorkbook wb = new HSSFWorkbook(
Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSFileSystem.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSFileSystem.java?rev=1753489&r1=1753488&r2=1753489&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSFileSystem.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSFileSystem.java Wed Jul 20 12:01:36 2016
@@ -27,6 +27,7 @@ import static org.junit.Assert.fail;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Iterator;
@@ -42,6 +43,7 @@ import org.apache.poi.poifs.property.Pro
import org.apache.poi.poifs.property.RootProperty;
import org.apache.poi.poifs.storage.HeaderBlock;
import org.apache.poi.util.IOUtils;
+import org.apache.poi.util.TempFile;
import org.junit.Test;
/**
@@ -101,6 +103,13 @@ public final class TestNPOIFSFileSystem
original.close();
return new NPOIFSFileSystem(new ByteArrayInputStream(baos.toByteArray()));
}
+ protected static NPOIFSFileSystem writeOutFileAndReadBack(NPOIFSFileSystem original) throws IOException {
+ final File file = TempFile.createTempFile("TestPOIFS", ".ole2");
+ final FileOutputStream fout = new FileOutputStream(file);
+ original.writeFilesystem(fout);
+ original.close();
+ return new NPOIFSFileSystem(file, false);
+ }
@Test
public void basicOpen() throws Exception {
@@ -959,6 +968,20 @@ public final class TestNPOIFSFileSystem
assertEquals(0, fs._get_property_table().getStartBlock());
+ // Check the same but with saving to a file
+ fs = new NPOIFSFileSystem();
+ fs = writeOutFileAndReadBack(fs);
+
+ // Same, no change, SBAT remains empty
+ assertEquals(POIFSConstants.END_OF_CHAIN, fs.getNextBlock(0));
+ assertEquals(POIFSConstants.FAT_SECTOR_BLOCK, fs.getNextBlock(1));
+ assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(2));
+ assertEquals(POIFSConstants.UNUSED_BLOCK, fs.getNextBlock(3));
+ assertEquals(POIFSConstants.END_OF_CHAIN, fs.getRoot().getProperty().getStartBlock());
+ assertEquals(0, fs._get_property_table().getStartBlock());
+
+
+
// Put everything within a new directory
DirectoryEntry testDir = fs.createDirectory("Test Directory");
Modified: poi/trunk/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java?rev=1753489&r1=1753488&r2=1753489&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java Wed Jul 20 12:01:36 2016
@@ -177,7 +177,7 @@ public class TestDataSource extends Test
if(!writeable) {
fail("Shouldn't be able to read off the end of the file");
}
- } catch (IllegalArgumentException e) {
+ } catch (IndexOutOfBoundsException e) {
// expected here
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org