Merge pull request android10#17 from chronvas/master

Refactored Context extension networkInfo to return a nullable NetworkInfo

Author: android10

app/src/main/kotlin/com/fernandocejas/sample/core/extension/Context.kt

@@ -19,5 +19,5 @@ import android.content.Context
 import android.net.ConnectivityManager
 import android.net.NetworkInfo
 
-val Context.networkInfo: NetworkInfo get() =
+val Context.networkInfo: NetworkInfo? get() =
     (this.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager).activeNetworkInfo

app/src/main/kotlin/com/fernandocejas/sample/core/platform/NetworkHandler.kt

@@ -21,10 +21,10 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * Injectable class which handles device network connection.
+ * Injectable class which returns information about the network connection state.
  */
 @Singleton
 class NetworkHandler
 @Inject constructor(private val context: Context) {
-    val isConnected get() = context.networkInfo.isConnectedOrConnecting
+    val isConnected get() = context.networkInfo?.isConnectedOrConnecting
 }

app/src/main/kotlin/com/fernandocejas/sample/features/movies/MoviesRepository.kt

@@ -36,14 +36,14 @@ interface MoviesRepository {
         override fun movies(): Either<Failure, List<Movie>> {
             return when (networkHandler.isConnected) {
                 true -> request(service.movies(), { it.map { it.toMovie() } }, emptyList())
-                false -> Left(NetworkConnection())
+                false, null -> Left(NetworkConnection())
             }
         }
 
         override fun movieDetails(movieId: Int): Either<Failure, MovieDetails> {
             return when (networkHandler.isConnected) {
                 true -> request(service.movieDetails(movieId), { it.toMovieDetails() }, MovieDetailsEntity.empty())
-                false -> Left(NetworkConnection())
+                false, null -> Left(NetworkConnection())
             }
         }
 

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

@@ -89,6 +89,17 @@ class MoviesRepositoryTest : UnitTest() {
         verifyZeroInteractions(service)
     }
 
+    @Test fun `movies service should return network failure when undefined connection`() {
+        given { networkHandler.isConnected }.willReturn(null)
+
+        val movies = networkRepository.movies()
+
+        movies shouldBeInstanceOf Either::class.java
+        movies.isLeft shouldEqual true
+        movies.either({ failure -> failure shouldBeInstanceOf NetworkConnection::class.java }, {})
+        verifyZeroInteractions(service)
+    }
+
     @Test fun `movies service should return server error if no successful response`() {
         given { networkHandler.isConnected }.willReturn(true)
 
@@ -149,6 +160,17 @@ class MoviesRepositoryTest : UnitTest() {
         verifyZeroInteractions(service)
     }
 
+    @Test fun `movie details service should return network failure when undefined connection`() {
+        given { networkHandler.isConnected }.willReturn(null)
+
+        val movieDetails = networkRepository.movieDetails(1)
+
+        movieDetails shouldBeInstanceOf Either::class.java
+        movieDetails.isLeft shouldEqual true
+        movieDetails.either({ failure -> failure shouldBeInstanceOf NetworkConnection::class.java }, {})
+        verifyZeroInteractions(service)
+    }
+
     @Test fun `movie details service should return server error if no successful response`() {
         given { networkHandler.isConnected }.willReturn(true)