You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ye...@apache.org on 2012/10/24 14:06:40 UTC
svn commit: r1401641 - in /poi/trunk/src/scratchpad:
src/org/apache/poi/hsmf/datatypes/PropertyValue.java
src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java
testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java
Author: yegor
Date: Wed Oct 24 12:06:40 2012
New Revision: 1401641
URL: http://svn.apache.org/viewvc?rev=1401641&view=rev
Log:
fixed failing tests, force UTC time zone when formatting dates
Modified:
poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertyValue.java
poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertyValue.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertyValue.java?rev=1401641&r1=1401640&r2=1401641&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertyValue.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertyValue.java Wed Oct 24 12:06:40 2012
@@ -18,6 +18,7 @@
package org.apache.poi.hsmf.datatypes;
import java.util.Calendar;
+import java.util.TimeZone;
import org.apache.poi.util.LittleEndian;
@@ -92,7 +93,7 @@ public class PropertyValue {
long time = LittleEndian.getLong(data);
time = (time / 10 / 1000) - OFFSET;
- Calendar timeC = Calendar.getInstance();
+ Calendar timeC = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
timeC.setTimeInMillis(time);
return timeC;
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java?rev=1401641&r1=1401640&r2=1401641&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java Wed Oct 24 12:06:40 2012
@@ -20,6 +20,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.text.SimpleDateFormat;
+import java.util.TimeZone;
import org.apache.poi.POIOLE2TextExtractor;
import org.apache.poi.hsmf.MAPIMessage;
@@ -117,6 +118,7 @@ public class OutlookTextExtactor extends
try {
// First try via the proper chunk
SimpleDateFormat f = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss Z");
+ f.setTimeZone(TimeZone.getTimeZone("UTC"));
s.append("Date: " + f.format(msg.getMessageDate().getTime()) + "\n");
} catch(ChunkNotFoundException e) {
try {
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java?rev=1401641&r1=1401640&r2=1401641&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java Wed Oct 24 12:06:40 2012
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.GregorianCalendar;
+import java.util.TimeZone;
import junit.framework.TestCase;
@@ -63,6 +64,7 @@ public final class TestOutlookTextExtrac
assertContains(text, "Subject: Test the content transformer\n");
Calendar cal = new GregorianCalendar(2007, 5, 14, 9, 42, 55);
SimpleDateFormat f = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss Z");
+ f.setTimeZone(TimeZone.getTimeZone("UTC"));
String dateText = f.format(cal.getTime());
assertContains(text, "Date: " + dateText + "\n");
assertContains(text, "The quick brown fox jumps over the lazy dog");
@@ -81,7 +83,7 @@ public final class TestOutlookTextExtrac
assertEquals(-1, text.indexOf("CC:"));
assertEquals(-1, text.indexOf("BCC:"));
assertContains(text, "Subject: test message\n");
- assertContains(text, "Date: Fri, 6 Jul 2007 06:27:17 +0100\n");
+ assertContains(text, "Date: Fri, 6 Jul 2007 05:27:17 +0000\n");
assertContains(text, "This is a test message.");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org