Fix tests so they pass in other time zones.

anthonyu · Nov 8, 2010 · 6b31154 · 6b31154
1 parent 796d8b6
commit 6b31154
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/java/sizzle/functions/SizzleTimeIntrinsics.java b/src/java/sizzle/functions/SizzleTimeIntrinsics.java
@@ -45,8 +45,8 @@ public class SizzleTimeIntrinsics {
 		SizzleTimeIntrinsics.strftimeMap.put('Z', new SimpleDateFormat("zzz"));
 	}
 
-	private static long addPart(final int part, final long t, final long n, final TimeZone timeZone) {
-		final Calendar calendar = Calendar.getInstance(timeZone);
+	private static long addPart(final int part, final long t, final long n, final TimeZone tz) {
+		final Calendar calendar = Calendar.getInstance(tz);
 
 		calendar.setTimeInMillis(t / 1000);
 
@@ -837,7 +837,9 @@ private static String formatTime(final String formatstring, final long t, final
 			default:
 				if (inEscape) {
 					if (SizzleTimeIntrinsics.strftimeMap.containsKey(Character.valueOf(c))) {
-						sb.append(SizzleTimeIntrinsics.strftimeMap.get(Character.valueOf(c)).format(calendar.getTime()));
+						final SimpleDateFormat simpleDateFormat = SizzleTimeIntrinsics.strftimeMap.get(Character.valueOf(c));
+						simpleDateFormat.setTimeZone(tz);
+						sb.append(simpleDateFormat.format(calendar.getTime()));
 					} else {
 						throw new RuntimeException("invalid escape string: %" + c);
 					}

diff --git a/src/test/sizzle/functions/TestSizzleTimeIntrinsics.java b/src/test/sizzle/functions/TestSizzleTimeIntrinsics.java
@@ -14,8 +14,7 @@ public void testSizzleTimeIntrinsicsAddDay() {
 		calendar.set(2001, 1, 28, 0, 0, 0);
 		final long t = calendar.getTimeInMillis() * 1000;
 
-		Assert.assertEquals("addDay is wrong", "Thu Mar 1 00:00:00 2001",
-				SizzleTimeIntrinsics.formatTime("%c", SizzleTimeIntrinsics.addDay(t, 1, "PST8PDT"), "PST8PDT"));
+		Assert.assertEquals("addDay is wrong", "Thu Mar 1 00:00:00 2001", SizzleTimeIntrinsics.formatTime("%c", SizzleTimeIntrinsics.addDay(t, 1)));
 	}
 
 	@Test
@@ -24,13 +23,13 @@ public void testSizzleTimeIntrinsicsDayOfMonth() {
 		calendar.set(2001, 1, 28, 0, 0, 0);
 		final long t = calendar.getTimeInMillis() * 1000;
 
-		Assert.assertEquals("dayOfMonth is wrong", 28, SizzleTimeIntrinsics.dayOfMonth(t, "PST8PDT"));
+		Assert.assertEquals("dayOfMonth is wrong", 28, SizzleTimeIntrinsics.dayOfMonth(t));
 	}
 
 	@Test
 	public void testSizzleTimeIntrinsicsTruncateToDay() {
 		Assert.assertEquals("truncateToDay is wrong", "Fri Feb 13 00:00:00 2009",
-				SizzleTimeIntrinsics.formatTime("%c", SizzleTimeIntrinsics.truncToDay(1234567890000000l, "PST8PDT"), "PST8PDT"));
+				SizzleTimeIntrinsics.formatTime("%c", SizzleTimeIntrinsics.truncToDay(1234567890000000l)));
 	}
 
 	@Test
@@ -40,6 +39,6 @@ public void testSizzleTimeIntrinsicsFormatTime() {
 		final long t = calendar.getTimeInMillis() * 1000;
 
 		Assert.assertEquals("formatTime is wrong", "% That was Wed Feb 28 00:00:00 2001 in timezone PST %",
-				SizzleTimeIntrinsics.formatTime("%% That was %c in timezone %Z %%", t, "PST8PDT"));
+				SizzleTimeIntrinsics.formatTime("%% That was %c in timezone %Z %%", t));
 	}
 }