Apply (with slight tweaks) patch from Phillip Epp from bug #48574 - further XWPF support for tables, paragraphs, including enhanced support for adding new ones

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@953704 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 321 insertions, 30 deletions

diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java b/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java
index 17786326ac..f8c4e116b0 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java
@@ -24,9 +24,13 @@ import org.apache.poi.xwpf.extractor.TestXWPFWordExtractor;
 import org.apache.poi.xwpf.model.TestXWPFHeaderFooterPolicy;
 import org.apache.poi.xwpf.usermodel.TestXWPFHeader;
 import org.apache.poi.xwpf.usermodel.TestXWPFHeadings;
+import org.apache.poi.xwpf.usermodel.TestXWPFNumbering;
 import org.apache.poi.xwpf.usermodel.TestXWPFParagraph;
+import org.apache.poi.xwpf.usermodel.TestXWPFPictureData;
 import org.apache.poi.xwpf.usermodel.TestXWPFRun;
+import org.apache.poi.xwpf.usermodel.TestXWPFStyles;
 import org.apache.poi.xwpf.usermodel.TestXWPFTable;
+import org.apache.poi.xwpf.usermodel.TestXWPFTableRow;
 
 /**
  * Collects all tests for <tt>org.apache.poi.xwpf</tt> and sub-packages.
@@ -45,8 +49,11 @@ public final class AllXWPFTests {
 		result.addTestSuite(TestXWPFParagraph.class);
 		result.addTestSuite(TestXWPFRun.class);
 		result.addTestSuite(TestXWPFTable.class);
+		result.addTestSuite(TestXWPFStyles.class);
+		result.addTestSuite(TestXWPFPictureData.class);
+		result.addTestSuite(TestXWPFNumbering.class);
 		result.addTestSuite(TestAllExtendedProperties.class);
 		result.addTestSuite(TestPackageCorePropertiesGetKeywords.class);
-        return result;
+		return result;
 	}
 }
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java b/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java
index 1a7be43790..88d0823741 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java
@@ -20,10 +20,15 @@ package org.apache.poi.xwpf;
 import junit.framework.TestCase;
 
 import org.apache.poi.POIXMLProperties;
+import org.apache.poi.hssf.record.formula.AddPtg;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 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 {
 
@@ -93,4 +98,35 @@ public final class TestXWPFDocument extends TestCase {
 		assertNotNull(props);
 		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 testAddPicture(){
+		XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
+		byte[] jpeg = "This is a jpeg".getBytes();
+		try {
+			int jpegNum = doc.addPicture(jpeg, XWPFDocument.PICTURE_TYPE_JPEG);
+			byte[] newJpeg = doc.getAllPictures().get(jpegNum).getData();
+			assertEquals(newJpeg.length, jpeg.length);
+			for(int i = 0 ; i < jpeg.length; i++){
+				assertEquals(newJpeg[i], jpeg[i]); 
+			}
+		} catch (InvalidFormatException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
 }
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java
index 4ee379f992..4747910c7a 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java
@@ -18,6 +18,7 @@
 package org.apache.poi.xwpf.usermodel;
 
 import java.io.IOException;
+import java.util.Arrays;
 
 import junit.framework.TestCase;
 
@@ -81,7 +82,7 @@ public final class TestXWPFHeader extends TestCase {
 		pars[0] = p1;
 
 		XWPFParagraph p2 = new XWPFParagraph(ctP2);
-		XWPFParagraph p3 = new XWPFParagraph(ctP3);
+		XWPFParagraph p3 = new XWPFParagraph(ctP3, null);
 		XWPFParagraph[] pars2 = new XWPFParagraph[2];
 		pars2[0] = p2;
 		pars2[1] = p3;
@@ -96,16 +97,20 @@ public final class TestXWPFHeader extends TestCase {
 		assertNotNull(policy.getDefaultHeader());
 		assertNotNull(policy.getFirstPageHeader());
 		assertNotNull(policy.getDefaultFooter());
-		// ....and that the footer object captrued above contains two
+		// ....and that the footer object captured above contains two
 		// paragraphs of text.
-		assertEquals(footer.getParagraphs().length, 2);
+		assertEquals(footer.getParagraphs().size(), 2);
 		
 		// As an additional check, recover the defauls footer and
 		// make sure that it contains two paragraphs of text and that
 		// both do hold what is expected.
 		footer = policy.getDefaultFooter();
 
-		XWPFParagraph[] paras = footer.getParagraphs();
+		XWPFParagraph[] paras = new XWPFParagraph[footer.getParagraphs().size()];
+		int i=0;
+		for(XWPFParagraph p : footer.getParagraphs()) {
+		   paras[i++] = p;
+		}
 		
 		assertEquals(paras.length, 2);
 		assertEquals(paras[0].getText(), "First paragraph for the footer");
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java
new file mode 100644
index 0000000000..7990cd70d6
--- /dev/null
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java
@@ -0,0 +1,40 @@
+/* ====================================================================
+   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.
+==================================================================== */
+
+package org.apache.poi.xwpf.usermodel;
+
+import java.math.BigInteger;
+
+import junit.framework.TestCase;
+
+import org.apache.poi.xwpf.XWPFTestDataSamples;
+
+public class TestXWPFNumbering extends TestCase {
+	
+	public void testCompareAbstractNum(){
+		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);
+	}
+
+}
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
index 73f66927fd..3444c246e4 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
@@ -18,12 +18,26 @@
 package org.apache.poi.xwpf.usermodel;
 
 import java.math.BigInteger;
-import java.io.File;
+import java.util.List;
 
 import junit.framework.TestCase;
 
 import org.apache.poi.xwpf.XWPFTestDataSamples;
-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.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
@@ -39,9 +53,9 @@ public final class TestXWPFParagraph extends TestCase {
         XWPFHeader hdr = xml.getHeaderFooterPolicy().getDefaultHeader();
         assertNotNull(hdr);
 
-        XWPFParagraph[] ps = hdr.getParagraphs();
-        assertEquals(1, ps.length);
-        XWPFParagraph p = ps[0];
+       List<XWPFParagraph> ps =  hdr.getParagraphs();
+        assertEquals(1, ps.size());
+        XWPFParagraph p = ps.get(0);
 
         assertEquals(5, p.getCTP().getRArray().length);
         assertEquals("First header column!\tMid header\tRight header!", p
@@ -53,25 +67,25 @@ public final class TestXWPFParagraph extends TestCase {
      */
     public void disabled_testDocumentParagraph() {
         XWPFDocument xml = XWPFTestDataSamples.openSampleDocument("ThreeColHead.docx");
-        XWPFParagraph[] ps = xml.getParagraphs();
-        assertEquals(10, ps.length);
+        List<XWPFParagraph> ps = xml.getParagraphs();
+        assertEquals(10, ps.size());
 
-        assertFalse(ps[0].isEmpty());
+        assertFalse(ps.get(0).isEmpty());
         assertEquals(
                 "This is a sample word document. It has two pages. It has a three column heading, but no footer.",
-                ps[0].getText());
+                ps.get(0).getText());
 
-        assertTrue(ps[1].isEmpty());
-        assertEquals("", ps[1].getText());
+        assertTrue(ps.get(1).isEmpty());
+        assertEquals("", ps.get(1).getText());
 
-        assertFalse(ps[2].isEmpty());
-        assertEquals("HEADING TEXT", ps[2].getText());
+        assertFalse(ps.get(2).isEmpty());
+        assertEquals("HEADING TEXT", ps.get(2).getText());
 
-        assertTrue(ps[3].isEmpty());
-        assertEquals("", ps[3].getText());
+        assertTrue(ps.get(3).isEmpty());
+        assertEquals("", ps.get(3).getText());
 
-        assertFalse(ps[4].isEmpty());
-        assertEquals("More on page one", ps[4].getText());
+        assertFalse(ps.get(4).isEmpty());
+        assertEquals("More on page one", ps.get(4).getText());
     }
 
     public void testSetGetBorderTop() {
@@ -216,7 +230,7 @@ public final class TestXWPFParagraph extends TestCase {
 
     public void testBookmarks() {
         XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("bookmarks.docx");
-        XWPFParagraph paragraph = doc.getParagraphs()[0];
+        XWPFParagraph paragraph = doc.getParagraphs().get(0);
         assertEquals("Sample Word Document", paragraph.getText());
         assertEquals(1, paragraph.getCTP().sizeOfBookmarkStartArray());
         assertEquals(0, paragraph.getCTP().sizeOfBookmarkEndArray());
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java
new file mode 100644
index 0000000000..87be3b2c8d
--- /dev/null
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java
@@ -0,0 +1,89 @@
+/* ====================================================================
+   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.
+==================================================================== */
+
+package org.apache.poi.xwpf.usermodel;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.poi.hslf.usermodel.PictureData;
+import org.apache.poi.hssf.record.formula.AddPtg;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.poi.openxml4j.opc.PackageRelationship;
+import org.apache.poi.xwpf.XWPFTestDataSamples;
+
+
+import junit.framework.TestCase;
+
+public class TestXWPFPictureData extends TestCase {
+	   public void testRead(){
+		   XWPFDocument sampleDoc = XWPFTestDataSamples.openSampleDocument("VariousPictures.docx");
+	        List<XWPFPictureData> pictures = sampleDoc.getAllPictures();
+	        assertSame(pictures, sampleDoc.getAllPictures());
+
+	        assertEquals(5, pictures.size());
+	        String[] ext = {"wmf", "png", "emf", "emf", "jpeg"};
+	        for (int i = 0; i < pictures.size(); i++) {
+	            assertEquals(ext[i], pictures.get(i).suggestFileExtension());
+	        }
+
+	        int num = pictures.size();
+
+	        byte[] pictureData = {0xA, 0xB, 0XC, 0xD, 0xE, 0xF};
+
+	        int idx;
+			try {
+				idx = sampleDoc.addPicture(pictureData, XWPFDocument.PICTURE_TYPE_JPEG);
+				assertEquals(num + 1, pictures.size());
+				//idx is 0-based index in the #pictures array
+				assertEquals(pictures.size() - 1, idx);
+				XWPFPictureData pict = pictures.get(idx);
+				assertEquals("jpeg", pict.suggestFileExtension());
+				assertTrue(Arrays.equals(pictureData, pict.getData()));
+			} catch (InvalidFormatException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+	    }
+
+	    public void testNew(){
+	        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("EmptyDocumentWithHeaderFooter.docx");
+	        byte[] jpegData = "test jpeg data".getBytes();
+	        byte[] wmfData =  "test wmf data".getBytes();
+	        byte[] pngData =  "test png data".getBytes();
+	        List<XWPFPictureData> pictures = doc.getAllPictures();
+	        assertEquals(0, pictures.size());
+	        int jpegIdx;
+			try {
+				jpegIdx = doc.addPicture(jpegData, XWPFDocument.PICTURE_TYPE_JPEG);
+				assertEquals(1, pictures.size());
+				assertEquals("jpeg", pictures.get(jpegIdx).suggestFileExtension());
+				assertTrue(Arrays.equals(jpegData, pictures.get(jpegIdx).getData()));
+				
+				PackageRelationship addPictureReference = doc.addPictureReference(jpegData, Document.PICTURE_TYPE_JPEG );
+				XWPFPictureData pictureDataByID = doc.getPictureDataByID(addPictureReference.getId());
+				byte [] newJPEGData = pictureDataByID.getData();
+				assertEquals(newJPEGData.length, jpegData.length);
+				for(int i = 0; i < newJPEGData.length; i++){
+					assertEquals(newJPEGData[i], jpegData[i]);	
+				}
+			} catch (InvalidFormatException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+	    }
+}
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
new file mode 100644
index 0000000000..6c4a722035
--- /dev/null
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
@@ -0,0 +1,54 @@
+/* ====================================================================
+   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.
+==================================================================== */
+
+package org.apache.poi.xwpf.usermodel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.poi.xwpf.XWPFTestDataSamples;
+
+import junit.framework.TestCase;
+
+public class TestXWPFStyles extends TestCase {
+
+//	protected void setUp() throws Exception {
+//		super.setUp();
+//	}
+	
+	public void testGetUsedStyles(){
+		XWPFDocument sampleDoc = XWPFTestDataSamples.openSampleDocument("Styles.docx");
+		List<XWPFStyle> testUsedStyleList = new ArrayList<XWPFStyle>();
+		XWPFStyles styles = sampleDoc.getStyles();
+		XWPFStyle style = styles.getStyle("berschrift1");
+		testUsedStyleList.add(style);
+		testUsedStyleList.add(styles.getStyle("Standard"));
+		testUsedStyleList.add(styles.getStyle("berschrift1Zchn"));
+		testUsedStyleList.add(styles.getStyle("Absatz-Standardschriftart"));
+		style.hasSameName(style);
+		
+		List<XWPFStyle> usedStyleList = styles.getUsedStyleList(style);
+		assertEquals(usedStyleList, testUsedStyleList);
+		
+		
+	}
+
+//	protected void tearDown() throws Exception {
+//		super.tearDown();
+//	}
+
+}
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTable.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTable.java
index d7a831757e..6e8fe1e8ea 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTable.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTable.java
@@ -43,14 +43,14 @@ public class TestXWPFTable extends TestCase {
 
     public void testConstructor() {
         CTTbl ctTable = CTTbl.Factory.newInstance();
-        XWPFTable xtab = new XWPFTable(null, ctTable);
+        XWPFTable xtab = new XWPFTable(ctTable, null);
         assertNotNull(xtab);
         assertEquals(1, ctTable.sizeOfTrArray());
         assertEquals(1, ctTable.getTrArray(0).sizeOfTcArray());
         assertNotNull(ctTable.getTrArray(0).getTcArray(0).getPArray(0));
 
         ctTable = CTTbl.Factory.newInstance();
-        xtab = new XWPFTable(null, ctTable, 3, 2);
+        xtab = new XWPFTable(ctTable, null, 3, 2);
         assertNotNull(xtab);
         assertEquals(3, ctTable.sizeOfTrArray());
         assertEquals(2, ctTable.getTrArray(0).sizeOfTcArray());
@@ -67,7 +67,7 @@ public class TestXWPFTable extends TestCase {
         CTText text = run.addNewT();
         text.setStringValue("finally I can write!");
 
-        XWPFTable xtab = new XWPFTable(null, table);
+        XWPFTable xtab = new XWPFTable(table, null);
         assertEquals("finally I can write!\n", xtab.getText());
     }
 
@@ -84,7 +84,7 @@ public class TestXWPFTable extends TestCase {
         r3.addNewTc().addNewP();
         r3.addNewTc().addNewP();
 
-        XWPFTable xtab = new XWPFTable(null, table);
+        XWPFTable xtab = new XWPFTable(table, null);
         assertEquals(3, xtab.getNumberOfRows());
         assertNotNull(xtab.getRow(2));
 
@@ -95,7 +95,7 @@ public class TestXWPFTable extends TestCase {
         assertEquals(2, table.getTrArray(0).sizeOfTcArray());
 
         //check creation of first row
-        xtab = new XWPFTable(null, CTTbl.Factory.newInstance());
+        xtab = new XWPFTable(CTTbl.Factory.newInstance(), null);
         assertEquals(1, xtab.getCTTbl().getTrArray(0).sizeOfTcArray());
     }
 
@@ -104,7 +104,7 @@ public class TestXWPFTable extends TestCase {
         CTTbl table = CTTbl.Factory.newInstance();
         table.addNewTblPr().addNewTblW().setW(new BigInteger("1000"));
 
-        XWPFTable xtab = new XWPFTable(null, table);
+        XWPFTable xtab = new XWPFTable(table, null);
 
         assertEquals(1000, xtab.getWidth());
 
@@ -115,7 +115,7 @@ public class TestXWPFTable extends TestCase {
     public void testSetGetHeight() {
         CTTbl table = CTTbl.Factory.newInstance();
 
-        XWPFTable xtab = new XWPFTable(null, table);
+        XWPFTable xtab = new XWPFTable(table, null);
         XWPFTableRow row = xtab.createRow();
         row.setHeight(20);
         assertEquals(20, row.getHeight());
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java
new file mode 100644
index 0000000000..0844b507ba
--- /dev/null
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java
@@ -0,0 +1,46 @@
+/* ====================================================================
+   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.
+==================================================================== */
+
+package org.apache.poi.xwpf.usermodel;
+
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRow;
+
+import junit.framework.TestCase;
+
+public class TestXWPFTableRow extends TestCase {
+
+	
+	
+	@Override
+	protected void setUp() throws Exception {
+		// TODO Auto-generated method stub
+		super.setUp();
+	}
+
+	public void testSomething() throws Exception {
+		
+		CTRow ctRow = CTRow.Factory.newInstance();
+
+	}
+	
+	@Override
+	protected void tearDown() throws Exception {
+		// TODO Auto-generated method stub
+		super.tearDown();
+	}
+
+}