You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ta...@apache.org on 2015/05/29 16:01:33 UTC
svn commit: r1682473 [7/8] - in /poi/trunk/src/ooxml:
java/org/apache/poi/util/ java/org/apache/poi/xwpf/
java/org/apache/poi/xwpf/extractor/ java/org/apache/poi/xwpf/model/
java/org/apache/poi/xwpf/usermodel/ testcases/org/apache/poi/xwpf/
testcases/o...
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java?rev=1682473&r1=1682472&r2=1682473&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java Fri May 29 14:01:31 2015
@@ -40,7 +40,7 @@ import org.junit.Test;
public class TestXWPFBugs {
/**
* A word document that's encrypted with non-standard
- * Encryption options, and no cspname section. See bug 53475
+ * Encryption options, and no cspname section. See bug 53475
*/
@Test
public void bug53475NoCSPName() throws Exception {
@@ -54,7 +54,7 @@ public class TestXWPFBugs {
assertEquals(HashAlgorithm.sha1, info.getHeader().getHashAlgorithmEx());
// Check it can be decoded
- Decryptor d = Decryptor.getInstance(info);
+ Decryptor d = Decryptor.getInstance(info);
assertTrue("Unable to process: document is encrypted", d.verifyPassword("solrcell"));
// Check we can read the word document in that
@@ -66,7 +66,7 @@ public class TestXWPFBugs {
assertNotNull(text);
assertEquals("This is password protected Word document.", text.trim());
ex.close();
-
+
filesystem.close();
}
@@ -90,7 +90,7 @@ public class TestXWPFBugs {
assertEquals(HashAlgorithm.sha1, info.getHeader().getHashAlgorithmEx());
// Check it can be decoded
- Decryptor d = Decryptor.getInstance(info);
+ Decryptor d = Decryptor.getInstance(info);
assertTrue("Unable to process: document is encrypted", d.verifyPassword("pass"));
// Check we can read the word document in that
@@ -103,7 +103,7 @@ public class TestXWPFBugs {
// I know ... a stupid typo, maybe next time ...
assertEquals("The is a password protected document.", text.trim());
ex.close();
-
+
filesystem.close();
}
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestExternalEntities.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestExternalEntities.java?rev=1682473&r1=1682472&r2=1682473&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestExternalEntities.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestExternalEntities.java Fri May 29 14:01:31 2015
@@ -20,7 +20,6 @@ package org.apache.poi.xwpf.extractor;
import java.io.IOException;
import junit.framework.TestCase;
-
import org.apache.poi.xwpf.XWPFTestDataSamples;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
@@ -28,19 +27,20 @@ public class TestExternalEntities extend
/**
* Get text out of the simple file
- * @throws IOException
+ *
+ * @throws IOException
*/
public void testFile() throws IOException {
XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("ExternalEntityInText.docx");
XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
String text = extractor.getText();
-
+
assertTrue(text.length() > 0);
// Check contents, they should not contain the text from POI web site after colon!
assertEquals("Here should not be the POI web site: \"\"", text.trim());
-
+
extractor.close();
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java?rev=1682473&r1=1682472&r2=1682473&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java Fri May 29 14:01:31 2015
@@ -22,7 +22,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import junit.framework.TestCase;
-
import org.apache.poi.xwpf.XWPFTestDataSamples;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
@@ -33,7 +32,8 @@ public class TestXWPFWordExtractor exten
/**
* Get text out of the simple file
- * @throws IOException
+ *
+ * @throws IOException
*/
public void testGetSimpleText() throws IOException {
XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
@@ -59,13 +59,14 @@ public class TestXWPFWordExtractor exten
}
}
assertEquals(3, ps);
-
+
extractor.close();
}
/**
* Tests getting the text out of a complex file
- * @throws IOException
+ *
+ * @throws IOException
*/
public void testGetComplexText() throws IOException {
XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("IllustrativeCases.docx");
@@ -97,7 +98,7 @@ public class TestXWPFWordExtractor exten
}
}
assertEquals(134, ps);
-
+
extractor.close();
}
@@ -108,23 +109,23 @@ public class TestXWPFWordExtractor exten
// Now check contents
extractor.setFetchHyperlinks(false);
assertEquals(
- "This is a test document.\nThis bit is in bold and italic\n" +
- "Back to normal\n" +
- "This contains BOLD, ITALIC and BOTH, as well as RED and YELLOW text.\n" +
- "We have a hyperlink here, and another.\n",
+ "This is a test document.\nThis bit is in bold and italic\n" +
+ "Back to normal\n" +
+ "This contains BOLD, ITALIC and BOTH, as well as RED and YELLOW text.\n" +
+ "We have a hyperlink here, and another.\n",
extractor.getText()
);
// One hyperlink is a real one, one is just to the top of page
extractor.setFetchHyperlinks(true);
assertEquals(
- "This is a test document.\nThis bit is in bold and italic\n" +
- "Back to normal\n" +
- "This contains BOLD, ITALIC and BOTH, as well as RED and YELLOW text.\n" +
- "We have a hyperlink <http://poi.apache.org/> here, and another.\n",
+ "This is a test document.\nThis bit is in bold and italic\n" +
+ "Back to normal\n" +
+ "This contains BOLD, ITALIC and BOTH, as well as RED and YELLOW text.\n" +
+ "We have a hyperlink <http://poi.apache.org/> here, and another.\n",
extractor.getText()
);
-
+
extractor.close();
}
@@ -173,7 +174,7 @@ public class TestXWPFWordExtractor exten
"Footer Left\tFooter Middle\tFooter Right\n",
extractor.getText()
);
-
+
extractor.close();
}
@@ -183,7 +184,7 @@ public class TestXWPFWordExtractor exten
String text = extractor.getText();
assertTrue(text.contains("snoska"));
assertTrue(text.contains("Eto ochen prostoy[footnoteRef:1] text so snoskoy"));
-
+
extractor.close();
}
@@ -193,7 +194,7 @@ public class TestXWPFWordExtractor exten
XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
assertTrue(extractor.getText().contains("snoska"));
-
+
extractor.close();
}
@@ -204,7 +205,7 @@ public class TestXWPFWordExtractor exten
String text = extractor.getText();
assertTrue("Unable to find expected word in text\n" + text, text.contains("testdoc"));
assertTrue("Unable to find expected word in text\n" + text, text.contains("test phrase"));
-
+
extractor.close();
}
@@ -214,7 +215,7 @@ public class TestXWPFWordExtractor exten
String text = extractor.getText();
assertTrue(text.contains("XXX"));
assertTrue(text.contains("tilaka [endnoteRef:2]or 'tika'"));
-
+
extractor.close();
}
@@ -224,7 +225,7 @@ public class TestXWPFWordExtractor exten
assertTrue(extractor.getText().contains("pendant worn"));
assertTrue(extractor.getText().contains("extremely well"));
-
+
extractor.close();
}
@@ -235,14 +236,15 @@ public class TestXWPFWordExtractor exten
assertTrue(extractor.getText().contains("Section 1"));
assertTrue(extractor.getText().contains("Section 2"));
assertTrue(extractor.getText().contains("Section 3"));
-
+
extractor.close();
}
/**
* Test that we can open and process .docm
- * (macro enabled) docx files (bug #45690)
- * @throws IOException
+ * (macro enabled) docx files (bug #45690)
+ *
+ * @throws IOException
*/
public void testDOCMFiles() throws IOException {
XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("45690.docm");
@@ -251,35 +253,37 @@ public class TestXWPFWordExtractor exten
assertTrue(extractor.getText().contains("2004"));
assertTrue(extractor.getText().contains("2008"));
assertTrue(extractor.getText().contains("(120 "));
-
+
extractor.close();
}
-
+
/**
* Test that we handle things like tabs and
- * carriage returns properly in the text that
- * we're extracting (bug #49189)
- * @throws IOException
+ * carriage returns properly in the text that
+ * we're extracting (bug #49189)
+ *
+ * @throws IOException
*/
public void testDocTabs() throws IOException {
- XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("WithTabs.docx");
- XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-
- // Check bits
- assertTrue(extractor.getText().contains("a"));
- assertTrue(extractor.getText().contains("\t"));
- assertTrue(extractor.getText().contains("b"));
-
- // Now check the first paragraph in total
- assertTrue(extractor.getText().contains("a\tb\n"));
-
- extractor.close();
+ XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("WithTabs.docx");
+ XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
+
+ // Check bits
+ assertTrue(extractor.getText().contains("a"));
+ assertTrue(extractor.getText().contains("\t"));
+ assertTrue(extractor.getText().contains("b"));
+
+ // Now check the first paragraph in total
+ assertTrue(extractor.getText().contains("a\tb\n"));
+
+ extractor.close();
}
-
+
/**
* The output should not contain field codes, e.g. those specified in the
* w:instrText tag (spec sec. 17.16.23)
- * @throws IOException
+ *
+ * @throws IOException
*/
public void testNoFieldCodes() throws IOException {
XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("FieldCodes.docx");
@@ -288,14 +292,15 @@ public class TestXWPFWordExtractor exten
assertTrue(text.length() > 0);
assertFalse(text.contains("AUTHOR"));
assertFalse(text.contains("CREATEDATE"));
-
+
extractor.close();
}
-
+
/**
* The output should contain the values of simple fields, those specified
* with the fldSimple element (spec sec. 17.16.19)
- * @throws IOException
+ *
+ * @throws IOException
*/
public void testFldSimpleContent() throws IOException {
XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("FldSimple.docx");
@@ -303,7 +308,7 @@ public class TestXWPFWordExtractor exten
String text = extractor.getText();
assertTrue(text.length() > 0);
assertTrue(text.contains("FldSimple.docx"));
-
+
extractor.close();
}
@@ -316,12 +321,13 @@ public class TestXWPFWordExtractor exten
XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
String text = extractor.getText();
assertTrue(text.length() > 0);
-
+
extractor.close();
}
-
+
/**
* Test for basic extraction of SDT content
+ *
* @throws IOException
*/
public void testSimpleControlContent() throws IOException {
@@ -345,19 +351,19 @@ public class TestXWPFWordExtractor exten
XWPFWordExtractor ex = new XWPFWordExtractor(doc);
String s = ex.getText().toLowerCase();
int hits = 0;
-
- for (String targ : targs){
+
+ for (String targ : targs) {
boolean hit = false;
- if (s.indexOf(targ) > -1){
+ if (s.indexOf(targ) > -1) {
hit = true;
hits++;
}
- assertEquals("controlled content loading-"+targ, true, hit);
+ assertEquals("controlled content loading-" + targ, true, hit);
}
assertEquals("controlled content loading hit count", targs.length, hits);
ex.close();
-
-
+
+
doc = XWPFTestDataSamples.openSampleDocument("Bug54771a.docx");
targs = new String[]{
"bb",
@@ -366,48 +372,50 @@ public class TestXWPFWordExtractor exten
};
ex = new XWPFWordExtractor(doc);
s = ex.getText().toLowerCase();
-
+
//At one point in development there were three copies of the text.
//This ensures that there is only one copy.
- for (String targ : targs){
+ for (String targ : targs) {
Matcher m = Pattern.compile(targ).matcher(s);
int hit = 0;
while (m.find()) {
hit++;
}
- assertEquals("controlled content loading-"+targ, 1, hit);
+ assertEquals("controlled content loading-" + targ, 1, hit);
}
//"test\n" appears twice: once as the "title" and once in the text.
//This also happens when you save this document as text from MSWord.
Matcher m = Pattern.compile("test\n").matcher(s);
int hit = 0;
- while (m.find()){
+ while (m.find()) {
hit++;
}
assertEquals("test<N>", 2, hit);
ex.close();
}
- /** No Header or Footer in document */
+ /**
+ * No Header or Footer in document
+ */
public void testBug55733() throws Exception {
XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("55733.docx");
- XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
+ XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
// Check it gives text without error
extractor.getText();
extractor.close();
}
-
- public void testCheckboxes() throws IOException {
+
+ public void testCheckboxes() throws IOException {
XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("checkboxes.docx");
System.out.println(doc);
XWPFWordExtractor extractor = new XWPFWordExtractor(doc);
-
+
assertEquals("This is a small test for checkboxes \nunchecked: |_| \n" +
- "Or checked: |X|\n\n\n\n\n" +
- "Test a checkbox within a textbox: |_| -> |X|\n\n\n" +
- "In Table:\n|_|\t|X|\n\n\n" +
- "In Sequence:\n|X||_||X|\n", extractor.getText());
+ "Or checked: |X|\n\n\n\n\n" +
+ "Test a checkbox within a textbox: |_| -> |X|\n\n\n" +
+ "In Table:\n|_|\t|X|\n\n\n" +
+ "In Sequence:\n|X||_||X|\n", extractor.getText());
extractor.close();
}
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFDecorators.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFDecorators.java?rev=1682473&r1=1682472&r2=1682473&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFDecorators.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFDecorators.java Fri May 29 14:01:31 2015
@@ -17,86 +17,85 @@
package org.apache.poi.xwpf.model;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFHyperlinkRun;
+import java.io.IOException;
+
+import junit.framework.TestCase;
+import org.apache.poi.xwpf.XWPFTestDataSamples;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.poi.xwpf.usermodel.XWPFHyperlinkRun;
import org.apache.poi.xwpf.usermodel.XWPFParagraph;
/**
- * Tests for the various XWPF decorators
- */
-public class TestXWPFDecorators extends TestCase {
- private XWPFDocument simple;
- private XWPFDocument hyperlink;
- private XWPFDocument comments;
-
- protected void setUp() throws IOException {
- simple = XWPFTestDataSamples.openSampleDocument("SampleDoc.docx");
- hyperlink = XWPFTestDataSamples.openSampleDocument("TestDocument.docx");
- comments = XWPFTestDataSamples.openSampleDocument("WordWithAttachments.docx");
- }
-
- @SuppressWarnings("deprecation")
- public void testHyperlink() {
- XWPFParagraph ps;
- XWPFParagraph ph;
- assertEquals(7, simple.getParagraphs().size());
- assertEquals(5, hyperlink.getParagraphs().size());
-
- // Simple text
- ps = simple.getParagraphs().get(0);
- assertEquals("I am a test document", ps.getParagraphText());
- assertEquals(1, ps.getRuns().size());
-
- ph = hyperlink.getParagraphs().get(4);
- assertEquals("We have a hyperlink here, and another.", ph.getParagraphText());
- assertEquals(3, ph.getRuns().size());
-
-
- // The proper way to do hyperlinks(!)
- assertFalse(ps.getRuns().get(0) instanceof XWPFHyperlinkRun);
- assertFalse(ph.getRuns().get(0) instanceof XWPFHyperlinkRun);
- assertTrue(ph.getRuns().get(1) instanceof XWPFHyperlinkRun);
- assertFalse(ph.getRuns().get(2) instanceof XWPFHyperlinkRun);
-
- XWPFHyperlinkRun link = (XWPFHyperlinkRun)ph.getRuns().get(1);
- assertEquals("http://poi.apache.org/", link.getHyperlink(hyperlink).getURL());
-
-
- // Test the old style decorator
- // You probably don't want to still be using it...
- assertEquals(
- "I am a test document",
- (new XWPFHyperlinkDecorator(ps, null, false)).getText()
- );
- assertEquals(
- "I am a test document",
- (new XWPFHyperlinkDecorator(ps, null, true)).getText()
- );
-
- assertEquals(
- "We have a hyperlink here, and another.hyperlink",
- (new XWPFHyperlinkDecorator(ph, null, false)).getText()
- );
- assertEquals(
- "We have a hyperlink here, and another.hyperlink <http://poi.apache.org/>",
- (new XWPFHyperlinkDecorator(ph, null, true)).getText()
- );
- }
-
- public void testComments() {
- int numComments = 0;
- for(XWPFParagraph p : comments.getParagraphs()) {
- XWPFCommentsDecorator d = new XWPFCommentsDecorator(p, null);
- if(d.getCommentText().length() > 0) {
- numComments++;
- assertEquals("\tComment by", d.getCommentText().substring(0, 11));
- }
- }
- assertEquals(3, numComments);
- }
-}
+ * Tests for the various XWPF decorators
+ */
+public class TestXWPFDecorators extends TestCase {
+ private XWPFDocument simple;
+ private XWPFDocument hyperlink;
+ private XWPFDocument comments;
+
+ protected void setUp() throws IOException {
+ simple = XWPFTestDataSamples.openSampleDocument("SampleDoc.docx");
+ hyperlink = XWPFTestDataSamples.openSampleDocument("TestDocument.docx");
+ comments = XWPFTestDataSamples.openSampleDocument("WordWithAttachments.docx");
+ }
+
+ @SuppressWarnings("deprecation")
+ public void testHyperlink() {
+ XWPFParagraph ps;
+ XWPFParagraph ph;
+ assertEquals(7, simple.getParagraphs().size());
+ assertEquals(5, hyperlink.getParagraphs().size());
+
+ // Simple text
+ ps = simple.getParagraphs().get(0);
+ assertEquals("I am a test document", ps.getParagraphText());
+ assertEquals(1, ps.getRuns().size());
+
+ ph = hyperlink.getParagraphs().get(4);
+ assertEquals("We have a hyperlink here, and another.", ph.getParagraphText());
+ assertEquals(3, ph.getRuns().size());
+
+
+ // The proper way to do hyperlinks(!)
+ assertFalse(ps.getRuns().get(0) instanceof XWPFHyperlinkRun);
+ assertFalse(ph.getRuns().get(0) instanceof XWPFHyperlinkRun);
+ assertTrue(ph.getRuns().get(1) instanceof XWPFHyperlinkRun);
+ assertFalse(ph.getRuns().get(2) instanceof XWPFHyperlinkRun);
+
+ XWPFHyperlinkRun link = (XWPFHyperlinkRun) ph.getRuns().get(1);
+ assertEquals("http://poi.apache.org/", link.getHyperlink(hyperlink).getURL());
+
+
+ // Test the old style decorator
+ // You probably don't want to still be using it...
+ assertEquals(
+ "I am a test document",
+ (new XWPFHyperlinkDecorator(ps, null, false)).getText()
+ );
+ assertEquals(
+ "I am a test document",
+ (new XWPFHyperlinkDecorator(ps, null, true)).getText()
+ );
+
+ assertEquals(
+ "We have a hyperlink here, and another.hyperlink",
+ (new XWPFHyperlinkDecorator(ph, null, false)).getText()
+ );
+ assertEquals(
+ "We have a hyperlink here, and another.hyperlink <http://poi.apache.org/>",
+ (new XWPFHyperlinkDecorator(ph, null, true)).getText()
+ );
+ }
+
+ public void testComments() {
+ int numComments = 0;
+ for (XWPFParagraph p : comments.getParagraphs()) {
+ XWPFCommentsDecorator d = new XWPFCommentsDecorator(p, null);
+ if (d.getCommentText().length() > 0) {
+ numComments++;
+ assertEquals("\tComment by", d.getCommentText().substring(0, 11));
+ }
+ }
+ assertEquals(3, numComments);
+ }
+}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java?rev=1682473&r1=1682472&r2=1682473&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java Fri May 29 14:01:31 2015
@@ -20,7 +20,6 @@ package org.apache.poi.xwpf.model;
import java.io.IOException;
import junit.framework.TestCase;
-
import org.apache.poi.xwpf.XWPFTestDataSamples;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
@@ -28,130 +27,130 @@ import org.apache.poi.xwpf.usermodel.XWP
* Tests for XWPF Header Footer Stuff
*/
public class TestXWPFHeaderFooterPolicy extends TestCase {
- private XWPFDocument noHeader;
- private XWPFDocument header;
- private XWPFDocument headerFooter;
- private XWPFDocument footer;
- private XWPFDocument oddEven;
- private XWPFDocument diffFirst;
-
- protected void setUp() throws IOException {
-
- noHeader = XWPFTestDataSamples.openSampleDocument("NoHeadFoot.docx");
- header = XWPFTestDataSamples.openSampleDocument("ThreeColHead.docx");
- headerFooter = XWPFTestDataSamples.openSampleDocument("SimpleHeadThreeColFoot.docx");
- footer = XWPFTestDataSamples.openSampleDocument("FancyFoot.docx");
- oddEven = XWPFTestDataSamples.openSampleDocument("PageSpecificHeadFoot.docx");
- diffFirst = XWPFTestDataSamples.openSampleDocument("DiffFirstPageHeadFoot.docx");
- }
-
- public void testPolicy() {
- XWPFHeaderFooterPolicy policy;
-
- policy = noHeader.getHeaderFooterPolicy();
- assertNull(policy.getDefaultHeader());
- assertNull(policy.getDefaultFooter());
-
- assertNull(policy.getHeader(1));
- assertNull(policy.getHeader(2));
- assertNull(policy.getHeader(3));
- assertNull(policy.getFooter(1));
- assertNull(policy.getFooter(2));
- assertNull(policy.getFooter(3));
-
-
- policy = header.getHeaderFooterPolicy();
- assertNotNull(policy.getDefaultHeader());
- assertNull(policy.getDefaultFooter());
-
- assertEquals(policy.getDefaultHeader(), policy.getHeader(1));
- assertEquals(policy.getDefaultHeader(), policy.getHeader(2));
- assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
- assertNull(policy.getFooter(1));
- assertNull(policy.getFooter(2));
- assertNull(policy.getFooter(3));
-
-
- policy = footer.getHeaderFooterPolicy();
- assertNull(policy.getDefaultHeader());
- assertNotNull(policy.getDefaultFooter());
-
- assertNull(policy.getHeader(1));
- assertNull(policy.getHeader(2));
- assertNull(policy.getHeader(3));
- assertEquals(policy.getDefaultFooter(), policy.getFooter(1));
- assertEquals(policy.getDefaultFooter(), policy.getFooter(2));
- assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
-
-
- policy = headerFooter.getHeaderFooterPolicy();
- assertNotNull(policy.getDefaultHeader());
- assertNotNull(policy.getDefaultFooter());
-
- assertEquals(policy.getDefaultHeader(), policy.getHeader(1));
- assertEquals(policy.getDefaultHeader(), policy.getHeader(2));
- assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
- assertEquals(policy.getDefaultFooter(), policy.getFooter(1));
- assertEquals(policy.getDefaultFooter(), policy.getFooter(2));
- assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
-
-
- policy = oddEven.getHeaderFooterPolicy();
- assertNotNull(policy.getDefaultHeader());
- assertNotNull(policy.getDefaultFooter());
- assertNotNull(policy.getEvenPageHeader());
- assertNotNull(policy.getEvenPageFooter());
-
- assertEquals(policy.getDefaultHeader(), policy.getHeader(1));
- assertEquals(policy.getEvenPageHeader(), policy.getHeader(2));
- assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
- assertEquals(policy.getDefaultFooter(), policy.getFooter(1));
- assertEquals(policy.getEvenPageFooter(), policy.getFooter(2));
- assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
-
-
- policy = diffFirst.getHeaderFooterPolicy();
- assertNotNull(policy.getDefaultHeader());
- assertNotNull(policy.getDefaultFooter());
- assertNotNull(policy.getFirstPageHeader());
- assertNotNull(policy.getFirstPageFooter());
- assertNull(policy.getEvenPageHeader());
- assertNull(policy.getEvenPageFooter());
-
- assertEquals(policy.getFirstPageHeader(), policy.getHeader(1));
- assertEquals(policy.getDefaultHeader(), policy.getHeader(2));
- assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
- assertEquals(policy.getFirstPageFooter(), policy.getFooter(1));
- assertEquals(policy.getDefaultFooter(), policy.getFooter(2));
- assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
- }
-
- public void testContents() {
- XWPFHeaderFooterPolicy policy;
-
- // Test a few simple bits off a simple header
- policy = diffFirst.getHeaderFooterPolicy();
-
- assertEquals(
- "I am the header on the first page, and I" + '\u2019' + "m nice and simple\n",
- policy.getFirstPageHeader().getText()
- );
- assertEquals(
- "First header column!\tMid header\tRight header!\n",
- policy.getDefaultHeader().getText()
- );
-
-
- // And a few bits off a more complex header
- policy = oddEven.getHeaderFooterPolicy();
-
- assertEquals(
- "[ODD Page Header text]\n\n",
- policy.getDefaultHeader().getText()
- );
- assertEquals(
- "[This is an Even Page, with a Header]\n\n",
- policy.getEvenPageHeader().getText()
- );
- }
+ private XWPFDocument noHeader;
+ private XWPFDocument header;
+ private XWPFDocument headerFooter;
+ private XWPFDocument footer;
+ private XWPFDocument oddEven;
+ private XWPFDocument diffFirst;
+
+ protected void setUp() throws IOException {
+
+ noHeader = XWPFTestDataSamples.openSampleDocument("NoHeadFoot.docx");
+ header = XWPFTestDataSamples.openSampleDocument("ThreeColHead.docx");
+ headerFooter = XWPFTestDataSamples.openSampleDocument("SimpleHeadThreeColFoot.docx");
+ footer = XWPFTestDataSamples.openSampleDocument("FancyFoot.docx");
+ oddEven = XWPFTestDataSamples.openSampleDocument("PageSpecificHeadFoot.docx");
+ diffFirst = XWPFTestDataSamples.openSampleDocument("DiffFirstPageHeadFoot.docx");
+ }
+
+ public void testPolicy() {
+ XWPFHeaderFooterPolicy policy;
+
+ policy = noHeader.getHeaderFooterPolicy();
+ assertNull(policy.getDefaultHeader());
+ assertNull(policy.getDefaultFooter());
+
+ assertNull(policy.getHeader(1));
+ assertNull(policy.getHeader(2));
+ assertNull(policy.getHeader(3));
+ assertNull(policy.getFooter(1));
+ assertNull(policy.getFooter(2));
+ assertNull(policy.getFooter(3));
+
+
+ policy = header.getHeaderFooterPolicy();
+ assertNotNull(policy.getDefaultHeader());
+ assertNull(policy.getDefaultFooter());
+
+ assertEquals(policy.getDefaultHeader(), policy.getHeader(1));
+ assertEquals(policy.getDefaultHeader(), policy.getHeader(2));
+ assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
+ assertNull(policy.getFooter(1));
+ assertNull(policy.getFooter(2));
+ assertNull(policy.getFooter(3));
+
+
+ policy = footer.getHeaderFooterPolicy();
+ assertNull(policy.getDefaultHeader());
+ assertNotNull(policy.getDefaultFooter());
+
+ assertNull(policy.getHeader(1));
+ assertNull(policy.getHeader(2));
+ assertNull(policy.getHeader(3));
+ assertEquals(policy.getDefaultFooter(), policy.getFooter(1));
+ assertEquals(policy.getDefaultFooter(), policy.getFooter(2));
+ assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
+
+
+ policy = headerFooter.getHeaderFooterPolicy();
+ assertNotNull(policy.getDefaultHeader());
+ assertNotNull(policy.getDefaultFooter());
+
+ assertEquals(policy.getDefaultHeader(), policy.getHeader(1));
+ assertEquals(policy.getDefaultHeader(), policy.getHeader(2));
+ assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
+ assertEquals(policy.getDefaultFooter(), policy.getFooter(1));
+ assertEquals(policy.getDefaultFooter(), policy.getFooter(2));
+ assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
+
+
+ policy = oddEven.getHeaderFooterPolicy();
+ assertNotNull(policy.getDefaultHeader());
+ assertNotNull(policy.getDefaultFooter());
+ assertNotNull(policy.getEvenPageHeader());
+ assertNotNull(policy.getEvenPageFooter());
+
+ assertEquals(policy.getDefaultHeader(), policy.getHeader(1));
+ assertEquals(policy.getEvenPageHeader(), policy.getHeader(2));
+ assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
+ assertEquals(policy.getDefaultFooter(), policy.getFooter(1));
+ assertEquals(policy.getEvenPageFooter(), policy.getFooter(2));
+ assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
+
+
+ policy = diffFirst.getHeaderFooterPolicy();
+ assertNotNull(policy.getDefaultHeader());
+ assertNotNull(policy.getDefaultFooter());
+ assertNotNull(policy.getFirstPageHeader());
+ assertNotNull(policy.getFirstPageFooter());
+ assertNull(policy.getEvenPageHeader());
+ assertNull(policy.getEvenPageFooter());
+
+ assertEquals(policy.getFirstPageHeader(), policy.getHeader(1));
+ assertEquals(policy.getDefaultHeader(), policy.getHeader(2));
+ assertEquals(policy.getDefaultHeader(), policy.getHeader(3));
+ assertEquals(policy.getFirstPageFooter(), policy.getFooter(1));
+ assertEquals(policy.getDefaultFooter(), policy.getFooter(2));
+ assertEquals(policy.getDefaultFooter(), policy.getFooter(3));
+ }
+
+ public void testContents() {
+ XWPFHeaderFooterPolicy policy;
+
+ // Test a few simple bits off a simple header
+ policy = diffFirst.getHeaderFooterPolicy();
+
+ assertEquals(
+ "I am the header on the first page, and I" + '\u2019' + "m nice and simple\n",
+ policy.getFirstPageHeader().getText()
+ );
+ assertEquals(
+ "First header column!\tMid header\tRight header!\n",
+ policy.getDefaultHeader().getText()
+ );
+
+
+ // And a few bits off a more complex header
+ policy = oddEven.getHeaderFooterPolicy();
+
+ assertEquals(
+ "[ODD Page Header text]\n\n",
+ policy.getDefaultHeader().getText()
+ );
+ assertEquals(
+ "[This is an Even Page, with a Header]\n\n",
+ policy.getEvenPageHeader().getText()
+ );
+ }
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestChangeTracking.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestChangeTracking.java?rev=1682473&r1=1682472&r2=1682473&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestChangeTracking.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestChangeTracking.java Fri May 29 14:01:31 2015
@@ -44,7 +44,7 @@ public class TestChangeTracking {
assertFalse(document.isTrackRevisions());
document.setTrackRevisions(true);
-
+
assertTrue(document.isTrackRevisions());
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java?rev=1682473&r1=1682472&r2=1682473&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java Fri May 29 14:01:31 2015
@@ -19,11 +19,9 @@ package org.apache.poi.xwpf.usermodel;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import java.io.FileInputStream;
import java.io.IOException;
import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
-import org.apache.poi.openxml4j.opc.OPCPackage;
import org.apache.poi.xwpf.XWPFTestDataSamples;
import org.apache.poi.xwpf.usermodel.XWPFRun.FontCharRange;
import org.junit.Test;
@@ -32,14 +30,14 @@ public class TestXWPFBugs {
@Test
public void bug55802() throws Exception {
String blabla =
- "Bir, iki, \u00fc\u00e7, d\u00f6rt, be\u015f,\n"+
- "\nalt\u0131, yedi, sekiz, dokuz, on.\n"+
- "\nK\u0131rm\u0131z\u0131 don,\n"+
- "\ngel bizim bah\u00e7eye kon,\n"+
- "\nsar\u0131 limon";
+ "Bir, iki, \u00fc\u00e7, d\u00f6rt, be\u015f,\n" +
+ "\nalt\u0131, yedi, sekiz, dokuz, on.\n" +
+ "\nK\u0131rm\u0131z\u0131 don,\n" +
+ "\ngel bizim bah\u00e7eye kon,\n" +
+ "\nsar\u0131 limon";
XWPFDocument doc = new XWPFDocument();
XWPFRun run = doc.createParagraph().createRun();
-
+
for (String str : blabla.split("\n")) {
run.setText(str);
run.addBreak();
@@ -55,40 +53,40 @@ public class TestXWPFBugs {
assertEquals(run.getFontFamily(FontCharRange.hAnsi), "Arial");
}
-
+
@Test
public void bug57312_NullPointException() throws IOException {
XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("57312.docx");
assertNotNull(doc);
-
- for( IBodyElement bodyElement : doc.getBodyElements()){
+
+ for (IBodyElement bodyElement : doc.getBodyElements()) {
BodyElementType elementType = bodyElement.getElementType();
-
- if(elementType == BodyElementType.PARAGRAPH) {
+
+ if (elementType == BodyElementType.PARAGRAPH) {
XWPFParagraph paragraph = (XWPFParagraph) bodyElement;
-
- for (IRunElement iRunElem : paragraph.getIRuns()){
-
- if (iRunElem instanceof XWPFRun){
+
+ for (IRunElement iRunElem : paragraph.getIRuns()) {
+
+ if (iRunElem instanceof XWPFRun) {
XWPFRun runElement = (XWPFRun) iRunElem;
-
+
UnderlinePatterns underline = runElement.getUnderline();
assertNotNull(underline);
-
+
//System.out.println("Found: " + underline + ": " + runElement.getText(0));
}
}
- }
+ }
}
}
-
+
@Test
public void test56392() throws IOException, OpenXML4JException {
XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("56392.docx");
- assertNotNull(doc);
+ assertNotNull(doc);
}
-
+
/**
* Removing a run needs to remove it from both Runs and IRuns
*/
@@ -97,7 +95,7 @@ public class TestXWPFBugs {
XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
assertNotNull(doc);
assertEquals(3, doc.getParagraphs().size());
-
+
for (XWPFParagraph paragraph : doc.getParagraphs()) {
paragraph.removeRun(0);
assertNotNull(paragraph.getText());
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java?rev=1682473&r1=1682472&r2=1682473&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java Fri May 29 14:01:31 2015
@@ -23,7 +23,6 @@ import java.util.Arrays;
import java.util.List;
import junit.framework.TestCase;
-
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.POIXMLProperties;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -44,8 +43,8 @@ public final class TestXWPFDocument exte
OPCPackage pack = doc.getPackage();
boolean found = false;
- for(PackagePart part : pack.getParts()) {
- if(part.getContentType().equals(XWPFRelation.DOCUMENT.getContentType())) {
+ for (PackagePart part : pack.getParts()) {
+ if (part.getContentType().equals(XWPFRelation.DOCUMENT.getContentType())) {
found = true;
}
if (false) {
@@ -106,7 +105,7 @@ public final class TestXWPFDocument exte
assertEquals("Apache POI", props.getExtendedProperties().getUnderlyingProperties().getApplication());
}
- public void testAddParagraph() throws IOException{
+ public void testAddParagraph() throws IOException {
XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
assertEquals(3, doc.getParagraphs().size());
@@ -129,15 +128,15 @@ public final class TestXWPFDocument exte
public void testAddPicture() throws IOException, InvalidFormatException {
XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
byte[] jpeg = XWPFTestDataSamples.getImage("nature1.jpg");
- String relationId = doc.addPictureData(jpeg,XWPFDocument.PICTURE_TYPE_JPEG);
+ String relationId = doc.addPictureData(jpeg, XWPFDocument.PICTURE_TYPE_JPEG);
byte[] newJpeg = ((XWPFPictureData) doc.getRelationById(relationId)).getData();
- assertEquals(newJpeg.length,jpeg.length);
- for (int i = 0 ; i < jpeg.length ; i++)
- {
- assertEquals(newJpeg[i],jpeg[i]);
+ assertEquals(newJpeg.length, jpeg.length);
+ for (int i = 0; i < jpeg.length; i++) {
+ assertEquals(newJpeg[i], jpeg[i]);
}
}
+
public void testAllPictureFormats() throws IOException, InvalidFormatException {
XWPFDocument doc = new XWPFDocument();
@@ -235,7 +234,7 @@ public final class TestXWPFDocument exte
os.close();
XWPFHeader xwpfHeader = doc.getHeaderArray(0);
PackageRelationship relationship = xwpfHeader.getPackagePart().addRelationship(partName, TargetMode.INTERNAL, jpgRelation.getRelation());
- XWPFPictureData newPicData = new XWPFPictureData(newImagePart,relationship);
+ XWPFPictureData newPicData = new XWPFPictureData(newImagePart, relationship);
/* new part is now ready to rumble */
assertFalse(xwpfHeader.getAllPictures().contains(newPicData));
@@ -267,7 +266,7 @@ public final class TestXWPFDocument exte
List<XWPFPictureData> allPackagePictures = doc.getAllPackagePictures();
assertNotNull(allPictures);
- assertEquals(3,allPictures.size());
+ assertEquals(3, allPictures.size());
for (XWPFPictureData xwpfPictureData : allPictures) {
assertTrue(allPackagePictures.contains(xwpfPictureData));
}
@@ -287,7 +286,7 @@ public final class TestXWPFDocument exte
List<XWPFPictureData> allPackagePictures = doc.getAllPackagePictures();
assertNotNull(allPackagePictures);
- assertEquals(5,allPackagePictures.size());
+ assertEquals(5, allPackagePictures.size());
try {
allPackagePictures.add(allPackagePictures.get(0));
@@ -301,22 +300,22 @@ public final class TestXWPFDocument exte
public void testPictureHandlingSimpleFile() throws IOException, InvalidFormatException {
XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("issue_51265_1.docx");
- assertEquals(1,doc.getAllPackagePictures().size());
+ assertEquals(1, doc.getAllPackagePictures().size());
byte[] newPic = XWPFTestDataSamples.getImage("abstract4.jpg");
String id1 = doc.addPictureData(newPic, Document.PICTURE_TYPE_JPEG);
- assertEquals(2,doc.getAllPackagePictures().size());
+ assertEquals(2, doc.getAllPackagePictures().size());
/* copy data, to avoid instance-equality */
byte[] newPicCopy = Arrays.copyOf(newPic, newPic.length);
String id2 = doc.addPictureData(newPicCopy, Document.PICTURE_TYPE_JPEG);
- assertEquals(id1,id2);
+ assertEquals(id1, id2);
doc.getPackage().revert();
}
public void testPictureHandlingHeaderDocumentImages() throws IOException {
XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("issue_51265_2.docx");
- assertEquals(1,doc.getAllPictures().size());
- assertEquals(1,doc.getAllPackagePictures().size());
- assertEquals(1,doc.getHeaderArray(0).getAllPictures().size());
+ assertEquals(1, doc.getAllPictures().size());
+ assertEquals(1, doc.getAllPackagePictures().size());
+ assertEquals(1, doc.getHeaderArray(0).getAllPictures().size());
doc.getPackage().revert();
}
@@ -324,18 +323,19 @@ public final class TestXWPFDocument exte
XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("issue_51265_3.docx");
XWPFHeader xwpfHeader = doc.getHeaderArray(0);
- assertEquals(3,doc.getAllPictures().size());
- assertEquals(3,xwpfHeader.getAllPictures().size());
- assertEquals(5,doc.getAllPackagePictures().size());
+ assertEquals(3, doc.getAllPictures().size());
+ assertEquals(3, xwpfHeader.getAllPictures().size());
+ assertEquals(5, doc.getAllPackagePictures().size());
byte[] nature1 = XWPFTestDataSamples.getImage("nature1.jpg");
String id = doc.addPictureData(nature1, Document.PICTURE_TYPE_JPEG);
POIXMLDocumentPart part1 = xwpfHeader.getRelationById("rId1");
XWPFPictureData part2 = (XWPFPictureData) doc.getRelationById(id);
- assertSame(part1,part2);
+ assertSame(part1, part2);
doc.getPackage().revert();
}
+
public void testZeroLengthLibreOfficeDocumentWithWaterMarkHeader() throws IOException {
XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("zero-length.docx");
POIXMLProperties properties = doc.getProperties();
@@ -352,7 +352,7 @@ public final class TestXWPFDocument exte
assertEquals(0, extendedProperties.getUnderlyingProperties().getCharacters());
}
- public void testSettings(){
+ public void testSettings() {
XWPFSettings settings = new XWPFSettings();
settings.setZoomPercent(50);
assertEquals(50, settings.getZoomPercent());
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java?rev=1682473&r1=1682472&r2=1682473&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java Fri May 29 14:01:31 2015
@@ -19,52 +19,50 @@ package org.apache.poi.xwpf.usermodel;
import java.io.IOException;
import java.math.BigInteger;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFtnEdn;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STFtnEdn;
-
-public class TestXWPFFootnotes extends TestCase {
-
- public void testAddFootnotesToDocument() throws IOException{
- XWPFDocument docOut = new XWPFDocument();
-
- BigInteger noteId = BigInteger.valueOf(1);
-
- XWPFFootnotes footnotes = docOut.createFootnotes();
- CTFtnEdn ctNote = CTFtnEdn.Factory.newInstance();
- ctNote.setId(noteId);
- ctNote.setType(STFtnEdn.NORMAL);
- footnotes.addFootnote(ctNote);
-
- XWPFDocument docIn = XWPFTestDataSamples.writeOutAndReadBack(docOut);
-
- XWPFFootnote note = docIn.getFootnoteByID(noteId.intValue());
- assertEquals(note.getCTFtnEdn().getType(), STFtnEdn.NORMAL);
- }
-
- /**
- * Bug 55066 - avoid double loading the footnotes
- */
- public void testLoadFootnotesOnce() throws IOException{
- XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Bug54849.docx");
- List<XWPFFootnote> footnotes = doc.getFootnotes();
- int hits = 0;
- for (XWPFFootnote fn : footnotes){
- for (IBodyElement e : fn.getBodyElements()){
- if (e instanceof XWPFParagraph){
- String txt = ((XWPFParagraph)e).getText();
- if (txt.indexOf("Footnote_sdt") > -1){
- hits++;
- }
- }
- }
- }
- assertEquals("Load footnotes once", 1, hits);
- }
-}
-
+import java.util.List;
+
+import junit.framework.TestCase;
+import org.apache.poi.xwpf.XWPFTestDataSamples;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTFtnEdn;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.STFtnEdn;
+
+public class TestXWPFFootnotes extends TestCase {
+
+ public void testAddFootnotesToDocument() throws IOException {
+ XWPFDocument docOut = new XWPFDocument();
+
+ BigInteger noteId = BigInteger.valueOf(1);
+
+ XWPFFootnotes footnotes = docOut.createFootnotes();
+ CTFtnEdn ctNote = CTFtnEdn.Factory.newInstance();
+ ctNote.setId(noteId);
+ ctNote.setType(STFtnEdn.NORMAL);
+ footnotes.addFootnote(ctNote);
+
+ XWPFDocument docIn = XWPFTestDataSamples.writeOutAndReadBack(docOut);
+
+ XWPFFootnote note = docIn.getFootnoteByID(noteId.intValue());
+ assertEquals(note.getCTFtnEdn().getType(), STFtnEdn.NORMAL);
+ }
+
+ /**
+ * Bug 55066 - avoid double loading the footnotes
+ */
+ public void testLoadFootnotesOnce() throws IOException {
+ XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Bug54849.docx");
+ List<XWPFFootnote> footnotes = doc.getFootnotes();
+ int hits = 0;
+ for (XWPFFootnote fn : footnotes) {
+ for (IBodyElement e : fn.getBodyElements()) {
+ if (e instanceof XWPFParagraph) {
+ String txt = ((XWPFParagraph) e).getText();
+ if (txt.indexOf("Footnote_sdt") > -1) {
+ hits++;
+ }
+ }
+ }
+ }
+ assertEquals("Load footnotes once", 1, hits);
+ }
+}
+
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java?rev=1682473&r1=1682472&r2=1682473&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java Fri May 29 14:01:31 2015
@@ -17,13 +17,12 @@
package org.apache.poi.xwpf.usermodel;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.apache.poi.xwpf.model.XWPFHeaderFooterPolicy;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
+import java.io.IOException;
+
+import junit.framework.TestCase;
+import org.apache.poi.xwpf.XWPFTestDataSamples;
+import org.apache.poi.xwpf.model.XWPFHeaderFooterPolicy;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTText;
@@ -159,25 +158,25 @@ public final class TestXWPFHeader extend
assertEquals("First paragraph for the footer", paras[0].getText());
assertEquals("Second paragraph for the footer", paras[1].getText());
}
-
- public void testSetWatermark() throws IOException {
- XWPFDocument sampleDoc = XWPFTestDataSamples.openSampleDocument("SampleDoc.docx");
-
- // No header is set (yet)
- XWPFHeaderFooterPolicy policy = sampleDoc.getHeaderFooterPolicy();
- assertNull(policy.getDefaultHeader());
+
+ public void testSetWatermark() throws IOException {
+ XWPFDocument sampleDoc = XWPFTestDataSamples.openSampleDocument("SampleDoc.docx");
+
+ // No header is set (yet)
+ XWPFHeaderFooterPolicy policy = sampleDoc.getHeaderFooterPolicy();
+ assertNull(policy.getDefaultHeader());
assertNull(policy.getFirstPageHeader());
assertNull(policy.getDefaultFooter());
policy.createWatermark("DRAFT");
- assertNotNull(policy.getDefaultHeader());
- assertNotNull(policy.getFirstPageHeader());
- assertNotNull(policy.getEvenPageHeader());
-
- // Re-open, and check
- XWPFDocument reopened = XWPFTestDataSamples.writeOutAndReadBack(sampleDoc);
- policy = reopened.getHeaderFooterPolicy();
+ assertNotNull(policy.getDefaultHeader());
+ assertNotNull(policy.getFirstPageHeader());
+ assertNotNull(policy.getEvenPageHeader());
+
+ // Re-open, and check
+ XWPFDocument reopened = XWPFTestDataSamples.writeOutAndReadBack(sampleDoc);
+ policy = reopened.getHeaderFooterPolicy();
assertNotNull(policy.getDefaultHeader());
assertNotNull(policy.getFirstPageHeader());
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java?rev=1682473&r1=1682472&r2=1682473&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java Fri May 29 14:01:31 2015
@@ -16,39 +16,38 @@
==================================================================== */
package org.apache.poi.xwpf.usermodel;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.apache.xmlbeans.XmlException;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtBlock;
-
-/**
- * @author Paolo Mottadelli
- */
-public final class TestXWPFHeadings extends TestCase{
- private static final String HEADING1 = "Heading1";
-
- public void testSetParagraphStyle() throws IOException, XmlException {
- //new clean instance of paragraph
- XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("heading123.docx");
- XWPFParagraph p = doc.createParagraph();
- XWPFRun run = p.createRun();
- run.setText("Heading 1");
-
- CTSdtBlock block = doc.getDocument().getBody().addNewSdt();
-
- assertNull(p.getStyle());
- p.setStyle(HEADING1);
- assertEquals(HEADING1, p.getCTP().getPPr().getPStyle().getVal());
-
- doc.createTOC();
- /*
- // TODO - finish this test
- if (false) {
- CTStyles styles = doc.getStyle();
- CTStyle style = styles.addNewStyle();
+import java.io.IOException;
+
+import junit.framework.TestCase;
+import org.apache.poi.xwpf.XWPFTestDataSamples;
+import org.apache.xmlbeans.XmlException;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtBlock;
+
+/**
+ * @author Paolo Mottadelli
+ */
+public final class TestXWPFHeadings extends TestCase {
+ private static final String HEADING1 = "Heading1";
+
+ public void testSetParagraphStyle() throws IOException, XmlException {
+ //new clean instance of paragraph
+ XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("heading123.docx");
+ XWPFParagraph p = doc.createParagraph();
+ XWPFRun run = p.createRun();
+ run.setText("Heading 1");
+
+ CTSdtBlock block = doc.getDocument().getBody().addNewSdt();
+
+ assertNull(p.getStyle());
+ p.setStyle(HEADING1);
+ assertEquals(HEADING1, p.getCTP().getPPr().getPStyle().getVal());
+
+ doc.createTOC();
+ /*
+ // TODO - finish this test
+ if (false) {
+ CTStyles styles = doc.getStyle();
+ CTStyle style = styles.addNewStyle();
style.setType(STStyleType.PARAGRAPH);
style.setStyleId("Heading1");
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java?rev=1682473&r1=1682472&r2=1682473&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java Fri May 29 14:01:31 2015
@@ -18,86 +18,85 @@
package org.apache.poi.xwpf.usermodel;
import java.io.IOException;
-import java.math.BigInteger;
-
-import junit.framework.TestCase;
-
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTNum;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTNumLvl;
-
-public class TestXWPFNumbering extends TestCase {
-
- public void testCompareAbstractNum() throws IOException {
- XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Numbering.docx");
- XWPFNumbering numbering = doc.getNumbering();
- BigInteger numId = BigInteger.valueOf(1);
- assertTrue(numbering.numExist(numId));
- XWPFNum num = numbering.getNum(numId);
- BigInteger abstrNumId = num.getCTNum().getAbstractNumId().getVal();
- XWPFAbstractNum abstractNum = numbering.getAbstractNum(abstrNumId);
- BigInteger compareAbstractNum = numbering.getIdOfAbstractNum(abstractNum);
- assertEquals(abstrNumId, compareAbstractNum);
- }
-
- public void testAddNumberingToDoc() throws IOException{
- BigInteger abstractNumId = BigInteger.valueOf(1);
- BigInteger numId = BigInteger.valueOf(1);
-
- XWPFDocument docOut = new XWPFDocument();
- XWPFNumbering numbering = docOut.createNumbering();
- numId = numbering.addNum(abstractNumId);
-
- XWPFDocument docIn = XWPFTestDataSamples.writeOutAndReadBack(docOut);
-
- numbering = docIn.getNumbering();
- assertTrue(numbering.numExist(numId));
- XWPFNum num = numbering.getNum(numId);
-
- BigInteger compareAbstractNum = num.getCTNum().getAbstractNumId().getVal();
- assertEquals(abstractNumId, compareAbstractNum);
- }
-
- public void testGetNumIlvl() throws IOException{
- XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Numbering.docx");
- BigInteger numIlvl = BigInteger.valueOf(0);
- assertEquals(numIlvl, doc.getParagraphs().get(0).getNumIlvl());
- numIlvl = BigInteger.valueOf(1);
- assertEquals(numIlvl, doc.getParagraphs().get(5).getNumIlvl());
- }
-
- public void testGetNumFmt() throws IOException{
- XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Numbering.docx");
- assertEquals("bullet", doc.getParagraphs().get(0).getNumFmt());
- assertEquals("bullet", doc.getParagraphs().get(1).getNumFmt());
- assertEquals("bullet", doc.getParagraphs().get(2).getNumFmt());
- assertEquals("bullet", doc.getParagraphs().get(3).getNumFmt());
- assertEquals("decimal", doc.getParagraphs().get(4).getNumFmt());
- assertEquals("lowerLetter", doc.getParagraphs().get(5).getNumFmt());
- assertEquals("lowerRoman", doc.getParagraphs().get(6).getNumFmt());
- }
-
- public void testLvlText() throws IOException {
- XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Numbering.docx");
-
- assertEquals("%1.%2.%3.", doc.getParagraphs().get(12).getNumLevelText());
-
- assertEquals("NEW-%1-FORMAT", doc.getParagraphs().get(14).getNumLevelText());
-
- XWPFParagraph p = doc.getParagraphs().get(18);
- assertEquals("%1.", p.getNumLevelText());
- //test that null doesn't throw NPE
- assertNull(p.getNumFmt());
- }
-
- public void testOverrideList() throws IOException {
- XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("NumberingWOverrides.docx");
- XWPFParagraph p = doc.getParagraphs().get(4);
- XWPFNumbering numbering = doc.getNumbering();
- CTNum ctNum = numbering.getNum(p.getNumID()).getCTNum();
- assertEquals(9, ctNum.sizeOfLvlOverrideArray());
- CTNumLvl ctNumLvl = ctNum.getLvlOverrideArray(0);
- assertEquals("upperLetter", ctNumLvl.getLvl().getNumFmt().getVal().toString());
- }
-
-}
+import java.math.BigInteger;
+
+import junit.framework.TestCase;
+import org.apache.poi.xwpf.XWPFTestDataSamples;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTNum;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTNumLvl;
+
+public class TestXWPFNumbering extends TestCase {
+
+ public void testCompareAbstractNum() throws IOException {
+ XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Numbering.docx");
+ XWPFNumbering numbering = doc.getNumbering();
+ BigInteger numId = BigInteger.valueOf(1);
+ assertTrue(numbering.numExist(numId));
+ XWPFNum num = numbering.getNum(numId);
+ BigInteger abstrNumId = num.getCTNum().getAbstractNumId().getVal();
+ XWPFAbstractNum abstractNum = numbering.getAbstractNum(abstrNumId);
+ BigInteger compareAbstractNum = numbering.getIdOfAbstractNum(abstractNum);
+ assertEquals(abstrNumId, compareAbstractNum);
+ }
+
+ public void testAddNumberingToDoc() throws IOException {
+ BigInteger abstractNumId = BigInteger.valueOf(1);
+ BigInteger numId = BigInteger.valueOf(1);
+
+ XWPFDocument docOut = new XWPFDocument();
+ XWPFNumbering numbering = docOut.createNumbering();
+ numId = numbering.addNum(abstractNumId);
+
+ XWPFDocument docIn = XWPFTestDataSamples.writeOutAndReadBack(docOut);
+
+ numbering = docIn.getNumbering();
+ assertTrue(numbering.numExist(numId));
+ XWPFNum num = numbering.getNum(numId);
+
+ BigInteger compareAbstractNum = num.getCTNum().getAbstractNumId().getVal();
+ assertEquals(abstractNumId, compareAbstractNum);
+ }
+
+ public void testGetNumIlvl() throws IOException {
+ XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Numbering.docx");
+ BigInteger numIlvl = BigInteger.valueOf(0);
+ assertEquals(numIlvl, doc.getParagraphs().get(0).getNumIlvl());
+ numIlvl = BigInteger.valueOf(1);
+ assertEquals(numIlvl, doc.getParagraphs().get(5).getNumIlvl());
+ }
+
+ public void testGetNumFmt() throws IOException {
+ XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Numbering.docx");
+ assertEquals("bullet", doc.getParagraphs().get(0).getNumFmt());
+ assertEquals("bullet", doc.getParagraphs().get(1).getNumFmt());
+ assertEquals("bullet", doc.getParagraphs().get(2).getNumFmt());
+ assertEquals("bullet", doc.getParagraphs().get(3).getNumFmt());
+ assertEquals("decimal", doc.getParagraphs().get(4).getNumFmt());
+ assertEquals("lowerLetter", doc.getParagraphs().get(5).getNumFmt());
+ assertEquals("lowerRoman", doc.getParagraphs().get(6).getNumFmt());
+ }
+
+ public void testLvlText() throws IOException {
+ XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Numbering.docx");
+
+ assertEquals("%1.%2.%3.", doc.getParagraphs().get(12).getNumLevelText());
+
+ assertEquals("NEW-%1-FORMAT", doc.getParagraphs().get(14).getNumLevelText());
+
+ XWPFParagraph p = doc.getParagraphs().get(18);
+ assertEquals("%1.", p.getNumLevelText());
+ //test that null doesn't throw NPE
+ assertNull(p.getNumFmt());
+ }
+
+ public void testOverrideList() throws IOException {
+ XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("NumberingWOverrides.docx");
+ XWPFParagraph p = doc.getParagraphs().get(4);
+ XWPFNumbering numbering = doc.getNumbering();
+ CTNum ctNum = numbering.getNum(p.getNumID()).getCTNum();
+ assertEquals(9, ctNum.sizeOfLvlOverrideArray());
+ CTNumLvl ctNumLvl = ctNum.getLvlOverrideArray(0);
+ assertEquals("upperLetter", ctNumLvl.getLvl().getNumFmt().getVal().toString());
+ }
+
+}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java?rev=1682473&r1=1682472&r2=1682473&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java Fri May 29 14:01:31 2015
@@ -22,12 +22,26 @@ import java.math.BigInteger;
import java.util.List;
import junit.framework.TestCase;
-
import org.apache.poi.xwpf.XWPFTestDataSamples;
import org.openxmlformats.schemas.drawingml.x2006.picture.CTPicture;
import org.openxmlformats.schemas.drawingml.x2006.picture.PicDocument;
import org.openxmlformats.schemas.drawingml.x2006.picture.impl.PicDocumentImpl;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.*;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTBookmark;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTBorder;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTInd;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTJc;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTOnOff;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPBdr;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPPr;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSpacing;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTextAlignment;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.STBorder;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.STJc;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.STLineSpacingRule;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.STOnOff;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTextAlignment;
/**
* Tests for XWPF Paragraphs
@@ -36,7 +50,8 @@ public final class TestXWPFParagraph ext
/**
* Check that we get the right paragraph from the header
- * @throws IOException
+ *
+ * @throws IOException
*/
public void disabled_testHeaderParagraph() throws IOException {
XWPFDocument xml = XWPFTestDataSamples.openSampleDocument("ThreeColHead.docx");
@@ -44,7 +59,7 @@ public final class TestXWPFParagraph ext
XWPFHeader hdr = xml.getHeaderFooterPolicy().getDefaultHeader();
assertNotNull(hdr);
- List<XWPFParagraph> ps = hdr.getParagraphs();
+ List<XWPFParagraph> ps = hdr.getParagraphs();
assertEquals(1, ps.size());
XWPFParagraph p = ps.get(0);
@@ -55,7 +70,8 @@ public final class TestXWPFParagraph ext
/**
* Check that we get the right paragraphs from the document
- * @throws IOException
+ *
+ * @throws IOException
*/
public void disabled_testDocumentParagraph() throws IOException {
XWPFDocument xml = XWPFTestDataSamples.openSampleDocument("ThreeColHead.docx");
@@ -88,7 +104,7 @@ public final class TestXWPFParagraph ext
assertEquals(STBorder.NONE.intValue(), p.getBorderTop().getValue());
CTP ctp = p.getCTP();
- CTPPr ppr = ctp.getPPr()== null? ctp.addNewPPr() : ctp.getPPr();
+ CTPPr ppr = ctp.getPPr() == null ? ctp.addNewPPr() : ctp.getPPr();
//bordi
CTPBdr bdr = ppr.addNewPBdr();
@@ -109,7 +125,7 @@ public final class TestXWPFParagraph ext
assertEquals(STJc.LEFT.intValue(), p.getAlignment().getValue());
CTP ctp = p.getCTP();
- CTPPr ppr = ctp.getPPr()== null? ctp.addNewPPr() : ctp.getPPr();
+ CTPPr ppr = ctp.getPPr() == null ? ctp.addNewPPr() : ctp.getPPr();
CTJc align = ppr.addNewJc();
align.setVal(STJc.CENTER);
@@ -125,7 +141,7 @@ public final class TestXWPFParagraph ext
XWPFParagraph p = doc.createParagraph();
CTP ctp = p.getCTP();
- CTPPr ppr = ctp.getPPr()== null? ctp.addNewPPr() : ctp.getPPr();
+ CTPPr ppr = ctp.getPPr() == null ? ctp.addNewPPr() : ctp.getPPr();
assertEquals(-1, p.getSpacingAfter());
@@ -142,7 +158,7 @@ public final class TestXWPFParagraph ext
XWPFParagraph p = doc.createParagraph();
CTP ctp = p.getCTP();
- CTPPr ppr = ctp.getPPr()== null? ctp.addNewPPr() : ctp.getPPr();
+ CTPPr ppr = ctp.getPPr() == null ? ctp.addNewPPr() : ctp.getPPr();
assertEquals(STLineSpacingRule.INT_AUTO, p.getSpacingLineRule().getValue());
@@ -161,7 +177,7 @@ public final class TestXWPFParagraph ext
assertEquals(-1, p.getIndentationLeft());
CTP ctp = p.getCTP();
- CTPPr ppr = ctp.getPPr()== null? ctp.addNewPPr() : ctp.getPPr();
+ CTPPr ppr = ctp.getPPr() == null ? ctp.addNewPPr() : ctp.getPPr();
assertEquals(-1, p.getIndentationLeft());
@@ -179,7 +195,7 @@ public final class TestXWPFParagraph ext
XWPFParagraph p = doc.createParagraph();
CTP ctp = p.getCTP();
- CTPPr ppr = ctp.getPPr()== null? ctp.addNewPPr() : ctp.getPPr();
+ CTPPr ppr = ctp.getPPr() == null ? ctp.addNewPPr() : ctp.getPPr();
CTTextAlignment txtAlign = ppr.addNewTextAlignment();
txtAlign.setVal(STTextAlignment.CENTER);
@@ -194,7 +210,7 @@ public final class TestXWPFParagraph ext
XWPFParagraph p = doc.createParagraph();
CTP ctp = p.getCTP();
- CTPPr ppr = ctp.getPPr()== null? ctp.addNewPPr() : ctp.getPPr();
+ CTPPr ppr = ctp.getPPr() == null ? ctp.addNewPPr() : ctp.getPPr();
CTOnOff wordWrap = ppr.addNewWordWrap();
wordWrap.setVal(STOnOff.FALSE);
@@ -210,7 +226,7 @@ public final class TestXWPFParagraph ext
XWPFParagraph p = doc.createParagraph();
CTP ctp = p.getCTP();
- CTPPr ppr = ctp.getPPr()== null? ctp.addNewPPr() : ctp.getPPr();
+ CTPPr ppr = ctp.getPPr() == null ? ctp.addNewPPr() : ctp.getPPr();
CTOnOff pageBreak = ppr.addNewPageBreakBefore();
pageBreak.setVal(STOnOff.FALSE);
@@ -229,8 +245,8 @@ public final class TestXWPFParagraph ext
assertEquals(0, paragraph.getCTP().sizeOfBookmarkEndArray());
CTBookmark ctBookmark = paragraph.getCTP().getBookmarkStartArray(0);
assertEquals("poi", ctBookmark.getName());
- for(CTBookmark bookmark : paragraph.getCTP().getBookmarkStartArray()) {
- assertEquals("poi", bookmark.getName());
+ for (CTBookmark bookmark : paragraph.getCTP().getBookmarkStartArray()) {
+ assertEquals("poi", bookmark.getName());
}
}
@@ -241,108 +257,108 @@ public final class TestXWPFParagraph ext
p.setNumID(new BigInteger("10"));
assertEquals("10", p.getNumID().toString());
}
-
+
public void testAddingRuns() throws Exception {
- XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
-
- XWPFParagraph p = doc.getParagraphs().get(0);
- assertEquals(2, p.getRuns().size());
-
- XWPFRun r = p.createRun();
- assertEquals(3, p.getRuns().size());
- assertEquals(2, p.getRuns().indexOf(r));
-
- XWPFRun r2 = p.insertNewRun(1);
- assertEquals(4, p.getRuns().size());
- assertEquals(1, p.getRuns().indexOf(r2));
- assertEquals(3, p.getRuns().indexOf(r));
+ XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
+
+ XWPFParagraph p = doc.getParagraphs().get(0);
+ assertEquals(2, p.getRuns().size());
+
+ XWPFRun r = p.createRun();
+ assertEquals(3, p.getRuns().size());
+ assertEquals(2, p.getRuns().indexOf(r));
+
+ XWPFRun r2 = p.insertNewRun(1);
+ assertEquals(4, p.getRuns().size());
+ assertEquals(1, p.getRuns().indexOf(r2));
+ assertEquals(3, p.getRuns().indexOf(r));
}
-
+
public void testPictures() throws Exception {
- XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("VariousPictures.docx");
- assertEquals(7, doc.getParagraphs().size());
-
- XWPFParagraph p;
- XWPFRun r;
-
- // Text paragraphs
- assertEquals("Sheet with various pictures", doc.getParagraphs().get(0).getText());
- assertEquals("(jpeg, png, wmf, emf and pict) ", doc.getParagraphs().get(1).getText());
-
- // Spacer ones
- assertEquals("", doc.getParagraphs().get(2).getText());
- assertEquals("", doc.getParagraphs().get(3).getText());
- assertEquals("", doc.getParagraphs().get(4).getText());
-
- // Image one
- p = doc.getParagraphs().get(5);
- assertEquals(6, p.getRuns().size());
-
- r = p.getRuns().get(0);
- assertEquals("", r.toString());
- assertEquals(1, r.getEmbeddedPictures().size());
- assertNotNull(r.getEmbeddedPictures().get(0).getPictureData());
- assertEquals("image1.wmf", r.getEmbeddedPictures().get(0).getPictureData().getFileName());
-
- r = p.getRuns().get(1);
- assertEquals("", r.toString());
- assertEquals(1, r.getEmbeddedPictures().size());
- assertNotNull(r.getEmbeddedPictures().get(0).getPictureData());
- assertEquals("image2.png", r.getEmbeddedPictures().get(0).getPictureData().getFileName());
-
- r = p.getRuns().get(2);
- assertEquals("", r.toString());
- assertEquals(1, r.getEmbeddedPictures().size());
- assertNotNull(r.getEmbeddedPictures().get(0).getPictureData());
- assertEquals("image3.emf", r.getEmbeddedPictures().get(0).getPictureData().getFileName());
-
- r = p.getRuns().get(3);
- assertEquals("", r.toString());
- assertEquals(1, r.getEmbeddedPictures().size());
- assertNotNull(r.getEmbeddedPictures().get(0).getPictureData());
- assertEquals("image4.emf", r.getEmbeddedPictures().get(0).getPictureData().getFileName());
-
- r = p.getRuns().get(4);
- assertEquals("", r.toString());
- assertEquals(1, r.getEmbeddedPictures().size());
- assertNotNull(r.getEmbeddedPictures().get(0).getPictureData());
- assertEquals("image5.jpeg", r.getEmbeddedPictures().get(0).getPictureData().getFileName());
-
- r = p.getRuns().get(5);
- assertEquals(" ", r.toString());
- assertEquals(0, r.getEmbeddedPictures().size());
-
- // Final spacer
- assertEquals("", doc.getParagraphs().get(6).getText());
-
-
- // Look in detail at one
- r = p.getRuns().get(4);
- XWPFPicture pict = r.getEmbeddedPictures().get(0);
- CTPicture picture = pict.getCTPicture();
- assertEquals("rId8", picture.getBlipFill().getBlip().getEmbed());
-
- // Ensure that the ooxml compiler finds everything we need
- r.getCTR().getDrawingArray(0);
- r.getCTR().getDrawingArray(0).getInlineArray(0);
- r.getCTR().getDrawingArray(0).getInlineArray(0).getGraphic();
- r.getCTR().getDrawingArray(0).getInlineArray(0).getGraphic().getGraphicData();
- PicDocument pd = new PicDocumentImpl(null);
- assertTrue(pd.isNil());
- }
-
- public void testTika792() throws Exception{
- //This test forces the loading of CTMoveBookmark and
- //CTMoveBookmarkImpl into ooxml-lite.
- XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Tika-792.docx");
- XWPFParagraph paragraph = doc.getParagraphs().get(0);
- assertEquals("s", paragraph.getText());
+ XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("VariousPictures.docx");
+ assertEquals(7, doc.getParagraphs().size());
+
+ XWPFParagraph p;
+ XWPFRun r;
+
+ // Text paragraphs
+ assertEquals("Sheet with various pictures", doc.getParagraphs().get(0).getText());
+ assertEquals("(jpeg, png, wmf, emf and pict) ", doc.getParagraphs().get(1).getText());
+
+ // Spacer ones
+ assertEquals("", doc.getParagraphs().get(2).getText());
+ assertEquals("", doc.getParagraphs().get(3).getText());
+ assertEquals("", doc.getParagraphs().get(4).getText());
+
+ // Image one
+ p = doc.getParagraphs().get(5);
+ assertEquals(6, p.getRuns().size());
+
+ r = p.getRuns().get(0);
+ assertEquals("", r.toString());
+ assertEquals(1, r.getEmbeddedPictures().size());
+ assertNotNull(r.getEmbeddedPictures().get(0).getPictureData());
+ assertEquals("image1.wmf", r.getEmbeddedPictures().get(0).getPictureData().getFileName());
+
+ r = p.getRuns().get(1);
+ assertEquals("", r.toString());
+ assertEquals(1, r.getEmbeddedPictures().size());
+ assertNotNull(r.getEmbeddedPictures().get(0).getPictureData());
+ assertEquals("image2.png", r.getEmbeddedPictures().get(0).getPictureData().getFileName());
+
+ r = p.getRuns().get(2);
+ assertEquals("", r.toString());
+ assertEquals(1, r.getEmbeddedPictures().size());
+ assertNotNull(r.getEmbeddedPictures().get(0).getPictureData());
+ assertEquals("image3.emf", r.getEmbeddedPictures().get(0).getPictureData().getFileName());
+
+ r = p.getRuns().get(3);
+ assertEquals("", r.toString());
+ assertEquals(1, r.getEmbeddedPictures().size());
+ assertNotNull(r.getEmbeddedPictures().get(0).getPictureData());
+ assertEquals("image4.emf", r.getEmbeddedPictures().get(0).getPictureData().getFileName());
+
+ r = p.getRuns().get(4);
+ assertEquals("", r.toString());
+ assertEquals(1, r.getEmbeddedPictures().size());
+ assertNotNull(r.getEmbeddedPictures().get(0).getPictureData());
+ assertEquals("image5.jpeg", r.getEmbeddedPictures().get(0).getPictureData().getFileName());
+
+ r = p.getRuns().get(5);
+ assertEquals(" ", r.toString());
+ assertEquals(0, r.getEmbeddedPictures().size());
+
+ // Final spacer
+ assertEquals("", doc.getParagraphs().get(6).getText());
+
+
+ // Look in detail at one
+ r = p.getRuns().get(4);
+ XWPFPicture pict = r.getEmbeddedPictures().get(0);
+ CTPicture picture = pict.getCTPicture();
+ assertEquals("rId8", picture.getBlipFill().getBlip().getEmbed());
+
+ // Ensure that the ooxml compiler finds everything we need
+ r.getCTR().getDrawingArray(0);
+ r.getCTR().getDrawingArray(0).getInlineArray(0);
+ r.getCTR().getDrawingArray(0).getInlineArray(0).getGraphic();
+ r.getCTR().getDrawingArray(0).getInlineArray(0).getGraphic().getGraphicData();
+ PicDocument pd = new PicDocumentImpl(null);
+ assertTrue(pd.isNil());
+ }
+
+ public void testTika792() throws Exception {
+ //This test forces the loading of CTMoveBookmark and
+ //CTMoveBookmarkImpl into ooxml-lite.
+ XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("Tika-792.docx");
+ XWPFParagraph paragraph = doc.getParagraphs().get(0);
+ assertEquals("s", paragraph.getText());
}
public void testSettersGetters() {
XWPFDocument doc = new XWPFDocument();
XWPFParagraph p = doc.createParagraph();
-
+
assertTrue(p.isEmpty());
assertFalse(p.removeRun(0));
@@ -355,7 +371,7 @@ public final class TestXWPFParagraph ext
assertFalse(p.isEmpty());
assertNull(p.getStyleID());
assertNull(p.getStyle());
-
+
assertNull(p.getNumID());
p.setNumID(BigInteger.valueOf(12));
assertEquals(BigInteger.valueOf(12), p.getNumID());
@@ -363,18 +379,18 @@ public final class TestXWPFParagraph ext
assertEquals(BigInteger.valueOf(13), p.getNumID());
assertNull(p.getNumFmt());
-
+
assertNull(p.getNumIlvl());
-
+
assertEquals("", p.getParagraphText());
assertEquals("", p.getPictureText());
assertEquals("", p.getFootnoteText());
-
+
p.setBorderBetween(Borders.NONE);
assertEquals(Borders.NONE, p.getBorderBetween());
p.setBorderBetween(Borders.BASIC_BLACK_DASHES);
assertEquals(Borders.BASIC_BLACK_DASHES, p.getBorderBetween());
-
+
p.setBorderBottom(Borders.NONE);
assertEquals(Borders.NONE, p.getBorderBottom());
p.setBorderBottom(Borders.BABY_RATTLE);
@@ -394,37 +410,37 @@ public final class TestXWPFParagraph ext
assertEquals(Borders.NONE, p.getBorderBottom());
p.setBorderBottom(Borders.BASIC_WHITE_DOTS);
assertEquals(Borders.BASIC_WHITE_DOTS, p.getBorderBottom());
-
+
assertFalse(p.isPageBreak());
p.setPageBreak(true);
assertTrue(p.isPageBreak());
p.setPageBreak(false);
assertFalse(p.isPageBreak());
-
+
assertEquals(-1, p.getSpacingAfter());
p.setSpacingAfter(12);
assertEquals(12, p.getSpacingAfter());
-
+
assertEquals(-1, p.getSpacingAfterLines());
p.setSpacingAfterLines(14);
assertEquals(14, p.getSpacingAfterLines());
-
+
assertEquals(-1, p.getSpacingBefore());
p.setSpacingBefore(16);
assertEquals(16, p.getSpacingBefore());
-
+
assertEquals(-1, p.getSpacingBeforeLines());
p.setSpacingBeforeLines(18);
assertEquals(18, p.getSpacingBeforeLines());
-
+
assertEquals(LineSpacingRule.AUTO, p.getSpacingLineRule());
p.setSpacingLineRule(LineSpacingRule.EXACT);
assertEquals(LineSpacingRule.EXACT, p.getSpacingLineRule());
-
+
assertEquals(-1, p.getIndentationLeft());
p.setIndentationLeft(21);
assertEquals(21, p.getIndentationLeft());
-
+
assertEquals(-1, p.getIndentationRight());
p.setIndentationRight(25);
assertEquals(25, p.getIndentationRight());
@@ -442,20 +458,20 @@ public final class TestXWPFParagraph ext
assertTrue(p.isWordWrap());
p.setWordWrap(false);
assertFalse(p.isWordWrap());
-
+
assertNull(p.getStyle());
p.setStyle("teststyle");
assertEquals("teststyle", p.getStyle());
-
+
p.addRun(CTR.Factory.newInstance());
-
+
//assertTrue(p.removeRun(0));
-
+
assertNotNull(p.getBody());
assertEquals(BodyElementType.PARAGRAPH, p.getElementType());
assertEquals(BodyType.DOCUMENT, p.getPartType());
}
-
+
public void testSearchTextNotFound() {
XWPFDocument doc = new XWPFDocument();
XWPFParagraph p = doc.createParagraph();
@@ -469,17 +485,17 @@ public final class TestXWPFParagraph ext
List<XWPFParagraph> ps = xml.getParagraphs();
assertEquals(10, ps.size());
-
+
XWPFParagraph p = ps.get(0);
TextSegement segment = p.searchText("sample word document", new PositionInParagraph());
assertNotNull(segment);
-
+
assertEquals("sample word document", p.getText(segment));
-
+
assertTrue(p.removeRun(0));
}
-
+
@SuppressWarnings("deprecation")
public void testRuns() {
XWPFDocument doc = new XWPFDocument();
@@ -489,7 +505,7 @@ public final class TestXWPFParagraph ext
XWPFRun r = new XWPFRun(run, doc.createParagraph());
p.addRun(r);
p.addRun(r);
-
+
assertNotNull(p.getRun(run));
assertNull(p.getRun(null));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org