PDFBOX-6109: recognise datetime without timezone and improve test coverage

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1930099 13f79535-47bb-0310-9956-ffa450edef68

Author: THausherr

xmpbox/src/main/java/org/apache/xmpbox/DateConverter.java

@@ -144,7 +144,7 @@ public static Calendar toCalendar(String date) throws IOException
                 }
 
                 int timeZonePos = 12;
-                if (date.length() - 12 > 5 || (date.length() - 12 == 3 && date.endsWith("Z")))
+                if (date.length() == 14 || date.length() - 12 > 5 || (date.length() - 12 == 3 && date.endsWith("Z")))
                 {
                     second = Integer.parseInt(date.substring(12, 14));
                     timeZonePos = 14;

xmpbox/src/test/java/org/apache/xmpbox/DateConverterTest.java

@@ -59,6 +59,42 @@ void testDateConversion() throws IOException
         convDate = DateConverter.toCalendar("D:2015-02-02");
         assertEquals(2015, convDate.get(Calendar.YEAR));
 
+        convDate = DateConverter.toCalendar("D:2015-02-03T10:11:12");
+        assertEquals(2015, convDate.get(Calendar.YEAR));
+        assertEquals(1, convDate.get(Calendar.MONTH)); // 0-based
+        assertEquals(3, convDate.get(Calendar.DAY_OF_MONTH));
+        assertEquals(10, convDate.get(Calendar.HOUR));
+        assertEquals(11, convDate.get(Calendar.MINUTE));
+        assertEquals(12, convDate.get(Calendar.SECOND));
+
+        convDate = DateConverter.toCalendar("D:2015-02-03T10:11:12Z");
+        assertEquals(2015, convDate.get(Calendar.YEAR));
+        assertEquals(1, convDate.get(Calendar.MONTH)); // 0-based
+        assertEquals(3, convDate.get(Calendar.DAY_OF_MONTH));
+        assertEquals(10, convDate.get(Calendar.HOUR));
+        assertEquals(11, convDate.get(Calendar.MINUTE));
+        assertEquals(12, convDate.get(Calendar.SECOND));
+
+        convDate = DateConverter.toCalendar("D:2015-02-03T10:11:12+05:00");
+        assertEquals(2015, convDate.get(Calendar.YEAR));
+        assertEquals(1, convDate.get(Calendar.MONTH)); // 0-based
+        assertEquals(3, convDate.get(Calendar.DAY_OF_MONTH));
+        assertEquals(10, convDate.get(Calendar.HOUR));
+        assertEquals(11, convDate.get(Calendar.MINUTE));
+        assertEquals(12, convDate.get(Calendar.SECOND));
+        assertEquals(5 * 3600 * 1000, convDate.get(Calendar.ZONE_OFFSET));
+        assertEquals("GMT+05:00", convDate.getTimeZone().getDisplayName());
+
+        convDate = DateConverter.toCalendar("D:2015-02-03T10:11:12-05:00");
+        assertEquals(2015, convDate.get(Calendar.YEAR));
+        assertEquals(1, convDate.get(Calendar.MONTH)); // 0-based
+        assertEquals(3, convDate.get(Calendar.DAY_OF_MONTH));
+        assertEquals(10, convDate.get(Calendar.HOUR));
+        assertEquals(11, convDate.get(Calendar.MINUTE));
+        assertEquals(12, convDate.get(Calendar.SECOND));
+        assertEquals(-5 * 3600 * 1000, convDate.get(Calendar.ZONE_OFFSET));
+        assertEquals("GMT-05:00", convDate.getTimeZone().getDisplayName());
+
         convDate = DateConverter.toCalendar("2025-09-03T15:43:47.989082+00:00");
         assertEquals(989, convDate.get(Calendar.MILLISECOND));