From c2d66a280f0d19ded0a70369f8bcb3d3858f47e7 Mon Sep 17 00:00:00 2001
From: Josh Micich <josh@apache.org>
Date: Tue, 29 Sep 2009 23:01:48 +0000
Subject: [PATCH] minor fixes to junit after r819469

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@820120 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/poi/xwpf/AllXWPFTests.java     | 10 ++-
 .../org/apache/poi/xwpf/TestXWPFDocument.java |  5 +-
 .../poi/xwpf/usermodel/TestXWPFHeadings.java  | 66 +++++++++++--------
 3 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java b/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java
index 17cc36783..584790331 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java
@@ -22,12 +22,15 @@ import junit.framework.TestSuite;
 
 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.TestXWPFParagraph;
 import org.apache.poi.xwpf.usermodel.TestXWPFRun;
+import org.apache.poi.xwpf.usermodel.TestXWPFTable;
 
 /**
  * Collects all tests for <tt>org.apache.poi.xwpf</tt> and sub-packages.
- * 
+ *
  * @author Josh Micich
  */
 public final class AllXWPFTests {
@@ -35,10 +38,13 @@ public final class AllXWPFTests {
 	public static Test suite() {
 		TestSuite result = new TestSuite(AllXWPFTests.class.getName());
 		result.addTestSuite(TestXWPFDocument.class);
+		result.addTestSuite(TestXWPFWordExtractor.class);
 		result.addTestSuite(TestXWPFHeaderFooterPolicy.class);
+		result.addTestSuite(TestXWPFHeader.class);
+		result.addTestSuite(TestXWPFHeadings.class);
 		result.addTestSuite(TestXWPFParagraph.class);
 		result.addTestSuite(TestXWPFRun.class);
-		result.addTestSuite(TestXWPFWordExtractor.class);
+		result.addTestSuite(TestXWPFTable.class);
 		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 d25d22a48..1a7be4379 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java
@@ -36,7 +36,10 @@ public final class TestXWPFDocument extends TestCase {
 			if(part.getContentType().equals(XWPFRelation.DOCUMENT.getContentType())) {
 				found = true;
 			}
-			System.out.println(part);
+			if (false) {
+				// successful tests should be silent
+				System.out.println(part);
+			}
 		}
 		assertTrue(found);
 	}
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java
index 455dc6887..7edd4bd4e 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java
@@ -7,38 +7,48 @@ import java.io.OutputStream;
 
 import junit.framework.TestCase;
 
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.poi.util.TempFile;
 import org.apache.poi.xwpf.XWPFTestDataSamples;
 import org.apache.xmlbeans.XmlException;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSdtBlock;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTStyle;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTStyles;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.STStyleType;
 
-public class TestXWPFHeadings extends TestCase{
+/**
+ * @author Paolo Mottadelli
+ */
+public final class TestXWPFHeadings extends TestCase{
 	private static final String HEADING1 = "Heading1";
-	
-	public void testSetParagraphStyle() throws IOException, XmlException, InvalidFormatException {
-        //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();
-        
-//        CTStyles styles = doc.getStyle();
-//        CTStyle style = styles.addNewStyle();
-//        style.setType(STStyleType.PARAGRAPH);
-//        style.setStyleId("Heading1");
-        
-        File file = new File("/Users/paolomoz/Desktop/testHeaders.docx");
-        OutputStream out = new FileOutputStream(file);
-        doc.write(out);
-        out.close();
-    }
 
+	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");
+		}
+
+		if (false) {
+			File file = TempFile.createTempFile("testHeaders", ".docx");
+			OutputStream out = new FileOutputStream(file);
+			doc.write(out);
+			out.close();
+		}
+	}
 }