Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 53453: Apply patch to add methods to set margins in sections of HWPF documents 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1649176 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2015-01-03 09:34:07 +00:00
parent 460678e607
commit 1e340fbce8
3 changed files with 415 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java
View File

@ -95,6 +95,66 @@ public final class Section extends Range
return _props.getXaPage(); return _props.getXaPage();
} }
/**
* Set the height of the bottom margin in twips. In the AbstractWordUtils class, a constant
* is defined that indicates how many twips there are per inch and it can be used in setting
* the margins width a little like this;
*
* section.setMarginBottom( (int) 1.5 * AbstractWordUtils.TWIPS_PER_INCH );
*
* @param marginWidth A primitive int whose value will indciate how high the margin should
* be - in twips.
*/
public void setMarginBottom(int marginWidth)
{
this._props.setDyaBottom(marginWidth);
}
/**
* Set the width of the left hand margin in twips. In the AbstractWordUtils class, a constant
* is defined that indicates how many twips there are per inch and it can be used in setting
* the margins width a little like this;
*
* section.setMarginLeft( (int) 1.5 * AbstractWordUtils.TWIPS_PER_INCH );
*
* @param marginWidth A primitive int whose value will indciate how high the margin should
* be - in twips.
*/
public void setMarginLeft(int marginWidth)
{
this._props.setDxaLeft(marginWidth);
}
/**
* Set the width of the right hand margin in twips. In the AbstractWordUtils class, a constant
* is defined that indicates how many twips there are per inch and it can be used in setting
* the margins width a little like this;
*
* section.setMarginRight( (int) 1.5 * AbstractWordUtils.TWIPS_PER_INCH );
*
* @param marginWidth A primitive int whose value will indciate how high the margin should
* be - in twips.
*/
public void setMarginRight(int marginWidth)
{
this._props.setDxaRight(marginWidth);
}
/**
* Set the height of the top margin in twips. In the AbstractWordUtils class, a constant
* is defined that indicates how many twips there are per inch and it can be used in setting
* the margins width a little like this;
*
* section.setMarginTop( (int) 1.5 * AbstractWordUtils.TWIPS_PER_INCH );
*
* @param marginWidth A primitive int whose value will indciate how high the margin should
* be - in twips.
*/
public void setMarginTop(int marginWidth)
{
this._props.setDyaTop(marginWidth);
}
public boolean isColumnsEvenlySpaced() public boolean isColumnsEvenlySpaced()
{ {
return _props.getFEvenlySpaced(); return _props.getFEvenlySpaced();

571
src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
View File

@ -31,6 +31,7 @@ import org.apache.poi.POIDataSamples;
import org.apache.poi.hwpf.HWPFDocument; import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.HWPFOldDocument; import org.apache.poi.hwpf.HWPFOldDocument;
import org.apache.poi.hwpf.HWPFTestDataSamples; import org.apache.poi.hwpf.HWPFTestDataSamples;
import org.apache.poi.hwpf.converter.AbstractWordUtils;
import org.apache.poi.hwpf.converter.WordToTextConverter; import org.apache.poi.hwpf.converter.WordToTextConverter;
import org.apache.poi.hwpf.extractor.Word6Extractor; import org.apache.poi.hwpf.extractor.Word6Extractor;
import org.apache.poi.hwpf.extractor.WordExtractor; import org.apache.poi.hwpf.extractor.WordExtractor;
@ -53,80 +54,97 @@ import org.apache.poi.util.POILogger;
public class TestBugs extends TestCase public class TestBugs extends TestCase
{ {
private static final POILogger logger = POILogFactory private static final POILogger logger = POILogFactory
.getLogger( TestBugs.class ); .getLogger(TestBugs.class);
public static void assertEquals( String expected, String actual ) public static void assertEqualsIgnoreNewline(String expected, String actual )
{ {
String newExpected = expected.replaceAll( "\r\n", "\n" ) String newExpected = expected.replaceAll("\r\n", "\n" )
.replaceAll( "\r", "\n" ).trim(); .replaceAll("\r", "\n").trim();
String newActual = actual.replaceAll( "\r\n", "\n" ) String newActual = actual.replaceAll("\r\n", "\n" )
.replaceAll( "\r", "\n" ).trim(); .replaceAll("\r", "\n").trim();
TestCase.assertEquals( newExpected, newActual ); TestCase.assertEquals(newExpected, newActual);
} }
private static void assertTableStructures( Range expected, Range actual ) private static void assertTableStructures(Range expected, Range actual )
{ {
assertEquals( expected.numParagraphs(), actual.numParagraphs() ); assertEquals(expected.numParagraphs(), actual.numParagraphs());
for ( int p = 0; p < expected.numParagraphs(); p++ ) for (int p = 0; p < expected.numParagraphs(); p++ )
{ {
Paragraph expParagraph = expected.getParagraph( p ); Paragraph expParagraph = expected.getParagraph(p);
Paragraph actParagraph = actual.getParagraph( p ); Paragraph actParagraph = actual.getParagraph(p);
assertEquals( expParagraph.text(), actParagraph.text() ); assertEqualsIgnoreNewline(expParagraph.text(), actParagraph.text());
assertEquals( "Diffent isInTable flags for paragraphs #" + p assertEquals("Diffent isInTable flags for paragraphs #" + p
+ " -- " + expParagraph + " -- " + actParagraph + ".", + " -- " + expParagraph + " -- " + actParagraph + ".",
expParagraph.isInTable(), actParagraph.isInTable() ); expParagraph.isInTable(), actParagraph.isInTable());
assertEquals( expParagraph.isTableRowEnd(), assertEquals(expParagraph.isTableRowEnd(),
actParagraph.isTableRowEnd() ); actParagraph.isTableRowEnd());
if ( expParagraph.isInTable() && actParagraph.isInTable() ) if (expParagraph.isInTable() && actParagraph.isInTable() )
{ {
Table expTable, actTable; Table expTable, actTable;
try try
{ {
expTable = expected.getTable( expParagraph ); expTable = expected.getTable(expParagraph);
actTable = actual.getTable( actParagraph ); actTable = actual.getTable(actParagraph);
} }
catch ( Exception exc ) catch (Exception exc )
{ {
continue; continue;
} }
assertEquals( expTable.numRows(), actTable.numRows() ); assertEquals(expTable.numRows(), actTable.numRows());
assertEquals( expTable.numParagraphs(), assertEquals(expTable.numParagraphs(),
actTable.numParagraphs() ); actTable.numParagraphs());
} }
} }
} }
static void fixed( String bugzillaId ) private static void fixed(String bugzillaId )
{ {
throw new Error( throw new Error(
"Bug " "Bug "
+ bugzillaId + bugzillaId
+ " seems to be fixed. " + " seems to be fixed. "
+ "Please resolve the issue in Bugzilla and remove fail() from the test" ); + "Please resolve the issue in Bugzilla and remove fail() from the test");
}
private String getText(String samplefile) throws IOException {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile(samplefile);
WordExtractor extractor = new WordExtractor(doc);
try {
return extractor.getText();
} finally {
extractor.close();
}
}
private String getTextOldFile(String samplefile) throws IOException {
HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile(samplefile);
Word6Extractor extractor = new Word6Extractor(doc);
try {
return extractor.getText();
} finally {
extractor.close();
}
} }
/** /**
* Bug 33519 - HWPF fails to read a file * Bug 33519 - HWPF fails to read a file
* @throws IOException
*/ */
public void test33519() public void test33519() throws IOException
{ {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "Bug33519.doc" ); assertNotNull(getText("Bug33519.doc"));
WordExtractor extractor = new WordExtractor( doc );
extractor.getText();
} }
/** /**
* Bug 34898 - WordExtractor doesn't read the whole string from the file * Bug 34898 - WordExtractor doesn't read the whole string from the file
* @throws IOException
*/ */
public void test34898() public void test34898() throws IOException
{ {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "Bug34898.doc" ); assertEqualsIgnoreNewline("\u30c7\u30a3\u30ec\u30af\u30c8\u30ea", getText("Bug34898.doc").trim());
WordExtractor extractor = new WordExtractor( doc );
assertEquals( "\u30c7\u30a3\u30ec\u30af\u30c8\u30ea", extractor
.getText().trim() );
} }
/** /**
@ -134,18 +152,18 @@ public class TestBugs extends TestCase
*/ */
public void test41898() public void test41898()
{ {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "Bug41898.doc" ); HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug41898.doc");
List<Picture> pics = doc.getPicturesTable().getAllPictures(); List<Picture> pics = doc.getPicturesTable().getAllPictures();
assertNotNull( pics ); assertNotNull(pics);
assertEquals( 1, pics.size() ); assertEquals(1, pics.size());
Picture pic = pics.get( 0 ); Picture pic = pics.get(0);
assertNotNull( pic.suggestFileExtension() ); assertNotNull(pic.suggestFileExtension());
assertNotNull( pic.suggestFullFileName() ); assertNotNull(pic.suggestFullFileName());
assertNotNull( pic.getContent() ); assertNotNull(pic.getContent());
assertNotNull( pic.getRawContent() ); assertNotNull(pic.getRawContent());
/* /*
* This is a file with empty EMF image, but present Office Drawing * This is a file with empty EMF image, but present Office Drawing
@ -153,42 +171,49 @@ public class TestBugs extends TestCase
*/ */
final Collection<OfficeDrawing> officeDrawings = doc final Collection<OfficeDrawing> officeDrawings = doc
.getOfficeDrawingsMain().getOfficeDrawings(); .getOfficeDrawingsMain().getOfficeDrawings();
assertNotNull( officeDrawings ); assertNotNull(officeDrawings);
assertEquals( 1, officeDrawings.size() ); assertEquals(1, officeDrawings.size());
OfficeDrawing officeDrawing = officeDrawings.iterator().next(); OfficeDrawing officeDrawing = officeDrawings.iterator().next();
assertNotNull( officeDrawing ); assertNotNull(officeDrawing);
assertEquals( 1044, officeDrawing.getShapeId() ); assertEquals(1044, officeDrawing.getShapeId());
} }
/** /**
* Bug 44331 - HWPFDocument.write destroys fields * Bug 44331 - HWPFDocument.write destroys fields
* @throws IOException
*/ */
public void test44431() public void test44431() throws IOException
{ {
HWPFDocument doc1 = HWPFTestDataSamples.openSampleFile( "Bug44431.doc" ); HWPFDocument doc1 = HWPFTestDataSamples.openSampleFile("Bug44431.doc");
WordExtractor extractor1 = new WordExtractor( doc1 );
HWPFDocument doc2 = HWPFTestDataSamples.writeOutAndReadBack( doc1 ); WordExtractor extractor1 = new WordExtractor(doc1);
WordExtractor extractor2 = new WordExtractor( doc2 ); try {
HWPFDocument doc2 = HWPFTestDataSamples.writeOutAndReadBack(doc1);
assertEquals( extractor1.getFooterText(), extractor2.getFooterText() ); WordExtractor extractor2 = new WordExtractor(doc2);
assertEquals( extractor1.getHeaderText(), extractor2.getHeaderText() ); try {
assertEquals( Arrays.toString( extractor1.getParagraphText() ), assertEqualsIgnoreNewline(extractor1.getFooterText(), extractor2.getFooterText());
Arrays.toString( extractor2.getParagraphText() ) ); assertEqualsIgnoreNewline(extractor1.getHeaderText(), extractor2.getHeaderText());
assertEqualsIgnoreNewline(Arrays.toString(extractor1.getParagraphText() ),
Arrays.toString(extractor2.getParagraphText()));
assertEquals( extractor1.getText(), extractor2.getText() ); assertEqualsIgnoreNewline(extractor1.getText(), extractor2.getText());
} finally {
extractor2.close();
}
} finally {
extractor1.close();
}
} }
/** /**
* Bug 44331 - HWPFDocument.write destroys fields * Bug 44331 - HWPFDocument.write destroys fields
* @throws IOException
*/ */
public void test44431_2() public void test44431_2() throws IOException
{ {
HWPFDocument doc1 = HWPFTestDataSamples.openSampleFile( "Bug44431.doc" ); assertEqualsIgnoreNewline("File name=FieldsTest.doc\n" +
WordExtractor extractor1 = new WordExtractor( doc1 );
assertEquals( "File name=FieldsTest.doc\n" +
"\n" + "\n" +
"\n" + "\n" +
"STYLEREF test\n" + "STYLEREF test\n" +
@ -207,23 +232,36 @@ public class TestBugs extends TestCase
"\n" + "\n" +
"\n" + "\n" +
"\n" + "\n" +
"Page 3 of 3", extractor1.getText() ); "Page 3 of 3", getText("Bug44431.doc"));
} }
/** /**
* Bug 45473 - HWPF cannot read file after save * Bug 45473 - HWPF cannot read file after save
* @throws IOException
*/ */
public void test45473() public void test45473() throws IOException
{ {
HWPFDocument doc1 = HWPFTestDataSamples.openSampleFile( "Bug45473.doc" ); HWPFDocument doc1 = HWPFTestDataSamples.openSampleFile("Bug45473.doc");
String text1 = new WordExtractor( doc1 ).getText().trim(); WordExtractor wordExtractor = new WordExtractor(doc1);
final String text1;
try {
text1 = wordExtractor.getText().trim();
} finally {
wordExtractor.close();
}
HWPFDocument doc2 = HWPFTestDataSamples.writeOutAndReadBack( doc1 ); HWPFDocument doc2 = HWPFTestDataSamples.writeOutAndReadBack(doc1);
String text2 = new WordExtractor( doc2 ).getText().trim(); WordExtractor wordExtractor2 = new WordExtractor(doc2);
final String text2;
try {
text2 = wordExtractor2.getText().trim();
} finally {
wordExtractor2.close();
}
// the text in the saved document has some differences in line // the text in the saved document has some differences in line
// separators but we tolerate that // separators but we tolerate that
assertEquals( text1.replaceAll( "\n", "" ), text2.replaceAll( "\n", "" ) ); assertEqualsIgnoreNewline(text1.replaceAll("\n", "" ), text2.replaceAll("\n", ""));
} }
/** /**
@ -231,36 +269,35 @@ public class TestBugs extends TestCase
*/ */
public void test46220() public void test46220()
{ {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "Bug46220.doc" ); HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug46220.doc");
// reference checksums as in Bugzilla // reference checksums as in Bugzilla
String[] md5 = { "851be142bce6d01848e730cb6903f39e", String[] md5 = { "851be142bce6d01848e730cb6903f39e",
"7fc6d8fb58b09ababd036d10a0e8c039", "7fc6d8fb58b09ababd036d10a0e8c039",
"a7dc644c40bc2fbf17b2b62d07f99248", "a7dc644c40bc2fbf17b2b62d07f99248",
"72d07b8db5fad7099d90bc4c304b4666" }; "72d07b8db5fad7099d90bc4c304b4666" };
List<Picture> pics = doc.getPicturesTable().getAllPictures(); List<Picture> pics = doc.getPicturesTable().getAllPictures();
assertEquals( 4, pics.size() ); assertEquals(4, pics.size());
for ( int i = 0; i < pics.size(); i++ ) for (int i = 0; i < pics.size(); i++ )
{ {
Picture pic = pics.get( i ); Picture pic = pics.get(i);
byte[] data = pic.getRawContent(); byte[] data = pic.getRawContent();
// use Apache Commons Codec utils to compute md5 // use Apache Commons Codec utils to compute md5
assertEquals( md5[i], DigestUtils.md5Hex( data ) ); assertEqualsIgnoreNewline(md5[i], DigestUtils.md5Hex(data));
} }
} }
/** /**
* [RESOLVED FIXED] Bug 46817 - Regression: Text from some table cells * [RESOLVED FIXED] Bug 46817 - Regression: Text from some table cells
* missing * missing
* @throws IOException
*/ */
public void test46817() public void test46817() throws IOException
{ {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "Bug46817.doc" ); String text = getText("Bug46817.doc").trim();
WordExtractor extractor = new WordExtractor( doc );
String text = extractor.getText().trim();
assertTrue( text.contains( "Nazwa wykonawcy" ) ); assertTrue(text.contains("Nazwa wykonawcy"));
assertTrue( text.contains( "kujawsko-pomorskie" ) ); assertTrue(text.contains("kujawsko-pomorskie"));
assertTrue( text.contains( "ekomel@ekomel.com.pl" ) ); assertTrue(text.contains("ekomel@ekomel.com.pl"));
} }
/** /**
@ -271,26 +308,38 @@ public class TestBugs extends TestCase
*/ */
public void test47286() throws IOException public void test47286() throws IOException
{ {
HWPFDocument doc1 = HWPFTestDataSamples.openSampleFile( "Bug47286.doc" ); HWPFDocument doc1 = HWPFTestDataSamples.openSampleFile("Bug47286.doc");
String text1 = new WordExtractor( doc1 ).getText().trim(); WordExtractor wordExtractor = new WordExtractor(doc1);
final String text1;
try {
text1 = wordExtractor.getText().trim();
} finally {
wordExtractor.close();
}
HWPFDocument doc2 = HWPFTestDataSamples.writeOutAndReadBack( doc1 ); HWPFDocument doc2 = HWPFTestDataSamples.writeOutAndReadBack(doc1);
String text2 = new WordExtractor( doc2 ).getText().trim(); WordExtractor wordExtractor2 = new WordExtractor(doc2);
final String text2;
try {
text2 = wordExtractor2.getText().trim();
} finally {
wordExtractor2.close();
}
// the text in the saved document has some differences in line // the text in the saved document has some differences in line
// separators but we tolerate that // separators but we tolerate that
assertEquals( text1.replaceAll( "\n", "" ), text2.replaceAll( "\n", "" ) ); assertEqualsIgnoreNewline(text1.replaceAll("\n", "" ), text2.replaceAll("\n", ""));
assertEquals( doc1.getCharacterTable().getTextRuns().size(), doc2 assertEquals(doc1.getCharacterTable().getTextRuns().size(), doc2
.getCharacterTable().getTextRuns().size() ); .getCharacterTable().getTextRuns().size());
List<PlexOfField> expectedFields = doc1.getFieldsTables() List<PlexOfField> expectedFields = doc1.getFieldsTables()
.getFieldsPLCF( FieldsDocumentPart.MAIN ); .getFieldsPLCF(FieldsDocumentPart.MAIN);
List<PlexOfField> actualFields = doc2.getFieldsTables().getFieldsPLCF( List<PlexOfField> actualFields = doc2.getFieldsTables().getFieldsPLCF(
FieldsDocumentPart.MAIN ); FieldsDocumentPart.MAIN);
assertEquals( expectedFields.size(), actualFields.size() ); assertEquals(expectedFields.size(), actualFields.size());
assertTableStructures( doc1.getRange(), doc2.getRange() ); assertTableStructures(doc1.getRange(), doc2.getRange());
} }
/** /**
@ -299,60 +348,60 @@ public class TestBugs extends TestCase
*/ */
public void test47287() public void test47287()
{ {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "Bug47287.doc" ); HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug47287.doc");
String[] values = { "1-1", "1-2", "1-3", "1-4", "1-5", "1-6", "1-7", String[] values = { "1-1", "1-2", "1-3", "1-4", "1-5", "1-6", "1-7",
"1-8", "1-9", "1-10", "1-11", "1-12", "1-13", "1-14", "1-15", }; "1-8", "1-9", "1-10", "1-11", "1-12", "1-13", "1-14", "1-15", };
int usedVal = 0; int usedVal = 0;
String PLACEHOLDER = "\u2002\u2002\u2002\u2002\u2002"; String PLACEHOLDER = "\u2002\u2002\u2002\u2002\u2002";
Range r = doc.getRange(); Range r = doc.getRange();
for ( int x = 0; x < r.numSections(); x++ ) for (int x = 0; x < r.numSections(); x++ )
{ {
Section s = r.getSection( x ); Section s = r.getSection(x);
for ( int y = 0; y < s.numParagraphs(); y++ ) for (int y = 0; y < s.numParagraphs(); y++ )
{ {
Paragraph p = s.getParagraph( y ); Paragraph p = s.getParagraph(y);
for ( int z = 0; z < p.numCharacterRuns(); z++ ) for (int z = 0; z < p.numCharacterRuns(); z++ )
{ {
boolean isFound = false; boolean isFound = false;
// character run // character run
CharacterRun run = p.getCharacterRun( z ); CharacterRun run = p.getCharacterRun(z);
// character run text // character run text
String text = run.text(); String text = run.text();
String oldText = text; String oldText = text;
int c = text.indexOf( "FORMTEXT " ); int c = text.indexOf("FORMTEXT ");
if ( c < 0 ) if (c < 0 )
{ {
int k = text.indexOf( PLACEHOLDER ); int k = text.indexOf(PLACEHOLDER);
if ( k >= 0 ) if (k >= 0 )
{ {
text = text.substring( 0, k ) + values[usedVal] text = text.substring(0, k ) + values[usedVal]
+ text.substring( k + PLACEHOLDER.length() ); + text.substring(k + PLACEHOLDER.length());
usedVal++; usedVal++;
isFound = true; isFound = true;
} }
} }
else else
{ {
for ( ; c >= 0; c = text.indexOf( "FORMTEXT ", c for (; c >= 0; c = text.indexOf("FORMTEXT ", c
+ "FORMTEXT ".length() ) ) + "FORMTEXT ".length() ) )
{ {
int k = text.indexOf( PLACEHOLDER, c ); int k = text.indexOf(PLACEHOLDER, c);
if ( k >= 0 ) if (k >= 0 )
{ {
text = text.substring( 0, k ) text = text.substring(0, k )
+ values[usedVal] + values[usedVal]
+ text.substring( k + text.substring(k
+ PLACEHOLDER.length() ); + PLACEHOLDER.length());
usedVal++; usedVal++;
isFound = true; isFound = true;
} }
} }
} }
if ( isFound ) if (isFound )
{ {
run.replaceText( oldText, text, 0 ); run.replaceText(oldText, text, 0);
} }
} }
@ -361,11 +410,11 @@ public class TestBugs extends TestCase
String docText = r.text(); String docText = r.text();
assertTrue( docText.contains( "1-1" ) ); assertTrue(docText.contains("1-1"));
assertTrue( docText.contains( "1-12" ) ); assertTrue(docText.contains("1-12"));
assertFalse( docText.contains( "1-13" ) ); assertFalse(docText.contains("1-13"));
assertFalse( docText.contains( "1-15" ) ); assertFalse(docText.contains("1-15"));
} }
/** /**
@ -374,11 +423,10 @@ public class TestBugs extends TestCase
*/ */
public void test47731() throws Exception public void test47731() throws Exception
{ {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "Bug47731.doc" ); String foundText = getText("Bug47731.doc");
String foundText = new WordExtractor( doc ).getText();
assertTrue( foundText assertTrue(foundText
.contains( "Soak the rice in water for three to four hours" ) ); .contains("Soak the rice in water for three to four hours"));
} }
/** /**
@ -386,21 +434,19 @@ public class TestBugs extends TestCase
*/ */
public void test47742() throws Exception public void test47742() throws Exception
{ {
// (1) extract text from MS Word document via POI // (1) extract text from MS Word document via POI
HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "Bug47742.doc" ); String foundText = getText("Bug47742.doc");
String foundText = new WordExtractor( doc ).getText();
// (2) read text from text document (retrieved by saving the word // (2) read text from text document (retrieved by saving the word
// document as text file using encoding UTF-8) // document as text file using encoding UTF-8)
InputStream is = POIDataSamples.getDocumentInstance() InputStream is = POIDataSamples.getDocumentInstance()
.openResourceAsStream( "Bug47742-text.txt" ); .openResourceAsStream("Bug47742-text.txt");
try { try {
byte[] expectedBytes = IOUtils.toByteArray( is ); byte[] expectedBytes = IOUtils.toByteArray(is);
String expectedText = new String( expectedBytes, "utf-8" ) String expectedText = new String(expectedBytes, "utf-8" )
.substring( 1 ); // strip-off the unicode marker .substring(1); // strip-off the unicode marker
assertEquals( expectedText, foundText ); assertEqualsIgnoreNewline(expectedText, foundText);
} finally { } finally {
is.close(); is.close();
} }
@ -411,7 +457,7 @@ public class TestBugs extends TestCase
*/ */
public void test47958() public void test47958()
{ {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "Bug47958.doc" ); HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug47958.doc");
doc.getPicturesTable().getAllPictures(); doc.getPicturesTable().getAllPictures();
} }
@ -421,26 +467,22 @@ public class TestBugs extends TestCase
*/ */
public void test48065() public void test48065()
{ {
HWPFDocument doc1 = HWPFTestDataSamples.openSampleFile( "Bug48065.doc" ); HWPFDocument doc1 = HWPFTestDataSamples.openSampleFile("Bug48065.doc");
HWPFDocument doc2 = HWPFTestDataSamples.writeOutAndReadBack( doc1 ); HWPFDocument doc2 = HWPFTestDataSamples.writeOutAndReadBack(doc1);
Range expected = doc1.getRange(); Range expected = doc1.getRange();
Range actual = doc2.getRange(); Range actual = doc2.getRange();
assertEquals( assertEqualsIgnoreNewline(
expected.text().replace( "\r", "\n" ).replaceAll( "\n\n", "\n" ), expected.text().replace("\r", "\n").replaceAll("\n\n", "\n" ),
actual.text().replace( "\r", "\n" ).replaceAll( "\n\n", "\n" ) ); actual.text().replace("\r", "\n").replaceAll("\n\n", "\n"));
assertTableStructures( expected, actual ); assertTableStructures(expected, actual);
} }
public void test49933() public void test49933() throws IOException
{ {
HWPFOldDocument document = HWPFTestDataSamples String text = getTextOldFile("Bug49933.doc");
.openOldSampleFile( "Bug49933.doc" );
Word6Extractor word6Extractor = new Word6Extractor( document );
String text = word6Extractor.getText();
assertTrue( text.contains( "best.wine.jump.ru" ) ); assertTrue( text.contains( "best.wine.jump.ru" ) );
} }
@ -451,7 +493,7 @@ public class TestBugs extends TestCase
public void test50936_1() public void test50936_1()
{ {
HWPFDocument hwpfDocument = HWPFTestDataSamples HWPFDocument hwpfDocument = HWPFTestDataSamples
.openSampleFile( "Bug50936_1.doc" ); .openSampleFile("Bug50936_1.doc");
hwpfDocument.getPicturesTable().getAllPictures(); hwpfDocument.getPicturesTable().getAllPictures();
} }
@ -461,7 +503,7 @@ public class TestBugs extends TestCase
public void test50936_2() public void test50936_2()
{ {
HWPFDocument hwpfDocument = HWPFTestDataSamples HWPFDocument hwpfDocument = HWPFTestDataSamples
.openSampleFile( "Bug50936_2.doc" ); .openSampleFile("Bug50936_2.doc");
hwpfDocument.getPicturesTable().getAllPictures(); hwpfDocument.getPicturesTable().getAllPictures();
} }
@ -471,61 +513,56 @@ public class TestBugs extends TestCase
public void test50936_3() public void test50936_3()
{ {
HWPFDocument hwpfDocument = HWPFTestDataSamples HWPFDocument hwpfDocument = HWPFTestDataSamples
.openSampleFile( "Bug50936_3.doc" ); .openSampleFile("Bug50936_3.doc");
hwpfDocument.getPicturesTable().getAllPictures(); hwpfDocument.getPicturesTable().getAllPictures();
} }
/** /**
* [FAILING] Bug 50955 - error while retrieving the text file * [FAILING] Bug 50955 - error while retrieving the text file
* @throws IOException
*/ */
public void test50955() public void test50955() throws IOException
{ {
try try {
{ getTextOldFile("Bug50955.doc");
HWPFOldDocument doc = HWPFTestDataSamples
.openOldSampleFile( "Bug50955.doc" );
Word6Extractor extractor = new Word6Extractor( doc );
extractor.getText();
fixed( "50955" ); fixed("50955");
} } catch (IllegalStateException e) {
catch ( Exception e ) // expected here
{
// expected exception
} }
} }
/** /**
* [RESOLVED FIXED] Bug 51604 - replace text fails for doc ( poi 3.8 beta * [RESOLVED FIXED] Bug 51604 - replace text fails for doc (poi 3.8 beta
* release from download site ) * release from download site )
*/ */
public void test51604() public void test51604()
{ {
HWPFDocument document = HWPFTestDataSamples HWPFDocument document = HWPFTestDataSamples
.openSampleFile( "Bug51604.doc" ); .openSampleFile("Bug51604.doc");
Range range = document.getRange(); Range range = document.getRange();
int numParagraph = range.numParagraphs(); int numParagraph = range.numParagraphs();
int counter = 0; int counter = 0;
for ( int i = 0; i < numParagraph; i++ ) for (int i = 0; i < numParagraph; i++ )
{ {
Paragraph paragraph = range.getParagraph( i ); Paragraph paragraph = range.getParagraph(i);
int numCharRuns = paragraph.numCharacterRuns(); int numCharRuns = paragraph.numCharacterRuns();
for ( int j = 0; j < numCharRuns; j++ ) for (int j = 0; j < numCharRuns; j++ )
{ {
CharacterRun charRun = paragraph.getCharacterRun( j ); CharacterRun charRun = paragraph.getCharacterRun(j);
String text = charRun.text(); String text = charRun.text();
charRun.replaceText( text, "+" + ( ++counter ) ); charRun.replaceText(text, "+" + (++counter));
} }
} }
document = HWPFTestDataSamples.writeOutAndReadBack( document ); document = HWPFTestDataSamples.writeOutAndReadBack(document);
String text = document.getDocumentText(); String text = document.getDocumentText();
assertEquals( "+1+2+3+4+5+6+7+8+9+10+11+12", text ); assertEqualsIgnoreNewline("+1+2+3+4+5+6+7+8+9+10+11+12", text);
} }
/** /**
* [RESOLVED FIXED] Bug 51604 - replace text fails for doc ( poi 3.8 beta * [RESOLVED FIXED] Bug 51604 - replace text fails for doc (poi 3.8 beta
* release from download site ) * release from download site )
* *
* @throws IOException * @throws IOException
@ -533,81 +570,81 @@ public class TestBugs extends TestCase
*/ */
public void test51604p2() throws Exception public void test51604p2() throws Exception
{ {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "Bug51604.doc" ); HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug51604.doc");
Range range = doc.getRange(); Range range = doc.getRange();
int numParagraph = range.numParagraphs(); int numParagraph = range.numParagraphs();
for ( int i = 0; i < numParagraph; i++ ) for (int i = 0; i < numParagraph; i++ )
{ {
Paragraph paragraph = range.getParagraph( i ); Paragraph paragraph = range.getParagraph(i);
int numCharRuns = paragraph.numCharacterRuns(); int numCharRuns = paragraph.numCharacterRuns();
for ( int j = 0; j < numCharRuns; j++ ) for (int j = 0; j < numCharRuns; j++ )
{ {
CharacterRun charRun = paragraph.getCharacterRun( j ); CharacterRun charRun = paragraph.getCharacterRun(j);
String text = charRun.text(); String text = charRun.text();
if ( text.contains( "Header" ) ) if (text.contains("Header" ) )
charRun.replaceText( text, "added" ); charRun.replaceText(text, "added");
} }
} }
doc = HWPFTestDataSamples.writeOutAndReadBack( doc ); doc = HWPFTestDataSamples.writeOutAndReadBack(doc);
final FileInformationBlock fileInformationBlock = doc final FileInformationBlock fileInformationBlock = doc
.getFileInformationBlock(); .getFileInformationBlock();
int totalLength = 0; int totalLength = 0;
for ( SubdocumentType type : SubdocumentType.values() ) for (SubdocumentType type : SubdocumentType.values() )
{ {
final int partLength = fileInformationBlock final int partLength = fileInformationBlock
.getSubdocumentTextStreamLength( type ); .getSubdocumentTextStreamLength(type);
assert ( partLength >= 0 ); assert (partLength >= 0);
totalLength += partLength; totalLength += partLength;
} }
assertEquals( doc.getText().length(), totalLength ); assertEquals(doc.getText().length(), totalLength);
} }
/** /**
* [RESOLVED FIXED] Bug 51604 - replace text fails for doc ( poi 3.8 beta * [RESOLVED FIXED] Bug 51604 - replace text fails for doc (poi 3.8 beta
* release from download site ) * release from download site )
*/ */
public void test51604p3() throws Exception public void test51604p3() throws Exception
{ {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "Bug51604.doc" ); HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug51604.doc");
byte[] originalData = new byte[doc.getFileInformationBlock() byte[] originalData = new byte[doc.getFileInformationBlock()
.getLcbDop()]; .getLcbDop()];
System.arraycopy( doc.getTableStream(), doc.getFileInformationBlock() System.arraycopy(doc.getTableStream(), doc.getFileInformationBlock()
.getFcDop(), originalData, 0, originalData.length ); .getFcDop(), originalData, 0, originalData.length);
HWPFOutputStream outputStream = new HWPFOutputStream(); HWPFOutputStream outputStream = new HWPFOutputStream();
doc.getDocProperties().writeTo( outputStream ); doc.getDocProperties().writeTo(outputStream);
final byte[] oldData = outputStream.toByteArray(); final byte[] oldData = outputStream.toByteArray();
assertEquals( Arrays.toString( originalData ), assertEqualsIgnoreNewline(Arrays.toString(originalData ),
Arrays.toString( oldData ) ); Arrays.toString(oldData));
Range range = doc.getRange(); Range range = doc.getRange();
int numParagraph = range.numParagraphs(); int numParagraph = range.numParagraphs();
for ( int i = 0; i < numParagraph; i++ ) for (int i = 0; i < numParagraph; i++ )
{ {
Paragraph paragraph = range.getParagraph( i ); Paragraph paragraph = range.getParagraph(i);
int numCharRuns = paragraph.numCharacterRuns(); int numCharRuns = paragraph.numCharacterRuns();
for ( int j = 0; j < numCharRuns; j++ ) for (int j = 0; j < numCharRuns; j++ )
{ {
CharacterRun charRun = paragraph.getCharacterRun( j ); CharacterRun charRun = paragraph.getCharacterRun(j);
String text = charRun.text(); String text = charRun.text();
if ( text.contains( "Header" ) ) if (text.contains("Header" ) )
charRun.replaceText( text, "added" ); charRun.replaceText(text, "added");
} }
} }
doc = HWPFTestDataSamples.writeOutAndReadBack( doc ); doc = HWPFTestDataSamples.writeOutAndReadBack(doc);
outputStream = new HWPFOutputStream(); outputStream = new HWPFOutputStream();
doc.getDocProperties().writeTo( outputStream ); doc.getDocProperties().writeTo(outputStream);
final byte[] newData = outputStream.toByteArray(); final byte[] newData = outputStream.toByteArray();
assertEquals( Arrays.toString( oldData ), Arrays.toString( newData ) ); assertEqualsIgnoreNewline(Arrays.toString(oldData ), Arrays.toString(newData));
} }
/** /**
@ -617,30 +654,39 @@ public class TestBugs extends TestCase
public void test51671() throws Exception public void test51671() throws Exception
{ {
InputStream is = POIDataSamples.getDocumentInstance() InputStream is = POIDataSamples.getDocumentInstance()
.openResourceAsStream( "empty.doc" ); .openResourceAsStream("empty.doc");
NPOIFSFileSystem npoifsFileSystem = new NPOIFSFileSystem( is ); NPOIFSFileSystem npoifsFileSystem = new NPOIFSFileSystem(is);
try {
HWPFDocument hwpfDocument = new HWPFDocument( HWPFDocument hwpfDocument = new HWPFDocument(
npoifsFileSystem.getRoot() ); npoifsFileSystem.getRoot());
hwpfDocument.write( new ByteArrayOutputStream() ); hwpfDocument.write(new ByteArrayOutputStream());
} finally {
npoifsFileSystem.close();
}
} }
/** /**
* Bug 51678 - Extracting text from Bug51524.zip is slow Bug 51524 - * Bug 51678 - Extracting text from Bug51524.zip is slow Bug 51524 -
* PapBinTable constructor is slow * PapBinTable constructor is slow
* @throws IOException
*/ */
public void test51678And51524() public void test51678And51524() throws IOException
{ {
// YK: the test will run only if the poi.test.remote system property is // YK: the test will run only if the poi.test.remote system property is
// set. // set.
// TODO: refactor into something nicer! // TODO: refactor into something nicer!
if ( System.getProperty( "poi.test.remote" ) != null ) if (System.getProperty("poi.test.remote" ) != null )
{ {
String href = "http://domex.nps.edu/corp/files/govdocs1/007/007488.doc"; String href = "http://domex.nps.edu/corp/files/govdocs1/007/007488.doc";
HWPFDocument hwpfDocument = HWPFTestDataSamples HWPFDocument hwpfDocument = HWPFTestDataSamples
.openRemoteFile( href ); .openRemoteFile(href);
WordExtractor wordExtractor = new WordExtractor( hwpfDocument ); WordExtractor wordExtractor = new WordExtractor(hwpfDocument);
try {
wordExtractor.getText(); wordExtractor.getText();
} finally {
wordExtractor.close();
}
} }
} }
@ -650,13 +696,13 @@ public class TestBugs extends TestCase
*/ */
public void testBug51890() public void testBug51890()
{ {
HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "Bug51890.doc" ); HWPFDocument doc = HWPFTestDataSamples.openSampleFile("Bug51890.doc");
for ( Picture picture : doc.getPicturesTable().getAllPictures() ) for (Picture picture : doc.getPicturesTable().getAllPictures() )
{ {
PictureType pictureType = picture.suggestPictureType(); PictureType pictureType = picture.suggestPictureType();
logger.log( POILogger.DEBUG, logger.log(POILogger.DEBUG,
"Picture at offset " + picture.getStartOffset() "Picture at offset " + picture.getStartOffset()
+ " has type " + pictureType ); + " has type " + pictureType);
} }
} }
@ -670,9 +716,9 @@ public class TestBugs extends TestCase
* we don't have Java test for this file - it should be checked using * we don't have Java test for this file - it should be checked using
* Microsoft BFF Validator. But check read-write-read anyway. -- sergey * Microsoft BFF Validator. But check read-write-read anyway. -- sergey
*/ */
HWPFTestDataSamples.openSampleFile( "Bug51834.doc" ); HWPFTestDataSamples.openSampleFile("Bug51834.doc");
HWPFTestDataSamples.writeOutAndReadBack( HWPFTestDataSamples HWPFTestDataSamples.writeOutAndReadBack(HWPFTestDataSamples
.openSampleFile( "Bug51834.doc" ) ); .openSampleFile("Bug51834.doc"));
} }
/** /**
@ -680,8 +726,8 @@ public class TestBugs extends TestCase
*/ */
public void testBug51944() throws Exception public void testBug51944() throws Exception
{ {
HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile( "Bug51944.doc" ); HWPFOldDocument doc = HWPFTestDataSamples.openOldSampleFile("Bug51944.doc");
WordToTextConverter.getText( doc ); assertNotNull(WordToTextConverter.getText(doc));
} }
/** /**
@ -690,7 +736,7 @@ public class TestBugs extends TestCase
*/ */
public void testBug52032_1() throws Exception public void testBug52032_1() throws Exception
{ {
HWPFTestDataSamples.openSampleFile( "Bug52032_1.doc" ); assertNotNull(getText("Bug52032_1.doc"));
} }
/** /**
@ -699,7 +745,7 @@ public class TestBugs extends TestCase
*/ */
public void testBug52032_2() throws Exception public void testBug52032_2() throws Exception
{ {
HWPFTestDataSamples.openSampleFile( "Bug52032_2.doc" ); assertNotNull(getText("Bug52032_2.doc"));
} }
/** /**
@ -708,7 +754,7 @@ public class TestBugs extends TestCase
*/ */
public void testBug52032_3() throws Exception public void testBug52032_3() throws Exception
{ {
HWPFTestDataSamples.openSampleFile( "Bug52032_3.doc" ); assertNotNull(getText("Bug52032_3.doc"));
} }
/** /**
@ -716,7 +762,7 @@ public class TestBugs extends TestCase
*/ */
public void testBug53380_1() throws Exception public void testBug53380_1() throws Exception
{ {
HWPFTestDataSamples.openSampleFile( "Bug53380_1.doc" ); assertNotNull(getText("Bug53380_1.doc"));
} }
/** /**
@ -724,7 +770,7 @@ public class TestBugs extends TestCase
*/ */
public void testBug53380_2() throws Exception public void testBug53380_2() throws Exception
{ {
HWPFTestDataSamples.openSampleFile( "Bug53380_2.doc" ); assertNotNull(getText("Bug53380_2.doc"));
} }
/** /**
@ -732,7 +778,7 @@ public class TestBugs extends TestCase
*/ */
public void testBug53380_3() throws Exception public void testBug53380_3() throws Exception
{ {
HWPFTestDataSamples.openSampleFile( "Bug53380_3.doc" ); assertNotNull(getText("Bug53380_3.doc"));
} }
/** /**
@ -740,7 +786,7 @@ public class TestBugs extends TestCase
*/ */
public void testBug53380_4() throws Exception public void testBug53380_4() throws Exception
{ {
HWPFTestDataSamples.openSampleFile( "Bug53380_4.doc" ); assertNotNull(getText("Bug53380_4.doc"));
} }
/** /**
@ -752,6 +798,91 @@ public class TestBugs extends TestCase
public void DISABLEDtest56880() throws Exception { public void DISABLEDtest56880() throws Exception {
HWPFDocument doc = HWPFDocument doc =
HWPFTestDataSamples.openSampleFile("56880.doc"); HWPFTestDataSamples.openSampleFile("56880.doc");
assertEquals("Check Request", doc.getRange().text()); assertEqualsIgnoreNewline("Check Request", doc.getRange().text());
}
// These are the values the are explected to be read when the file
// is checked.
private int section1LeftMargin = 1440;
private int section1RightMargin = 1440;
private int section1TopMargin = 1440;
private int section1BottomMargin = 1440;
private int section1NumColumns = 1;
private int section2LeftMargin = 1440;
private int section2RightMargin = 1440;
private int section2TopMargin = 1440;
private int section2BottomMargin = 1440;
private int section2NumColumns = 3;
public void testHWPFSections() {
HWPFDocument document = null;
Paragraph para = null;
Section section = null;
Range overallRange = null;
int numParas = 0;
int numSections = 0;
document = HWPFTestDataSamples.openSampleFile("Bug53453Section.doc");
overallRange = document.getOverallRange();
numParas = overallRange.numParagraphs();
for(int i = 0; i < numParas; i++) {
para = overallRange.getParagraph(i);
numSections = para.numSections();
for(int j = 0; j < numSections; j++) {
section = para.getSection(j);
if(para.text().trim().equals("Section1")) {
assertEquals(section1BottomMargin, section.getMarginBottom());
assertEquals(section1LeftMargin, section.getMarginLeft());
assertEquals(section1RightMargin, section.getMarginRight());
assertEquals(section1TopMargin, section.getMarginTop());
assertEquals(section1NumColumns, section.getNumColumns());
}
else if(para.text().trim().equals("Section2")) {
assertEquals(section2BottomMargin, section.getMarginBottom());
assertEquals(section2LeftMargin, section.getMarginLeft());
assertEquals(section2RightMargin, section.getMarginRight());
assertEquals(section2TopMargin, section.getMarginTop());
assertEquals(section2NumColumns, section.getNumColumns());
// Change the margin widths
this.section2BottomMargin = (int)(1.5 * AbstractWordUtils.TWIPS_PER_INCH);
this.section2TopMargin = (int)(1.75 * AbstractWordUtils.TWIPS_PER_INCH);
this.section2LeftMargin = (int)(0.5 * AbstractWordUtils.TWIPS_PER_INCH);
this.section2RightMargin = (int)(0.75 * AbstractWordUtils.TWIPS_PER_INCH);
section.setMarginBottom(this.section2BottomMargin);
section.setMarginLeft(this.section2LeftMargin);
section.setMarginRight(this.section2RightMargin);
section.setMarginTop(this.section2TopMargin);
}
}
}
// Save away and re-read the document to prove the chages are permanent
document = HWPFTestDataSamples.writeOutAndReadBack(document);
overallRange = document.getOverallRange();
numParas = overallRange.numParagraphs();
for(int i = 0; i < numParas; i++) {
para = overallRange.getParagraph(i);
numSections = para.numSections();
for(int j = 0; j < numSections; j++) {
section = para.getSection(j);
if(para.text().trim().equals("Section1")) {
// No changes to the margins in Section1
assertEquals(section1BottomMargin, section.getMarginBottom());
assertEquals(section1LeftMargin, section.getMarginLeft());
assertEquals(section1RightMargin, section.getMarginRight());
assertEquals(section1TopMargin, section.getMarginTop());
assertEquals(section1NumColumns, section.getNumColumns());
}
else if(para.text().trim().equals("Section2")) {
// The margins in Section2 have kept the new settings.
assertEquals(section2BottomMargin, section.getMarginBottom());
assertEquals(section2LeftMargin, section.getMarginLeft());
assertEquals(section2RightMargin, section.getMarginRight());
assertEquals(section2TopMargin, section.getMarginTop());
assertEquals(section2NumColumns, section.getNumColumns());
}
}
}
} }
} }

BIN
test-data/document/Bug53453Section.doc Normal file
View File

Binary file not shown.