diff --git a/app/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.kt b/app/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.kt index 6ee006a5d..4b31515dc 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.kt +++ b/app/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.kt @@ -5,22 +5,29 @@ */ package com.todoroo.astrid.service -import org.tasks.data.entity.Task import com.todoroo.astrid.utility.TitleParser import dagger.hilt.android.testing.HiltAndroidTest import kotlinx.coroutines.runBlocking -import net.fortuna.ical4j.model.Recur.Frequency.* -import org.junit.Assert.* +import net.fortuna.ical4j.model.Recur.Frequency.DAILY +import net.fortuna.ical4j.model.Recur.Frequency.MONTHLY +import net.fortuna.ical4j.model.Recur.Frequency.WEEKLY +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNotSame +import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Ignore import org.junit.Test import org.tasks.R +import org.tasks.data.dao.CaldavDao import org.tasks.data.dao.TagDataDao +import org.tasks.data.entity.Task +import org.tasks.data.newLocalAccount import org.tasks.date.DateTimeUtils import org.tasks.injection.InjectingTestCase import org.tasks.preferences.Preferences import org.tasks.repeats.RecurrenceUtils.newRecur -import java.util.* +import java.util.Calendar import javax.inject.Inject @HiltAndroidTest @@ -28,11 +35,15 @@ class TitleParserTest : InjectingTestCase() { @Inject lateinit var tagDataDao: TagDataDao @Inject lateinit var preferences: Preferences @Inject lateinit var taskCreator: TaskCreator + @Inject lateinit var caldavDao: CaldavDao @Before override fun setUp() { - super.setUp() - preferences.setStringFromInteger(R.string.p_default_urgency_key, 0) + runBlocking { + super.setUp() + preferences.setStringFromInteger(R.string.p_default_urgency_key, 0) + caldavDao.newLocalAccount() + } } /** diff --git a/app/src/androidTest/java/org/tasks/ui/editviewmodel/BaseTaskEditViewModelTest.kt b/app/src/androidTest/java/org/tasks/ui/editviewmodel/BaseTaskEditViewModelTest.kt index ac68aa913..5a4e0a516 100644 --- a/app/src/androidTest/java/org/tasks/ui/editviewmodel/BaseTaskEditViewModelTest.kt +++ b/app/src/androidTest/java/org/tasks/ui/editviewmodel/BaseTaskEditViewModelTest.kt @@ -12,13 +12,16 @@ import com.todoroo.astrid.timers.TimerPlugin import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.runBlocking +import org.junit.Before import org.tasks.calendars.CalendarEventProvider import org.tasks.data.dao.AlarmDao +import org.tasks.data.dao.CaldavDao import org.tasks.data.dao.LocationDao import org.tasks.data.dao.TagDataDao import org.tasks.data.dao.UserActivityDao import org.tasks.data.db.Database import org.tasks.data.entity.Task +import org.tasks.data.newLocalAccount import org.tasks.injection.InjectingTestCase import org.tasks.location.GeofenceApi import org.tasks.preferences.DefaultFilterProvider @@ -44,9 +47,18 @@ open class BaseTaskEditViewModelTest : InjectingTestCase() { @Inject lateinit var tagDataDao: TagDataDao @Inject lateinit var alarmDao: AlarmDao @Inject lateinit var userActivityDao: UserActivityDao + @Inject lateinit var caldavDao: CaldavDao protected lateinit var viewModel: TaskEditViewModel + @Before + override fun setUp() { + runBlocking { + super.setUp() + caldavDao.newLocalAccount() + } + } + protected fun setup(task: Task) = runBlocking { viewModel = TaskEditViewModel( context,