Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 5a889101 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Fix Time API methods not existing on Android (closes bitfireAT/davx5#125) 

- move all tests that use Time API or other desugared APIs to Android unit tests
- move resources for tests
- don't use LocalTime.ofInstant() because it requires API level 31 and is not desugared
- fix Locale test
- added warning to src/test/README.txt
- update Kotlin and slf4j dependency
parent ce6d4548

build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


buildscript {

    ext.versions = [

        kotlin: '1.7.0',

        kotlin: '1.7.10',

        dokka: '1.5.0',

        ical4j: '3.2.5',

        // latest Apache Commons versions that don't require Java 8 (Android 7)
@@ -99,7 +99,7 @@ dependencies { 
    // noinspection GradleDependency

    implementation "commons-io:commons-io:${versions.commonsIO}"



    implementation 'org.slf4j:slf4j-jdk14:1.7.32'

    implementation 'org.slf4j:slf4j-jdk14:1.7.36'

    implementation 'androidx.core:core-ktx:1.8.0'



    androidTestImplementation 'androidx.test:core:1.4.0'

src/test/java/at/bitfire/ical4android/AndroidTimeUtilsTest.kt→src/androidTest/java/at/bitfire/ical4android/AndroidTimeUtilsTest.kt

+0 −4
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ package at.bitfire.ical4android 
import at.bitfire.ical4android.util.AndroidTimeUtils

import net.fortuna.ical4j.data.CalendarBuilder

import net.fortuna.ical4j.model.*

import net.fortuna.ical4j.model.Date

import net.fortuna.ical4j.model.TimeZone

import net.fortuna.ical4j.model.component.VTimeZone

import net.fortuna.ical4j.model.parameter.TzId

import net.fortuna.ical4j.model.parameter.Value
@@ -19,11 +17,9 @@ import net.fortuna.ical4j.model.property.RDate 
import net.fortuna.ical4j.util.TimeZones

import org.junit.Assert.*

import org.junit.Test

import java.io.InputStreamReader

import java.io.StringReader

import java.time.Duration

import java.time.Period

import java.util.*



class AndroidTimeUtilsTest {

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

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ import net.fortuna.ical4j.model.property.Attendee 
import net.fortuna.ical4j.model.property.DtEnd

import net.fortuna.ical4j.model.property.DtStart

import org.junit.*

import org.junit.Assert.*



import org.junit.Assert.assertEquals

import org.junit.Assert.assertNotNull

import java.net.URI

import java.util.*

src/test/java/at/bitfire/ical4android/EventTest.kt→src/androidTest/java/at/bitfire/ical4android/EventTest.kt

+4 −3
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.Date