Migrated to synctools and fixed tests (#2077)

Author: patrickunterwegs

app/build.gradle.kts

@@ -220,7 +220,7 @@ dependencies {
     ksp(libs.room.compiler)
 
     // bitfire libraries
-    implementation(libs.bitfire.ical4android)
+    implementation(libs.synctools)
 
     // third-party libs
     implementation(libs.mikepenz.aboutLibraries)

app/src/androidTest/java/at/techbee/jtx/FileCleanupJobTest.kt

@@ -10,31 +10,32 @@ package at.techbee.jtx
 
 import android.content.Context
 import android.util.Log
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SmallTest
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.work.Configuration
-import androidx.work.Constraints
-import androidx.work.OneTimeWorkRequestBuilder
-import androidx.work.WorkInfo
-import androidx.work.WorkManager
+import androidx.work.ListenableWorker
 import androidx.work.testing.SynchronousExecutor
+import androidx.work.testing.TestListenableWorkerBuilder
 import androidx.work.testing.WorkManagerTestInitHelper
+import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.util.concurrent.Executor
 
 @RunWith(AndroidJUnit4::class)
 @SmallTest
 class FileCleanupJobTest {
 
     private lateinit var context: Context
+    private lateinit var executor: Executor
 
     @Before
     fun setUp() {
-        context = InstrumentationRegistry.getInstrumentation().targetContext
+        context = ApplicationProvider.getApplicationContext()
         val config = Configuration.Builder()
             .setMinimumLoggingLevel(Log.DEBUG)
             .setExecutor(SynchronousExecutor())
@@ -45,24 +46,12 @@ class FileCleanupJobTest {
     @Test
     fun cleanup_test() {
 
-        val constraints = Constraints.Builder()
-            .setRequiresDeviceIdle(true)
-            .setRequiresBatteryNotLow(true)
-            .build()
-        val request = OneTimeWorkRequestBuilder<FileCleanupJob>()
-            .setConstraints(constraints)
-            .build()
-
-        val workManager = WorkManager.getInstance(context)
-        val testDriver = WorkManagerTestInitHelper.getTestDriver(context)
-        // enqueue
-        workManager.enqueue(request).result.get()
-        // tell the testing framework that all constraints are met.
-        testDriver?.setAllConstraintsMet(request.id)
-        val workInfo = workManager.getWorkInfoById(request.id).get()
-
-        assertTrue(workInfo?.state in listOf(WorkInfo.State.RUNNING, WorkInfo.State.SUCCEEDED))
+        val worker = TestListenableWorkerBuilder<FileCleanupJob>(context).build()
 
+        runBlocking {
+            val result = worker.doWork()
+            assertTrue(result is ListenableWorker.Result.Success)
+        }
     }
 
     @After

app/src/androidTest/java/at/techbee/jtx/database/properties/AttachmentAndroidTest.kt

@@ -10,10 +10,7 @@ package at.techbee.jtx.database.properties
 
 import android.content.ContentValues
 import androidx.test.platform.app.InstrumentationRegistry
-import androidx.work.WorkInfo
-import androidx.work.WorkManager
-import org.junit.Assert.*
-
+import org.junit.Assert.assertEquals
 import org.junit.Test
 
 class AttachmentAndroidTest {
@@ -58,17 +55,4 @@ class AttachmentAndroidTest {
 
         assertEquals("/data/user/0/${context.packageName}/files/attachments", dir.toString())
     }
-
-    @Test
-    fun scheduleCleanupJobTest() {
-
-        val context = InstrumentationRegistry.getInstrumentation().targetContext
-        Attachment.scheduleCleanupJob(context)
-
-        val workManager = WorkManager.getInstance(context)
-        val workInfo = workManager.getWorkInfosForUniqueWork("fileCleanupWorkRequest").get()
-
-        //check if the Work was enqueued
-        assertEquals(workInfo.firstOrNull()?.state, WorkInfo.State.ENQUEUED)
-    }
 }

app/src/main/java/at/techbee/jtx/util/Ical4androidUtil.kt

@@ -13,20 +13,25 @@ import android.content.ContentProviderClient
 import android.content.ContentValues
 import android.content.Context
 import android.util.Log
-import at.bitfire.ical4android.*
-import at.bitfire.ical4android.util.MiscUtils.toValues
+import at.bitfire.ical4android.JtxCollection
+import at.bitfire.ical4android.JtxCollectionFactory
+import at.bitfire.ical4android.JtxICalObject
+import at.bitfire.ical4android.JtxICalObjectFactory
+import at.bitfire.synctools.storage.toContentValues
 import at.techbee.jtx.contract.JtxContract
 import at.techbee.jtx.contract.JtxContract.asSyncAdapter
 import net.fortuna.ical4j.data.CalendarOutputter
 import net.fortuna.ical4j.model.Calendar
 import net.fortuna.ical4j.model.component.VJournal
 import net.fortuna.ical4j.model.component.VToDo
+import net.fortuna.ical4j.model.property.ProdId
 import net.fortuna.ical4j.model.property.Version
 import java.io.OutputStream
 import java.io.Reader
 
 object Ical4androidUtil {
 
+    private val prodId = ProdId("+//IDN techbee.at//jtx Board")
 
     /**
      * @param [account] to look up
@@ -36,7 +41,7 @@ object Ical4androidUtil {
      */
     fun getICSFormatForCollectionFromProvider(account: Account, context: Context?, collectionId: Long): String? {
         val collection = getCollection(account, context, collectionId) ?: return null
-        return collection.getICSForCollection()
+        return collection.getICSForCollection(prodId)
     }
 
 
@@ -61,7 +66,7 @@ object Ical4androidUtil {
 
         val ical = Calendar()
         ical.properties += Version.VERSION_2_0
-        ical.properties += ICalendar.prodId
+        ical.properties +=  prodId
 
         iCalObjectIds.forEach { iCalObjectId ->
             val uri = JtxContract.JtxICalObject.CONTENT_URI
@@ -75,8 +80,8 @@ object Ical4androidUtil {
 
                 while (cursor.moveToNext()) {
                     val jtxIcalObject = JtxICalObject(collection)
-                    jtxIcalObject.populateFromContentValues(cursor.toValues())
-                    val singleICS = jtxIcalObject.getICalendarFormat()
+                    jtxIcalObject.populateFromContentValues(cursor.toContentValues())
+                    val singleICS = jtxIcalObject.getICalendarFormat(prodId)
                     singleICS?.components?.forEach { component ->
                         if(component is VToDo || component is VJournal)
                             ical.components += component
@@ -85,7 +90,7 @@ object Ical4androidUtil {
             }
         }
 
-        Ical4Android.checkThreadContextClassLoader()
+        //Ical4Android.checkThreadContextClassLoader()
         try {
             CalendarOutputter(false).output(ical, os)
         } catch (e: Exception) {

gradle/libs.versions.toml

@@ -17,7 +17,6 @@ androidx-test-junit = "1.3.0"
 androidx-work = "2.11.0"
 annotation = "1.9.1"
 biometricKtx = "1.4.0-alpha02"
-bitfire-ical4android = "883954c7ca"
 calendarCompose = "2.9.0"
 coilCompose = "2.7.0"
 colorpickerCompose = "1.1.2"
@@ -42,6 +41,7 @@ playServicesLocation = "21.3.0"
 playServicesMaps = "19.2.0"
 profileinstaller = "1.4.1"
 reorderable = "3.0.0"
+synctools = "9c48db4d61"
 uiTextGoogleFonts = "1.9.4"
 room = "2.8.3"
 volley = "1.2.1"
@@ -75,7 +75,6 @@ androidx-test-junit = { module = "androidx.test.ext:junit", version.ref = "andro
 androidx-ui-text-google-fonts = { group = "androidx.compose.ui", name = "ui-text-google-fonts", version.ref = "uiTextGoogleFonts" }
 androidx-work-base = { module = "androidx.work:work-runtime-ktx", version.ref = "androidx-work" }
 androidx-work-testing = { module = "androidx.work:work-testing", version.ref = "androidx-work" }
-bitfire-ical4android = { module = "com.github.bitfireAT:ical4android", version.ref = "bitfire-ical4android" }
 calendar-compose = { module = "com.kizitonwose.calendar:compose", version.ref = "calendarCompose"}
 coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coilCompose" }
 colorpicker-compose = { module = "com.github.skydoves:colorpicker-compose", version.ref = "colorpickerCompose" }
@@ -107,6 +106,7 @@ room-base = { module = "androidx.room:room-ktx", version.ref = "room" }
 room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
 room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
 room-testing = { module = "androidx.room:room-testing", version.ref = "room" }
+synctools = { module = "com.github.bitfireat:synctools", version.ref = "synctools" }
 volley = { module = "com.android.volley:volley", version.ref = "volley" }
 
 # gplay and managed build variants