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

Fix HPBF generics warnings, and add a NPOIFS check to the HPBF tests

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1085495 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2011-03-25 18:03:18 +00:00
parent eb812a0e8c
commit e43a1777ed
2 changed files with 57 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/scratchpad/src/org/apache/poi/hpbf/model/EscherPart.java
View File

@ -41,7 +41,7 @@ public abstract class EscherPart extends HPBFPart {
DefaultEscherRecordFactory erf = DefaultEscherRecordFactory erf =
new DefaultEscherRecordFactory(); new DefaultEscherRecordFactory();
ArrayList ec = new ArrayList(); ArrayList<EscherRecord> ec = new ArrayList<EscherRecord>();
int left = data.length; int left = data.length;
while(left > 0) { while(left > 0) {
EscherRecord er = erf.createRecord(data, 0); EscherRecord er = erf.createRecord(data, 0);
@ -51,8 +51,7 @@ public abstract class EscherPart extends HPBFPart {
ec.add(er); ec.add(er);
} }
records = (EscherRecord[]) records = ec.toArray(new EscherRecord[ec.size()]);
ec.toArray(new EscherRecord[ec.size()]);
} }
public EscherRecord[] getEscherRecords() { public EscherRecord[] getEscherRecords() {

85
src/scratchpad/testcases/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java
View File

@ -18,40 +18,18 @@
package org.apache.poi.hpbf.extractor; package org.apache.poi.hpbf.extractor;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.poi.POIDataSamples; import org.apache.poi.POIDataSamples;
import org.apache.poi.hpbf.HPBFDocument; import org.apache.poi.hpbf.HPBFDocument;
import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
public final class TestPublisherTextExtractor extends TestCase { public final class TestPublisherTextExtractor extends TestCase {
private static final POIDataSamples _samples = POIDataSamples.getPublisherInstance(); private static final POIDataSamples _samples = POIDataSamples.getPublisherInstance();
public void testBasics() throws Exception { private static final String SAMPLE_TEXT =
HPBFDocument doc = new HPBFDocument(
_samples.openResourceAsStream("Sample.pub")
);
PublisherTextExtractor ext =
new PublisherTextExtractor(doc);
ext.getText();
ext = new PublisherTextExtractor(
_samples.openResourceAsStream("Simple.pub")
);
ext.getText();
}
public void testContents() throws Exception {
HPBFDocument doc = new HPBFDocument(
_samples.openResourceAsStream("Sample.pub")
);
PublisherTextExtractor ext =
new PublisherTextExtractor(doc);
String text = ext.getText();
assertEquals(
"This is some text on the first page\n" + "This is some text on the first page\n" +
"It\u2019s in times new roman, font size 10, all normal\n" + "It\u2019s in times new roman, font size 10, all normal\n" +
"" + "" +
@ -75,25 +53,56 @@ public final class TestPublisherTextExtractor extends TestCase {
"More text, more hyperlinks\n" + "More text, more hyperlinks\n" +
"email link\n" + "email link\n" +
"Final hyperlink\n" + "Final hyperlink\n" +
"Within doc to page 1\n" "Within doc to page 1\n";
, text private static final String SIMPLE_TEXT =
"0123456789\n" +
"0123456789abcdef\n" +
"0123456789abcdef0123456789abcdef\n" +
"0123456789\n" +
"0123456789abcdef\n" +
"0123456789abcdef0123456789abcdef\n" +
"0123456789abcdef0123456789abcdef0123456789abcdef\n";
public void testBasics() throws Exception {
HPBFDocument doc = new HPBFDocument(
_samples.openResourceAsStream("Sample.pub")
); );
// Now a simpler one PublisherTextExtractor ext =
new PublisherTextExtractor(doc);
ext.getText();
ext = new PublisherTextExtractor( ext = new PublisherTextExtractor(
_samples.openResourceAsStream("Simple.pub") _samples.openResourceAsStream("Simple.pub")
); );
text = ext.getText(); ext.getText();
assertEquals( }
"0123456789\n" +
"0123456789abcdef\n" + public void testContents() throws Exception {
"0123456789abcdef0123456789abcdef\n" + PublisherTextExtractor ext;
"0123456789\n" + File sample = _samples.getFile("Sample.pub");
"0123456789abcdef\n" + File simple = _samples.getFile("Simple.pub");
"0123456789abcdef0123456789abcdef\n" +
"0123456789abcdef0123456789abcdef0123456789abcdef\n" // Check this complicated file using POIFS
, text HPBFDocument docOPOIFS = new HPBFDocument(
new FileInputStream(sample)
); );
ext = new PublisherTextExtractor(docOPOIFS);
assertEquals( SAMPLE_TEXT, ext.getText() );
// And with NPOIFS
HPBFDocument docNPOIFS = new HPBFDocument(
new NPOIFSFileSystem(sample)
);
ext = new PublisherTextExtractor(docNPOIFS);
assertEquals( SAMPLE_TEXT, ext.getText() );
// Now a simpler file
ext = new PublisherTextExtractor(
new FileInputStream(simple)
);
assertEquals( SIMPLE_TEXT, ext.getText() );
} }
/** /**