New version of openxml4j, which supports reading from InputStreams. Enable WorkbookFa...

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

diff --git a/build.xml b/build.xml
index 30ce0be36f5aa20c9315da5d4b97b6664e739244..e8ebdf496f0af58a5c0998dad6d513cb0989fa77 100644 (file)
--- 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 43b7f7ced5960513047bd11071696e4997d0ca80..789d3206c9a618bc3899255814e7a3413ff86c9d 100644 (file)
--- 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(