aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Burch <nick@apache.org>2008-03-22 17:03:27 +0000
committerNick Burch <nick@apache.org>2008-03-22 17:03:27 +0000
commit2f5dc6f5e8dd9795b9863b4072943205cf5d4855 (patch)
tree1ac9876bae5cb8859b58b994c38d302abbdd0398
parentaea6fd622f694313225a6e81f73e6b41d9c63ae6 (diff)
downloadpoi-2f5dc6f5e8dd9795b9863b4072943205cf5d4855.tar.gz
poi-2f5dc6f5e8dd9795b9863b4072943205cf5d4855.zip
New version of openxml4j, which supports reading from InputStreams. Enable WorkbookFactory test for this
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@640015 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--build.xml4
-rw-r--r--src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java8
2 files changed, 7 insertions, 5 deletions
diff --git a/build.xml b/build.xml
index 30ce0be36f..e8ebdf496f 100644
--- a/build.xml
+++ b/build.xml
@@ -147,8 +147,8 @@ under the License.
<property name="ooxml.jar5.dir" location="${ooxml.lib}/jsr173_1.0_api.jar"/>
<property name="ooxml.jar5.url" value="${repository}/xmlbeans/jars/jsr173_1.0_api.jar"/>
<!-- No official release of openxml4j yet -->
- <property name="ooxml.jar6.dir" location="${ooxml.lib}/openxml4j-bin-alpha-080321.jar"/>
- <property name="ooxml.jar6.url" value="http://people.apache.org/~nick/openxml4j-bin-alpha-080321.jar"/>
+ <property name="ooxml.jar6.dir" location="${ooxml.lib}/openxml4j-bin-alpha-080322.jar"/>
+ <property name="ooxml.jar6.url" value="http://people.apache.org/~nick/openxml4j-bin-alpha-080322.jar"/>
<!-- See http://www.ecma-international.org/publications/standards/Ecma-376.htm -->
<!-- "Copy these file(s), free of charge" -->
diff --git a/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java b/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java
index 43b7f7ced5..789d3206c9 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java
@@ -70,9 +70,11 @@ public class TestWorkbookFactory extends TestCase {
}
/**
- * TODO - fix openxml4j to support input stream
+ * Creates the appropriate kind of Workbook, but
+ * checking the mime magic at the start of the
+ * InputStream, then creating what's required.
*/
- public void DISABLEDtestCreateGeneric() throws Exception {
+ public void testCreateGeneric() throws Exception {
Workbook wb;
// InputStream -> either
@@ -86,7 +88,7 @@ public class TestWorkbookFactory extends TestCase {
new FileInputStream(xlsx)
);
assertNotNull(wb);
- assertTrue(wb instanceof HSSFWorkbook);
+ assertTrue(wb instanceof XSSFWorkbook);
try {
wb = WorkbookFactory.create(