Merge pull request #212 from mishako/time-zone-z

"Support time zone Z in RFC 822 dates"

Thanks Misha!

src/main/java/com/rometools/rome/io/impl/DateParser.java

@@ -19,7 +19,9 @@ package com.rometools.rome.io.impl;
 import java.text.DateFormat;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
@@ -146,15 +148,33 @@ public class DateParser {
      *
      */
     public static Date parseRFC822(String sDate, final Locale locale) {
-        final int utIndex = sDate.indexOf(" UT");
+        sDate = convertUnsupportedTimeZones(sDate);
-        if (utIndex > -1) {
-            final String pre = sDate.substring(0, utIndex);
-            final String post = sDate.substring(utIndex + 3);
-            sDate = pre + " GMT" + post;
-        }
         return parseUsingMask(RFC822_MASKS, sDate, locale);
     }
 
+    private static String convertUnsupportedTimeZones(String sDate) {
+        final List<String> unsupportedZeroOffsetTimeZones = Arrays.asList("UT", "Z");
+
+        for (String timeZone : unsupportedZeroOffsetTimeZones) {
+            if (sDate.endsWith(timeZone)) {
+                return replaceLastOccurrence(sDate, timeZone, "UTC");
+            }
+        }
+        return sDate;
+    }
+
+    private static String replaceLastOccurrence(String original, String target, String replacement) {
+        final int lastIndexOfTarget = original.lastIndexOf(target);
+
+        if (lastIndexOfTarget == -1) {
+            return original;
+        } else {
+            return new StringBuilder(original)
+                .replace(lastIndexOfTarget, lastIndexOfTarget + target.length(), replacement)
+                .toString();
+        }
+    }
+
     /**
      * Parses a Date out of a String with a date in W3C date-time format.
      * <p/>

src/test/java/com/rometools/rome/unittest/TestDateParser.java

@@ -1,6 +1,4 @@
 /*
- * Copyright 2004-2005 Sun Microsystems, Inc.
- *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,119 +10,109 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
+
 package com.rometools.rome.unittest;
 
-import java.util.Calendar;
+import static org.junit.Assert.assertEquals;
-import java.util.Date;
+import static org.junit.Assert.assertNull;
-import java.util.GregorianCalendar;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import junit.framework.TestCase;
 
 import com.rometools.rome.io.impl.DateParser;
 
-/**
+import org.junit.Test;
- *
- * Start of tests for DateParser
- *
- * @author Nick Lothian
- *
- */
-public class TestDateParser extends TestCase {
-    public void testParse() {
-        final Calendar cal = new GregorianCalendar();
-        cal.setTimeZone(TimeZone.getTimeZone("GMT"));
 
-        // four-digit year
+import java.text.DateFormat;
-        String sDate = "Tue, 19 Jul 2005 23:00:51 GMT";
+import java.text.ParseException;
-        cal.setTime(DateParser.parseRFC822(sDate, Locale.US));
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
 
-        assertEquals(2005, cal.get(Calendar.YEAR));
+public class TestDateParser {
-        assertEquals(6, cal.get(Calendar.MONTH)); // month is zero-indexed
-        assertEquals(19, cal.get(Calendar.DAY_OF_MONTH));
-        assertEquals(3, cal.get(Calendar.DAY_OF_WEEK));
-        assertEquals(23, cal.get(Calendar.HOUR_OF_DAY));
-        assertEquals(0, cal.get(Calendar.MINUTE));
-        assertEquals(51, cal.get(Calendar.SECOND));
 
-        // two-digit year
+    @Test
-        sDate = "Tue, 19 Jul 05 23:00:51 GMT";
+    public void testW3c() {
-        cal.setTime(DateParser.parseRFC822(sDate, Locale.US));
+        assertEquals(date("2005-07-19 17:00:42"),
+                     DateParser.parseW3CDateTime("2005-07-19T17:00:42Z", Locale.US));
+    }
 
-        assertEquals(2005, cal.get(Calendar.YEAR));
+    @Test
-        assertEquals(6, cal.get(Calendar.MONTH)); // month is zero-indexed
+    public void testW3cNoSeconds() {
-        assertEquals(19, cal.get(Calendar.DAY_OF_MONTH));
+        assertEquals(date("2005-07-19 17:00:00"),
-        assertEquals(3, cal.get(Calendar.DAY_OF_WEEK));
+                     DateParser.parseW3CDateTime("2005-07-19T17:00Z", Locale.US));
-        assertEquals(23, cal.get(Calendar.HOUR_OF_DAY));
+    }
-        assertEquals(0, cal.get(Calendar.MINUTE));
-        assertEquals(51, cal.get(Calendar.SECOND));
 
-        // four-digit year
+    @Test
-        sDate = "Tue, 19 Jul 2005 23:00:51 UT";
+    public void testW3cNoTime() {
-        cal.setTime(DateParser.parseRFC822(sDate, Locale.US));
+        assertEquals(date("2005-07-19 00:00:00"),
+                     DateParser.parseW3CDateTime("2005-07-19", Locale.US));
+    }
 
-        assertEquals(2005, cal.get(Calendar.YEAR));
+    @Test
-        assertEquals(6, cal.get(Calendar.MONTH)); // month is zero-indexed
+    public void testW3cOnlyYearAndMonth() {
-        assertEquals(19, cal.get(Calendar.DAY_OF_MONTH));
+        assertEquals(date("2005-07-01 00:00:00"),
-        assertEquals(3, cal.get(Calendar.DAY_OF_WEEK));
+                     DateParser.parseW3CDateTime("2005-07", Locale.US));
-        assertEquals(23, cal.get(Calendar.HOUR_OF_DAY));
+    }
-        assertEquals(0, cal.get(Calendar.MINUTE));
-        assertEquals(51, cal.get(Calendar.SECOND));
 
-        // two-digit year
+    @Test
-        sDate = "Tue, 19 Jul 05 23:00:51 UT";
+    public void testW3cOnlyYear() {
-        cal.setTime(DateParser.parseRFC822(sDate, Locale.US));
+        assertEquals(date("2005-01-01 00:00:00"),
+                     DateParser.parseW3CDateTime("2005", Locale.US));
+    }
 
-        assertEquals(2005, cal.get(Calendar.YEAR));
+    @Test
-        assertEquals(6, cal.get(Calendar.MONTH)); // month is zero-indexed
+    public void testRfc822FourDigitYear() {
-        assertEquals(19, cal.get(Calendar.DAY_OF_MONTH));
+        assertEquals(date("2005-07-19 17:00:42"),
-        assertEquals(3, cal.get(Calendar.DAY_OF_WEEK));
+                     DateParser.parseRFC822("Tue, 19 Jul 2005 17:00:42 GMT", Locale.US));
-        assertEquals(23, cal.get(Calendar.HOUR_OF_DAY));
+    }
-        assertEquals(0, cal.get(Calendar.MINUTE));
-        assertEquals(51, cal.get(Calendar.SECOND));
 
-        // RFC822
+    @Test
-        sDate = "Tue, 19 Jul 2005 23:00:51 GMT";
+    public void testRfc822TwoDigitYear() {
-        assertNotNull(DateParser.parseDate(sDate, Locale.US));
+        assertEquals(date("2005-07-19 17:00:42"),
+                     DateParser.parseRFC822("Tue, 19 Jul 05 17:00:42 GMT", Locale.US));
+    }
 
-        // RFC822
+    @Test
-        sDate = "Tue, 19 Jul 05 23:00:51 GMT";
+    public void testRfc822WithUtTimeZone() {
-        assertNotNull(DateParser.parseDate(sDate, Locale.US));
+        assertEquals(date("2005-07-19 17:00:42"),
+                     DateParser.parseRFC822("Tue, 19 Jul 2005 17:00:42 UT", Locale.US));
+    }
 
-        final Calendar c = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
+    @Test
-        c.set(2000, Calendar.JANUARY, 01, 0, 0, 0);
+    public void testRfc822WithUtcTimeZone() {
-        final Date expectedDate = c.getTime();
+        assertEquals(date("2005-07-19 17:00:42"),
+                     DateParser.parseRFC822("Tue, 19 Jul 2005 17:00:42 UTC", Locale.US));
+    }
 
-        // W3C
+    @Test
-        sDate = "2000-01-01T00:00:00Z";
+    public void testRfc822WithZTimeZone() {
-        assertEquals(expectedDate.getTime() / 1000, DateParser.parseDate(sDate, Locale.US).getTime() / 1000);
+        assertEquals(date("2005-07-19 17:00:42"),
+                     DateParser.parseRFC822("Tue, 19 Jul 2005 17:00:42 Z", Locale.US));
+    }
 
-        // W3C
+    @Test
-        sDate = "2000-01-01T00:00Z";
+    public void testExtraMaskInRomePropertiesFile() {
-        assertEquals(expectedDate.getTime() / 1000, DateParser.parseDate(sDate, Locale.US).getTime() / 1000);
+        assertEquals(date("2005-07-19 17:00:00", TimeZone.getDefault()),
+                     DateParser.parseDate("17:00 2005/07/19", Locale.US));
+    }
 
-        // W3C
+    @Test
-        sDate = "2000-01-01";
+    public void testInvalidDate() {
-        assertEquals(expectedDate.getTime() / 1000, DateParser.parseDate(sDate, Locale.US).getTime() / 1000);
+        assertNull(DateParser.parseDate("X00:00 2005-07-19", Locale.US));
+    }
 
-        // W3C
+    static Date date(String dateString) {
-        sDate = "2000-01";
+        return date(dateString, TimeZone.getTimeZone("UTC"));
-        assertEquals(expectedDate.getTime() / 1000, DateParser.parseDate(sDate, Locale.US).getTime() / 1000);
+    }
 
-        // W3C
+    static Date date(String dateString, TimeZone timeZone) {
-        sDate = "2000";
+        final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        assertEquals(expectedDate.getTime() / 1000, DateParser.parseDate(sDate, Locale.US).getTime() / 1000);
+        dateFormat.setTimeZone(timeZone);
-
-        // EXTRA
-        sDate = "18:10 2000/10/10";
-        assertNotNull(DateParser.parseDate(sDate, Locale.US));
-
-        // INVALID
-        sDate = "X20:10 2000-10-10";
-        assertNull(DateParser.parseDate(sDate, Locale.US));
 
+        try {
+            return dateFormat.parse(dateString);
+        } catch (ParseException e) {
+            throw new IllegalArgumentException("Failed to parse date", e);
+        }
     }
 }