Snap for 9269479 from adfeaba824c914da2f93321c48a79fd418cb1e59 to udc-release

Change-Id: I5dfc11c3f4160ef04e0ea04af44d16098e9cded5

1 files changed, 16 insertions, 7 deletions

diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java b/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java
index 98de92d..bac077a 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java
+++ b/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java
@@ -130,6 +130,22 @@ public class TimestampTest extends TestCase {
                     "1969-12-31 05:14:39.309" },
             new String[] { "1970-01-01 19:45:20.231", "1970-01-02 07:17:59.0", "1969-12-31 22:14:39.309" } };
 
+    private TimeZone oldTimeZone;
+
+    @Override
+    public void setUp() {
+        oldTimeZone = TimeZone.getDefault();
+        // TIME_TESTN and corresponsing values in YEAR_ARRAY and MONTH_ARRAY
+        // are time zone dependant. TIME_TESTN comments indicate that
+        // they are interpreted as GMT, hence setting time zone to GMT.
+        TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
+    }
+
+    @Override
+    public void tearDown() {
+        TimeZone.setDefault(oldTimeZone);
+    }
+
     /*
     * Constructor test
     */
@@ -661,13 +677,6 @@ public class TimestampTest extends TestCase {
         SerializationTest.verifyGolden(this, object);
     }
 
-    // Reset defualt timezone
-    TimeZone defaultTimeZone = TimeZone.getDefault();
-
-    protected void tearDown() {
-        TimeZone.setDefault(defaultTimeZone);
-    }
-
     /**
      * @tests overriding Timestamp to create an immutable class.
      */