Implement CompletedHandler with unit test

Author: sunkup

lib/src/main/kotlin/at/bitfire/synctools/mapping/tasks/DmfsTaskProcessor.kt

@@ -12,6 +12,7 @@ import at.bitfire.ical4android.UnknownProperty
 import at.bitfire.ical4android.util.TimeApiExtensions.toLocalDate
 import at.bitfire.synctools.mapping.tasks.handler.AlarmsHandler
 import at.bitfire.synctools.mapping.tasks.handler.ClassificationHandler
+import at.bitfire.synctools.mapping.tasks.handler.CompletedHandler
 import at.bitfire.synctools.mapping.tasks.handler.DmfsTaskFieldHandler
 import at.bitfire.synctools.mapping.tasks.handler.DmfsTaskPropertyHandler
 import at.bitfire.synctools.mapping.tasks.handler.PriorityHandler
@@ -24,7 +25,6 @@ import at.bitfire.synctools.storage.tasks.DmfsTaskList
 import at.bitfire.synctools.util.AndroidTimeUtils
 import net.fortuna.ical4j.model.TimeZoneRegistryFactory
 import net.fortuna.ical4j.model.parameter.RelType
-import net.fortuna.ical4j.model.property.Completed
 import net.fortuna.ical4j.model.property.DtStart
 import net.fortuna.ical4j.model.property.Due
 import net.fortuna.ical4j.model.property.Duration
@@ -41,7 +41,6 @@ import org.dmfs.tasks.contract.TaskContract.Property.Comment
 import org.dmfs.tasks.contract.TaskContract.Property.Relation
 import org.dmfs.tasks.contract.TaskContract.Tasks
 import java.net.URISyntaxException
-import java.time.Instant
 import java.time.temporal.Temporal
 import java.util.logging.Level
 import java.util.logging.Logger
@@ -61,6 +60,7 @@ class DmfsTaskProcessor(
         PriorityHandler(),
         ClassificationHandler(),
         StatusHandler(),
+        CompletedHandler(),
     )
 
     private val propertyHandlers: Map<String, DmfsTaskPropertyHandler> = mapOf(
@@ -100,7 +100,6 @@ class DmfsTaskProcessor(
 
         // Note: big method – maybe split? Depends on how we want to proceed with refactoring.
 
-        values.getAsLong(Tasks.COMPLETED)?.let { to.completedAt = Completed(Instant.ofEpochMilli(it)) }
         values.getAsInteger(Tasks.PERCENT_COMPLETE)?.let { to.percentComplete = it }
 
         val allDay = (values.getAsInteger(Tasks.IS_ALLDAY) ?: 0) != 0

lib/src/main/kotlin/at/bitfire/synctools/mapping/tasks/handler/CompletedHandler.kt

@@ -0,0 +1,23 @@
+/*
+ * This file is part of bitfireAT/synctools which is released under GPLv3.
+ * Copyright © All Contributors. See the LICENSE and AUTHOR files in the root directory for details.
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package at.bitfire.synctools.mapping.tasks.handler
+
+import android.content.ContentValues
+import at.bitfire.ical4android.Task
+import net.fortuna.ical4j.model.property.Completed
+import org.dmfs.tasks.contract.TaskContract.Tasks
+import java.time.Instant
+
+class CompletedHandler : DmfsTaskFieldHandler {
+
+    override fun process(from: ContentValues, to: Task) {
+        from.getAsLong(Tasks.COMPLETED)?.let { epochMillis ->
+            to.completedAt = Completed(Instant.ofEpochMilli(epochMillis))
+        }
+    }
+
+}

lib/src/test/kotlin/at/bitfire/synctools/mapping/tasks/handler/CompletedHandlerTest.kt

@@ -0,0 +1,41 @@
+/*
+ * This file is part of bitfireAT/synctools which is released under GPLv3.
+ * Copyright © All Contributors. See the LICENSE and AUTHOR files in the root directory for details.
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package at.bitfire.synctools.mapping.tasks.handler
+
+import android.content.ContentValues
+import androidx.core.content.contentValuesOf
+import at.bitfire.ical4android.Task
+import net.fortuna.ical4j.model.property.Completed
+import org.dmfs.tasks.contract.TaskContract.Tasks
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import java.time.Instant
+
+@RunWith(RobolectricTestRunner::class)
+class CompletedHandlerTest {
+
+    private val handler = CompletedHandler()
+
+    @Test
+    fun `No COMPLETED leaves completedAt null`() {
+        val task = Task()
+        handler.process(ContentValues(), task)
+        assertNull(task.completedAt)
+    }
+
+    @Test
+    fun `COMPLETED epoch millis is mapped correctly`() {
+        val task = Task()
+        val epochMillis = 1_700_000_000_000L
+        handler.process(contentValuesOf(Tasks.COMPLETED to epochMillis), task)
+        assertEquals(Completed(Instant.ofEpochMilli(epochMillis)), task.completedAt)
+    }
+
+}