Skip to content

Commit a9ac952

Browse files
authored
Introduce mapping classes (#32)
* Move AttendeeMappings to new package * Move AndroidEvent builders to builder class * Move populate... methods to `AndroidEventProcessor` class * Move builder tests to AndroidEventBuilderTest * Move processor tests to AndroidEventProcessorTest * Explicit null check / KDoc * Small changes * Fix tests * Revert commenting out "set duration to null"
1 parent 50ec0b0 commit a9ac952

File tree

14 files changed

+4013
-3328
lines changed

14 files changed

+4013
-3328
lines changed

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

Lines changed: 10 additions & 2268 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class AospTest {
3030
Manifest.permission.WRITE_CALENDAR
3131
)!!
3232

33-
private val testAccount = Account("test@example.com", CalendarContract.ACCOUNT_TYPE_LOCAL)
33+
private val testAccount = Account(javaClass.name, CalendarContract.ACCOUNT_TYPE_LOCAL)
3434

3535
private val provider by lazy {
3636
InstrumentationRegistry.getInstrumentation().targetContext.contentResolver.acquireContentProviderClient(CalendarContract.AUTHORITY)!!

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import android.accounts.Account
1010
import android.content.ContentUris
1111
import android.content.ContentValues
1212
import android.database.DatabaseUtils
13+
import android.provider.CalendarContract
1314
import at.bitfire.ical4android.impl.TestTask
1415
import at.bitfire.ical4android.impl.TestTaskList
1516
import net.fortuna.ical4j.model.property.RelatedTo
@@ -25,7 +26,7 @@ import org.junit.Test
2526
class DmfsTaskListTest(providerName: TaskProvider.ProviderName):
2627
DmfsStyleProvidersTaskTest(providerName) {
2728

28-
private val testAccount = Account("AndroidTaskListTest", TaskContract.LOCAL_ACCOUNT_TYPE)
29+
private val testAccount = Account(javaClass.name, CalendarContract.ACCOUNT_TYPE_LOCAL)
2930

3031

3132
private fun createTaskList(): TestTaskList {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import android.content.ContentUris
1111
import android.content.ContentValues
1212
import android.database.DatabaseUtils
1313
import android.net.Uri
14+
import android.provider.CalendarContract
1415
import at.bitfire.ical4android.impl.TestTask
1516
import at.bitfire.ical4android.impl.TestTaskList
1617
import at.bitfire.synctools.storage.LocalStorageException
@@ -37,7 +38,6 @@ import net.fortuna.ical4j.model.property.RRule
3738
import net.fortuna.ical4j.model.property.RelatedTo
3839
import net.fortuna.ical4j.model.property.Status
3940
import net.fortuna.ical4j.model.property.XProperty
40-
import org.dmfs.tasks.contract.TaskContract.LOCAL_ACCOUNT_TYPE
4141
import org.dmfs.tasks.contract.TaskContract.Properties
4242
import org.dmfs.tasks.contract.TaskContract.Property
4343
import org.dmfs.tasks.contract.TaskContract.Property.Category
@@ -63,7 +63,7 @@ class DmfsTaskTest(
6363
private val tzChicago = tzRegistry.getTimeZone("America/Chicago")!!
6464
private val tzDefault = tzRegistry.getTimeZone(ZoneId.systemDefault().id)!!
6565

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

6868
private lateinit var taskListUri: Uri
6969
private var taskList: TestTaskList? = null

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ package at.bitfire.ical4android
99
import android.accounts.Account
1010
import android.content.ContentProviderClient
1111
import android.content.ContentValues
12+
import android.provider.CalendarContract
1213
import androidx.test.platform.app.InstrumentationRegistry
1314
import at.bitfire.ical4android.impl.TestJtxCollection
1415
import at.bitfire.ical4android.impl.testProdId
@@ -34,7 +35,7 @@ class JtxCollectionTest {
3435
val context = InstrumentationRegistry.getInstrumentation().targetContext
3536
private lateinit var client: ContentProviderClient
3637

37-
private val testAccount = Account("TEST", JtxContract.JtxCollection.TEST_ACCOUNT_TYPE)
38+
private val testAccount = Account(javaClass.name, CalendarContract.ACCOUNT_TYPE_LOCAL)
3839

3940
private val url = "https://jtx.techbee.at"
4041
private val displayname = "jtx"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import android.content.ContentProviderClient
1111
import android.content.ContentValues
1212
import android.database.DatabaseUtils
1313
import android.os.ParcelFileDescriptor
14+
import android.provider.CalendarContract
1415
import androidx.core.content.pm.PackageInfoCompat
1516
import androidx.test.platform.app.InstrumentationRegistry
1617
import at.bitfire.ical4android.impl.TestJtxCollection
@@ -44,7 +45,7 @@ class JtxICalObjectTest {
4445
val context = InstrumentationRegistry.getInstrumentation().targetContext
4546
private lateinit var client: ContentProviderClient
4647

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

lib/src/androidTest/kotlin/at/bitfire/ical4android/impl/TestCalendar.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,19 @@ import android.provider.CalendarContract.Reminders
1313
import androidx.core.content.contentValuesOf
1414
import at.bitfire.synctools.storage.calendar.AndroidCalendar
1515
import at.bitfire.synctools.storage.calendar.AndroidCalendarProvider
16+
import java.util.UUID
1617

1718
object TestCalendar {
1819

1920
fun findOrCreate(account: Account, client: ContentProviderClient): AndroidCalendar {
2021
val provider = AndroidCalendarProvider(account, client)
22+
23+
// we use colors for testing
24+
provider.provideCss3ColorIndices()
25+
2126
return provider.findFirstCalendar( null, null)
2227
?: provider.createAndGetCalendar(contentValuesOf(
23-
Calendars.NAME to "TestCalendar",
28+
Calendars.NAME to UUID.randomUUID().toString(),
2429
Calendars.CALENDAR_DISPLAY_NAME to "ical4android Test Calendar",
2530
Calendars.ALLOWED_REMINDERS to Reminders.METHOD_DEFAULT)
2631
)

0 commit comments

Comments
 (0)