Skip to content

LocalEvent: don't subclass AndroidEvent #1551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rfc2822 merged 5 commits into from
Jun 27, 2025
Merged

LocalEvent: don't subclass AndroidEvent #1551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ede1cbb
[WIP] Refactor LocalEvent to delegate to AndroidEvent
rfc2822 Jun 27, 2025
a893018
Move tests
rfc2822 Jun 27, 2025
f0b8d10
Use test rules from synctools
rfc2822 Jun 27, 2025
71fdf75
Add null check for content provider client in JtxSyncManagerTest
rfc2822 Jun 27, 2025
3819b7d
Update dependencies, move OkhttpClientTest
rfc2822 Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
37 changes: 0 additions & 37 deletions app/src/androidTest/kotlin/at/bitfire/davdroid/CatchExceptionsRule.kt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...est/kotlin/at/bitfire/davdroid/Dav4jvm.kt → ...kotlin/at/bitfire/davdroid/Dav4jvmTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
123 changes: 0 additions & 123 deletions app/src/androidTest/kotlin/at/bitfire/davdroid/InitCalendarProviderRule.kt
View file
Open in desktop

This file was deleted.

13 changes: 7 additions & 6 deletions ...n/at/bitfire/davdroid/OkhttpClientTest.kt → ...fire/davdroid/network/OkhttpClientTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
}
}
Expand Down
7 changes: 4 additions & 3 deletions app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalCalendarTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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!!

Expand Down Expand Up @@ -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!!

Expand Down
Loading