Skip to content

Commit fe527e9

Browse files
committed
Make observeForTesting non-suspending
1 parent 36ae26e commit fe527e9

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

app/src/test/java/com/example/android/architecture/blueprints/todoapp/LiveDataTestUtil.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ fun <T> LiveData<T>.getOrAwaitValue(
6363
/**
6464
* Observes a [LiveData] until the `block` is done executing.
6565
*/
66-
suspend fun <T> LiveData<T>.observeForTesting(block: suspend () -> Unit) {
66+
fun <T> LiveData<T>.observeForTesting(block: () -> Unit) {
6767
val observer = Observer<T> { }
6868
try {
6969
observeForever(observer)

app/src/test/java/com/example/android/architecture/blueprints/todoapp/taskdetail/TaskDetailViewModelTest.kt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,19 +102,18 @@ class TaskDetailViewModelTest {
102102
// Load the ViewModel
103103
taskDetailViewModel.start(task.id)
104104
// Start observing to compute transformations
105-
taskDetailViewModel.task.observeForTesting {
105+
taskDetailViewModel.task.observeForTesting {}
106106

107-
// Verify that the task was completed initially
108-
assertThat(tasksRepository.tasksServiceData[task.id]?.isCompleted).isTrue()
107+
// Verify that the task was completed initially
108+
assertThat(tasksRepository.tasksServiceData[task.id]?.isCompleted).isTrue()
109109

110-
// When the ViewModel is asked to complete the task
111-
taskDetailViewModel.setCompleted(false)
110+
// When the ViewModel is asked to complete the task
111+
taskDetailViewModel.setCompleted(false)
112112

113-
// Then the task is not completed and the snackbar shows the correct message
114-
val newTask = (tasksRepository.getTask(task.id) as Success).data
115-
assertTrue(newTask.isActive)
116-
assertSnackbarMessage(taskDetailViewModel.snackbarText, R.string.task_marked_active)
117-
}
113+
// Then the task is not completed and the snackbar shows the correct message
114+
val newTask = (tasksRepository.getTask(task.id) as Success).data
115+
assertTrue(newTask.isActive)
116+
assertSnackbarMessage(taskDetailViewModel.snackbarText, R.string.task_marked_active)
118117
}
119118

120119
@Test

0 commit comments

Comments
 (0)