Setting the locale doesn't seem to set the timezone, so do that explicitly to ensure the tests behave for everyone
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1077874 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
8e1411c194
commit
f050cf6eeb
@ -21,6 +21,7 @@ import java.io.IOException;
|
||||
import java.text.DateFormat;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.TimeZone;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
@ -87,18 +88,18 @@ public final class TestAttachments extends TestCase {
|
||||
public void testAttachmentDetails() throws Exception {
|
||||
List<Attachment> attachments = quick.getAttachments();
|
||||
|
||||
// Pick a predictable date format
|
||||
// Note that the 28th April is in summer time in the UK
|
||||
// Pick a predictable date format + timezone
|
||||
DateFormat fmt = DateFormat.getDateTimeInstance(
|
||||
DateFormat.MEDIUM, DateFormat.MEDIUM, Locale.UK
|
||||
);
|
||||
fmt.setTimeZone(TimeZone.getTimeZone("UTC"));
|
||||
|
||||
// They should all have the same date on them
|
||||
assertEquals("28-Apr-2010 13:40:56", fmt.format( attachments.get(0).getModifiedDate()));
|
||||
assertEquals("28-Apr-2010 13:40:56", fmt.format( attachments.get(1).getModifiedDate()));
|
||||
assertEquals("28-Apr-2010 13:40:56", fmt.format( attachments.get(2).getModifiedDate()));
|
||||
assertEquals("28-Apr-2010 13:40:56", fmt.format( attachments.get(3).getModifiedDate()));
|
||||
assertEquals("28-Apr-2010 13:40:56", fmt.format( attachments.get(4).getModifiedDate()));
|
||||
assertEquals("28-Apr-2010 12:40:56", fmt.format( attachments.get(0).getModifiedDate()));
|
||||
assertEquals("28-Apr-2010 12:40:56", fmt.format( attachments.get(1).getModifiedDate()));
|
||||
assertEquals("28-Apr-2010 12:40:56", fmt.format( attachments.get(2).getModifiedDate()));
|
||||
assertEquals("28-Apr-2010 12:40:56", fmt.format( attachments.get(3).getModifiedDate()));
|
||||
assertEquals("28-Apr-2010 12:40:56", fmt.format( attachments.get(4).getModifiedDate()));
|
||||
|
||||
// They should all have a 3512 byte metafile rendered version
|
||||
assertEquals(3512, attachments.get(0).getRenderedMetaFile().length);
|
||||
|
@ -20,6 +20,7 @@ package org.apache.poi.hmef.attribute;
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.text.DateFormat;
|
||||
import java.util.Locale;
|
||||
import java.util.TimeZone;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
@ -151,6 +152,7 @@ public final class TestMAPIAttributes extends TestCase {
|
||||
DateFormat fmt = DateFormat.getDateTimeInstance(
|
||||
DateFormat.MEDIUM, DateFormat.MEDIUM, Locale.UK
|
||||
);
|
||||
fmt.setTimeZone(TimeZone.getTimeZone("UTC"));
|
||||
assertEquals("15-Dec-2010 14:46:31", fmt.format(date.getDate()));
|
||||
|
||||
// RTF
|
||||
|
@ -20,6 +20,7 @@ package org.apache.poi.hmef.attribute;
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.text.DateFormat;
|
||||
import java.util.Locale;
|
||||
import java.util.TimeZone;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
@ -156,12 +157,13 @@ public final class TestTNEFAttributes extends TestCase {
|
||||
assertEquals(3, LittleEndian.getUShort(attr.getData(), 12)); // Weds
|
||||
|
||||
// Ask for it as a Java date, and have it converted
|
||||
// Pick a predictable format + location. Note location is in summer time!
|
||||
// Pick a predictable format + location + timezone
|
||||
TNEFDateAttribute date = (TNEFDateAttribute)attr;
|
||||
DateFormat fmt = DateFormat.getDateTimeInstance(
|
||||
DateFormat.MEDIUM, DateFormat.MEDIUM, Locale.UK
|
||||
);
|
||||
assertEquals("28-Apr-2010 13:40:56", fmt.format(date.getDate()));
|
||||
fmt.setTimeZone(TimeZone.getTimeZone("UTC"));
|
||||
assertEquals("28-Apr-2010 12:40:56", fmt.format(date.getDate()));
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user