Fix availability mapping for events (don't write NULL values) (#133)

* Fix availability mapping for events (don't write NULL values)

* Fix tests

Author: rfc2822

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

@@ -15,15 +15,12 @@ class AvailabilityBuilder: AndroidEntityBuilder {
 
     override fun build(from: VEvent, main: VEvent, to: Entity) {
         val availability = when (from.transparency) {
-            Transp.OPAQUE ->
-                Events.AVAILABILITY_BUSY
-
             Transp.TRANSPARENT ->
                 Events.AVAILABILITY_FREE
 
-            // Default value in iCalendar is OPAQUE, but we set it to null to indicate that it was not set in the iCalendar.
-            else ->
-                null
+            // Default value in iCalendar is OPAQUE
+            else /* including Transp.OPAQUE */ ->
+                Events.AVAILABILITY_BUSY
         }
         to.entityValues.put(
             Events.AVAILABILITY,

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

@@ -14,18 +14,15 @@ import net.fortuna.ical4j.model.property.Transp
 class AvailabilityProcessor: AndroidEventFieldProcessor {
 
     override fun process(from: Entity, main: Entity, to: VEvent) {
-        val transp = when (from.entityValues.getAsInteger(Events.AVAILABILITY)) {
-            Events.AVAILABILITY_BUSY,
-            Events.AVAILABILITY_TENTATIVE ->
-                Transp.OPAQUE
-
+        val transp: Transp = when (from.entityValues.getAsInteger(Events.AVAILABILITY)) {
             Events.AVAILABILITY_FREE ->
                 Transp.TRANSPARENT
 
+            /* Events.AVAILABILITY_BUSY, Events.AVAILABILITY_TENTATIVE */
             else ->
-                null    // defaults to OPAQUE in iCalendar
+                Transp.OPAQUE
         }
-        if (transp != null)
+        if (transp != Transp.OPAQUE)    // iCalendar default value is OPAQUE
             to.properties += transp
     }
 

lib/src/test/kotlin/at/bitfire/synctools/mapping/calendar/builder/AvailabilityBuilderTest.kt

@@ -9,12 +9,10 @@ package at.bitfire.synctools.mapping.calendar.builder
 import android.content.ContentValues
 import android.content.Entity
 import android.provider.CalendarContract.Events
-import androidx.core.content.contentValuesOf
 import at.bitfire.synctools.icalendar.propertyListOf
-import at.bitfire.synctools.test.assertContentValuesEqual
 import net.fortuna.ical4j.model.component.VEvent
 import net.fortuna.ical4j.model.property.Transp
-import org.junit.Assert.assertNull
+import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -34,7 +32,7 @@ class AvailabilityBuilderTest {
             to = result
         )
         assertTrue(result.entityValues.containsKey(Events.AVAILABILITY))
-        assertNull(result.entityValues.get(Events.AVAILABILITY))
+        assertEquals(Events.AVAILABILITY_BUSY, result.entityValues.get(Events.AVAILABILITY))
     }
 
     @Test
@@ -45,9 +43,7 @@ class AvailabilityBuilderTest {
             main = VEvent(),
             to = result
         )
-        assertContentValuesEqual(contentValuesOf(
-            Events.AVAILABILITY to Events.AVAILABILITY_BUSY
-        ), result.entityValues)
+        assertEquals(Events.AVAILABILITY_BUSY, result.entityValues.get(Events.AVAILABILITY))
     }
 
     @Test
@@ -58,9 +54,7 @@ class AvailabilityBuilderTest {
             main = VEvent(),
             to = result
         )
-        assertContentValuesEqual(contentValuesOf(
-            Events.AVAILABILITY to Events.AVAILABILITY_FREE
-        ), result.entityValues)
+        assertEquals(Events.AVAILABILITY_FREE, result.entityValues.get(Events.AVAILABILITY))
     }
 
 }

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

@@ -29,6 +29,7 @@ class AvailabilityProcessorTest {
         val result = VEvent()
         val entity = Entity(ContentValues())
         processor.process(entity, entity, result)
+        // OPAQUE is default value
         assertNull(result.getProperty<Transp>(Property.TRANSP))
     }
 
@@ -39,7 +40,8 @@ class AvailabilityProcessorTest {
             Events.AVAILABILITY to Events.AVAILABILITY_BUSY
         ))
         processor.process(entity, entity, result)
-        assertEquals(Transp.OPAQUE, result.getProperty<Transp>(Property.TRANSP))
+        // OPAQUE is default value
+        assertNull(result.getProperty<Transp>(Property.TRANSP))
     }
 
     @Test
@@ -59,7 +61,8 @@ class AvailabilityProcessorTest {
             Events.AVAILABILITY to Events.AVAILABILITY_TENTATIVE
         ))
         processor.process(entity, entity, result)
-        assertEquals(Transp.OPAQUE, result.getProperty<Transp>(Property.TRANSP))
+        // OPAQUE is default value
+        assertNull(result.getProperty<Transp>(Property.TRANSP))
     }
 
 }