Add SequenceProcessor

Author: rfc2822

lib/src/androidTest/kotlin/at/bitfire/synctools/mapping/calendar/LegacyAndroidEventProcessorTest.kt

@@ -141,24 +141,6 @@ class LegacyAndroidEventProcessorTest {
     }
 
 
-    @Test
-    fun testPopulateEvent_Sequence_Int() {
-        populateEvent(true, asSyncAdapter = true) {
-            put(AndroidEvent2.COLUMN_SEQUENCE, 5)
-        }.let { result ->
-            assertEquals(5, result.sequence)
-        }
-    }
-
-    @Test
-    fun testPopulateEvent_Sequence_Null() {
-        populateEvent(true, asSyncAdapter = true) {
-            putNull(AndroidEvent2.COLUMN_SEQUENCE)
-        }.let { result ->
-            assertNull(result.sequence)
-        }
-    }
-
     @Test
     fun testPopulateEvent_NonAllDay_NonRecurring() {
         populateEvent(false) {

lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/LegacyAndroidEventProcessor.kt

@@ -27,12 +27,12 @@ import at.bitfire.synctools.mapping.calendar.processor.LocationProcessor
 import at.bitfire.synctools.mapping.calendar.processor.MutatorsProcessor
 import at.bitfire.synctools.mapping.calendar.processor.OrganizerProcessor
 import at.bitfire.synctools.mapping.calendar.processor.RemindersProcessor
+import at.bitfire.synctools.mapping.calendar.processor.SequenceProcessor
 import at.bitfire.synctools.mapping.calendar.processor.StatusProcessor
 import at.bitfire.synctools.mapping.calendar.processor.TitleProcessor
 import at.bitfire.synctools.mapping.calendar.processor.UidProcessor
 import at.bitfire.synctools.mapping.calendar.processor.UnknownPropertiesProcessor
 import at.bitfire.synctools.mapping.calendar.processor.UrlProcessor
-import at.bitfire.synctools.storage.calendar.AndroidEvent2
 import at.bitfire.synctools.storage.calendar.EventAndExceptions
 import net.fortuna.ical4j.model.Date
 import net.fortuna.ical4j.model.DateList
@@ -86,6 +86,7 @@ class LegacyAndroidEventProcessor(
         AvailabilityProcessor(),
         StatusProcessor(),
         // scheduling
+        SequenceProcessor(),
         OrganizerProcessor(),
         AttendeesProcessor(),
         // extended properties
@@ -245,8 +246,6 @@ class LegacyAndroidEventProcessor(
             logger.log(Level.WARNING, "Couldn't parse recurrence rules, ignoring", e)
         }
 
-        to.sequence = row.getAsInteger(AndroidEvent2.COLUMN_SEQUENCE)
-
         // exceptions from recurring events
         row.getAsLong(Events.ORIGINAL_INSTANCE_TIME)?.let { originalInstanceTime ->
             val originalAllDay = (row.getAsInteger(Events.ORIGINAL_ALL_DAY) ?: 0) != 0

lib/src/main/kotlin/at/bitfire/synctools/mapping/calendar/processor/SequenceProcessor.kt

@@ -0,0 +1,19 @@
+/*
+ * 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.calendar.processor
+
+import android.content.Entity
+import at.bitfire.ical4android.Event
+import at.bitfire.synctools.storage.calendar.AndroidEvent2
+
+class SequenceProcessor: AndroidEventFieldProcessor {
+
+    override fun process(from: Entity, main: Entity, to: Event) {
+        to.sequence = from.entityValues.getAsInteger(AndroidEvent2.COLUMN_SEQUENCE)
+    }
+
+}

lib/src/test/kotlin/at/bitfire/synctools/mapping/calendar/processor/SequenceProcessorTest.kt

@@ -0,0 +1,53 @@
+/*
+ * 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.calendar.processor
+
+import android.content.ContentValues
+import android.content.Entity
+import androidx.core.content.contentValuesOf
+import at.bitfire.ical4android.Event
+import at.bitfire.synctools.storage.calendar.AndroidEvent2
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class SequenceProcessorTest {
+
+    private val processor = SequenceProcessor()
+
+    @Test
+    fun `No sequence`() {
+        val result = Event()
+        val entity = Entity(ContentValues())
+        processor.process(entity, entity, result)
+        assertNull(result.sequence)
+    }
+
+    @Test
+    fun `Sequence is 0`() {
+        val entity = Entity(contentValuesOf(
+            AndroidEvent2.COLUMN_SEQUENCE to 0
+        ))
+        val result = Event()
+        processor.process(entity, entity, result)
+        assertEquals(0, result.sequence)
+    }
+
+    @Test
+    fun `Sequence is 1`() {
+        val entity = Entity(contentValuesOf(
+            AndroidEvent2.COLUMN_SEQUENCE to 1
+        ))
+        val result = Event()
+        processor.process(entity, entity, result)
+        assertEquals(1, result.sequence)
+    }
+
+}