Added tests for all datetime formats from AOSP

Author: ArnyminerZ

lib/src/main/kotlin/at/bitfire/vcard4android/contactrow/EventHandler.kt

@@ -62,11 +62,25 @@ object EventHandler : DataRowHandler() {
     override fun handle(values: ContentValues, contact: Contact) {
         super.handle(values, contact)
 
-        val dateStr = values.getAsString(Event.START_DATE) ?: return
+        var dateStr = values.getAsString(Event.START_DATE) ?: return
         val full: Temporal? = parseStartDate(dateStr)
         val partial: PartialDate? = if (full == null) try {
-            PartialDate.parse(dateStr)
-        } catch (_: IllegalArgumentException) {
+            if (dateStr.endsWith('Z')) {
+                // 'Z' is not supported for suffix in PartialDate, replace with actual offset
+                dateStr = dateStr.removeSuffix("Z") + "+00:00"
+            }
+
+            val regex = "\\.\\d{3}".toRegex()
+            if (dateStr.contains(regex)) {
+                // partial dates do not accept nanoseconds, so strip them if present
+                dateStr = dateStr.replace(regex, "")
+                PartialDate.parse(dateStr)
+            } else {
+                PartialDate.parse(dateStr)
+            }
+        } catch (e: IllegalArgumentException) {
+            System.err.println("Could not parse partial date: $dateStr")
+            e.printStackTrace()
             null
         } else {
             null

lib/src/test/kotlin/at/bitfire/vcard4android/contactrow/EventHandlerTest.kt

@@ -25,16 +25,19 @@ import java.time.ZoneOffset
 @RunWith(RobolectricTestRunner::class)
 class EventHandlerTest {
 
+    // Tested date formats are as provided by Android AOSP Contacts App
+    // https://android.googlesource.com/platform/packages/apps/Contacts/+/refs/tags/android-13.0.0_r49/src/com/android/contacts/util/CommonDateUtils.java
+
     @Test
-    fun test_parseStartDate_ISO_UTC_DateTime() {
+    fun test_parseStartDate_ISO_DATE_AND_TIME_FORMAT_DateTime() {
         assertEquals(
             OffsetDateTime.of(1953, 10,  15, 23, 10, 0, 0, ZoneOffset.UTC),
             EventHandler.parseStartDate("1953-10-15T23:10:00Z")
         )
     }
 
     @Test
-    fun test_parseStartDate_ISO_Date() {
+    fun test_parseStartDate_FULL_DATE_FORMAT_Date() {
         assertEquals(
             LocalDate.of(1953, 10,  15),
             EventHandler.parseStartDate("1953-10-15")
@@ -53,7 +56,7 @@ class EventHandlerTest {
     }
 
     @Test
-    fun testStartDate_Full() {
+    fun testStartDate_FULL_DATE_FORMAT() {
         val contact = Contact()
         EventHandler.handle(ContentValues().apply {
             put(Event.START_DATE, "1984-08-20")
@@ -65,14 +68,39 @@ class EventHandlerTest {
     }
 
     @Test
-    fun testStartDate_Partial() {
+    fun testStartDate_DATE_AND_TIME_FORMAT() {
+        val contact = Contact()
+        EventHandler.handle(ContentValues().apply {
+            put(Event.START_DATE, "1953-10-15T23:10:12.345Z")
+        }, contact)
+        assertEquals(
+            OffsetDateTime.of(1953, 10,  15, 23, 10, 12, 345_000_000, ZoneOffset.UTC),
+            contact.customDates[0].property.date
+        )
+    }
+
+    @Test
+    fun testStartDate_NO_YEAR_DATE_FORMAT() {
         val contact = Contact()
         EventHandler.handle(ContentValues().apply {
             put(Event.START_DATE, "--08-20")
         }, contact)
         assertEquals(PartialDate.parse("--0820"), contact.customDates[0].property.partialDate)
     }
 
+    @Test
+    fun testStartDate_NO_YEAR_DATE_AND_TIME_FORMAT() {
+        val contact = Contact()
+        EventHandler.handle(ContentValues().apply {
+            put(Event.START_DATE, "--08-20T23:10:12.345Z")
+        }, contact)
+        // Note that nanoseconds are stripped in PartialDate
+        assertEquals(
+            PartialDate.builder().month(8).date(20).hour(23).minute(10).second(12).offset(ZoneOffset.UTC).build(),
+            contact.customDates[0].property.partialDate
+        )
+    }
+
 
     @Test
     fun testType_Anniversary() {