eclipse warnings - close resources
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1773910 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker
parent
4aaef1761d
commit
4cc6e093f4
@ -36,8 +36,6 @@ import org.apache.poi.hwpf.usermodel.Range;
|
||||
|
||||
/**
|
||||
* Demonstrates how you can extract misc embedded data from a ppt file
|
||||
*
|
||||
* @author Yegor Kozlov
|
||||
*/
|
||||
public final class DataExtraction {
|
||||
|
||||
@ -93,6 +91,7 @@ public final class DataExtraction {
|
||||
FileOutputStream out = new FileOutputStream(name + "-("+(oleIdx)+").doc");
|
||||
doc.write(out);
|
||||
out.close();
|
||||
doc.close();
|
||||
} else {
|
||||
FileOutputStream out = new FileOutputStream(ole.getProgID() + "-"+(oleIdx+1)+".dat");
|
||||
InputStream dis = data.getData();
|
||||
@ -117,8 +116,8 @@ public final class DataExtraction {
|
||||
out.close();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
ppt.close();
|
||||
}
|
||||
|
||||
private static void usage(){
|
||||
|
||||
@ -131,16 +131,16 @@ public class Msg2txt {
|
||||
*/
|
||||
public void processAttachment(AttachmentChunks attachment,
|
||||
File dir) throws IOException {
|
||||
String fileName = attachment.attachFileName.toString();
|
||||
if(attachment.attachLongFileName != null) {
|
||||
fileName = attachment.attachLongFileName.toString();
|
||||
String fileName = attachment.getAttachFileName().toString();
|
||||
if(attachment.getAttachLongFileName() != null) {
|
||||
fileName = attachment.getAttachLongFileName().toString();
|
||||
}
|
||||
|
||||
File f = new File(dir, fileName);
|
||||
OutputStream fileOut = null;
|
||||
try {
|
||||
fileOut = new FileOutputStream(f);
|
||||
fileOut.write(attachment.attachData.getValue());
|
||||
fileOut.write(attachment.getAttachData().getValue());
|
||||
} finally {
|
||||
if(fileOut != null) {
|
||||
fileOut.close();
|
||||
|
||||
@ -32,8 +32,6 @@ import org.apache.poi.xwpf.usermodel.XWPFRun;
|
||||
|
||||
/**
|
||||
* A simple WOrdprocessingML document created by POI XWPF API
|
||||
*
|
||||
* @author Yegor Kozlov
|
||||
*/
|
||||
public class SimpleDocument {
|
||||
|
||||
@ -71,18 +69,18 @@ public class SimpleDocument {
|
||||
|
||||
XWPFRun r2 = p2.createRun();
|
||||
r2.setText("jumped over the lazy dog");
|
||||
r2.setStrike(true);
|
||||
r2.setStrikeThrough(true);
|
||||
r2.setFontSize(20);
|
||||
|
||||
XWPFRun r3 = p2.createRun();
|
||||
r3.setText("and went away");
|
||||
r3.setStrike(true);
|
||||
r3.setStrikeThrough(true);
|
||||
r3.setFontSize(20);
|
||||
r3.setSubscript(VerticalAlign.SUPERSCRIPT);
|
||||
|
||||
|
||||
XWPFParagraph p3 = doc.createParagraph();
|
||||
p3.setWordWrap(true);
|
||||
p3.setWordWrapped(true);
|
||||
p3.setPageBreak(true);
|
||||
|
||||
//p3.setAlignment(ParagraphAlignment.DISTRIBUTE);
|
||||
@ -127,6 +125,6 @@ public class SimpleDocument {
|
||||
FileOutputStream out = new FileOutputStream("simple.docx");
|
||||
doc.write(out);
|
||||
out.close();
|
||||
|
||||
doc.close();
|
||||
}
|
||||
}
|
||||
|
||||
@ -18,23 +18,23 @@
|
||||
*/
|
||||
package org.apache.poi.xwpf.usermodel.examples;
|
||||
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
|
||||
import org.apache.poi.util.Units;
|
||||
import org.apache.poi.xwpf.usermodel.BreakType;
|
||||
import org.apache.poi.xwpf.usermodel.XWPFDocument;
|
||||
import org.apache.poi.xwpf.usermodel.XWPFParagraph;
|
||||
import org.apache.poi.xwpf.usermodel.XWPFRun;
|
||||
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileOutputStream;
|
||||
|
||||
/**
|
||||
* Demonstrates how to add pictures in a .docx document
|
||||
*
|
||||
* @author Yegor Kozlov
|
||||
*/
|
||||
public class SimpleImages {
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
public static void main(String[] args) throws IOException, InvalidFormatException {
|
||||
XWPFDocument doc = new XWPFDocument();
|
||||
XWPFParagraph p = doc.createParagraph();
|
||||
|
||||
@ -69,6 +69,7 @@ public class SimpleImages {
|
||||
FileOutputStream out = new FileOutputStream("images.docx");
|
||||
doc.write(out);
|
||||
out.close();
|
||||
doc.close();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -38,7 +38,7 @@ public class HSMFFileHandler extends POIFSFileHandler {
|
||||
|
||||
for(AttachmentChunks attachment : attachments) {
|
||||
|
||||
DirectoryChunk chunkDirectory = attachment.attachmentDirectory;
|
||||
DirectoryChunk chunkDirectory = attachment.getAttachmentDirectory();
|
||||
if(chunkDirectory != null) {
|
||||
MAPIMessage attachmentMSG = chunkDirectory.getAsEmbededMessage();
|
||||
assertNotNull(attachmentMSG);
|
||||
|
||||
@ -420,6 +420,7 @@ public abstract class POIDocument implements Closeable {
|
||||
*
|
||||
* @return {@code true} if dummy directory was created, {@code false} otherwise
|
||||
*/
|
||||
@SuppressWarnings("resource")
|
||||
@Internal
|
||||
protected boolean initDirectory() {
|
||||
if (directory == null) {
|
||||
|
||||
@ -17,14 +17,10 @@
|
||||
|
||||
package org.apache.poi.hssf.record;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import org.apache.poi.ss.util.CellRangeAddress;
|
||||
import org.apache.poi.util.HexDump;
|
||||
import org.apache.poi.util.HexRead;
|
||||
import org.apache.poi.util.LittleEndianByteArrayInputStream;
|
||||
import org.apache.poi.util.LittleEndian;
|
||||
import org.apache.poi.util.LittleEndianInput;
|
||||
import org.apache.poi.util.LittleEndianOutput;
|
||||
import org.apache.poi.util.POILogFactory;
|
||||
@ -107,15 +103,14 @@ public final class HyperlinkRecord extends StandardRecord implements Cloneable {
|
||||
}
|
||||
|
||||
public long getD4() {
|
||||
//
|
||||
ByteArrayOutputStream baos = new ByteArrayOutputStream(8);
|
||||
try {
|
||||
new DataOutputStream(baos).writeLong(_d4);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
byte[] result = new byte[Long.SIZE/Byte.SIZE];
|
||||
long l = _d4;
|
||||
for (int i = result.length-1; i >= 0; i--) {
|
||||
result[i] = (byte)(l & 0xFF);
|
||||
l >>= 8;
|
||||
}
|
||||
byte[] buf = baos.toByteArray();
|
||||
return new LittleEndianByteArrayInputStream(buf).readLong();
|
||||
|
||||
return LittleEndian.getLong(result, 0);
|
||||
}
|
||||
|
||||
public String formatAsString() {
|
||||
|
||||
@ -64,11 +64,15 @@ public final class FileHelper {
|
||||
* If an I/O error occur.
|
||||
*/
|
||||
public static void copyFile(File in, File out) throws IOException {
|
||||
FileChannel sourceChannel = new FileInputStream(in).getChannel();
|
||||
FileChannel destinationChannel = new FileOutputStream(out).getChannel();
|
||||
FileInputStream fis = new FileInputStream(in);
|
||||
FileOutputStream fos = new FileOutputStream(out);
|
||||
FileChannel sourceChannel = fis.getChannel();
|
||||
FileChannel destinationChannel = fos.getChannel();
|
||||
sourceChannel.transferTo(0, sourceChannel.size(), destinationChannel);
|
||||
sourceChannel.close();
|
||||
destinationChannel.close();
|
||||
fos.close();
|
||||
fis.close();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -17,24 +17,26 @@
|
||||
|
||||
package org.apache.poi.openxml4j.opc;
|
||||
|
||||
import static org.junit.Assert.assertArrayEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import java.io.BufferedInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.Iterator;
|
||||
import java.util.Set;
|
||||
import java.util.TreeMap;
|
||||
import java.util.zip.ZipEntry;
|
||||
import java.util.zip.ZipInputStream;
|
||||
|
||||
import junit.framework.Assert;
|
||||
import org.junit.Assert;
|
||||
|
||||
import junit.framework.AssertionFailedError;
|
||||
|
||||
/**
|
||||
* Compare the contents of 2 zip files.
|
||||
*
|
||||
* @author CDubettier
|
||||
*/
|
||||
public class ZipFileAssert {
|
||||
private ZipFileAssert() {
|
||||
@ -42,22 +44,18 @@ public class ZipFileAssert {
|
||||
|
||||
static final int BUFFER_SIZE = 2048;
|
||||
|
||||
protected static boolean equals(
|
||||
protected static void equals(
|
||||
TreeMap<String, ByteArrayOutputStream> file1,
|
||||
TreeMap<String, ByteArrayOutputStream> file2) {
|
||||
Set listFile1 = file1.keySet();
|
||||
if (listFile1.size() == file2.keySet().size()) {
|
||||
for (Iterator iter = listFile1.iterator(); iter.hasNext();) {
|
||||
String fileName = (String) iter.next();
|
||||
Set<String> listFile1 = file1.keySet();
|
||||
Assert.assertEquals("not the same number of files in zip:", listFile1.size(), file2.keySet().size());
|
||||
|
||||
for (String fileName : listFile1) {
|
||||
// extract the contents for both
|
||||
ByteArrayOutputStream contain2 = file2.get(fileName);
|
||||
ByteArrayOutputStream contain1 = file1.get(fileName);
|
||||
|
||||
if (contain2 == null) {
|
||||
// file not found in archive 2
|
||||
Assert.fail(fileName + " not found in 2nd zip");
|
||||
return false;
|
||||
}
|
||||
assertNotNull(fileName + " not found in 2nd zip", contain2);
|
||||
// no need to check for contain1. The key come from it
|
||||
|
||||
if ((fileName.endsWith(".xml")) || fileName.endsWith(".rels")) {
|
||||
@ -67,31 +65,11 @@ public class ZipFileAssert {
|
||||
// but POI does not depend on this library
|
||||
} else {
|
||||
// not xml, may be an image or other binary format
|
||||
if (contain2.size() != contain1.size()) {
|
||||
// not the same size
|
||||
Assert.fail(fileName
|
||||
+ " does not have the same size in both zip:"
|
||||
+ contain2.size() + "!=" + contain1.size());
|
||||
return false;
|
||||
}
|
||||
byte array1[] = contain1.toByteArray();
|
||||
byte array2[] = contain2.toByteArray();
|
||||
for (int i = 0; i < array1.length; i++) {
|
||||
if (array1[i] != array2[i]) {
|
||||
Assert.fail(fileName + " differ at index:" + i);
|
||||
return false;
|
||||
Assert.assertEquals(fileName + " does not have the same size in both zip:", contain2.size(), contain1.size());
|
||||
assertArrayEquals("contents differ", contain1.toByteArray(), contain2.toByteArray());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// not the same number of files -> cannot be equals
|
||||
Assert.fail("not the same number of files in zip:"
|
||||
+ listFile1.size() + "!=" + file2.keySet().size());
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
protected static TreeMap<String, ByteArrayOutputStream> decompress(
|
||||
File filename) throws IOException {
|
||||
@ -139,16 +117,16 @@ public class ZipFileAssert {
|
||||
*
|
||||
*/
|
||||
public static void assertEquals(File expected, File actual) {
|
||||
Assert.assertNotNull(expected);
|
||||
Assert.assertNotNull(actual);
|
||||
assertNotNull(expected);
|
||||
assertNotNull(actual);
|
||||
|
||||
Assert.assertTrue("File does not exist [" + expected.getAbsolutePath()
|
||||
assertTrue("File does not exist [" + expected.getAbsolutePath()
|
||||
+ "]", expected.exists());
|
||||
Assert.assertTrue("File does not exist [" + actual.getAbsolutePath()
|
||||
assertTrue("File does not exist [" + actual.getAbsolutePath()
|
||||
+ "]", actual.exists());
|
||||
|
||||
Assert.assertTrue("Expected file not readable", expected.canRead());
|
||||
Assert.assertTrue("Actual file not readable", actual.canRead());
|
||||
assertTrue("Expected file not readable", expected.canRead());
|
||||
assertTrue("Actual file not readable", actual.canRead());
|
||||
|
||||
try {
|
||||
TreeMap<String, ByteArrayOutputStream> file1 = decompress(expected);
|
||||
|
||||
@ -133,11 +133,11 @@ public class OLE2ScratchpadExtractorFactory {
|
||||
// Stored in the Attachment blocks
|
||||
MAPIMessage msg = ((OutlookTextExtactor)ext).getMAPIMessage();
|
||||
for (AttachmentChunks attachment : msg.getAttachmentFiles()) {
|
||||
if (attachment.attachData != null) {
|
||||
byte[] data = attachment.attachData.getValue();
|
||||
if (attachment.getAttachData() != null) {
|
||||
byte[] data = attachment.getAttachData().getValue();
|
||||
nonPOIFS.add( new ByteArrayInputStream(data) );
|
||||
} else if (attachment.attachmentDirectory != null) {
|
||||
dirs.add(attachment.attachmentDirectory.getDirectory());
|
||||
} else if (attachment.getAttachmentDirectory() != null) {
|
||||
dirs.add(attachment.getAttachmentDirectory().getDirectory());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -17,16 +17,19 @@
|
||||
|
||||
package org.apache.poi.hpbf.extractor;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
import org.apache.poi.POIDataSamples;
|
||||
import org.apache.poi.hpbf.HPBFDocument;
|
||||
import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
|
||||
import org.junit.Test;
|
||||
|
||||
public final class TestPublisherTextExtractor extends TestCase {
|
||||
public final class TestPublisherTextExtractor {
|
||||
private static final POIDataSamples _samples = POIDataSamples.getPublisherInstance();
|
||||
|
||||
private static final String SAMPLE_TEXT =
|
||||
@ -54,6 +57,7 @@ public final class TestPublisherTextExtractor extends TestCase {
|
||||
"email link\n" +
|
||||
"Final hyperlink\n" +
|
||||
"Within doc to page 1\n";
|
||||
|
||||
private static final String SIMPLE_TEXT =
|
||||
"0123456789\n" +
|
||||
"0123456789abcdef\n" +
|
||||
@ -63,73 +67,83 @@ public final class TestPublisherTextExtractor extends TestCase {
|
||||
"0123456789abcdef0123456789abcdef\n" +
|
||||
"0123456789abcdef0123456789abcdef0123456789abcdef\n";
|
||||
|
||||
public void testBasics() throws Exception {
|
||||
HPBFDocument doc = new HPBFDocument(
|
||||
_samples.openResourceAsStream("Sample.pub")
|
||||
);
|
||||
@Test
|
||||
public void testBasics() throws IOException {
|
||||
InputStream sample = _samples.openResourceAsStream("Sample.pub");
|
||||
HPBFDocument doc = new HPBFDocument(sample);
|
||||
PublisherTextExtractor ext = new PublisherTextExtractor(doc);
|
||||
assertNotNull(ext.getText());
|
||||
ext.close();
|
||||
doc.close();
|
||||
sample.close();
|
||||
|
||||
PublisherTextExtractor ext =
|
||||
new PublisherTextExtractor(doc);
|
||||
ext.getText();
|
||||
|
||||
ext = new PublisherTextExtractor(
|
||||
_samples.openResourceAsStream("Simple.pub")
|
||||
);
|
||||
ext.getText();
|
||||
InputStream simple = _samples.openResourceAsStream("Simple.pub");
|
||||
ext = new PublisherTextExtractor(simple);
|
||||
assertNotNull(ext.getText());
|
||||
ext.close();
|
||||
simple.close();
|
||||
}
|
||||
|
||||
public void testContents() throws Exception {
|
||||
PublisherTextExtractor ext;
|
||||
File sample = _samples.getFile("Sample.pub");
|
||||
File simple = _samples.getFile("Simple.pub");
|
||||
|
||||
@Test
|
||||
public void testContents() throws IOException {
|
||||
// Check this complicated file using POIFS
|
||||
HPBFDocument docOPOIFS = new HPBFDocument(
|
||||
new FileInputStream(sample)
|
||||
);
|
||||
ext = new PublisherTextExtractor(docOPOIFS);
|
||||
assertEquals( SAMPLE_TEXT, ext.getText() );
|
||||
InputStream sample = _samples.openResourceAsStream("Sample.pub");
|
||||
HPBFDocument docOPOIFS = new HPBFDocument(sample);
|
||||
PublisherTextExtractor ext = new PublisherTextExtractor(docOPOIFS);
|
||||
assertEquals(SAMPLE_TEXT, ext.getText());
|
||||
ext.close();
|
||||
docOPOIFS.close();
|
||||
sample.close();
|
||||
|
||||
// And with NPOIFS
|
||||
sample = _samples.openResourceAsStream("Sample.pub");
|
||||
NPOIFSFileSystem fs = new NPOIFSFileSystem(sample);
|
||||
HPBFDocument docNPOIFS = new HPBFDocument(
|
||||
fs
|
||||
);
|
||||
HPBFDocument docNPOIFS = new HPBFDocument(fs);
|
||||
ext = new PublisherTextExtractor(docNPOIFS);
|
||||
assertEquals( SAMPLE_TEXT, ext.getText() );
|
||||
|
||||
assertEquals(SAMPLE_TEXT, ext.getText());
|
||||
ext.close();
|
||||
docNPOIFS.close();
|
||||
fs.close();
|
||||
sample.close();
|
||||
|
||||
// Now a simpler file
|
||||
ext = new PublisherTextExtractor(
|
||||
new FileInputStream(simple)
|
||||
);
|
||||
assertEquals( SIMPLE_TEXT, ext.getText() );
|
||||
fs.close();
|
||||
InputStream simple = _samples.openResourceAsStream("Simple.pub");
|
||||
ext = new PublisherTextExtractor(simple);
|
||||
assertEquals(SIMPLE_TEXT, ext.getText());
|
||||
ext.close();
|
||||
}
|
||||
|
||||
/**
|
||||
* We have the same file saved for Publisher 98, Publisher
|
||||
* 2000 and Publisher 2007. Check they all agree.
|
||||
* We have the same file saved for Publisher 98, Publisher 2000 and
|
||||
* Publisher 2007. Check they all agree.
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
@Test
|
||||
public void testMultipleVersions() throws Exception {
|
||||
File f;
|
||||
HPBFDocument doc;
|
||||
InputStream sample = _samples.openResourceAsStream("Sample.pub");
|
||||
HPBFDocument doc = new HPBFDocument(sample);
|
||||
PublisherTextExtractor ext = new PublisherTextExtractor(doc);
|
||||
String s2007 = ext.getText();
|
||||
ext.close();
|
||||
doc.close();
|
||||
sample.close();
|
||||
|
||||
doc = new HPBFDocument(
|
||||
_samples.openResourceAsStream("Sample.pub")
|
||||
);
|
||||
String s2007 = (new PublisherTextExtractor(doc)).getText();
|
||||
InputStream sample2000 = _samples.openResourceAsStream("Sample2000.pub");
|
||||
doc = new HPBFDocument(sample2000);
|
||||
ext = new PublisherTextExtractor(doc);
|
||||
String s2000 = ext.getText();
|
||||
ext.close();
|
||||
doc.close();
|
||||
sample2000.close();
|
||||
|
||||
doc = new HPBFDocument(
|
||||
_samples.openResourceAsStream("Sample2000.pub")
|
||||
);
|
||||
String s2000 = (new PublisherTextExtractor(doc)).getText();
|
||||
|
||||
doc = new HPBFDocument(
|
||||
_samples.openResourceAsStream("Sample98.pub")
|
||||
);
|
||||
String s98 = (new PublisherTextExtractor(doc)).getText();
|
||||
InputStream sample98 = _samples.openResourceAsStream("Sample98.pub");
|
||||
doc = new HPBFDocument(sample98);
|
||||
ext = new PublisherTextExtractor(doc);
|
||||
String s98 = ext.getText();
|
||||
ext.close();
|
||||
doc.close();
|
||||
sample98.close();
|
||||
|
||||
// Check they all agree
|
||||
assertEquals(s2007, s2000);
|
||||
@ -137,17 +151,15 @@ public final class TestPublisherTextExtractor extends TestCase {
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that the hyperlink extraction stuff works as well
|
||||
* as we can hope it to.
|
||||
* Test that the hyperlink extraction stuff works as well as we can hope it
|
||||
* to.
|
||||
*/
|
||||
@Test
|
||||
public void testWithHyperlinks() throws Exception {
|
||||
HPBFDocument doc = new HPBFDocument(
|
||||
_samples.openResourceAsStream("LinkAt10.pub")
|
||||
);
|
||||
InputStream linkAt = _samples.openResourceAsStream("LinkAt10.pub");
|
||||
HPBFDocument doc = new HPBFDocument(linkAt);
|
||||
|
||||
PublisherTextExtractor ext =
|
||||
new PublisherTextExtractor(doc);
|
||||
ext.getText();
|
||||
PublisherTextExtractor ext = new PublisherTextExtractor(doc);
|
||||
|
||||
// Default is no hyperlinks
|
||||
assertEquals("1234567890LINK\n", ext.getText());
|
||||
@ -155,21 +167,21 @@ public final class TestPublisherTextExtractor extends TestCase {
|
||||
// Turn on
|
||||
ext.setHyperlinksByDefault(true);
|
||||
assertEquals("1234567890LINK\n<http://poi.apache.org/>\n", ext.getText());
|
||||
|
||||
ext.close();
|
||||
doc.close();
|
||||
linkAt.close();
|
||||
|
||||
// Now a much more complex document
|
||||
ext = new PublisherTextExtractor(
|
||||
_samples.openResourceAsStream("Sample.pub")
|
||||
);
|
||||
InputStream sample = _samples.openResourceAsStream("Sample.pub");
|
||||
ext = new PublisherTextExtractor(sample);
|
||||
ext.setHyperlinksByDefault(true);
|
||||
String text = ext.getText();
|
||||
ext.close();
|
||||
sample.close();
|
||||
|
||||
assertTrue(text.endsWith(
|
||||
"<http://poi.apache.org/>\n" +
|
||||
"<C:\\Documents and Settings\\Nick\\My Documents\\Booleans.xlsx>\n" +
|
||||
"<>\n" +
|
||||
"<mailto:dev@poi.apache.org?subject=HPBF>\n" +
|
||||
"<mailto:dev@poi.apache.org?subject=HPBF>\n"
|
||||
));
|
||||
assertTrue(text.endsWith("<http://poi.apache.org/>\n"
|
||||
+ "<C:\\Documents and Settings\\Nick\\My Documents\\Booleans.xlsx>\n"
|
||||
+ "<>\n" + "<mailto:dev@poi.apache.org?subject=HPBF>\n"
|
||||
+ "<mailto:dev@poi.apache.org?subject=HPBF>\n"));
|
||||
}
|
||||
}
|
||||
|
||||
@ -17,20 +17,27 @@
|
||||
|
||||
package org.apache.poi.hpbf.model;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import org.apache.poi.POIDataSamples;
|
||||
import org.apache.poi.hpbf.HPBFDocument;
|
||||
import org.apache.poi.hpbf.model.qcbits.QCTextBit;
|
||||
import org.apache.poi.hpbf.model.qcbits.QCPLCBit.Type12;
|
||||
import org.apache.poi.hpbf.model.qcbits.QCPLCBit.Type0;
|
||||
import org.apache.poi.hpbf.model.qcbits.QCPLCBit.Type12;
|
||||
import org.apache.poi.hpbf.model.qcbits.QCPLCBit.Type4;
|
||||
import org.apache.poi.hpbf.model.qcbits.QCPLCBit.Type8;
|
||||
import org.apache.poi.POIDataSamples;
|
||||
import org.apache.poi.hpbf.model.qcbits.QCTextBit;
|
||||
import org.junit.Test;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
public final class TestQuillContents extends TestCase {
|
||||
public final class TestQuillContents {
|
||||
private static final POIDataSamples _samples = POIDataSamples.getPublisherInstance();
|
||||
|
||||
public void testBasics() throws Exception {
|
||||
@Test
|
||||
public void testBasics() throws IOException {
|
||||
HPBFDocument doc = new HPBFDocument(
|
||||
_samples.openResourceAsStream("Sample.pub")
|
||||
);
|
||||
@ -59,9 +66,12 @@ public final class TestQuillContents extends TestCase {
|
||||
assertEquals("STSH", qc.getBits()[3].getThingType());
|
||||
assertEquals("STSH", qc.getBits()[3].getBitType());
|
||||
assertEquals(2, qc.getBits()[3].getOptA());
|
||||
|
||||
doc.close();
|
||||
}
|
||||
|
||||
public void testText() throws Exception {
|
||||
@Test
|
||||
public void testText() throws IOException {
|
||||
HPBFDocument doc = new HPBFDocument(
|
||||
_samples.openResourceAsStream("Sample.pub")
|
||||
);
|
||||
@ -73,9 +83,12 @@ public final class TestQuillContents extends TestCase {
|
||||
String t = text.getText();
|
||||
assertTrue(t.startsWith("This is some text on the first page"));
|
||||
assertTrue(t.endsWith("Within doc to page 1\r"));
|
||||
|
||||
doc.close();
|
||||
}
|
||||
|
||||
public void testPLC() throws Exception {
|
||||
@Test
|
||||
public void testPLC() throws IOException {
|
||||
HPBFDocument doc = new HPBFDocument(
|
||||
_samples.openResourceAsStream("Simple.pub")
|
||||
);
|
||||
@ -133,9 +146,13 @@ public final class TestQuillContents extends TestCase {
|
||||
assertEquals(0x22000000, plc12.getPlcValB()[0]);
|
||||
assertEquals(0x05, plc12.getPlcValA()[1]);
|
||||
assertEquals(0x04, plc12.getPlcValB()[1]);
|
||||
|
||||
doc.close();
|
||||
}
|
||||
|
||||
public void testComplexPLC() throws Exception {
|
||||
@SuppressWarnings("unused")
|
||||
@Test
|
||||
public void testComplexPLC() throws IOException {
|
||||
HPBFDocument doc = new HPBFDocument(
|
||||
_samples.openResourceAsStream("Sample.pub")
|
||||
);
|
||||
@ -234,9 +251,12 @@ public final class TestQuillContents extends TestCase {
|
||||
assertEquals(0x000004, plc16.getPlcValB()[4]);
|
||||
assertEquals(0x000004, plc16.getPlcValA()[5]);
|
||||
assertEquals(0x000004, plc16.getPlcValB()[5]);
|
||||
|
||||
doc.close();
|
||||
}
|
||||
|
||||
public void testNoHyperlinks() throws Exception {
|
||||
@Test
|
||||
public void testNoHyperlinks() throws IOException {
|
||||
HPBFDocument doc = new HPBFDocument(
|
||||
_samples.openResourceAsStream("SampleNewsletter.pub")
|
||||
);
|
||||
@ -250,9 +270,12 @@ public final class TestQuillContents extends TestCase {
|
||||
assertEquals(0, plc18.getNumberOfHyperlinks());
|
||||
assertEquals(0, plc18.getTextStartAt(0));
|
||||
assertEquals(601, plc18.getAllTextEndAt());
|
||||
|
||||
doc.close();
|
||||
}
|
||||
|
||||
public void testSimpleHyperlink() throws Exception {
|
||||
@Test
|
||||
public void testSimpleHyperlink() throws IOException {
|
||||
HPBFDocument doc;
|
||||
QuillContents qc;
|
||||
Type12 hlBit;
|
||||
@ -270,6 +293,7 @@ public final class TestQuillContents extends TestCase {
|
||||
assertEquals(10, hlBit.getTextStartAt(0));
|
||||
assertEquals(15, hlBit.getAllTextEndAt());
|
||||
assertEquals("http://poi.apache.org/", hlBit.getHyperlink(0));
|
||||
doc.close();
|
||||
|
||||
// Longer link at 10
|
||||
doc = new HPBFDocument(
|
||||
@ -284,6 +308,7 @@ public final class TestQuillContents extends TestCase {
|
||||
assertEquals(10, hlBit.getTextStartAt(0));
|
||||
assertEquals(15, hlBit.getAllTextEndAt());
|
||||
assertEquals("http://poi.apache.org/hpbf/", hlBit.getHyperlink(0));
|
||||
doc.close();
|
||||
|
||||
// Link at 20
|
||||
doc = new HPBFDocument(
|
||||
@ -298,9 +323,11 @@ public final class TestQuillContents extends TestCase {
|
||||
assertEquals(20, hlBit.getTextStartAt(0));
|
||||
assertEquals(25, hlBit.getAllTextEndAt());
|
||||
assertEquals("http://poi.apache.org/", hlBit.getHyperlink(0));
|
||||
doc.close();
|
||||
}
|
||||
|
||||
public void testManyHyperlinks() throws Exception {
|
||||
@Test
|
||||
public void testManyHyperlinks() throws IOException {
|
||||
HPBFDocument doc;
|
||||
QuillContents qc;
|
||||
Type12 hlBit;
|
||||
@ -319,9 +346,11 @@ public final class TestQuillContents extends TestCase {
|
||||
assertEquals(15, hlBit.getAllTextEndAt());
|
||||
assertEquals("http://poi.apache.org/", hlBit.getHyperlink(0));
|
||||
|
||||
doc.close();
|
||||
}
|
||||
|
||||
public void testHyperlinkDifferentVersions() throws Exception {
|
||||
@Test
|
||||
public void testHyperlinkDifferentVersions() throws IOException {
|
||||
HPBFDocument doc;
|
||||
QuillContents qc;
|
||||
Type12 hlBitA;
|
||||
@ -354,6 +383,7 @@ public final class TestQuillContents extends TestCase {
|
||||
assertEquals("", hlBitB.getHyperlink(0));
|
||||
assertEquals("mailto:dev@poi.apache.org?subject=HPBF", hlBitB.getHyperlink(1));
|
||||
assertEquals("mailto:dev@poi.apache.org?subject=HPBF", hlBitB.getHyperlink(2));
|
||||
doc.close();
|
||||
|
||||
// 2000 version
|
||||
doc = new HPBFDocument(
|
||||
@ -382,6 +412,7 @@ public final class TestQuillContents extends TestCase {
|
||||
assertEquals("", hlBitB.getHyperlink(0));
|
||||
assertEquals("mailto:dev@poi.apache.org?subject=HPBF", hlBitB.getHyperlink(1));
|
||||
assertEquals("mailto:dev@poi.apache.org?subject=HPBF", hlBitB.getHyperlink(2));
|
||||
doc.close();
|
||||
|
||||
// 98 version
|
||||
doc = new HPBFDocument(
|
||||
@ -410,5 +441,6 @@ public final class TestQuillContents extends TestCase {
|
||||
assertEquals("", hlBitB.getHyperlink(0));
|
||||
assertEquals("mailto:dev@poi.apache.org?subject=HPBF", hlBitB.getHyperlink(1));
|
||||
assertEquals("mailto:dev@poi.apache.org?subject=HPBF", hlBitB.getHyperlink(2));
|
||||
doc.close();
|
||||
}
|
||||
}
|
||||
|
||||
@ -18,46 +18,58 @@
|
||||
package org.apache.poi.hslf;
|
||||
|
||||
|
||||
import junit.framework.TestCase;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
import org.apache.poi.POIDataSamples;
|
||||
import org.apache.poi.hslf.exceptions.EncryptedPowerPointFileException;
|
||||
import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
|
||||
import org.apache.poi.POIDataSamples;
|
||||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
* Tests that HSLFSlideShow does the right thing with an encrypted file
|
||||
*
|
||||
* @author Nick Burch (nick at torchbox dot com)
|
||||
*/
|
||||
public final class TestEncryptedFile extends TestCase {
|
||||
private static POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
|
||||
|
||||
public void testLoadNonEncrypted() throws Exception {
|
||||
HSLFSlideShowImpl hss = new HSLFSlideShowImpl(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
|
||||
public final class TestEncryptedFile {
|
||||
private static final POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
|
||||
|
||||
@Test
|
||||
public void testLoadNonEncrypted() throws IOException {
|
||||
InputStream is = slTests.openResourceAsStream("basic_test_ppt_file.ppt");
|
||||
HSLFSlideShowImpl hss = new HSLFSlideShowImpl(is);
|
||||
assertNotNull(hss);
|
||||
hss.close();
|
||||
is.close();
|
||||
}
|
||||
|
||||
public void testLoadEncrypted() throws Exception {
|
||||
@Test(expected=EncryptedPowerPointFileException.class)
|
||||
public void testLoadEncrypted1() throws IOException {
|
||||
InputStream is = slTests.openResourceAsStream("Password_Protected-hello.ppt");
|
||||
try {
|
||||
new HSLFSlideShowImpl(slTests.openResourceAsStream("Password_Protected-hello.ppt"));
|
||||
fail();
|
||||
} catch(EncryptedPowerPointFileException e) {
|
||||
// Good
|
||||
new HSLFSlideShowImpl(is).close();
|
||||
} finally {
|
||||
is.close();
|
||||
}
|
||||
}
|
||||
|
||||
@Test(expected=EncryptedPowerPointFileException.class)
|
||||
public void testLoadEncrypted2() throws IOException {
|
||||
InputStream is = slTests.openResourceAsStream("Password_Protected-np-hello.ppt");
|
||||
try {
|
||||
new HSLFSlideShowImpl(slTests.openResourceAsStream("Password_Protected-np-hello.ppt"));
|
||||
fail();
|
||||
} catch(EncryptedPowerPointFileException e) {
|
||||
// Good
|
||||
new HSLFSlideShowImpl(is).close();
|
||||
} finally {
|
||||
is.close();
|
||||
}
|
||||
}
|
||||
|
||||
@Test(expected=EncryptedPowerPointFileException.class)
|
||||
public void testLoadEncrypted3() throws IOException {
|
||||
InputStream is = slTests.openResourceAsStream("Password_Protected-56-hello.ppt");
|
||||
try {
|
||||
new HSLFSlideShowImpl(slTests.openResourceAsStream("Password_Protected-56-hello.ppt"));
|
||||
fail();
|
||||
} catch(EncryptedPowerPointFileException e) {
|
||||
// Good
|
||||
new HSLFSlideShowImpl(is).close();
|
||||
} finally {
|
||||
is.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -77,7 +77,7 @@ public class TestDocumentEncryption {
|
||||
try {
|
||||
NPOIFSFileSystem fs = new NPOIFSFileSystem(slTests.getFile(pptFile), true);
|
||||
HSLFSlideShowImpl hss = new HSLFSlideShowImpl(fs);
|
||||
new HSLFSlideShow(hss);
|
||||
new HSLFSlideShow(hss).close();
|
||||
fs.close();
|
||||
} catch (EncryptedPowerPointFileException e) {
|
||||
fail(pptFile+" can't be decrypted");
|
||||
@ -99,17 +99,19 @@ public class TestDocumentEncryption {
|
||||
|
||||
ByteArrayOutputStream bos = new ByteArrayOutputStream();
|
||||
hss.write(bos);
|
||||
hss.close();
|
||||
fs.close();
|
||||
|
||||
fs = new NPOIFSFileSystem(new ByteArrayInputStream(bos.toByteArray()));
|
||||
hss = new HSLFSlideShowImpl(fs);
|
||||
List<HSLFPictureData> picsActual = hss.getPictureData();
|
||||
fs.close();
|
||||
|
||||
assertEquals(picsExpected.size(), picsActual.size());
|
||||
for (int i=0; i<picsExpected.size(); i++) {
|
||||
assertArrayEquals(picsExpected.get(i).getRawData(), picsActual.get(i).getRawData());
|
||||
}
|
||||
hss.close();
|
||||
fs.close();
|
||||
}
|
||||
|
||||
@Test
|
||||
@ -128,6 +130,7 @@ public class TestDocumentEncryption {
|
||||
Biff8EncryptionKey.setCurrentUserPassword("hello");
|
||||
ByteArrayOutputStream encrypted = new ByteArrayOutputStream();
|
||||
hss.write(encrypted);
|
||||
hss.close();
|
||||
fs.close();
|
||||
|
||||
// decrypted
|
||||
@ -137,6 +140,7 @@ public class TestDocumentEncryption {
|
||||
Biff8EncryptionKey.setCurrentUserPassword(null);
|
||||
ByteArrayOutputStream actual = new ByteArrayOutputStream();
|
||||
hss.write(actual);
|
||||
hss.close();
|
||||
fs.close();
|
||||
|
||||
assertArrayEquals(expected.toByteArray(), actual.toByteArray());
|
||||
@ -184,6 +188,7 @@ public class TestDocumentEncryption {
|
||||
ps = PropertySetFactory.create(fs2.getRoot(), DocumentSummaryInformation.DEFAULT_STREAM_NAME);
|
||||
assertTrue(ps.isDocumentSummaryInformation());
|
||||
assertEquals("On-screen Show (4:3)", ps.getProperties()[1].getValue());
|
||||
ss.close();
|
||||
fs.close();
|
||||
fs2.close();
|
||||
}
|
||||
|
||||
@ -847,7 +847,6 @@ public final class TestBugs {
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("resource")
|
||||
public void bug57796() throws IOException {
|
||||
HSLFSlideShow ppt = open("WithLinks.ppt");
|
||||
HSLFSlide slide = ppt.getSlides().get(0);
|
||||
@ -859,7 +858,7 @@ public final class TestBugs {
|
||||
assertEquals(hlRun.getId(), hlShape.getId());
|
||||
assertEquals(hlRun.getAddress(), hlShape.getAddress());
|
||||
assertEquals(hlRun.getLabel(), hlShape.getLabel());
|
||||
assertEquals(hlRun.getType(), hlShape.getType());
|
||||
assertEquals(hlRun.getTypeEnum(), hlShape.getTypeEnum());
|
||||
assertEquals(hlRun.getStartIndex(), hlShape.getStartIndex());
|
||||
assertEquals(hlRun.getEndIndex(), hlShape.getEndIndex());
|
||||
|
||||
@ -999,9 +998,16 @@ public final class TestBugs {
|
||||
long persistId = vbaAtom.getPersistIdRef();
|
||||
for (HSLFObjectData objData : ppt.getEmbeddedObjects()) {
|
||||
if (objData.getExOleObjStg().getPersistId() == persistId) {
|
||||
return new VBAMacroReader(objData.getData()).readMacros();
|
||||
VBAMacroReader mr = new VBAMacroReader(objData.getData());
|
||||
try {
|
||||
return mr.readMacros();
|
||||
} finally {
|
||||
mr.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ppt.close();
|
||||
|
||||
} finally {
|
||||
IOUtils.closeQuietly(npoifs);
|
||||
|
||||
@ -260,14 +260,14 @@ public final class TestPOIFSChunkParser {
|
||||
assertTrue(groups[4] instanceof NameIdChunks);
|
||||
|
||||
attachment = (AttachmentChunks)groups[2];
|
||||
assertEquals("TEST-U~1.DOC", attachment.attachFileName.toString());
|
||||
assertEquals("test-unicode.doc", attachment.attachLongFileName.toString());
|
||||
assertEquals(24064, attachment.attachData.getValue().length);
|
||||
assertEquals("TEST-U~1.DOC", attachment.getAttachFileName().toString());
|
||||
assertEquals("test-unicode.doc", attachment.getAttachLongFileName().toString());
|
||||
assertEquals(24064, attachment.getAttachData().getValue().length);
|
||||
|
||||
attachment = (AttachmentChunks)groups[3];
|
||||
assertEquals("pj1.txt", attachment.attachFileName.toString());
|
||||
assertEquals("pj1.txt", attachment.attachLongFileName.toString());
|
||||
assertEquals(89, attachment.attachData.getValue().length);
|
||||
assertEquals("pj1.txt", attachment.getAttachFileName().toString());
|
||||
assertEquals("pj1.txt", attachment.getAttachLongFileName().toString());
|
||||
assertEquals(89, attachment.getAttachData().getValue().length);
|
||||
|
||||
|
||||
// Check raw details on one without
|
||||
@ -279,14 +279,14 @@ public final class TestPOIFSChunkParser {
|
||||
assertEquals(2, msgWith.getAttachmentFiles().length);
|
||||
|
||||
attachment = msgWith.getAttachmentFiles()[0];
|
||||
assertEquals("TEST-U~1.DOC", attachment.attachFileName.toString());
|
||||
assertEquals("test-unicode.doc", attachment.attachLongFileName.toString());
|
||||
assertEquals(24064, attachment.attachData.getValue().length);
|
||||
assertEquals("TEST-U~1.DOC", attachment.getAttachFileName().toString());
|
||||
assertEquals("test-unicode.doc", attachment.getAttachLongFileName().toString());
|
||||
assertEquals(24064, attachment.getAttachData().getValue().length);
|
||||
|
||||
attachment = msgWith.getAttachmentFiles()[1];
|
||||
assertEquals("pj1.txt", attachment.attachFileName.toString());
|
||||
assertEquals("pj1.txt", attachment.attachLongFileName.toString());
|
||||
assertEquals(89, attachment.attachData.getValue().length);
|
||||
assertEquals("pj1.txt", attachment.getAttachFileName().toString());
|
||||
assertEquals("pj1.txt", attachment.getAttachLongFileName().toString());
|
||||
assertEquals(89, attachment.getAttachData().getValue().length);
|
||||
|
||||
// Plus check core details are there
|
||||
assertEquals("'nicolas1.23456@free.fr'", msgWith.getDisplayTo());
|
||||
|
||||
@ -17,10 +17,15 @@
|
||||
|
||||
package org.apache.poi.hwpf.usermodel;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import org.apache.poi.OldFileFormatException;
|
||||
import org.apache.poi.hwpf.HWPFOldDocument;
|
||||
import org.apache.poi.hwpf.HWPFTestCase;
|
||||
import org.apache.poi.hwpf.HWPFTestDataSamples;
|
||||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
* Tests for Word 6 and Word 95 support
|
||||
@ -29,13 +34,14 @@ public final class TestHWPFOldDocument extends HWPFTestCase {
|
||||
/**
|
||||
* Test a simple Word 6 document
|
||||
*/
|
||||
public void testWord6() throws Exception {
|
||||
@Test(expected=OldFileFormatException.class)
|
||||
public void testWord6hwpf() throws IOException {
|
||||
// Can't open as HWPFDocument
|
||||
try {
|
||||
HWPFTestDataSamples.openSampleFile("Word6.doc");
|
||||
fail("Shouldn't be openable");
|
||||
} catch(OldFileFormatException e) {}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWord6hwpfOld() throws IOException {
|
||||
// Open
|
||||
HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile("Word6.doc");
|
||||
|
||||
@ -44,49 +50,44 @@ public final class TestHWPFOldDocument extends HWPFTestCase {
|
||||
assertEquals(1, doc.getRange().numParagraphs());
|
||||
assertEquals(1, doc.getRange().numCharacterRuns());
|
||||
|
||||
assertEquals(
|
||||
"The quick brown fox jumps over the lazy dog\r",
|
||||
doc.getRange().getParagraph(0).text()
|
||||
);
|
||||
assertEquals("The quick brown fox jumps over the lazy dog\r",
|
||||
doc.getRange().getParagraph(0).text());
|
||||
doc.close();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Test a simple Word 95 document
|
||||
*/
|
||||
public void testWord95() throws Exception {
|
||||
@Test(expected=OldFileFormatException.class)
|
||||
public void testWord95hwpf() throws IOException {
|
||||
// Can't open as HWPFDocument
|
||||
try {
|
||||
HWPFTestDataSamples.openSampleFile("Word95.doc");
|
||||
fail("Shouldn't be openable");
|
||||
} catch(OldFileFormatException e) {}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWord95hwpfOld() throws IOException {
|
||||
// Open
|
||||
HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile("Word95.doc");
|
||||
HWPFOldDocument doc = HWPFTestDataSamples
|
||||
.openOldSampleFile("Word95.doc");
|
||||
|
||||
// Check
|
||||
assertEquals(1, doc.getRange().numSections());
|
||||
assertEquals(7, doc.getRange().numParagraphs());
|
||||
|
||||
assertEquals(
|
||||
"The quick brown fox jumps over the lazy dog\r",
|
||||
doc.getRange().getParagraph(0).text()
|
||||
);
|
||||
assertEquals("The quick brown fox jumps over the lazy dog\r",
|
||||
doc.getRange().getParagraph(0).text());
|
||||
assertEquals("\r", doc.getRange().getParagraph(1).text());
|
||||
assertEquals(
|
||||
"Paragraph 2\r",
|
||||
doc.getRange().getParagraph(2).text()
|
||||
);
|
||||
assertEquals("Paragraph 2\r", doc.getRange().getParagraph(2).text());
|
||||
assertEquals("\r", doc.getRange().getParagraph(3).text());
|
||||
assertEquals(
|
||||
"Paragraph 3. Has some RED text and some " +
|
||||
"BLUE BOLD text in it.\r",
|
||||
doc.getRange().getParagraph(4).text()
|
||||
);
|
||||
"Paragraph 3. Has some RED text and some "
|
||||
+ "BLUE BOLD text in it.\r",
|
||||
doc.getRange().getParagraph(4).text());
|
||||
assertEquals("\r", doc.getRange().getParagraph(5).text());
|
||||
assertEquals(
|
||||
"Last (4th) paragraph.\r",
|
||||
doc.getRange().getParagraph(6).text()
|
||||
);
|
||||
assertEquals("Last (4th) paragraph.\r",
|
||||
doc.getRange().getParagraph(6).text());
|
||||
|
||||
assertEquals(1, doc.getRange().getParagraph(0).numCharacterRuns());
|
||||
assertEquals(1, doc.getRange().getParagraph(1).numCharacterRuns());
|
||||
@ -97,46 +98,49 @@ public final class TestHWPFOldDocument extends HWPFTestCase {
|
||||
assertEquals(1, doc.getRange().getParagraph(5).numCharacterRuns());
|
||||
// Normal, superscript for 4th, normal
|
||||
assertEquals(3, doc.getRange().getParagraph(6).numCharacterRuns());
|
||||
|
||||
doc.close();
|
||||
}
|
||||
|
||||
/**
|
||||
* Test a word document that has sections,
|
||||
* as well as the usual paragraph stuff.
|
||||
* Test a word document that has sections, as well as the usual paragraph
|
||||
* stuff.
|
||||
*/
|
||||
public void testWord6Sections() throws Exception {
|
||||
@Test
|
||||
public void testWord6Sections() throws IOException {
|
||||
HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile("Word6_sections.doc");
|
||||
|
||||
assertEquals(3, doc.getRange().numSections());
|
||||
assertEquals(6, doc.getRange().numParagraphs());
|
||||
|
||||
assertEquals(
|
||||
"This is a test.\r",
|
||||
doc.getRange().getParagraph(0).text()
|
||||
);
|
||||
assertEquals("This is a test.\r",
|
||||
doc.getRange().getParagraph(0).text());
|
||||
assertEquals("\r", doc.getRange().getParagraph(1).text());
|
||||
assertEquals("\u000c", doc.getRange().getParagraph(2).text()); // Section line?
|
||||
assertEquals("This is a new section.\r", doc.getRange().getParagraph(3).text());
|
||||
assertEquals("\u000c", doc.getRange().getParagraph(4).text()); // Section line?
|
||||
// Section / line?
|
||||
assertEquals("\u000c", doc.getRange().getParagraph(2).text());
|
||||
assertEquals("This is a new section.\r",
|
||||
doc.getRange().getParagraph(3).text());
|
||||
// Section / line?
|
||||
assertEquals("\u000c", doc.getRange().getParagraph(4).text());
|
||||
assertEquals("\r", doc.getRange().getParagraph(5).text());
|
||||
doc.close();
|
||||
}
|
||||
|
||||
/**
|
||||
* Another word document with sections, this time with a
|
||||
* few more section properties set on it
|
||||
* Another word document with sections, this time with a few more section
|
||||
* properties set on it
|
||||
*/
|
||||
public void testWord6Sections2() throws Exception {
|
||||
HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile("Word6_sections2.doc");
|
||||
@Test
|
||||
public void testWord6Sections2() throws IOException {
|
||||
HWPFOldDocument doc = HWPFTestDataSamples
|
||||
.openOldSampleFile("Word6_sections2.doc");
|
||||
|
||||
assertEquals(1, doc.getRange().numSections());
|
||||
assertEquals(57, doc.getRange().numParagraphs());
|
||||
|
||||
assertEquals(
|
||||
"\r",
|
||||
doc.getRange().getParagraph(0).text()
|
||||
);
|
||||
assertEquals(
|
||||
"STATEMENT OF INSOLVENCY PRACTICE 10 (SCOTLAND)\r",
|
||||
doc.getRange().getParagraph(1).text()
|
||||
);
|
||||
assertEquals("\r", doc.getRange().getParagraph(0).text());
|
||||
assertEquals("STATEMENT OF INSOLVENCY PRACTICE 10 (SCOTLAND)\r",
|
||||
doc.getRange().getParagraph(1).text());
|
||||
doc.close();
|
||||
}
|
||||
}
|
||||
|
||||
@ -17,7 +17,15 @@
|
||||
|
||||
package org.apache.poi.hwpf.usermodel;
|
||||
|
||||
import java.io.*;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
import org.apache.poi.POIDataSamples;
|
||||
import org.apache.poi.hwpf.HWPFDocument;
|
||||
@ -28,15 +36,19 @@ import org.apache.poi.poifs.filesystem.OPOIFSFileSystem;
|
||||
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
|
||||
import org.apache.poi.util.IOUtils;
|
||||
import org.apache.poi.util.TempFile;
|
||||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
* Test various write situations
|
||||
*/
|
||||
public final class TestHWPFWrite extends HWPFTestCase {
|
||||
private static final POIDataSamples SAMPLES = POIDataSamples.getDocumentInstance();
|
||||
|
||||
/**
|
||||
* Write to a stream
|
||||
*/
|
||||
public void testWriteStream() throws Exception {
|
||||
@Test
|
||||
public void testWriteStream() throws IOException {
|
||||
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("SampleDoc.doc");
|
||||
|
||||
Range r = doc.getRange();
|
||||
@ -56,7 +68,8 @@ public final class TestHWPFWrite extends HWPFTestCase {
|
||||
/**
|
||||
* Write to a new file
|
||||
*/
|
||||
public void testWriteNewFile() throws Exception {
|
||||
@Test
|
||||
public void testWriteNewFile() throws IOException {
|
||||
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("SampleDoc.doc");
|
||||
|
||||
Range r = doc.getRange();
|
||||
@ -79,14 +92,14 @@ public final class TestHWPFWrite extends HWPFTestCase {
|
||||
}
|
||||
|
||||
/**
|
||||
* Writing to the file we opened from - note, uses a temp file to
|
||||
* avoid changing our test files!
|
||||
* Writing to the file we opened from - note, uses a temp file to avoid
|
||||
* changing our test files!
|
||||
*/
|
||||
@SuppressWarnings("resource")
|
||||
@Test
|
||||
public void testInPlaceWrite() throws Exception {
|
||||
// Setup as a copy of a known-good file
|
||||
final File file = TempFile.createTempFile("TestDocument", ".doc");
|
||||
InputStream inputStream = POIDataSamples.getDocumentInstance().openResourceAsStream("SampleDoc.doc");
|
||||
InputStream inputStream = SAMPLES.openResourceAsStream("SampleDoc.doc");
|
||||
try {
|
||||
FileOutputStream outputStream = new FileOutputStream(file);
|
||||
try {
|
||||
@ -99,7 +112,8 @@ public final class TestHWPFWrite extends HWPFTestCase {
|
||||
}
|
||||
|
||||
// Open from the temp file in read-write mode
|
||||
HWPFDocument doc = new HWPFDocument(new NPOIFSFileSystem(file, false).getRoot());
|
||||
NPOIFSFileSystem poifs = new NPOIFSFileSystem(file, false);
|
||||
HWPFDocument doc = new HWPFDocument(poifs.getRoot());
|
||||
Range r = doc.getRange();
|
||||
assertEquals("I am a test document\r", r.getParagraph(0).text());
|
||||
|
||||
@ -109,50 +123,51 @@ public final class TestHWPFWrite extends HWPFTestCase {
|
||||
// Save in-place, close, re-open and check
|
||||
doc.write();
|
||||
doc.close();
|
||||
poifs.close();
|
||||
|
||||
doc = new HWPFDocument(new NPOIFSFileSystem(file).getRoot());
|
||||
poifs = new NPOIFSFileSystem(file);
|
||||
doc = new HWPFDocument(poifs.getRoot());
|
||||
r = doc.getRange();
|
||||
assertEquals("X XX a test document\r", r.getParagraph(0).text());
|
||||
doc.close();
|
||||
poifs.close();
|
||||
}
|
||||
|
||||
@SuppressWarnings("resource")
|
||||
public void testInvalidInPlaceWrite() throws Exception {
|
||||
HWPFDocument doc;
|
||||
|
||||
@Test(expected=IllegalStateException.class)
|
||||
public void testInvalidInPlaceWriteInputStream() throws IOException {
|
||||
// Can't work for InputStream opened files
|
||||
doc = new HWPFDocument(
|
||||
POIDataSamples.getDocumentInstance().openResourceAsStream("SampleDoc.doc"));
|
||||
InputStream is = SAMPLES.openResourceAsStream("SampleDoc.doc");
|
||||
HWPFDocument doc = new HWPFDocument(is);
|
||||
is.close();
|
||||
try {
|
||||
doc.write();
|
||||
fail("Shouldn't work for InputStream");
|
||||
} catch (IllegalStateException e) {
|
||||
// expected here
|
||||
}
|
||||
} finally {
|
||||
doc.close();
|
||||
}
|
||||
}
|
||||
|
||||
@Test(expected=IllegalStateException.class)
|
||||
public void testInvalidInPlaceWriteOPOIFS() throws Exception {
|
||||
// Can't work for OPOIFS
|
||||
OPOIFSFileSystem ofs = new OPOIFSFileSystem(
|
||||
POIDataSamples.getDocumentInstance().openResourceAsStream("SampleDoc.doc"));
|
||||
doc = new HWPFDocument(ofs.getRoot());
|
||||
OPOIFSFileSystem ofs = new OPOIFSFileSystem(SAMPLES.openResourceAsStream("SampleDoc.doc"));
|
||||
HWPFDocument doc = new HWPFDocument(ofs.getRoot());
|
||||
try {
|
||||
doc.write();
|
||||
fail("Shouldn't work for OPOIFSFileSystem");
|
||||
} catch (IllegalStateException e) {
|
||||
// expected here
|
||||
}
|
||||
} finally {
|
||||
doc.close();
|
||||
}
|
||||
}
|
||||
|
||||
@Test(expected=IllegalStateException.class)
|
||||
public void testInvalidInPlaceWriteNPOIFS() throws Exception {
|
||||
// Can't work for Read-Only files
|
||||
NPOIFSFileSystem fs = new NPOIFSFileSystem(
|
||||
POIDataSamples.getDocumentInstance().getFile("SampleDoc.doc"), true);
|
||||
doc = new HWPFDocument(fs.getRoot());
|
||||
NPOIFSFileSystem fs = new NPOIFSFileSystem(SAMPLES.getFile("SampleDoc.doc"), true);
|
||||
HWPFDocument doc = new HWPFDocument(fs.getRoot());
|
||||
try {
|
||||
doc.write();
|
||||
fail("Shouldn't work for Read Only");
|
||||
} catch (IllegalStateException e) {
|
||||
// expected here
|
||||
}
|
||||
} finally {
|
||||
doc.close();
|
||||
fs.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -17,7 +17,10 @@
|
||||
|
||||
package org.apache.poi.hwpf.usermodel;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import org.apache.poi.EncryptedDocumentException;
|
||||
import org.apache.poi.hwpf.HWPFDocument;
|
||||
@ -25,54 +28,58 @@ import org.apache.poi.hwpf.HWPFTestCase;
|
||||
import org.apache.poi.hwpf.HWPFTestDataSamples;
|
||||
import org.apache.poi.hwpf.extractor.WordExtractor;
|
||||
import org.apache.poi.hwpf.model.StyleSheet;
|
||||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
* Test various problem documents
|
||||
*
|
||||
* @author Nick Burch (nick at torchbox dot com)
|
||||
*/
|
||||
public final class TestProblems extends HWPFTestCase {
|
||||
|
||||
|
||||
/**
|
||||
* ListEntry passed no ListTable
|
||||
*/
|
||||
public void testListEntryNoListTable() {
|
||||
@Test
|
||||
public void testListEntryNoListTable() throws IOException {
|
||||
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("ListEntryNoListTable.doc");
|
||||
|
||||
Range r = doc.getRange();
|
||||
StyleSheet styleSheet = doc.getStyleSheet();
|
||||
for (int x = 0; x < r.numSections(); x++) {
|
||||
Section s = r.getSection(x);
|
||||
for (int y = 0; y < s.numParagraphs(); y++) {
|
||||
Paragraph paragraph = s.getParagraph(y);
|
||||
// System.out.println(paragraph.getCharacterRun(0).text());
|
||||
s.getParagraph(y);
|
||||
}
|
||||
}
|
||||
|
||||
doc.close();
|
||||
}
|
||||
|
||||
/**
|
||||
* AIOOB for TableSprmUncompressor.unCompressTAPOperation
|
||||
*/
|
||||
public void testSprmAIOOB() {
|
||||
@Test
|
||||
public void testSprmAIOOB() throws IOException {
|
||||
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("AIOOB-Tap.doc");
|
||||
|
||||
Range r = doc.getRange();
|
||||
StyleSheet styleSheet = doc.getStyleSheet();
|
||||
assertNotNull(styleSheet);
|
||||
|
||||
Range r = doc.getRange();
|
||||
for (int x = 0; x < r.numSections(); x++) {
|
||||
Section s = r.getSection(x);
|
||||
for (int y = 0; y < s.numParagraphs(); y++) {
|
||||
Paragraph paragraph = s.getParagraph(y);
|
||||
// System.out.println(paragraph.getCharacterRun(0).text());
|
||||
assertNotNull(paragraph);
|
||||
}
|
||||
}
|
||||
doc.close();
|
||||
}
|
||||
|
||||
/**
|
||||
* Test for TableCell not skipping the last paragraph. Bugs #45062 and
|
||||
* #44292
|
||||
*/
|
||||
public void testTableCellLastParagraph() {
|
||||
@Test
|
||||
public void testTableCellLastParagraph() throws IOException {
|
||||
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug44292.doc");
|
||||
Range r = doc.getRange();
|
||||
assertEquals(6, r.numParagraphs());
|
||||
@ -106,7 +113,6 @@ public final class TestProblems extends HWPFTestCase {
|
||||
assertEquals(0, row.getStartOffset());
|
||||
assertEquals(86, row.getEndOffset());
|
||||
|
||||
|
||||
// get the first cell
|
||||
TableCell cell = row.getCell(0);
|
||||
// First cell should have one paragraph
|
||||
@ -117,19 +123,18 @@ public final class TestProblems extends HWPFTestCase {
|
||||
assertEquals(0, cell.getStartOffset());
|
||||
assertEquals(20, cell.getEndOffset());
|
||||
|
||||
|
||||
// get the second
|
||||
cell = row.getCell(1);
|
||||
// Second cell should be detected as having two paragraphs
|
||||
assertEquals(2, cell.numParagraphs());
|
||||
assertEquals("First para is ok\r", cell.getParagraph(0).text());
|
||||
assertEquals("Second paragraph is skipped\7", cell.getParagraph(1).text());
|
||||
assertEquals("Second paragraph is skipped\7",
|
||||
cell.getParagraph(1).text());
|
||||
assertEquals(1, cell._parStart);
|
||||
assertEquals(3, cell._parEnd);
|
||||
assertEquals(20, cell.getStartOffset());
|
||||
assertEquals(65, cell.getEndOffset());
|
||||
|
||||
|
||||
// get the last cell
|
||||
cell = row.getCell(2);
|
||||
// Last cell should have one paragraph
|
||||
@ -139,9 +144,12 @@ public final class TestProblems extends HWPFTestCase {
|
||||
assertEquals(4, cell._parEnd);
|
||||
assertEquals(65, cell.getStartOffset());
|
||||
assertEquals(85, cell.getEndOffset());
|
||||
|
||||
doc.close();
|
||||
}
|
||||
|
||||
public void testRangeDelete() {
|
||||
@Test
|
||||
public void testRangeDelete() throws IOException {
|
||||
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug28627.doc");
|
||||
|
||||
Range range = doc.getRange();
|
||||
@ -173,35 +181,36 @@ public final class TestProblems extends HWPFTestCase {
|
||||
}
|
||||
|
||||
assertEquals(newLength, totalLength - deletedLength);
|
||||
|
||||
doc.close();
|
||||
}
|
||||
|
||||
/**
|
||||
* With an encrypted file, we should give a suitable exception, and not OOM
|
||||
*/
|
||||
public void testEncryptedFile() {
|
||||
try {
|
||||
@Test(expected=EncryptedDocumentException.class)
|
||||
public void testEncryptedFile() throws IOException {
|
||||
HWPFTestDataSamples.openSampleFile("PasswordProtected.doc");
|
||||
fail();
|
||||
} catch (EncryptedDocumentException e) {
|
||||
// Good
|
||||
}
|
||||
}
|
||||
|
||||
public void testWriteProperties() {
|
||||
@Test
|
||||
public void testWriteProperties() throws IOException {
|
||||
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("SampleDoc.doc");
|
||||
assertEquals("Nick Burch", doc.getSummaryInformation().getAuthor());
|
||||
|
||||
// Write and read
|
||||
HWPFDocument doc2 = writeOutAndRead(doc);
|
||||
assertEquals("Nick Burch", doc2.getSummaryInformation().getAuthor());
|
||||
doc2.close();
|
||||
doc.close();
|
||||
}
|
||||
|
||||
/**
|
||||
* Test for reading paragraphs from Range after replacing some
|
||||
* text in this Range.
|
||||
* Bug #45269
|
||||
* Test for reading paragraphs from Range after replacing some text in this
|
||||
* Range. Bug #45269
|
||||
*/
|
||||
public void testReadParagraphsAfterReplaceText()throws Exception{
|
||||
@Test
|
||||
public void testReadParagraphsAfterReplaceText() throws IOException {
|
||||
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug45269.doc");
|
||||
Range range = doc.getRange();
|
||||
|
||||
@ -209,7 +218,7 @@ public final class TestProblems extends HWPFTestCase {
|
||||
String longer = " foi porraaaaa ";
|
||||
String shorter = " foi ";
|
||||
|
||||
//check replace with longer text
|
||||
// check replace with longer text
|
||||
for (int x = 0; x < range.numParagraphs(); x++) {
|
||||
Paragraph para = range.getParagraph(x);
|
||||
int offset = para.text().indexOf(toFind);
|
||||
@ -222,7 +231,7 @@ public final class TestProblems extends HWPFTestCase {
|
||||
doc = HWPFTestDataSamples.openSampleFile("Bug45269.doc");
|
||||
range = doc.getRange();
|
||||
|
||||
//check replace with shorter text
|
||||
// check replace with shorter text
|
||||
for (int x = 0; x < range.numParagraphs(); x++) {
|
||||
Paragraph para = range.getParagraph(x);
|
||||
int offset = para.text().indexOf(toFind);
|
||||
@ -231,13 +240,16 @@ public final class TestProblems extends HWPFTestCase {
|
||||
assertEquals(offset, para.text().indexOf(shorter));
|
||||
}
|
||||
}
|
||||
|
||||
doc.close();
|
||||
}
|
||||
|
||||
/**
|
||||
* Bug #49936 - Problems with reading the header out of
|
||||
* the Header Stories
|
||||
* Bug #49936 - Problems with reading the header out of the Header Stories
|
||||
*/
|
||||
public void testProblemHeaderStories49936() throws Exception {
|
||||
@SuppressWarnings("deprecation")
|
||||
@Test
|
||||
public void testProblemHeaderStories49936() throws IOException {
|
||||
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("HeaderFooterProblematic.doc");
|
||||
HeaderStories hs = new HeaderStories(doc);
|
||||
|
||||
@ -252,24 +264,31 @@ public final class TestProblems extends HWPFTestCase {
|
||||
WordExtractor ext = new WordExtractor(doc);
|
||||
assertEquals("\n", ext.getHeaderText());
|
||||
assertEquals("", ext.getFooterText());
|
||||
ext.close();
|
||||
doc.close();
|
||||
}
|
||||
|
||||
/**
|
||||
* Bug #45877 - problematic PAPX with no parent set
|
||||
*/
|
||||
public void testParagraphPAPXNoParent45877() throws Exception {
|
||||
@Test
|
||||
public void testParagraphPAPXNoParent45877() throws IOException {
|
||||
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug45877.doc");
|
||||
assertEquals(17, doc.getRange().numParagraphs());
|
||||
|
||||
assertEquals("First paragraph\r", doc.getRange().getParagraph(0).text());
|
||||
assertEquals("After Crashing Part\r", doc.getRange().getParagraph(13).text());
|
||||
assertEquals("First paragraph\r",
|
||||
doc.getRange().getParagraph(0).text());
|
||||
assertEquals("After Crashing Part\r",
|
||||
doc.getRange().getParagraph(13).text());
|
||||
|
||||
doc.close();
|
||||
}
|
||||
|
||||
/**
|
||||
* Bug #48245 - don't include the text from the
|
||||
* next cell in the current one
|
||||
* Bug #48245 - don't include the text from the next cell in the current one
|
||||
*/
|
||||
public void testTableIterator() throws Exception {
|
||||
@Test
|
||||
public void testTableIterator() throws IOException {
|
||||
HWPFDocument doc = HWPFTestDataSamples.openSampleFile("simple-table2.doc");
|
||||
Range r = doc.getRange();
|
||||
|
||||
@ -314,7 +333,6 @@ public final class TestProblems extends HWPFTestCase {
|
||||
assertEquals(2, p._parStart);
|
||||
assertEquals(3, p._parEnd);
|
||||
|
||||
|
||||
// Now look at the table
|
||||
Table table = r.getTable(r.getParagraph(0));
|
||||
assertEquals(3, table.numRows());
|
||||
@ -322,7 +340,6 @@ public final class TestProblems extends HWPFTestCase {
|
||||
TableRow row;
|
||||
TableCell cell;
|
||||
|
||||
|
||||
row = table.getRow(0);
|
||||
assertEquals(0, row._parStart);
|
||||
assertEquals(4, row._parEnd);
|
||||
@ -354,7 +371,6 @@ public final class TestProblems extends HWPFTestCase {
|
||||
assertEquals("Row 1/Cell 3\u0007", cell.text());
|
||||
assertEquals("Row 1/Cell 3\u0007", cell.getParagraph(0).text());
|
||||
|
||||
|
||||
// Onto row #2
|
||||
row = table.getRow(1);
|
||||
assertEquals(4, row._parStart);
|
||||
@ -384,7 +400,6 @@ public final class TestProblems extends HWPFTestCase {
|
||||
assertEquals(79, cell.getEndOffset());
|
||||
assertEquals("Row 2/Cell 3\u0007", cell.text());
|
||||
|
||||
|
||||
// Finally row 3
|
||||
row = table.getRow(2);
|
||||
assertEquals(8, row._parStart);
|
||||
@ -413,6 +428,7 @@ public final class TestProblems extends HWPFTestCase {
|
||||
assertEquals(106, cell.getStartOffset());
|
||||
assertEquals(119, cell.getEndOffset());
|
||||
assertEquals("Row 3/Cell 3\u0007", cell.text());
|
||||
}
|
||||
|
||||
doc.close();
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user