From 807aa97ee7a2d380f77c947a47e9871d7ce98122 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Fri, 1 Jul 2011 22:00:45 +0000 Subject: [PATCH] Don't use ambiguous timezone names. Fixes bug 331. --- .../com/google/gson/functional/DefaultTypeAdaptersTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java b/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java index 3b8a027d..74717b6f 100644 --- a/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java +++ b/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java @@ -63,7 +63,8 @@ public class DefaultTypeAdaptersTest extends TestCase { protected void setUp() throws Exception { super.setUp(); this.oldTimeZone = TimeZone.getDefault(); - TimeZone.setDefault(TimeZone.getTimeZone("PST")); + TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles")); + Locale.setDefault(Locale.US); gson = new Gson(); }