Implement StatusHandler with unit test

Author: sunkup

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

@@ -16,6 +16,7 @@ import at.bitfire.synctools.mapping.tasks.handler.DmfsTaskFieldHandler
 import at.bitfire.synctools.mapping.tasks.handler.DmfsTaskPropertyHandler
 import at.bitfire.synctools.mapping.tasks.handler.PriorityHandler
 import at.bitfire.synctools.mapping.tasks.handler.SequenceHandler
+import at.bitfire.synctools.mapping.tasks.handler.StatusHandler
 import at.bitfire.synctools.mapping.tasks.handler.TitleHandler
 import at.bitfire.synctools.mapping.tasks.handler.UidHandler
 import at.bitfire.synctools.storage.tasks.DmfsTask.Companion.UNKNOWN_PROPERTY_DATA
@@ -33,7 +34,6 @@ import net.fortuna.ical4j.model.property.Organizer
 import net.fortuna.ical4j.model.property.RDate
 import net.fortuna.ical4j.model.property.RRule
 import net.fortuna.ical4j.model.property.RelatedTo
-import net.fortuna.ical4j.model.property.Status
 import org.dmfs.tasks.contract.TaskContract.Properties
 import org.dmfs.tasks.contract.TaskContract.Property.Alarm
 import org.dmfs.tasks.contract.TaskContract.Property.Category
@@ -60,6 +60,7 @@ class DmfsTaskProcessor(
         SequenceHandler(),
         PriorityHandler(),
         ClassificationHandler(),
+        StatusHandler(),
     )
 
     private val propertyHandlers: Map<String, DmfsTaskPropertyHandler> = mapOf(
@@ -102,13 +103,6 @@ class DmfsTaskProcessor(
         values.getAsLong(Tasks.COMPLETED)?.let { to.completedAt = Completed(Instant.ofEpochMilli(it)) }
         values.getAsInteger(Tasks.PERCENT_COMPLETE)?.let { to.percentComplete = it }
 
-        to.status = when (values.getAsInteger(Tasks.STATUS)) {
-            Tasks.STATUS_IN_PROCESS -> Status(Status.VALUE_IN_PROCESS)
-            Tasks.STATUS_COMPLETED ->  Status(Status.VALUE_COMPLETED)
-            Tasks.STATUS_CANCELLED ->  Status(Status.VALUE_CANCELLED)
-            else ->                    Status(Status.VALUE_NEEDS_ACTION)
-        }
-
         val allDay = (values.getAsInteger(Tasks.IS_ALLDAY) ?: 0) != 0
 
         val tzID = values.getAsString(Tasks.TZ)

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

@@ -0,0 +1,25 @@
+/*
+ * 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.Status
+import org.dmfs.tasks.contract.TaskContract.Tasks
+
+class StatusHandler : DmfsTaskFieldHandler {
+
+    override fun process(from: ContentValues, to: Task) {
+        to.status = when (from.getAsInteger(Tasks.STATUS)) {
+            Tasks.STATUS_IN_PROCESS -> Status(Status.VALUE_IN_PROCESS)
+            Tasks.STATUS_COMPLETED ->  Status(Status.VALUE_COMPLETED)
+            Tasks.STATUS_CANCELLED ->  Status(Status.VALUE_CANCELLED)
+            else ->                    Status(Status.VALUE_NEEDS_ACTION)
+        }
+    }
+
+}

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

@@ -0,0 +1,66 @@
+/*
+ * 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.Status
+import org.dmfs.tasks.contract.TaskContract.Tasks
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class StatusHandlerTest {
+
+    private val handler = StatusHandler()
+
+    @Test
+    fun `No STATUS defaults to NEEDS-ACTION`() {
+        val task = Task()
+        handler.process(ContentValues(), task)
+        assertEquals(Status(Status.VALUE_NEEDS_ACTION), task.status)
+    }
+
+    @Test
+    fun `STATUS_NEEDS_ACTION maps to NEEDS-ACTION`() {
+        val task = Task()
+        handler.process(contentValuesOf(Tasks.STATUS to Tasks.STATUS_NEEDS_ACTION), task)
+        assertEquals(Status(Status.VALUE_NEEDS_ACTION), task.status)
+    }
+
+    @Test
+    fun `STATUS_IN_PROCESS maps to IN-PROCESS`() {
+        val task = Task()
+        handler.process(contentValuesOf(Tasks.STATUS to Tasks.STATUS_IN_PROCESS), task)
+        assertEquals(Status(Status.VALUE_IN_PROCESS), task.status)
+    }
+
+    @Test
+    fun `STATUS_COMPLETED maps to COMPLETED`() {
+        val task = Task()
+        handler.process(contentValuesOf(Tasks.STATUS to Tasks.STATUS_COMPLETED), task)
+        assertEquals(Status(Status.VALUE_COMPLETED), task.status)
+    }
+
+    @Test
+    fun `STATUS_CANCELLED maps to CANCELLED`() {
+        val task = Task()
+        handler.process(contentValuesOf(Tasks.STATUS to Tasks.STATUS_CANCELLED), task)
+        assertEquals(Status(Status.VALUE_CANCELLED), task.status)
+    }
+
+    @Test
+    fun `Unknown STATUS defaults to NEEDS-ACTION`() {
+        val task = Task()
+        handler.process(contentValuesOf(Tasks.STATUS to 99), task)
+        assertEquals(Status(Status.VALUE_NEEDS_ACTION), task.status)
+    }
+
+}