Author: nick
Date: Fri May 6 01:43:16 2011
New Revision: 1100022
URL: http://svn.apache.org/viewvc?rev=1100022&view=rev
Log:
Re-enable the XWPF test for adding paragraphs, and fix it up to work properly
Added:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/package.html
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java
Added: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/package.html
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/package.html?rev=1100022&view=auto
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/package.html (added)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/package.html Fri May 6
01:43:16 2011
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!--
+ ====================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ====================================================================
+-->
+<html>
+<body>
+ <p>This package contains classes for handling Microsoft .docx
+ Word Processing files, known in POI as XWPF (XML Word Processing
+ Format).
+ </p>
+</body>
+</html>
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java?rev=1100022&r1=1100021&r2=1100022&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
Fri May 6 01:43:16 2011
@@ -649,7 +649,9 @@ public class XWPFDocument extends POIXML
* @return a new paragraph
*/
public XWPFParagraph createParagraph(){
- return new XWPFParagraph(ctDocument.getBody().addNewP(), this);
+ XWPFParagraph p = new XWPFParagraph(ctDocument.getBody().addNewP(),
this);
+ paragraphs.add(p);
+ return p;
}
/**
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java?rev=1100022&r1=1100021&r2=1100022&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java
(original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java Fri
May 6 01:43:16 2011
@@ -24,7 +24,10 @@ import org.apache.poi.openxml4j.exceptio
import org.apache.poi.openxml4j.opc.OPCPackage;
import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.poi.xwpf.usermodel.XWPFParagraph;
import org.apache.poi.xwpf.usermodel.XWPFRelation;
+import org.apache.xmlbeans.XmlCursor;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP;
public final class TestXWPFDocument extends TestCase {
@@ -95,20 +98,22 @@ public final class TestXWPFDocument exte
assertEquals("Apache POI",
props.getExtendedProperties().getUnderlyingProperties().getApplication());
}
-// public void testAddParagraph(){
-// XWPFDocument doc =
XWPFTestDataSamples.openSampleDocument("sample.docx");
-// int pLength = doc.getParagraphs().length;
-// XWPFParagraph p = doc.insertNewParagraph(3);
-// assertTrue(p == doc.getParagraphs()[3]);
-// assertTrue(++pLength == doc.getParagraphs().length);
-// CTP ctp = p.getCTP();
-// XWPFParagraph newP = doc.getParagraph(ctp);
-// assertSame(p, newP);
-// XmlCursor cursor =
doc.getDocument().getBody().getPArray(0).newCursor();
-// XWPFParagraph cP = doc.insertNewParagraph(cursor);
-// assertSame(cP, doc.getParagraphs()[0]);
-// assertTrue(++pLength == doc.getParagraphs().length);
-// }
+ public void testAddParagraph(){
+ XWPFDocument doc =
XWPFTestDataSamples.openSampleDocument("sample.docx");
+ assertEquals(3, doc.getParagraphs().size());
+
+ XWPFParagraph p = doc.createParagraph();
+ assertEquals(p, doc.getParagraphs().get(3));
+ assertEquals(4, doc.getParagraphs().size());
+
+ CTP ctp = p.getCTP();
+ XWPFParagraph newP = doc.getParagraph(ctp);
+ assertSame(p, newP);
+ XmlCursor cursor =
doc.getDocument().getBody().getPArray(0).newCursor();
+ XWPFParagraph cP = doc.insertNewParagraph(cursor);
+ assertSame(cP, doc.getParagraphs().get(0));
+ assertEquals(5, doc.getParagraphs().size());
+ }
public void testAddPicture(){
XWPFDocument doc =
XWPFTestDataSamples.openSampleDocument("sample.docx");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
