Merge pull request #13 from ashwini009/remove-jetifier

Disable Jetifier to move purely on AndroidX

Author: reactivedroid

app/build.gradle.kts

@@ -138,7 +138,6 @@ dependencies {
     androidTestImplementation(Deps.Mockito.android)
     testImplementation(Deps.Mockito.kotlin)
     testImplementation(Deps.Mockito.inline)
-    testImplementation(Deps.robolectric)
     testImplementation(Deps.AndroidX.Test.arch_core_testing)
     testImplementation(Deps.AndroidX.Test.core)
     androidTestImplementation(Deps.AndroidX.Test.runner)
@@ -149,6 +148,7 @@ dependencies {
     androidTestImplementation(Deps.AndroidX.Test.Espresso.idling_resource)
     androidTestImplementation(Deps.AndroidX.Test.rules)
     testImplementation(Deps.truth)
+    androidTestImplementation(Deps.truth)
     testImplementation(Deps.Coroutines.test)
     // end-region Test
 

app/src/test/java/com/android/tvmaze/favorites/FavoriteShowsRepositoryTest.kt renamed to app/src/androidTest/java/com/android/tvmaze/favorites/FavoritesRepositoryTest.kt

@@ -2,45 +2,42 @@ package com.android.tvmaze.favorites
 
 import android.content.Context
 import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
 import com.android.tvmaze.db.TvMazeDatabase
 import com.android.tvmaze.db.favouriteshow.ShowDao
 import com.android.tvmaze.favorite.FavoriteShowsRepository
-import com.android.tvmaze.utils.TestUtil
+import com.android.tvmaze.utils.TestUtils
 import com.google.common.truth.Truth.assertThat
 import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
-import org.mockito.MockitoAnnotations
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 import java.io.IOException
 
-@RunWith(RobolectricTestRunner::class)
-@Config(manifest = Config.NONE)
-class FavoriteShowsRepositoryTest {
-    @Mock
-    private lateinit var context: Context
+@LargeTest
+@RunWith(AndroidJUnit4::class)
+class FavoritesRepositoryTest {
     private lateinit var favoriteShowsRepository: FavoriteShowsRepository
     private lateinit var tvMazeDb: TvMazeDatabase
     private lateinit var showDao: ShowDao
 
     @Before
     fun setup() {
-        MockitoAnnotations.initMocks(this)
+        val context = ApplicationProvider.getApplicationContext<Context>()
         tvMazeDb = Room.inMemoryDatabaseBuilder(
             context, TvMazeDatabase::class.java
-        ).build()
+        ).allowMainThreadQueries().build()
         showDao = tvMazeDb.showDao()
         favoriteShowsRepository = FavoriteShowsRepository(showDao)
     }
 
     @Test
     fun testShowInsertionInDb() {
         runBlocking {
-            favoriteShowsRepository.insertIntoFavorites(TestUtil.getFakeShow())
+            favoriteShowsRepository.insertIntoFavorites(TestUtils.getFakeShow())
             val favShows = favoriteShowsRepository.allFavoriteShows()
             assertThat(favShows.isNotEmpty()).isTrue()
         }
@@ -57,7 +54,7 @@ class FavoriteShowsRepositoryTest {
     @Test
     fun testFavoriteShows() {
         runBlocking {
-            val fakeShow = TestUtil.getFakeShow()
+            val fakeShow = TestUtils.getFakeShow()
             favoriteShowsRepository.insertIntoFavorites(fakeShow)
             val favoriteShows = favoriteShowsRepository.allFavoriteShows()
             assertThat(favoriteShows[0] == fakeShow).isTrue()
@@ -66,7 +63,7 @@ class FavoriteShowsRepositoryTest {
 
     @After
     @Throws(IOException::class)
-    fun closeDb() {
+    fun release() {
         tvMazeDb.close()
     }
 }

app/src/androidTest/java/com/android/tvmaze/utils/TestUtils.kt

@@ -0,0 +1,14 @@
+package com.android.tvmaze.utils
+
+import com.android.tvmaze.db.favouriteshow.FavoriteShow
+
+object TestUtils {
+    fun getFakeShow(): FavoriteShow {
+        return FavoriteShow(
+            id = 222, name = "Friends",
+            premiered = "Aug 2002", imageUrl = null,
+            summary = "Friends for life!", rating = "10 stars",
+            runtime = 132000, isFavorite = true
+        )
+    }
+}

app/src/test/java/com/android/tvmaze/home/HomeViewModelTest.kt

@@ -11,17 +11,16 @@ import com.google.common.truth.Truth.assertThat
 import com.nhaarman.mockitokotlin2.whenever
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runBlockingTest
+import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.InjectMocks
 import org.mockito.Mock
+import org.mockito.Mockito
 import org.mockito.MockitoAnnotations
-import org.robolectric.RobolectricTestRunner
 
 @ExperimentalCoroutinesApi
-@RunWith(RobolectricTestRunner::class)
 class HomeViewModelTest {
     // Executes tasks in the Architecture Components in the same thread
     @get:Rule
@@ -131,4 +130,9 @@ class HomeViewModelTest {
             }
         }
     }
+
+    @After
+    fun release() {
+        Mockito.framework().clearInlineMocks()
+    }
 }

app/src/test/java/com/android/tvmaze/utils/TestUtil.kt

@@ -1,6 +1,5 @@
 package com.android.tvmaze.utils
 
-import com.android.tvmaze.db.favouriteshow.FavoriteShow
 import com.android.tvmaze.home.HomeViewData
 import com.android.tvmaze.network.home.Episode
 import com.android.tvmaze.network.home.Show
@@ -63,13 +62,4 @@ object TestUtil {
         episodeList.add(episode2)
         return episodeList
     }
-
-    fun getFakeShow(): FavoriteShow {
-        return FavoriteShow(
-            id = 222, name = "Friends",
-            premiered = "Aug 2002", imageUrl = null,
-            summary = "Friends for life!", rating = "10 stars",
-            runtime = 132000, isFavorite = true
-        )
-    }
 }

buildSrc/src/main/kotlin/Dependencies.kt

@@ -21,7 +21,6 @@ object Deps {
         const val timber = "4.7.1"
         const val mockito_kotlin = "2.2.0"
         const val arch_core_testing = "2.0.0"
-        const val robolectric = "4.3.1"
         const val moshi = "1.9.2"
         const val coroutines = "1.3.7"
         const val truth = "1.0.1"
@@ -42,7 +41,6 @@ object Deps {
     const val timber = "com.jakewharton.timber:timber:${Versions.timber}"
 
     const val junit = "junit:junit:${Versions.junit}"
-    const val robolectric = "org.robolectric:robolectric:${Versions.robolectric}"
 
     object Google {
         const val material = "com.google.android.material:material:${Versions.material}"

gradle.properties

@@ -13,7 +13,6 @@ org.gradle.jvmargs=-Xmx2048m -XX\:MaxPermSize\=2048m -XX\:+HeapDumpOnOutOfMemory
 org.gradle.parallel=true
 # Google Play and Firebase dependencies are migrating to androidX. This is to fix the duplicate class resolution build error to use the androidX libraries
 android.useAndroidX=true
-android.enableJetifier=true
 # All kapt to use workers
 kapt.use.worker.api=true
 kapt.incremental.apt=true