From ffc5d68b126db3f396211f27e43adbe9470d1a35 Mon Sep 17 00:00:00 2001 From: Yegor Kozlov Date: Wed, 15 Jun 2011 11:15:40 +0000 Subject: [PATCH] Bug 51374 - Fixed incorrect setting of lastPrinted OOXML core property git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1135997 13f79535-47bb-0310-9956-ffa450edef68 --- src/documentation/content/xdocs/status.xml | 1 + .../opc/internal/PackagePropertiesPart.java | 2 +- .../opc/TestPackageCoreProperties.java | 57 +++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml index c2b46ea71..889139d1d 100644 --- a/src/documentation/content/xdocs/status.xml +++ b/src/documentation/content/xdocs/status.xml @@ -34,6 +34,7 @@ + 51374 - Fixed incorrect setting of lastPrinted OOXML core property 51351 - Word to XSL-FO converter 50458 - Fixed missing shapeId in XSSF drawings 51339 - Fixed arithmetic rounding in formula evaluation diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java index 677a51322..e0b9a3721 100644 --- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java +++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java @@ -292,7 +292,7 @@ public final class PackagePropertiesPart extends PackagePart implements * @return A string representation of the last printed date. */ public String getLastPrintedPropertyString() { - return getDateValue(created); + return getDateValue(lastPrinted); } /** diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java index b934aa308..f2b2f7e1c 100644 --- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java +++ b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java @@ -29,6 +29,7 @@ import junit.framework.TestCase; 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.internal.PackagePropertiesPart; import org.apache.poi.openxml4j.util.Nullable; import org.apache.poi.util.POILogger; import org.apache.poi.util.POILogFactory; @@ -123,4 +124,60 @@ public final class TestPackageCoreProperties extends TestCase { assertEquals("MyTitle", props.getTitleProperty().getValue()); assertEquals("2", props.getVersionProperty().getValue()); } + + public void testCoreProperties_bug51374() throws Exception { + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); + df.setTimeZone(TimeZone.getTimeZone("UTC")); + String strDate = "2007-05-12T08:00:00Z"; + Date date = df.parse(strDate); + + OPCPackage pkg = new ZipPackage(); + PackagePropertiesPart props = (PackagePropertiesPart)pkg.getPackageProperties(); + + // created + assertEquals("", props.getCreatedPropertyString()); + assertNull(props.getCreatedProperty().getValue()); + props.setCreatedProperty((String)null); + assertEquals("", props.getCreatedPropertyString()); + assertNull(props.getCreatedProperty().getValue()); + props.setCreatedProperty(new Nullable()); + assertEquals("", props.getCreatedPropertyString()); + assertNull(props.getCreatedProperty().getValue()); + props.setCreatedProperty(new Nullable(date)); + assertEquals(strDate, props.getCreatedPropertyString()); + assertEquals(date, props.getCreatedProperty().getValue()); + props.setCreatedProperty(strDate); + assertEquals(strDate, props.getCreatedPropertyString()); + assertEquals(date, props.getCreatedProperty().getValue()); + + // lastPrinted + assertEquals("", props.getLastPrintedPropertyString()); + assertNull(props.getLastPrintedProperty().getValue()); + props.setLastPrintedProperty((String)null); + assertEquals("", props.getLastPrintedPropertyString()); + assertNull(props.getLastPrintedProperty().getValue()); + props.setLastPrintedProperty(new Nullable()); + assertEquals("", props.getLastPrintedPropertyString()); + assertNull(props.getLastPrintedProperty().getValue()); + props.setLastPrintedProperty(new Nullable(date)); + assertEquals(strDate, props.getLastPrintedPropertyString()); + assertEquals(date, props.getLastPrintedProperty().getValue()); + props.setLastPrintedProperty(strDate); + assertEquals(strDate, props.getLastPrintedPropertyString()); + assertEquals(date, props.getLastPrintedProperty().getValue()); + + // modified + assertNull(props.getModifiedProperty().getValue()); + props.setModifiedProperty((String)null); + assertNull(props.getModifiedProperty().getValue()); + props.setModifiedProperty(new Nullable()); + assertNull(props.getModifiedProperty().getValue()); + props.setModifiedProperty(new Nullable(date)); + assertEquals(strDate, props.getModifiedPropertyString()); + assertEquals(date, props.getModifiedProperty().getValue()); + props.setModifiedProperty(strDate); + assertEquals(strDate, props.getModifiedPropertyString()); + assertEquals(date, props.getModifiedProperty().getValue()); + } + }