Merge branch 'upstream/master' (c6d5064f) · Commits · e / os / ical4android

src/androidTest/java/at/bitfire/ical4android/AndroidCalendarTest.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -14,10 +14,10 @@ import android.provider.CalendarContract.Calendars
		import android.provider.CalendarContract.Colors
		import androidx.test.platform.app.InstrumentationRegistry
		import androidx.test.rule.GrantPermissionRule
		import at.bitfire.ical4android.MiscUtils.ContentProviderClientHelper.closeCompat
		import at.bitfire.ical4android.MiscUtils.UriHelper.asSyncAdapter
		import at.bitfire.ical4android.impl.TestCalendar
		import at.bitfire.ical4android.impl.TestEvent
		import at.bitfire.ical4android.util.MiscUtils.ContentProviderClientHelper.closeCompat
		import at.bitfire.ical4android.util.MiscUtils.UriHelper.asSyncAdapter
		import net.fortuna.ical4j.model.property.DtEnd
		import net.fortuna.ical4j.model.property.DtStart
		import org.junit.*

src/androidTest/java/at/bitfire/ical4android/AndroidCompatTimeZoneRegistryTest.kt

0 → 100644

+70 −0

Original line number	Diff line number	Diff line
		/***************************************************************************************************
		* Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
		**************************************************************************************************/

		package at.bitfire.ical4android

		import net.fortuna.ical4j.model.DefaultTimeZoneRegistryFactory
		import net.fortuna.ical4j.model.TimeZoneRegistry
		import org.junit.Assert.*
		import org.junit.Assume
		import org.junit.Before
		import org.junit.Test
		import java.time.ZoneId
		import java.time.zone.ZoneRulesException

		class AndroidCompatTimeZoneRegistryTest {

		lateinit var ical4jRegistry: TimeZoneRegistry
		lateinit var registry: TimeZoneRegistry

		val systemKnowsKyiv =
		try {
		ZoneId.of("Europe/Kyiv")
		true
		} catch (e: ZoneRulesException) {
		false
		}

		@Before
		fun createRegistry() {
		ical4jRegistry = DefaultTimeZoneRegistryFactory.getInstance().createRegistry()
		registry = AndroidCompatTimeZoneRegistry.Factory().createRegistry()
		}


		@Test
		fun getTimeZone_Existing() {
		assertEquals(
		ical4jRegistry.getTimeZone("Europe/Vienna"),
		registry.getTimeZone("Europe/Vienna")
		)
		}

		@Test
		fun getTimeZone_Existing_Kiev() {
		Assume.assumeFalse(systemKnowsKyiv)
		val tz = registry.getTimeZone("Europe/Kiev")
		assertFalse(tz === ical4jRegistry.getTimeZone("Europe/Kiev")) // we have made a copy
		assertEquals("Europe/Kiev", tz?.id)
		assertEquals("Europe/Kiev", tz?.vTimeZone?.timeZoneId?.value)
		}

		@Test
		fun getTimeZone_Existing_Kyiv() {
		Assume.assumeFalse(systemKnowsKyiv)

		/* Unfortunately, AndroidCompatTimeZoneRegistry can't rewrite to Europy/Kyiv to anything because
		it doesn't know a valid Android name for it. */
		assertEquals(
		ical4jRegistry.getTimeZone("Europe/Kyiv"),
		registry.getTimeZone("Europe/Kyiv")
		)
		}

		@Test
		fun getTimeZone_NotExisting() {
		assertNull(registry.getTimeZone("Test/NotExisting"))
		}

		}
		No newline at end of file

src/androidTest/java/at/bitfire/ical4android/AndroidEventTest.kt

+19 −2

Original line number	Diff line number	Diff line
		@@ -13,11 +13,12 @@ import android.net.Uri
		import android.provider.CalendarContract.*
		import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
		import androidx.test.rule.GrantPermissionRule
		import at.bitfire.ical4android.MiscUtils.ContentProviderClientHelper.closeCompat
		import at.bitfire.ical4android.MiscUtils.UriHelper.asSyncAdapter
		import at.bitfire.ical4android.impl.TestCalendar
		import at.bitfire.ical4android.impl.TestEvent
		import at.bitfire.ical4android.util.AndroidTimeUtils
		import at.bitfire.ical4android.util.DateUtils
		import at.bitfire.ical4android.util.MiscUtils.ContentProviderClientHelper.closeCompat
		import at.bitfire.ical4android.util.MiscUtils.UriHelper.asSyncAdapter
		import net.fortuna.ical4j.model.*
		import net.fortuna.ical4j.model.component.VAlarm
		import net.fortuna.ical4j.model.parameter.*
		@@ -28,6 +29,7 @@ import org.junit.Assert.*
		import java.net.URI
		import java.time.Duration
		import java.time.Period
		import java.util.TimeZone

		class AndroidEventTest {

		@@ -1458,6 +1460,21 @@ class AndroidEventTest {
		}
		}

		@Test
		fun testPopulateEvent_NonAllDay_Recurring_Duration_KievTimeZone() {
		populateEvent(false) {
		put(Events.DTSTART, 1592733600000L) // 21/06/2020 18:00 +0800
		put(Events.EVENT_TIMEZONE, "Europe/Kiev")
		put(Events.DURATION, "PT1H")
		put(Events.RRULE, "FREQ=DAILY;COUNT=2")
		}.let { result ->
		assertEquals(1592733600000L, result.dtStart?.date?.time)
		assertEquals(1592733600000L + 3600000, result.dtEnd?.date?.time)
		assertEquals("Europe/Kiev", result.dtStart?.timeZone?.id)
		assertEquals("Europe/Kiev", result.dtEnd?.timeZone?.id)
		}
		}

		@Test
		fun testPopulateEvent_NonAllDay_NonRecurring_NoTime() {
		populateEvent(false) {

src/androidTest/java/at/bitfire/ical4android/AndroidTaskTest.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ import android.net.Uri
		import androidx.test.filters.MediumTest
		import at.bitfire.ical4android.impl.TestTask
		import at.bitfire.ical4android.impl.TestTaskList
		import at.bitfire.ical4android.util.DateUtils
		import net.fortuna.ical4j.model.Date
		import net.fortuna.ical4j.model.DateList
		import net.fortuna.ical4j.model.DateTime

src/androidTest/java/at/bitfire/ical4android/AndroidTimeZonesTest.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@

		package at.bitfire.ical4android

		import at.bitfire.ical4android.util.DateUtils
		import org.junit.Assert
		import org.junit.Assert.assertNotNull
		import org.junit.Test