archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make runBlocking crash when used on main thread

Browse Source
pull/1051/head
Alex Baker 4 years ago
parent e4b2dc932e
commit a2776b960e
29 changed files with 45 additions and 59 deletions
Show Stats Download Patch File Download Diff File

6
app/src/androidTest/java/org/tasks/ui/editviewmodel/BaseTaskEditViewModelTest.kt
Unescape Escape View File

@ -10,6 +10,8 @@ import com.todoroo.astrid.service.TaskDeleter
import com.todoroo.astrid.service.TaskMover
import com.todoroo.astrid.timers.TimerPlugin
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
import org.junit.Before
import org.tasks.calendars.CalendarEventProvider
import org.tasks.injection.InjectingTestCase
@ -61,4 +63,8 @@ open class BaseTaskEditViewModelTest : InjectingTestCase() {
db.alarmDao,
alarmService)
}
protected fun save(): Boolean = runBlocking(Dispatchers.Main) {
viewModel.save()
}
}

7
app/src/androidTest/java/org/tasks/ui/editviewmodel/PriorityTests.kt
Unescape Escape View File

@ -1,11 +1,9 @@
package org.tasks.ui.editviewmodel
import androidx.test.annotation.UiThreadTest
import com.natpryce.makeiteasy.MakeItEasy
import com.todoroo.astrid.data.Task
import dagger.hilt.android.testing.HiltAndroidTest
import dagger.hilt.android.testing.UninstallModules
import kotlinx.coroutines.runBlocking
import org.junit.Assert
import org.junit.Test
import org.tasks.injection.ProductionModule
@ -24,13 +22,12 @@ class PriorityTests : BaseTaskEditViewModelTest() {
}
@Test
@UiThreadTest
fun applyPriorityChange() = runBlocking {
fun applyPriorityChange() {
val task = TaskMaker.newTask(MakeItEasy.with(TaskMaker.PRIORITY, Task.Priority.HIGH))
viewModel.setup(task)
viewModel.priority = Task.Priority.MEDIUM
viewModel.save()
save()
Assert.assertEquals(Task.Priority.MEDIUM, task.priority)
}

25
app/src/androidTest/java/org/tasks/ui/editviewmodel/ReminderTests.kt
Unescape Escape View File

@ -1,6 +1,5 @@
package org.tasks.ui.editviewmodel
import androidx.test.annotation.UiThreadTest
import dagger.hilt.android.testing.HiltAndroidTest
import dagger.hilt.android.testing.UninstallModules
import kotlinx.coroutines.runBlocking
@ -14,76 +13,76 @@ import org.tasks.makers.TaskMaker.newTask
@HiltAndroidTest
class ReminderTests : BaseTaskEditViewModelTest() {
@Test
@UiThreadTest
fun whenDueReminder() = runBlocking {
val task = newTask()
viewModel.setup(task)
viewModel.whenDue = true
viewModel.save()
save()
assertTrue(taskDao.fetch(task.id)!!.isNotifyAtDeadline)
}
@Test
@UiThreadTest
fun whenOverDueReminder() = runBlocking {
val task = newTask()
viewModel.setup(task)
viewModel.whenOverdue = true
viewModel.save()
save()
assertTrue(taskDao.fetch(task.id)!!.isNotifyAfterDeadline)
}
@Test
@UiThreadTest
fun ringFiveTimes() = runBlocking {
val task = newTask()
viewModel.setup(task)
viewModel.ringFiveTimes = true
viewModel.save()
save()
assertTrue(taskDao.fetch(task.id)!!.isNotifyModeFive)
}
@Test
@UiThreadTest
fun ringNonstop() = runBlocking {
val task = newTask()
viewModel.setup(task)
viewModel.ringNonstop = true
viewModel.save()
save()
assertTrue(taskDao.fetch(task.id)!!.isNotifyModeNonstop)
}
@Test
@UiThreadTest
fun ringFiveTimesCantRingNonstop() = runBlocking {
val task = newTask()
viewModel.setup(task)
viewModel.ringNonstop = true
viewModel.ringFiveTimes = true
viewModel.save()
save()
assertFalse(taskDao.fetch(task.id)!!.isNotifyModeNonstop)
assertTrue(taskDao.fetch(task.id)!!.isNotifyModeFive)
}
@Test
@UiThreadTest
fun ringNonStopCantRingFiveTimes() = runBlocking {
val task = newTask()
viewModel.setup(task)
viewModel.ringFiveTimes = true
viewModel.ringNonstop = true
viewModel.save()
save()
assertFalse(taskDao.fetch(task.id)!!.isNotifyModeFive)
assertTrue(taskDao.fetch(task.id)!!.isNotifyModeNonstop)

7
app/src/androidTest/java/org/tasks/ui/editviewmodel/RepeatTests.kt
Unescape Escape View File

@ -1,6 +1,5 @@
package org.tasks.ui.editviewmodel
import androidx.test.annotation.UiThreadTest
import com.google.ical.values.RRule
import com.natpryce.makeiteasy.MakeItEasy.with
import dagger.hilt.android.testing.HiltAndroidTest
@ -16,14 +15,13 @@ import org.tasks.makers.TaskMaker.newTask
@HiltAndroidTest
class RepeatTests : BaseTaskEditViewModelTest() {
@Test
@UiThreadTest
fun changeRepeatAfterCompletion() = runBlocking {
val task = newTask(with(TaskMaker.RRULE, RRule("RRULE:FREQ=DAILY;INTERVAL=1")))
viewModel.setup(task)
viewModel.repeatAfterCompletion = true
viewModel.save()
save()
assertEquals(
"RRULE:FREQ=DAILY;INTERVAL=1;FROM=COMPLETION",
@ -31,7 +29,6 @@ class RepeatTests : BaseTaskEditViewModelTest() {
}
@Test
@UiThreadTest
fun removeRepeatAfterCompletion() = runBlocking {
val task = newTask()
task.recurrence = "RRULE:FREQ=DAILY;INTERVAL=1;FROM=COMPLETION"
@ -39,7 +36,7 @@ class RepeatTests : BaseTaskEditViewModelTest() {
viewModel.repeatAfterCompletion = false
viewModel.save()
save()
assertEquals(
"RRULE:FREQ=DAILY;INTERVAL=1",

7
app/src/androidTest/java/org/tasks/ui/editviewmodel/TaskEditViewModelTest.kt
Unescape Escape View File

@ -1,6 +1,5 @@
package org.tasks.ui.editviewmodel
import androidx.test.annotation.UiThreadTest
import com.todoroo.astrid.data.Task
import dagger.hilt.android.testing.HiltAndroidTest
import dagger.hilt.android.testing.UninstallModules
@ -22,23 +21,21 @@ class TaskEditViewModelTest : BaseTaskEditViewModelTest() {
}
@Test
@UiThreadTest
fun dontSaveTaskWithoutChanges() = runBlocking {
viewModel.setup(newTask())
assertFalse(viewModel.save())
assertFalse(save())
assertTrue(taskDao.getAll().isEmpty())
}
@Test
@UiThreadTest
fun dontSaveTaskTwice() = runBlocking {
viewModel.setup(newTask())
viewModel.priority = Task.Priority.HIGH
assertTrue(viewModel.save())
assertTrue(save())
assertFalse(viewModel.save())
}

5
app/src/androidTest/java/org/tasks/ui/editviewmodel/TitleTests.kt
Unescape Escape View File

@ -1,6 +1,5 @@
package org.tasks.ui.editviewmodel
import androidx.test.annotation.UiThreadTest
import com.natpryce.makeiteasy.MakeItEasy.with
import com.todoroo.astrid.data.Task.Priority.Companion.HIGH
import dagger.hilt.android.testing.HiltAndroidTest
@ -26,20 +25,18 @@ class TitleTests : BaseTaskEditViewModelTest() {
}
@Test
@UiThreadTest
fun saveWithEmptyTitle() = runBlocking {
val task = newTask()
viewModel.setup(task)
viewModel.priority = HIGH
viewModel.save()
save()
assertEquals("(No title)", taskDao.fetch(task.id)!!.title)
}
@Test
@UiThreadTest
fun newTaskPrepopulatedWithTitleHasChanges() {
viewModel.setup(newTask(with(TaskMaker.TITLE, "some title")))

2
app/src/main/java/com/todoroo/astrid/alarms/AlarmService.kt
Unescape Escape View File

@ -5,9 +5,9 @@
*/
package com.todoroo.astrid.alarms
import kotlinx.coroutines.runBlocking
import org.tasks.data.Alarm
import org.tasks.data.AlarmDao
import org.tasks.data.runBlocking
import org.tasks.jobs.AlarmEntry
import org.tasks.jobs.NotificationQueue
import java.util.*

2
app/src/main/java/com/todoroo/astrid/dao/TaskDaoBlocking.kt
Unescape Escape View File

@ -9,9 +9,9 @@ import androidx.paging.DataSource
import androidx.sqlite.db.SimpleSQLiteQuery
import com.todoroo.astrid.api.Filter
import com.todoroo.astrid.data.Task
import kotlinx.coroutines.runBlocking
import org.tasks.data.SubtaskInfo
import org.tasks.data.TaskContainer
import org.tasks.data.runBlocking
import org.tasks.preferences.Preferences
import javax.inject.Inject

2
app/src/main/java/com/todoroo/astrid/service/TaskCompleter.kt
Unescape Escape View File

@ -3,8 +3,8 @@ package com.todoroo.astrid.service
import com.todoroo.andlib.utility.DateUtilities
import com.todoroo.astrid.dao.TaskDao
import com.todoroo.astrid.data.Task
import kotlinx.coroutines.runBlocking
import org.tasks.data.GoogleTaskDao
import org.tasks.data.runBlocking
import timber.log.Timber
import javax.inject.Inject

2
app/src/main/java/com/todoroo/astrid/service/TaskMover.kt
Unescape Escape View File

@ -8,7 +8,6 @@ import com.todoroo.astrid.api.GtasksFilter
import com.todoroo.astrid.dao.TaskDao
import com.todoroo.astrid.data.Task
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.runBlocking
import org.tasks.BuildConfig
import org.tasks.LocalBroadcastManager
import org.tasks.data.*
@ -58,7 +57,6 @@ class TaskMover @Inject constructor(
localBroadcastManager.broadcastRefresh()
}
// TODO: remove runBlocking
fun migrateLocalTasks() = runBlocking {
val list = caldavDao.getLocalList(context)
move(taskDao.getLocalTasks(), CaldavFilter(list))

1
app/src/main/java/org/tasks/data/AlarmDaoBlocking.kt
Unescape Escape View File

@ -1,6 +1,5 @@
package org.tasks.data
import kotlinx.coroutines.runBlocking
import javax.inject.Inject
@Deprecated("use coroutines")

1
app/src/main/java/org/tasks/data/CaldavDaoBlocking.kt
Unescape Escape View File

@ -3,7 +3,6 @@ package org.tasks.data
import android.content.Context
import androidx.lifecycle.LiveData
import com.todoroo.astrid.data.Task
import kotlinx.coroutines.runBlocking
import org.tasks.filters.CaldavFilters
import org.tasks.time.DateTimeUtils.currentTimeMillis
import javax.inject.Inject

1
app/src/main/java/org/tasks/data/ContentProviderDaoBlocking.kt
Unescape Escape View File

@ -3,7 +3,6 @@ package org.tasks.data
import android.database.Cursor
import androidx.sqlite.db.SupportSQLiteQuery
import com.todoroo.astrid.data.Task
import kotlinx.coroutines.runBlocking
import javax.inject.Inject
@Deprecated("use coroutines")

1
app/src/main/java/org/tasks/data/DeletionDaoBlocking.kt
Unescape Escape View File

@ -1,6 +1,5 @@
package org.tasks.data
import kotlinx.coroutines.runBlocking
import javax.inject.Inject
@Deprecated("use coroutines")

1
app/src/main/java/org/tasks/data/FilterDaoBlocking.kt
Unescape Escape View File

@ -1,6 +1,5 @@
package org.tasks.data
import kotlinx.coroutines.runBlocking
import javax.inject.Inject
@Deprecated("use coroutines")

1
app/src/main/java/org/tasks/data/GoogleTaskDaoBlocking.kt
Unescape Escape View File

@ -1,7 +1,6 @@
package org.tasks.data
import com.todoroo.astrid.data.Task
import kotlinx.coroutines.runBlocking
import org.tasks.time.DateTimeUtils.currentTimeMillis
import javax.inject.Inject

1
app/src/main/java/org/tasks/data/GoogleTaskListDaoBlocking.kt
Unescape Escape View File

@ -1,7 +1,6 @@
package org.tasks.data
import androidx.lifecycle.LiveData
import kotlinx.coroutines.runBlocking
import org.tasks.filters.GoogleTaskFilters
import org.tasks.time.DateTimeUtils.currentTimeMillis
import javax.inject.Inject

1
app/src/main/java/org/tasks/data/LocationDaoBlocking.kt
Unescape Escape View File

@ -1,7 +1,6 @@
package org.tasks.data
import androidx.lifecycle.LiveData
import kotlinx.coroutines.runBlocking
import org.tasks.filters.LocationFilters
import org.tasks.time.DateTimeUtils.currentTimeMillis
import javax.inject.Inject

14
app/src/main/java/org/tasks/data/RunBlocking.kt
Unescape Escape View File

@ -0,0 +1,14 @@
package org.tasks.data
import com.todoroo.andlib.utility.AndroidUtilities.assertNotMainThread
import kotlinx.coroutines.CoroutineScope
import kotlin.coroutines.CoroutineContext
import kotlin.coroutines.EmptyCoroutineContext
@Throws(InterruptedException::class)
fun <T> runBlocking(context: CoroutineContext = EmptyCoroutineContext, block: suspend CoroutineScope.() -> T): T {
assertNotMainThread()
return kotlinx.coroutines.runBlocking(context, block)
}

1
app/src/main/java/org/tasks/data/TagDaoBlocking.kt
Unescape Escape View File

@ -1,7 +1,6 @@
package org.tasks.data
import com.todoroo.astrid.data.Task
import kotlinx.coroutines.runBlocking
import javax.inject.Inject
@Deprecated("use coroutines")

1
app/src/main/java/org/tasks/data/TagDataDaoBlocking.kt
Unescape Escape View File

@ -3,7 +3,6 @@ package org.tasks.data
import androidx.core.util.Pair
import androidx.lifecycle.LiveData
import com.todoroo.astrid.data.Task
import kotlinx.coroutines.runBlocking
import org.tasks.filters.TagFilters
import org.tasks.time.DateTimeUtils.currentTimeMillis
import javax.inject.Inject

1
app/src/main/java/org/tasks/data/TaskAttachmentDaoBlocking.kt
Unescape Escape View File

@ -1,6 +1,5 @@
package org.tasks.data
import kotlinx.coroutines.runBlocking
import javax.inject.Inject
@Deprecated("use coroutines")

1
app/src/main/java/org/tasks/data/TaskListMetadataDaoBlocking.kt
Unescape Escape View File

@ -1,6 +1,5 @@
package org.tasks.data
import kotlinx.coroutines.runBlocking
import javax.inject.Inject
@Deprecated("use coroutines")

1
app/src/main/java/org/tasks/data/UserActivityDaoBlocking.kt
Unescape Escape View File

@ -1,6 +1,5 @@
package org.tasks.data
import kotlinx.coroutines.runBlocking
import javax.inject.Inject
@Deprecated("use coroutines")

6
app/src/main/java/org/tasks/jobs/CleanupWork.kt
Unescape Escape View File

@ -7,12 +7,8 @@ import androidx.work.WorkerParameters
import com.todoroo.astrid.alarms.AlarmService
import com.todoroo.astrid.reminders.ReminderService
import com.todoroo.astrid.timers.TimerPlugin
import kotlinx.coroutines.runBlocking
import org.tasks.analytics.Firebase
import org.tasks.data.DeletionDaoBlocking
import org.tasks.data.LocationDaoBlocking
import org.tasks.data.TaskAttachmentDaoBlocking
import org.tasks.data.UserActivityDaoBlocking
import org.tasks.data.*
import org.tasks.files.FileHelper
import org.tasks.injection.InjectingWorker
import org.tasks.location.GeofenceApi

2
app/src/main/java/org/tasks/jobs/WorkManagerImpl.kt
Unescape Escape View File

@ -10,12 +10,12 @@ import androidx.work.*
import com.todoroo.andlib.utility.AndroidUtilities
import com.todoroo.andlib.utility.DateUtilities
import com.todoroo.astrid.data.Task
import kotlinx.coroutines.runBlocking
import org.tasks.BuildConfig
import org.tasks.R
import org.tasks.data.CaldavDao
import org.tasks.data.GoogleTaskListDao
import org.tasks.data.Place
import org.tasks.data.runBlocking
import org.tasks.date.DateTimeUtils.midnight
import org.tasks.date.DateTimeUtils.newDateTime
import org.tasks.jobs.WorkManager.Companion.MAX_CLEANUP_LENGTH

2
app/src/main/java/org/tasks/notifications/NotificationDaoBlocking.kt
Unescape Escape View File

@ -1,6 +1,6 @@
package org.tasks.notifications
import kotlinx.coroutines.runBlocking
import org.tasks.data.runBlocking
import javax.inject.Inject
@Deprecated("use coroutines")

1
app/src/main/java/org/tasks/preferences/DefaultFilterProvider.kt
Unescape Escape View File

@ -7,7 +7,6 @@ import com.todoroo.astrid.core.BuiltInFilterExposer
import com.todoroo.astrid.core.BuiltInFilterExposer.getMyTasksFilter
import com.todoroo.astrid.data.Task
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.runBlocking
import org.tasks.R
import org.tasks.Strings.isNullOrEmpty
import org.tasks.data.*

1
app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
Unescape Escape View File

@ -30,7 +30,6 @@ import kotlinx.collections.immutable.toImmutableList
import kotlinx.collections.immutable.toImmutableSet
import kotlinx.coroutines.NonCancellable
import kotlinx.coroutines.async
import kotlinx.coroutines.runBlocking
import org.tasks.Event
import org.tasks.R
import org.tasks.Strings

Write Preview
Loading…
Cancel
Save