Skip to content

Remove possibility to subclass AndroidEvent #20

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 4 commits into from
Jun 27, 2025
Merged

Remove possibility to subclass AndroidEvent #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e96a08
- Move features from LocalEvent to AndroidEvent
rfc2822 Jun 27, 2025
a0ac59f
AndroidEvent: use private methods
rfc2822 Jun 27, 2025
6b1899a
Move tests
rfc2822 Jun 27, 2025
032fe6f
Move InitCalendarProviderRule
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
9 changes: 9 additions & 0 deletions lib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* This file is part of bitfireAT/synctools which is released under GPLv3.
* Copyright © All Contributors. See the LICENSE and AUTHOR files in the root directory for details.
* SPDX-License-Identifier: GPL-3.0-or-later
*/

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
Expand Down Expand Up @@ -117,6 +123,9 @@ dependencies {
exclude(group = "org.freemarker")
}

// synctools.test package also provide test rules
implementation(libs.androidx.test.rules)

// instrumented tests
androidTestImplementation(libs.androidx.test.rules)
androidTestImplementation(libs.androidx.test.runner)
Expand Down
5 changes: 2 additions & 3 deletions lib/src/androidTest/kotlin/at/bitfire/ical4android/AndroidCalendarTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import android.provider.CalendarContract.Colors
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.rule.GrantPermissionRule
import at.bitfire.ical4android.impl.TestCalendar
import at.bitfire.ical4android.impl.TestEvent
import at.bitfire.ical4android.util.MiscUtils.asSyncAdapter
import at.bitfire.ical4android.util.MiscUtils.closeCompat
import net.fortuna.ical4j.model.property.DtEnd
Expand Down Expand Up @@ -109,12 +108,12 @@ class AndroidCalendarTest {
val cal = TestCalendar.findOrCreate(testAccount, provider)
try {
// add event with color
TestEvent(cal, Event().apply {
AndroidEvent(cal, Event().apply {
dtStart = DtStart("20210314T204200Z")
dtEnd = DtEnd("20210314T204230Z")
color = Css3Color.limegreen
summary = "Test event with color"
}).add()
}, "remove-colors").add()

AndroidCalendar.removeColors(provider, testAccount)
assertEquals(0, countColors(testAccount))
Expand Down
Loading