LocalEvent: don't subclass AndroidEvent (#1551)

* [WIP] Refactor LocalEvent to delegate to AndroidEvent

* Move tests

* Use test rules from synctools

* Add null check for content provider client in JtxSyncManagerTest

* Update dependencies, move OkhttpClientTest

Author: rfc2822

app/build.gradle.kts

@@ -176,7 +176,10 @@ dependencies {
         exclude(group="junit")
         exclude(group="org.ogce", module="xpp3")    // Android has its own XmlPullParser implementation
     }
-    implementation(libs.bitfire.synctools)
+    implementation(libs.bitfire.synctools) {
+        exclude(group="androidx.test")              // synctools declares test rules, but we don't want them in non-test code
+        exclude(group = "junit")
+    }
 
     // third-party libs
     @Suppress("RedundantSuppression")

app/src/androidTest/kotlin/at/bitfire/davdroid/CatchExceptionsRule.kt

@@ -9,7 +9,7 @@ import at.bitfire.dav4jvm.XmlUtils
 import org.junit.Assert.assertTrue
 import org.junit.Test
 
-class Dav4jvm {
+class Dav4jvmTest {
 
     @Test
     fun test_Dav4jvm_XmlUtils_NewPullParser_RelaxedParsing() {

…st/kotlin/at/bitfire/davdroid/Dav4jvm.kt …otlin/at/bitfire/davdroid/Dav4jvmTest.ktapp/src/androidTest/kotlin/at/bitfire/davdroid/Dav4jvm.kt renamed to app/src/androidTest/kotlin/at/bitfire/davdroid/Dav4jvmTest.kt app/src/androidTest/kotlin/at/bitfire/davdroid/Dav4jvm.kt renamed to app/src/androidTest/kotlin/at/bitfire/davdroid/Dav4jvmTest.kt

@@ -2,10 +2,9 @@
  * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
  */
 
-package at.bitfire.davdroid
+package at.bitfire.davdroid.network
 
 import androidx.test.filters.SdkSuppress
-import at.bitfire.davdroid.network.HttpClient
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import okhttp3.Request
@@ -34,10 +33,12 @@ class OkhttpClientTest {
     fun testIcloudWithSettings() {
         httpClientBuilder.build().use { client ->
             client.okHttpClient
-                .newCall(Request.Builder()
-                .get()
-                .url("https://icloud.com")
-                .build())
+                .newCall(
+                    Request.Builder()
+                        .get()
+                        .url("https://icloud.com")
+                        .build()
+                )
                 .execute()
         }
     }

app/src/androidTest/kotlin/at/bitfire/davdroid/InitCalendarProviderRule.kt

@@ -12,11 +12,12 @@ import android.provider.CalendarContract
 import android.provider.CalendarContract.ACCOUNT_TYPE_LOCAL
 import android.provider.CalendarContract.Events
 import androidx.test.platform.app.InstrumentationRegistry
-import at.bitfire.davdroid.InitCalendarProviderRule
 import at.bitfire.ical4android.AndroidCalendar
+import at.bitfire.ical4android.AndroidEvent
 import at.bitfire.ical4android.Event
 import at.bitfire.ical4android.util.MiscUtils.asSyncAdapter
 import at.bitfire.ical4android.util.MiscUtils.closeCompat
+import at.bitfire.synctools.test.InitCalendarProviderRule
 import net.fortuna.ical4j.model.property.DtStart
 import net.fortuna.ical4j.model.property.RRule
 import net.fortuna.ical4j.model.property.RecurrenceId
@@ -96,7 +97,7 @@ class LocalCalendarTest {
                 status = Status.VEVENT_CANCELLED
             })
         }
-        val localEvent = LocalEvent(calendar, event, "filename.ics", null, null, LocalResource.FLAG_REMOTELY_PRESENT)
+        val localEvent = AndroidEvent(calendar, event, "filename.ics", null, null, LocalResource.FLAG_REMOTELY_PRESENT)
         localEvent.add()
         val eventId = localEvent.id!!
 
@@ -126,7 +127,7 @@ class LocalCalendarTest {
             summary = "Event with 3 instances"
             rRules.add(RRule("FREQ=DAILY;COUNT=3"))
         }
-        val localEvent = LocalEvent(calendar, event, "filename.ics", null, null, LocalResource.FLAG_REMOTELY_PRESENT)
+        val localEvent = AndroidEvent(calendar, event, "filename.ics", null, null, LocalResource.FLAG_REMOTELY_PRESENT)
         localEvent.add()
         val eventId = localEvent.id!!