You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2014/02/03 21:17:59 UTC
svn commit: r1564045 - in /poi/trunk:
src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
test-data/spreadsheet/55924.xlsx
Author: centic
Date: Mon Feb 3 20:17:59 2014
New Revision: 1564045
URL: http://svn.apache.org/r1564045
Log:
Bug 55924: Avoid errors during exporting XML if there are numeric cells without value, also verify in tests that XML can always be parsed
Added:
poi/trunk/test-data/spreadsheet/55924.xlsx
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java?rev=1564045&r1=1564044&r2=1564045&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java Mon Feb 3 20:17:59 2014
@@ -174,6 +174,11 @@ public class XSSFExportToXml implements
Node currentNode = getNodeByXPath(xpath,doc.getFirstChild(),doc,false);
STXmlDataType.Enum dataType = simpleXmlCell.getXmlDataType();
mapCellOnNode(cell,currentNode,dataType);
+
+ //remove nodes which are empty in order to keep the output xml valid
+ if("".equals(currentNode.getTextContent()) && currentNode.getParentNode() != null) {
+ currentNode.getParentNode().removeChild(currentNode);
+ }
}
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java?rev=1564045&r1=1564044&r2=1564045&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java Mon Feb 3 20:17:59 2014
@@ -17,10 +17,16 @@
package org.apache.poi.xssf.extractor;
+import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
import junit.framework.TestCase;
import org.apache.poi.POIXMLDocumentPart;
@@ -28,12 +34,15 @@ import org.apache.poi.xssf.XSSFTestDataS
import org.apache.poi.xssf.model.MapInfo;
import org.apache.poi.xssf.usermodel.XSSFMap;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.junit.Test;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
/**
* @author Roberto Manicardi
*/
public final class TestXSSFExportToXML extends TestCase {
-
public void testExportToXML() throws Exception {
XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("CustomXMLMappings.xlsx");
@@ -71,6 +80,8 @@ public final class TestXSSFExportToXML e
assertEquals("gvvv", argomento);
assertEquals("aaaa", progetto);
assertEquals("aa", crediti);
+
+ parseXML(xml);
}
}
@@ -114,6 +125,8 @@ public final class TestXSSFExportToXML e
assertEquals("ds", argomento);
assertEquals("ro", progetto);
assertEquals("ro", crediti);
+
+ parseXML(xml);
}
}
@@ -212,6 +225,8 @@ public final class TestXSSFExportToXML e
assertEquals("15", euro);
assertEquals("19", chf);
+
+ parseXML(xmlData);
}
}
@@ -239,6 +254,8 @@ public final class TestXSSFExportToXML e
String date = xmlData.split("<DATE>")[1].split("</DATE>")[0].trim();
assertEquals("2012-01-13", date);
+
+ parseXML(xmlData);
}
}
@@ -270,6 +287,59 @@ public final class TestXSSFExportToXML e
assertEquals("Hello World", stringValue);
assertEquals("5.1", doubleValue);
+
+ parseXML(xmlData);
+ }
+ }
+
+ @Test
+ public void testXmlExportIgnoresEmptyCells_Bugzilla_55924() throws Exception {
+
+ XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("55924.xlsx");
+
+ for (POIXMLDocumentPart p : wb.getRelations()) {
+
+ if (!(p instanceof MapInfo)) {
+ continue;
+ }
+ MapInfo mapInfo = (MapInfo) p;
+
+ XSSFMap map = mapInfo.getXSSFMapById(1);
+
+ assertNotNull("XSSFMap is null", map);
+
+ XSSFExportToXml exporter = new XSSFExportToXml(map);
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ exporter.exportToXML(os, true);
+ String xmlData = os.toString("UTF-8");
+
+ assertNotNull(xmlData);
+ assertFalse(xmlData.equals(""));
+
+ String a = xmlData.split("<A>")[1].split("</A>")[0].trim();
+ String euro = a.split("<EUR>")[1].split("</EUR>")[0].trim();
+ assertEquals("1",euro);
+
+ parseXML(xmlData);
+ }
+ }
+
+ private void parseXML(String xmlData) throws IOException, SAXException, ParserConfigurationException {
+ DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
+ docBuilderFactory.setNamespaceAware(true);
+ docBuilderFactory.setValidating(false);
+ DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
+ docBuilder.setEntityResolver(new DummyEntityResolver());
+
+ docBuilder.parse(new ByteArrayInputStream(xmlData.getBytes("UTF-8")));
+ }
+
+ private static class DummyEntityResolver implements EntityResolver
+ {
+ @Override
+ public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException
+ {
+ return null;
}
}
}
Added: poi/trunk/test-data/spreadsheet/55924.xlsx
URL: http://svn.apache.org/viewvc/poi/trunk/test-data/spreadsheet/55924.xlsx?rev=1564045&view=auto
==============================================================================
Files poi/trunk/test-data/spreadsheet/55924.xlsx (added) and poi/trunk/test-data/spreadsheet/55924.xlsx Mon Feb 3 20:17:59 2014 differ
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org