From 9f7190f05e06e7e19dbddf2b59a7b4202e6e31f7 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Wed, 26 May 2010 13:56:51 +0000 Subject: [PATCH] Fix bug #49160 - Ensure that CTDigSigBlob is included in poi-ooxml jar git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@948426 13f79535-47bb-0310-9956-ffa450edef68 --- src/documentation/content/xdocs/status.xml | 1 + .../poi/xwpf/TestAllExtendedProperties.java | 26 ++++++++----------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml index be43882899..acbd7e78b8 100644 --- a/src/documentation/content/xdocs/status.xml +++ b/src/documentation/content/xdocs/status.xml @@ -34,6 +34,7 @@ + 49160 - Ensure that CTDigSigBlob is included in poi-ooxml jar 49189 - Detect w:tab and w:cr entries in XWPF paragraphs, even when the XSD is silly and maps them to CTEmpty 49273 - Correct handling for Font Character Sets with indicies greater than 127 49334 - Track the ValueRangeRecords of charts in HSSFChart, to allow the basic axis operations diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestAllExtendedProperties.java b/src/ooxml/testcases/org/apache/poi/xwpf/TestAllExtendedProperties.java index 9db3be79ec..8b7b08b7c9 100644 --- a/src/ooxml/testcases/org/apache/poi/xwpf/TestAllExtendedProperties.java +++ b/src/ooxml/testcases/org/apache/poi/xwpf/TestAllExtendedProperties.java @@ -17,26 +17,12 @@ package org.apache.poi.xwpf; -import java.io.File; -import java.io.IOException; -import java.text.ParsePosition; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.TimeZone; - import junit.framework.TestCase; import org.apache.poi.POIXMLProperties.CoreProperties; -import org.apache.poi.openxml4j.OpenXML4JTestDataSamples; -import org.apache.poi.openxml4j.exceptions.InvalidFormatException; -import org.apache.poi.openxml4j.exceptions.OpenXML4JException; -import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.openxml4j.opc.PackageProperties; -import org.apache.poi.openxml4j.util.Nullable; -import org.apache.poi.util.POILogger; -import org.apache.poi.util.POILogFactory; import org.apache.poi.xwpf.usermodel.XWPFDocument; -import org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes.CTVariant; +import org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTDigSigBlob; import org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTProperties; import org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTVectorLpstr; import org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTVectorVariant; @@ -105,5 +91,15 @@ public final class TestAllExtendedProperties extends TestCase { assertEquals(3,ctProps.getTotalTime()); assertEquals(10,ctProps.getWords()); + // Check the digital signature part + // Won't be there in this file, but we + // need to do this check so that the + // appropriate parts end up in the + // smaller ooxml schemas file + CTDigSigBlob blob = ctProps.getDigSig(); + assertNull(blob); + + blob = CTDigSigBlob.Factory.newInstance(); + blob.setBlob(new byte [] {2,6,7,2,3,4,5,1,2,3}); } } -- 2.39.5