From 5b682dd9196ff46c5045edfaf29e65e95fbfa4f0 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Fri, 10 Feb 2017 11:43:01 +0000 Subject: [PATCH] Update the big file test to use POIFSFileSystem.create(File), and tweak javadocs git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1782454 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/poifs/filesystem/POIFSFileSystem.java | 5 +++-- .../poifs/filesystem/TestNPOIFSFileSystem.java | 17 +++-------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java b/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java index 84f345504d..c4ff362721 100644 --- a/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java +++ b/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java @@ -27,9 +27,10 @@ import org.apache.poi.util.CloseIgnoringInputStream; /** * Transition class for the move from {@link POIFSFileSystem} to * {@link OPOIFSFileSystem}, and from {@link NPOIFSFileSystem} to - * {@link POIFSFileSystem}. Currently, this is OPOIFS-powered + * {@link POIFSFileSystem}. + *

This has been updated to be powered by the NIO-based NPOIFS + * {@link NPOIFSFileSystem}. */ - public class POIFSFileSystem extends NPOIFSFileSystem // TODO Temporary workaround during #56791 implements POIFSViewable diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSFileSystem.java b/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSFileSystem.java index a4a5846c0b..5da455f128 100644 --- a/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSFileSystem.java +++ b/src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSFileSystem.java @@ -1569,8 +1569,7 @@ public final class TestNPOIFSFileSystem { * Note that to run this test, you will require 2.5+gb of free * space on your TMP/TEMP partition/disk * - * TODO Fix this to work - * TODO Update this to use a "create as new file" constructor too + * TODO Fix this to work... */ @Test @Ignore("Work in progress test for #60670") @@ -1584,14 +1583,8 @@ public final class TestNPOIFSFileSystem { int s512mb = 512*1024*1024; DocumentEntry entry; - // TODO Provide a create method that takes a file - // Create a just-sub 2gb file - NPOIFSFileSystem fs = new NPOIFSFileSystem(); - fs.writeFilesystem(new FileOutputStream(big)); - fs.close(); - - fs = new NPOIFSFileSystem(big, false); + NPOIFSFileSystem fs = POIFSFileSystem.create(big); for (int i=0; i<19; i++) { fs.createDocument(new DummyDataInputStream(s100mb), "Entry"+i); } @@ -1627,11 +1620,7 @@ public final class TestNPOIFSFileSystem { // Create a >2gb file - fs = new NPOIFSFileSystem(); - fs.writeFilesystem(new FileOutputStream(big)); - fs.close(); - - fs = new NPOIFSFileSystem(big, false); + fs = POIFSFileSystem.create(big); for (int i=0; i<4; i++) { fs.createDocument(new DummyDataInputStream(s512mb), "Entry"+i); }