Skip to content

Commit 44fbc3c

Browse files
committed
Remove LoadingView class. Fix NPE.
1 parent 1c8acc0 commit 44fbc3c

File tree

3 files changed

+2
-25
lines changed

3 files changed

+2
-25
lines changed

app/src/main/kotlin/com/fernandocejas/sample/framework/view/LoadingView.kt

Lines changed: 0 additions & 21 deletions
This file was deleted.

app/src/test/kotlin/com/fernandocejas/sample/features/movies/MovieDetailsViewModelTest.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import com.fernandocejas.sample.AndroidTest
1919
import com.fernandocejas.sample.framework.functional.Either.Right
2020
import com.fernandocejas.sample.navigation.Navigator
2121
import com.nhaarman.mockito_kotlin.given
22-
import kotlinx.coroutines.experimental.runBlocking
2322
import org.amshove.kluent.shouldEqualTo
2423
import org.junit.Before
2524
import org.junit.Test
@@ -44,7 +43,7 @@ class MovieDetailsViewModelTest : AndroidTest() {
4443
@Test fun `loading movie details should update live data`() {
4544
val movieDetails = MovieDetails(0, "IronMan", "poster", "summary",
4645
"cast", "director", 2018, "trailer")
47-
given { runBlocking { moviesRepository.movieDetails(0) } }.willReturn(Right(movieDetails))
46+
given { moviesRepository.movieDetails(0) }.willReturn(Right(movieDetails))
4847

4948
movieDetailsViewModel.loadMovieDetails(0)
5049

app/src/test/kotlin/com/fernandocejas/sample/features/movies/MoviesViewModelTest.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package com.fernandocejas.sample.features.movies
1818
import com.fernandocejas.sample.AndroidTest
1919
import com.fernandocejas.sample.framework.functional.Either.Right
2020
import com.nhaarman.mockito_kotlin.given
21-
import kotlinx.coroutines.experimental.runBlocking
2221
import org.amshove.kluent.shouldEqualTo
2322
import org.junit.Before
2423
import org.junit.Test
@@ -39,7 +38,7 @@ class MoviesViewModelTest : AndroidTest() {
3938

4039
@Test fun `loading movies should update live data`() {
4140
val moviesList = listOf(Movie(0, "IronMan"), Movie(1, "Batman"))
42-
given { runBlocking { moviesRepository.movies() } }.willReturn(Right(moviesList))
41+
given { moviesRepository.movies() }.willReturn(Right(moviesList))
4342

4443
moviesViewModel.loadMovies()
4544

0 commit comments

Comments
 (0)