LocalCalendar/LocalEvent: provide all fields for DAVx5 (#15)

* Update color insertion logic to use Css3Color.entries

* Add access level to AndroidCalendar

* Add methods to get and set calendar sync state

* [WIP] AndroidEvent: add more sync columns

* Tests

* Let new AndroidEvents have public setters for now

* Update AndroidEvent constructor to accept new fields

* Minor changes

* Update sync state methods to use read and write semantics

* Move companion objects to end of class declarations

Author: rfc2822

lib/src/androidTest/kotlin/at/bitfire/ical4android/AndroidCalendarTest.kt

@@ -91,14 +91,14 @@ class AndroidCalendarTest {
     @Test
     fun testInsertColors() {
         AndroidCalendar.insertColors(provider, testAccount)
-        assertEquals(Css3Color.values().size, countColors(testAccount))
+        assertEquals(Css3Color.entries.size, countColors(testAccount))
     }
 
     @Test
     fun testInsertColors_AlreadyThere() {
         AndroidCalendar.insertColors(provider, testAccount)
         AndroidCalendar.insertColors(provider, testAccount)
-        assertEquals(Css3Color.values().size, countColors(testAccount))
+        assertEquals(Css3Color.entries.size, countColors(testAccount))
     }
 
     @Test

lib/src/androidTest/kotlin/at/bitfire/ical4android/AndroidEventTest.kt

@@ -63,14 +63,6 @@ import java.net.URI
 import java.time.Duration
 import java.time.Period
 import java.util.logging.Logger
-import kotlin.collections.Map
-import kotlin.collections.component1
-import kotlin.collections.component2
-import kotlin.collections.emptyMap
-import kotlin.collections.first
-import kotlin.collections.firstOrNull
-import kotlin.collections.iterator
-import kotlin.collections.mapOf
 import kotlin.collections.plusAssign
 
 class AndroidEventTest {
@@ -126,6 +118,25 @@ class AndroidEventTest {
     }
 
 
+    @Test
+    fun testConstructor_ContentValues() {
+        val e = AndroidEvent(
+            calendar, contentValuesOf(
+                Events._ID to 123,
+                Events._SYNC_ID to "some-ical.ics",
+                AndroidEvent.COLUMN_ETAG to "some-etag",
+                AndroidEvent.COLUMN_SCHEDULE_TAG to "some-schedule-tag",
+                AndroidEvent.COLUMN_FLAGS to 45
+            )
+        )
+        assertEquals(123L, e.id)
+        assertEquals("some-ical.ics", e.syncId)
+        assertEquals("some-etag", e.eTag)
+        assertEquals("some-schedule-tag", e.scheduleTag)
+        assertEquals(45, e.flags)
+    }
+
+
     /**
      * buildEvent() BASIC TEST MATRIX:
      *
@@ -1522,6 +1533,87 @@ class AndroidEventTest {
         ).event!!
     }
 
+    @Test
+    fun testPopulateEvent_Uid_iCalUid() {
+        populateEvent(
+            true,
+            extendedProperties = mapOf(
+                AndroidEvent.EXTNAME_ICAL_UID to "[email protected]"
+            )
+        ).let { result ->
+            assertEquals("[email protected]", result.uid)
+        }
+    }
+
+    @Test
+    fun testPopulateEvent_Uid_UID_2445() {
+        populateEvent(true) {
+            put(Events.UID_2445, "[email protected]")
+        }.let { result ->
+            assertEquals("[email protected]", result.uid)
+        }
+    }
+
+    @Test
+    fun testPopulateEvent_Uid_UID_2445_and_iCalUid() {
+        populateEvent(
+            true,
+            extendedProperties = mapOf(
+                AndroidEvent.EXTNAME_ICAL_UID to "[email protected]"
+            )
+        ) {
+            put(Events.UID_2445, "[email protected]")
+        }.let { result ->
+            assertEquals("[email protected]", result.uid)
+        }
+    }
+
+
+    @Test
+    fun testPopulateEvent_Sequence_Int() {
+        populateEvent(true, asSyncAdapter = true) {
+            put(AndroidEvent.COLUMN_SEQUENCE, 5)
+        }.let { result ->
+            assertEquals(5, result.sequence)
+        }
+    }
+
+    @Test
+    fun testPopulateEvent_Sequence_Null() {
+        populateEvent(true, asSyncAdapter = true) {
+            putNull(AndroidEvent.COLUMN_SEQUENCE)
+        }.let { result ->
+            assertNull(result.sequence)
+        }
+    }
+
+    @Test
+    fun testPopulateEvent_IsOrganizer_False() {
+        populateEvent(true, asSyncAdapter = true) {
+            put(Events.IS_ORGANIZER, "0")
+        }.let { result ->
+            assertFalse(result.isOrganizer!!)
+        }
+    }
+
+    @Test
+    fun testPopulateEvent_IsOrganizer_Null() {
+        populateEvent(true, asSyncAdapter = true) {
+            putNull(Events.IS_ORGANIZER)
+        }.let { result ->
+            assertNull(result.isOrganizer)
+        }
+    }
+
+    @Test
+    fun testPopulateEvent_IsOrganizer_True() {
+        populateEvent(true, asSyncAdapter = true) {
+            put(Events.IS_ORGANIZER, "1")
+        }.let { result ->
+            assertTrue(result.isOrganizer!!)
+        }
+    }
+
     @Test
     fun testPopulateEvent_NonAllDay_NonRecurring() {
         populateEvent(false) {
@@ -1886,39 +1978,6 @@ class AndroidEventTest {
         }
     }
 
-    @Test
-    fun testPopulateEvent_Uid_iCalUid() {
-        populateEvent(
-            true,
-            extendedProperties = mapOf(
-                AndroidEvent.EXTNAME_ICAL_UID to "[email protected]"
-            )
-        ).let { result ->
-            assertEquals("[email protected]", result.uid)
-        }
-    }
-
-    @Test
-    fun testPopulateEvent_Uid_UID_2445() {
-        populateEvent(true) {
-            put(Events.UID_2445, "[email protected]")
-        }.let { result ->
-            assertEquals("[email protected]", result.uid)
-        }
-    }
-
-    @Test
-    fun testPopulateEvent_Uid_UID_2445_and_iCalUid() {
-        populateEvent(true,
-            extendedProperties = mapOf(
-                AndroidEvent.EXTNAME_ICAL_UID to "[email protected]"
-            )) {
-            put(Events.UID_2445, "[email protected]")
-        }.let { result ->
-            assertEquals("[email protected]", result.uid)
-        }
-    }
-
 
     private fun populateReminder(destinationCalendar: TestCalendar = calendar, builder: ContentValues.() -> Unit): VAlarm? {
         populateEvent(true, destinationCalendar = destinationCalendar, insertCallback = { id ->
@@ -2340,7 +2399,6 @@ class AndroidEventTest {
     }
 
 
-
     @Test
     fun testUpdateEvent() {
         // add test event without reminder
@@ -2480,4 +2538,4 @@ class AndroidEventTest {
         }
     }
 
-}
+}

lib/src/androidTest/kotlin/at/bitfire/ical4android/impl/TestCalendar.kt

@@ -15,9 +15,9 @@ import at.bitfire.ical4android.AndroidCalendar
 import at.bitfire.ical4android.AndroidCalendarFactory
 
 class TestCalendar(
-        account: Account,
-        providerClient: ContentProviderClient,
-        id: Long
+    account: Account,
+    providerClient: ContentProviderClient,
+    id: Long
 ): AndroidCalendar<TestEvent>(account, providerClient, TestEvent.Factory, id) {
 
     companion object {

lib/src/androidTest/kotlin/at/bitfire/ical4android/impl/TestEvent.kt

@@ -7,12 +7,10 @@
 package at.bitfire.ical4android.impl
 
 import android.content.ContentValues
-import android.provider.CalendarContract.Events
 import at.bitfire.ical4android.AndroidCalendar
 import at.bitfire.ical4android.AndroidEvent
 import at.bitfire.ical4android.AndroidEventFactory
 import at.bitfire.ical4android.Event
-import at.bitfire.synctools.storage.BatchOperation
 import java.util.UUID
 
 class TestEvent: AndroidEvent {
@@ -21,19 +19,7 @@ class TestEvent: AndroidEvent {
         : super(calendar, values)
 
     constructor(calendar: TestCalendar, event: Event)
-        : super(calendar, event)
-
-    val syncId by lazy { UUID.randomUUID().toString() }
-
-
-    override fun buildEvent(recurrence: Event?, builder: BatchOperation.CpoBuilder) {
-        if (recurrence != null)
-            builder.withValue(Events.ORIGINAL_SYNC_ID, syncId)
-        else
-            builder.withValue(Events._SYNC_ID, syncId)
-
-        super.buildEvent(recurrence, builder)
-    }
+            : super(calendar, event, UUID.randomUUID().toString(), null, null, 0)
 
 
     object Factory: AndroidEventFactory<TestEvent> {