Further rewrite, remove legacy AndroidEvent

Author: rfc2822

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

@@ -18,7 +18,6 @@ import android.provider.CalendarContract.ExtendedProperties
 import android.provider.CalendarContract.Reminders
 import androidx.core.content.contentValuesOf
 import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
-import at.bitfire.ical4android.AndroidEvent
 import at.bitfire.ical4android.Event
 import at.bitfire.ical4android.LegacyAndroidCalendar
 import at.bitfire.ical4android.UnknownProperty
@@ -102,7 +101,7 @@ class LegacyAndroidEventProcessorTest {
         insertCallback: (id: Long) -> Unit = {},
         extendedProperties: Map<String, String> = emptyMap(),
         valuesBuilder: ContentValues.() -> Unit = {}
-    ): AndroidEvent {
+    ): AndroidEvent2 {
         val values = ContentValues()
         values.put(Events.CALENDAR_ID, destinationCalendar.id)
         if (automaticDates) {
@@ -133,7 +132,7 @@ class LegacyAndroidEventProcessorTest {
             client.insert(ExtendedProperties.CONTENT_URI.asSyncAdapter(testAccount), extendedValues)
         }
 
-        return legacyCalendar.getAndroidEvent(destinationCalendar, id)!!
+        return calendar.getEvent(id)!!
     }
 
     private fun populateEvent(

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

@@ -288,15 +288,15 @@ class AndroidCalendarTest {
     }
 
     @Test
-    fun testDeleteEvent() {
+    fun testDeleteEventAndExceptions() {
         val id = calendar.addEvent(Entity(contentValuesOf(
             Events.CALENDAR_ID to calendar.id,
             Events.DTSTART to now,
             Events.DTEND to now + 3600000,
             Events.TITLE to "Some Event 1"
         )))
 
-        calendar.deleteEvent(id)
+        calendar.deleteEventAndExceptions(id)
 
         assertNull(calendar.getEvent(id))
     }