moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

fixed failing tests, force UTC time zone when formatting dates

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1401641 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yegor Kozlov 2012-10-24 12:06:40 +00:00
parent f6f8425c40
commit 04b9f9dff9
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertyValue.java
View File

@ -18,6 +18,7 @@
package org.apache.poi.hsmf.datatypes; package org.apache.poi.hsmf.datatypes;
import java.util.Calendar; import java.util.Calendar;
import java.util.TimeZone;
import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndian;
@ -92,7 +93,7 @@ public class PropertyValue {
long time = LittleEndian.getLong(data); long time = LittleEndian.getLong(data);
time = (time / 10 / 1000) - OFFSET; time = (time / 10 / 1000) - OFFSET;
Calendar timeC = Calendar.getInstance(); Calendar timeC = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
timeC.setTimeInMillis(time); timeC.setTimeInMillis(time);
return timeC; return timeC;

2
src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java
View File

@ -20,6 +20,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.TimeZone;
import org.apache.poi.POIOLE2TextExtractor; import org.apache.poi.POIOLE2TextExtractor;
import org.apache.poi.hsmf.MAPIMessage; import org.apache.poi.hsmf.MAPIMessage;
@ -117,6 +118,7 @@ public class OutlookTextExtactor extends POIOLE2TextExtractor {
try { try {
// First try via the proper chunk // First try via the proper chunk
SimpleDateFormat f = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss Z"); 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"); s.append("Date: " + f.format(msg.getMessageDate().getTime()) + "\n");
} catch(ChunkNotFoundException e) { } catch(ChunkNotFoundException e) {
try { try {

4
src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java
View File

@ -22,6 +22,7 @@ import java.io.IOException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.TimeZone;
import junit.framework.TestCase; import junit.framework.TestCase;
@ -63,6 +64,7 @@ public final class TestOutlookTextExtractor extends TestCase {
assertContains(text, "Subject: Test the content transformer\n"); assertContains(text, "Subject: Test the content transformer\n");
Calendar cal = new GregorianCalendar(2007, 5, 14, 9, 42, 55); Calendar cal = new GregorianCalendar(2007, 5, 14, 9, 42, 55);
SimpleDateFormat f = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss Z"); SimpleDateFormat f = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss Z");
f.setTimeZone(TimeZone.getTimeZone("UTC"));
String dateText = f.format(cal.getTime()); String dateText = f.format(cal.getTime());
assertContains(text, "Date: " + dateText + "\n"); assertContains(text, "Date: " + dateText + "\n");
assertContains(text, "The quick brown fox jumps over the lazy dog"); assertContains(text, "The quick brown fox jumps over the lazy dog");
@ -81,7 +83,7 @@ public final class TestOutlookTextExtractor extends TestCase {
assertEquals(-1, text.indexOf("CC:")); assertEquals(-1, text.indexOf("CC:"));
assertEquals(-1, text.indexOf("BCC:")); assertEquals(-1, text.indexOf("BCC:"));
assertContains(text, "Subject: test message\n"); 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."); assertContains(text, "This is a test message.");
} }