Skip to content

Introduce mapping classes #32

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 10 commits into from
Jul 9, 2025
Merged

Introduce mapping classes #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
47f6f62
Move AttendeeMappings to new package
rfc2822 Jul 7, 2025
5bc4bd3
Move AndroidEvent builders to builder class
rfc2822 Jul 7, 2025
7203214
Move populate... methods to `AndroidEventProcessor` class
rfc2822 Jul 7, 2025
4838870
Move builder tests to AndroidEventBuilderTest
rfc2822 Jul 7, 2025
a937e5d
Move processor tests to AndroidEventProcessorTest
rfc2822 Jul 7, 2025
be2b19d
Explicit null check / KDoc
rfc2822 Jul 7, 2025
499a64d
Small changes
rfc2822 Jul 9, 2025
c90aa10
[WIP]
rfc2822 Jul 9, 2025
c3a393e
Fix tests
rfc2822 Jul 9, 2025
a2dda0c
Revert commenting out "set duration to null"
rfc2822 Jul 9, 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
2,278 changes: 10 additions & 2,268 deletions lib/src/androidTest/kotlin/at/bitfire/ical4android/AndroidEventTest.kt
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/src/androidTest/kotlin/at/bitfire/ical4android/AospTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class AospTest {
Manifest.permission.WRITE_CALENDAR
)!!

private val testAccount = Account("[email protected]", CalendarContract.ACCOUNT_TYPE_LOCAL)
private val testAccount = Account(javaClass.name, CalendarContract.ACCOUNT_TYPE_LOCAL)

private val provider by lazy {
InstrumentationRegistry.getInstrumentation().targetContext.contentResolver.acquireContentProviderClient(CalendarContract.AUTHORITY)!!
Expand Down
3 changes: 2 additions & 1 deletion lib/src/androidTest/kotlin/at/bitfire/ical4android/DmfsTaskListTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import android.accounts.Account
import android.content.ContentUris
import android.content.ContentValues
import android.database.DatabaseUtils
import android.provider.CalendarContract
import at.bitfire.ical4android.impl.TestTask
import at.bitfire.ical4android.impl.TestTaskList
import net.fortuna.ical4j.model.property.RelatedTo
Expand All @@ -25,7 +26,7 @@ import org.junit.Test
class DmfsTaskListTest(providerName: TaskProvider.ProviderName):
DmfsStyleProvidersTaskTest(providerName) {

private val testAccount = Account("AndroidTaskListTest", TaskContract.LOCAL_ACCOUNT_TYPE)
private val testAccount = Account(javaClass.name, CalendarContract.ACCOUNT_TYPE_LOCAL)


private fun createTaskList(): TestTaskList {
Expand Down
4 changes: 2 additions & 2 deletions lib/src/androidTest/kotlin/at/bitfire/ical4android/DmfsTaskTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import android.content.ContentUris
import android.content.ContentValues
import android.database.DatabaseUtils
import android.net.Uri
import android.provider.CalendarContract
import at.bitfire.ical4android.impl.TestTask
import at.bitfire.ical4android.impl.TestTaskList
import at.bitfire.synctools.storage.LocalStorageException
Expand All @@ -37,7 +38,6 @@ import net.fortuna.ical4j.model.property.RRule
import net.fortuna.ical4j.model.property.RelatedTo
import net.fortuna.ical4j.model.property.Status
import net.fortuna.ical4j.model.property.XProperty
import org.dmfs.tasks.contract.TaskContract.LOCAL_ACCOUNT_TYPE
import org.dmfs.tasks.contract.TaskContract.Properties
import org.dmfs.tasks.contract.TaskContract.Property
import org.dmfs.tasks.contract.TaskContract.Property.Category
Expand All @@ -63,7 +63,7 @@ class DmfsTaskTest(
private val tzChicago = tzRegistry.getTimeZone("America/Chicago")!!
private val tzDefault = tzRegistry.getTimeZone(ZoneId.systemDefault().id)!!

private val testAccount = Account("AndroidTaskTest", LOCAL_ACCOUNT_TYPE)
private val testAccount = Account(javaClass.name, CalendarContract.ACCOUNT_TYPE_LOCAL)

private lateinit var taskListUri: Uri
private var taskList: TestTaskList? = null
Expand Down
3 changes: 2 additions & 1 deletion lib/src/androidTest/kotlin/at/bitfire/ical4android/JtxCollectionTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ package at.bitfire.ical4android
import android.accounts.Account
import android.content.ContentProviderClient
import android.content.ContentValues
import android.provider.CalendarContract
import androidx.test.platform.app.InstrumentationRegistry
import at.bitfire.ical4android.impl.TestJtxCollection
import at.bitfire.ical4android.impl.testProdId
Expand All @@ -34,7 +35,7 @@ class JtxCollectionTest {
val context = InstrumentationRegistry.getInstrumentation().targetContext
private lateinit var client: ContentProviderClient

private val testAccount = Account("TEST", JtxContract.JtxCollection.TEST_ACCOUNT_TYPE)
private val testAccount = Account(javaClass.name, CalendarContract.ACCOUNT_TYPE_LOCAL)

private val url = "https://jtx.techbee.at"
private val displayname = "jtx"
Expand Down
3 changes: 2 additions & 1 deletion lib/src/androidTest/kotlin/at/bitfire/ical4android/JtxICalObjectTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import android.content.ContentProviderClient
import android.content.ContentValues
import android.database.DatabaseUtils
import android.os.ParcelFileDescriptor
import android.provider.CalendarContract
import androidx.core.content.pm.PackageInfoCompat
import androidx.test.platform.app.InstrumentationRegistry
import at.bitfire.ical4android.impl.TestJtxCollection
Expand Down Expand Up @@ -44,7 +45,7 @@ class JtxICalObjectTest {
val context = InstrumentationRegistry.getInstrumentation().targetContext
private lateinit var client: ContentProviderClient

private val testAccount = Account("TEST", JtxContract.JtxCollection.TEST_ACCOUNT_TYPE)
private val testAccount = Account(javaClass.name, CalendarContract.ACCOUNT_TYPE_LOCAL)
private var collection: JtxCollection<at.bitfire.ical4android.JtxICalObject>? = null
private var sample: at.bitfire.ical4android.JtxICalObject? = null

Expand Down
7 changes: 6 additions & 1 deletion lib/src/androidTest/kotlin/at/bitfire/ical4android/impl/TestCalendar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,19 @@ import android.provider.CalendarContract.Reminders
import androidx.core.content.contentValuesOf
import at.bitfire.synctools.storage.calendar.AndroidCalendar
import at.bitfire.synctools.storage.calendar.AndroidCalendarProvider
import java.util.UUID

object TestCalendar {

fun findOrCreate(account: Account, client: ContentProviderClient): AndroidCalendar {
val provider = AndroidCalendarProvider(account, client)

// we use colors for testing
provider.provideCss3ColorIndices()

return provider.findFirstCalendar( null, null)
?: provider.createAndGetCalendar(contentValuesOf(
Calendars.NAME to "TestCalendar",
Calendars.NAME to UUID.randomUUID().toString(),
Calendars.CALENDAR_DISPLAY_NAME to "ical4android Test Calendar",
Calendars.ALLOWED_REMINDERS to Reminders.METHOD_DEFAULT)
)
Expand Down
Loading