fixing test hierarchies

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

2 files changed, 46 insertions, 3 deletions

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/AllXSSFTests.java b/src/ooxml/testcases/org/apache/poi/xssf/AllXSSFTests.java
index fe3574fe30..25227a42fc 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/AllXSSFTests.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/AllXSSFTests.java
@@ -25,11 +25,9 @@ import org.apache.poi.xssf.eventusermodel.TestXSSFReader;
 import org.apache.poi.xssf.extractor.TestXSSFExcelExtractor;
 import org.apache.poi.xssf.io.TestLoadSaveXSSF;
 import org.apache.poi.xssf.model.TestCommentsTable;
+import org.apache.poi.xssf.model.TestSharedStringsTable;
 import org.apache.poi.xssf.model.TestStylesTable;
 import org.apache.poi.xssf.usermodel.AllXSSFUsermodelTests;
-import org.apache.poi.xssf.usermodel.TestXSSFFont;
-import org.apache.poi.xssf.usermodel.TestXSSFSheet;
-import org.apache.poi.xssf.usermodel.TestXSSFWorkbook;
 import org.apache.poi.xssf.util.TestCTColComparator;
 import org.apache.poi.xssf.util.TestNumericRanges;
 
@@ -47,6 +45,7 @@ public final class AllXSSFTests {
 		result.addTestSuite(TestXSSFExcelExtractor.class);
 		result.addTestSuite(TestLoadSaveXSSF.class);
 		result.addTestSuite(TestCommentsTable.class);
+		result.addTestSuite(TestSharedStringsTable.class);
 		result.addTestSuite(TestStylesTable.class);
 		result.addTestSuite(TestCellReference.class);
 		result.addTestSuite(TestCTColComparator.class);
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java b/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java
new file mode 100644
index 0000000000..17cc36783e
--- /dev/null
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java
@@ -0,0 +1,44 @@
+/* ====================================================================
+   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;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.poi.xwpf.extractor.TestXWPFWordExtractor;
+import org.apache.poi.xwpf.model.TestXWPFHeaderFooterPolicy;
+import org.apache.poi.xwpf.usermodel.TestXWPFParagraph;
+import org.apache.poi.xwpf.usermodel.TestXWPFRun;
+
+/**
+ * Collects all tests for <tt>org.apache.poi.xwpf</tt> and sub-packages.
+ * 
+ * @author Josh Micich
+ */
+public final class AllXWPFTests {
+
+	public static Test suite() {
+		TestSuite result = new TestSuite(AllXWPFTests.class.getName());
+		result.addTestSuite(TestXWPFDocument.class);
+		result.addTestSuite(TestXWPFHeaderFooterPolicy.class);
+		result.addTestSuite(TestXWPFParagraph.class);
+		result.addTestSuite(TestXWPFRun.class);
+		result.addTestSuite(TestXWPFWordExtractor.class);
+		return result;
+	}
+}