Merge pull request #74 from ferPrieto/chore/Migrate-Mockito-Kotlin-To…

…-Mockk

Chore/migrate mockito kotlin to mockk

README.md

@@ -31,7 +31,7 @@ The purpose of this project is to consolidate some of the learned insights throu
 * [Retrofit][5] Type-safe REST client for Android to consume RESTful web services.
 * [Timber][6] Logger with a small API which provides utility on top of Android's normal Log class.
 * [Espresso][7] Android UI Testing framework.
-* [Mockito-Kotlin][8] test functions facilitation for Mockito (mocking framework for testing).
+* [MockK][8] mocking framework for testing.
 * [MockWebServer][9] A scriptable web server for testing HTTP clients, used for Instrumentation tests in this project.
 * [Coil Compose][10] Image downloading and caching library supported by Jetpack Compose.
 * [Lottie Compose][11] Library that provides that parses Adobe After Effects animations exported as json with Bodymovin and renders them natively on mobile.
@@ -45,7 +45,7 @@ The purpose of this project is to consolidate some of the learned insights throu
 [5]:  https://github.com/square/retrofit
 [6]:  https://github.com/JakeWharton/timber
 [7]:  https://developer.android.com/training/testing/espresso/
-[8]:  https://github.com/nhaarman/mockito-kotlin
+[8]:  https://mockk.io
 [9]:  https://github.com/square/okhttp/tree/master/mockwebserver
 [10]: https://github.com/coil-kt/coil
 [11]: https://airbnb.io/lottie/#/android-compose
@@ -96,7 +96,7 @@ These are the three options available (all of them maintained):
 
 There are some highlights:
 * Every layer in the architecture has been tested.
-* Mockito has been used for mocking | stubbing.
+* MockK has been used for mocking | stubbing.
 * `Given | When | Then` code presentation order, in order to give a more structured style.
 * Code Coverage (WORK IN PROGRESS).
 

app/build.gradle.kts

@@ -1,16 +1,16 @@
-import prieto.fernando.dependencies.ProjectModules
 import prieto.fernando.dependencies.Dependencies
+import prieto.fernando.dependencies.ProjectModules
 import prieto.fernando.dependencies.TestDependencies
 
 plugins {
     id("com.android.application")
     kotlin("android")
-    kotlin("android.extensions")
     id("prieto.fernando.android.plugin")
     id("dagger.hilt.android.plugin")
+    id("org.jlleitschuh.gradle.ktlint") version "10.2.1"
 }
 
-androidPlugin{
+androidPlugin {
     buildType = prieto.fernando.android.plugin.BuildType.App
 }
 
@@ -28,12 +28,13 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = prieto.fernando.dependencies.Versions.compose
+        kotlinCompilerExtensionVersion = "1.0.5"
     }
 
     buildTypes {
         getByName("debug") {
             isDebuggable = true
+            isTestCoverageEnabled = true
             buildConfigField("Integer", "PORT", "8080")
         }
         getByName("release") {
@@ -54,7 +55,7 @@ dependencies {
     implementation(Dependencies.AndroidX.fragmentKtx)
     implementation(Dependencies.AndroidX.lifecycleLivedataKtx)
     implementation(Dependencies.AndroidX.Compose.viewModel)
-    annotationProcessor(Dependencies.AndroidX.lifecycleCompiler)
+    kapt(Dependencies.AndroidX.lifecycleCompiler)
     implementation(Dependencies.AndroidX.archComponents)
     implementation(Dependencies.AndroidX.browser)
 
@@ -68,7 +69,6 @@ dependencies {
 
     implementation(Dependencies.Hilt.hiltAndroid)
     implementation(Dependencies.Hilt.hiltAndroidCompiler)
-    implementation(Dependencies.Hilt.hiltViewModel)
     implementation(Dependencies.Hilt.hiltCompiler)
     implementation(Dependencies.Hilt.hiltNavigationCompose)
 
@@ -100,4 +100,4 @@ dependencies {
     androidTestImplementation(TestDependencies.Hilt.androidTesting)
     kaptAndroidTest(TestDependencies.Hilt.androidCompiler)
     androidTestAnnotationProcessor(TestDependencies.Hilt.androidCompiler)
-}
+}

app/src/androidTest/java/prieto/fernando/spacex/di/FakeNetworkModule.kt

@@ -13,4 +13,4 @@ import prieto.fernando.data_api.di.NetworkModule
 )
 class FakeNetworkModule : NetworkModule() {
     override fun getBaseUrl() = "http://127.0.0.1:${BuildConfig.PORT}"
-}
+}

app/src/androidTest/java/prieto/fernando/spacex/presentation/screens/MainScreenKtTest.kt

@@ -12,7 +12,6 @@ import org.junit.runner.RunWith
 import prieto.fernando.spacex.presentation.screens.base.BaseScreenTest
 import prieto.fernando.spacex.webmock.SuccessDispatcher
 
-
 @ExperimentalMaterialApi
 @RunWith(AndroidJUnit4::class)
 @HiltAndroidTest
@@ -47,4 +46,4 @@ class MainScreenKtTest : BaseScreenTest() {
             .performClick()
         composeTestRule.onNodeWithText("LAUNCHES", useUnmergedTree = true).assertIsDisplayed()
     }
-}
+}

app/src/androidTest/java/prieto/fernando/spacex/presentation/screens/base/BaseScreenTest.kt

@@ -42,4 +42,4 @@ open class BaseScreenTest {
             }
         }
     }
-}
+}

app/src/androidTest/java/prieto/fernando/spacex/presentation/screens/dashboard/DashboardScreenTest.kt

@@ -42,4 +42,4 @@ class DashboardScreenTest : BaseScreenTest() {
             onNodeWithContentDescription("404 Animation").assertIsDisplayed()
         }
     }
-}
+}

app/src/androidTest/java/prieto/fernando/spacex/presentation/screens/launches/LaunchesScreenKtTest.kt

@@ -28,7 +28,7 @@ class LaunchesScreenKtTest : BaseScreenTest() {
         mockWebServer.dispatcher = SuccessDispatcher()
         setMainContent()
 
-       launchesScreenRobot(composeTestRule) {
+        launchesScreenRobot(composeTestRule) {
             clickOnLaunchesTab()
             initialElementsShowed()
         }
@@ -94,7 +94,8 @@ class LaunchesScreenKtTest : BaseScreenTest() {
                         onEventSent = {},
                         effectFlow = flow { emit(LaunchesContract.Effect.ClickableLink.None) },
                         onLinkClicked = { },
-                        onClickableLinkRetrieved = { })
+                        onClickableLinkRetrieved = { }
+                    )
                 }
             }
 
@@ -119,23 +120,29 @@ class LaunchesScreenKtTest : BaseScreenTest() {
                         state = LaunchesContract.State(
                             listOf(
                                 LaunchUiModel(
-                                    "Mission1", "08-12-2021", true, "0", RocketUiModel(
+                                    "Mission1", "08-12-2021", true, "0",
+                                    RocketUiModel(
                                         "Rocket1", "Rocket Type1"
-                                    ), LinksUiModel("", "", "Youtube Link"), true
+                                    ),
+                                    LinksUiModel("", "", "Youtube Link"), true
                                 ),
                                 LaunchUiModel(
-                                    "Mission2", "09-12-2021", false, "0", RocketUiModel(
+                                    "Mission2", "09-12-2021", false, "0",
+                                    RocketUiModel(
                                         "Rocket2", "Rocket Type2"
-                                    ), LinksUiModel("", "WikiPedia Link", "Youtube Link"), false
+                                    ),
+                                    LinksUiModel("", "WikiPedia Link", "Youtube Link"), false
                                 )
-                            ), isLoading = false, isError = false
+                            ),
+                            isLoading = false, isError = false
                         ),
                         bottomSheetScaffoldState = bottomSheetScaffoldState,
                         coroutineScope = coroutineScope,
                         onEventSent = {},
                         effectFlow = flow { emit(LaunchesContract.Effect.ClickableLink.None) },
                         onLinkClicked = { },
-                        onClickableLinkRetrieved = { })
+                        onClickableLinkRetrieved = { }
+                    )
                 }
             }
 
@@ -145,4 +152,4 @@ class LaunchesScreenKtTest : BaseScreenTest() {
             }
         }
     }
-}
+}

app/src/androidTest/java/prieto/fernando/spacex/presentation/screens/launches/LaunchesScreenRobot.kt

@@ -1,12 +1,13 @@
 package prieto.fernando.spacex.presentation.screens.launches
 
-import androidx.compose.ui.test.*
+import androidx.compose.ui.test.assertCountEquals
+import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.compose.ui.test.onAllNodesWithContentDescription
+import androidx.compose.ui.test.onNodeWithContentDescription
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.rules.ActivityScenarioRule
-import kotlinx.coroutines.InternalCoroutinesApi
 import prieto.fernando.spacex.presentation.EntryPointActivity
 
 internal fun launchesScreenRobot(
@@ -93,8 +94,8 @@ internal open class LaunchesScreenRobot constructor(
         listItemsShowed(0)
     }
 
-    fun missionOneAndTwoShowed(){
+    fun missionOneAndTwoShowed() {
         missionOneText.assertIsDisplayed()
         missionTwoText.assertIsDisplayed()
     }
-}
+}

app/src/androidTest/java/prieto/fernando/spacex/webmock/AssetReaderUtil.kt

@@ -23,4 +23,4 @@ object AssetReaderUtil {
         }
         return builder.toString()
     }
-}
+}

app/src/androidTest/java/prieto/fernando/spacex/webmock/ErrorDispatcher.kt

@@ -8,4 +8,4 @@ class ErrorDispatcher : Dispatcher() {
     override fun dispatch(request: RecordedRequest): MockResponse {
         return MockResponse().setResponseCode(404)
     }
-}
+}

app/src/androidTest/java/prieto/fernando/spacex/webmock/MockTestRunner.kt

@@ -20,4 +20,4 @@ class MockTestRunner : AndroidJUnitRunner() {
     ): Application {
         return super.newApplication(cl, HiltTestApplication::class.java.name, context)
     }
-}
+}

app/src/androidTest/java/prieto/fernando/spacex/webmock/SuccessDispatcher.kt

@@ -35,4 +35,4 @@ class SuccessDispatcher(
             errorResponse
         }
     }
-}
+}

app/src/main/java/prieto/fernando/spacex/BaseApplication.kt

@@ -2,4 +2,4 @@ package prieto.fernando.spacex
 
 import android.app.Application
 
-open class BaseApplication : Application()
+open class BaseApplication : Application()

app/src/main/java/prieto/fernando/spacex/SpaceXApp.kt

@@ -1,7 +1,6 @@
 package prieto.fernando.spacex
 
 import dagger.hilt.android.HiltAndroidApp
-import android.app.Application
 
 @HiltAndroidApp
 class SpaceXApp : BaseApplication()

app/src/main/java/prieto/fernando/spacex/di/AppModule.kt

@@ -1,15 +1,9 @@
 package prieto.fernando.spacex.di
 
-import android.app.Application
-import android.content.Context
-import android.content.res.Resources
 import dagger.Module
-import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 
-
 @Module
 @InstallIn(SingletonComponent::class)
 open class AppModule {

app/src/main/java/prieto/fernando/spacex/presentation/EntryPointActivity.kt

@@ -12,8 +12,7 @@ import prieto.fernando.spacex.theme.SpaceXTheme
 @AndroidEntryPoint
 class EntryPointActivity : ComponentActivity() {
 
-    @InternalCoroutinesApi
-    @ExperimentalMaterialApi
+    @OptIn(InternalCoroutinesApi::class, ExperimentalMaterialApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {

app/src/main/java/prieto/fernando/spacex/presentation/navigation/BottomNavigationScreens.kt

@@ -20,4 +20,4 @@ sealed class BottomNavigationScreens(
         R.string.tab_title_launches,
         R.drawable.ic_launches
     )
-}
+}

app/src/main/java/prieto/fernando/spacex/presentation/screens/MainScreen.kt

@@ -21,7 +21,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -34,15 +33,15 @@ import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.InternalCoroutinesApi
 import prieto.fernando.spacex.R
+import prieto.fernando.spacex.presentation.navigation.BottomNavigationScreens
 import prieto.fernando.spacex.presentation.screens.dashboard.DashboardScreen
 import prieto.fernando.spacex.presentation.screens.launches.LaunchesContract
 import prieto.fernando.spacex.presentation.screens.launches.LaunchesScreen
-import prieto.fernando.spacex.presentation.navigation.BottomNavigationScreens
+import prieto.fernando.spacex.presentation.vm.DashboardViewModel
+import prieto.fernando.spacex.presentation.vm.LaunchesViewModel
 import prieto.fernando.spacex.theme.Dark
 import prieto.fernando.spacex.theme.Light
 import prieto.fernando.spacex.theme.SpaceXTypography
-import prieto.fernando.spacex.presentation.vm.DashboardViewModel
-import prieto.fernando.spacex.presentation.vm.LaunchesViewModel
 
 @InternalCoroutinesApi
 @ExperimentalMaterialApi
@@ -167,16 +166,19 @@ private fun BottomSheet(
                         youTubeLinkState.value = effect.youTubeLink
                         wikipediaLinkState.value = effect.wikipedia
                     }
-                    is LaunchesContract.Effect.ClickableLink.Youtube -> youTubeLinkState.value =
-                        effect.youTubeLink
-                    is LaunchesContract.Effect.ClickableLink.Wikipedia -> wikipediaLinkState.value =
-                        effect.wikipedia
+                    is LaunchesContract.Effect.ClickableLink.Youtube ->
+                        youTubeLinkState.value =
+                            effect.youTubeLink
+                    is LaunchesContract.Effect.ClickableLink.Wikipedia ->
+                        wikipediaLinkState.value =
+                            effect.wikipedia
                     else -> {
                         youTubeLinkState.value = ""
                         wikipediaLinkState.value = ""
                     }
                 }
-            })
+            }
+        )
     }
 }
 
@@ -323,7 +325,6 @@ private fun getTabColour(selected: Boolean) =
         else Dark.UnselectedTab
     }
 
-
 @Composable
 private fun AnimatableIcon(
     modifier: Modifier,
@@ -382,4 +383,4 @@ private fun AnimatableText(
 private fun currentRoute(navController: NavHostController): String? {
     val navBackStackEntry by navController.currentBackStackEntryAsState()
     return navBackStackEntry?.destination?.route
-}
+}

app/src/main/java/prieto/fernando/spacex/presentation/screens/common/ErrorAnimation.kt

@@ -41,4 +41,4 @@ fun ErrorAnimation(
             modifier = modifier.semantics { contentDescription = "404 Animation" }
         )
     }
-}
+}

app/src/main/java/prieto/fernando/spacex/presentation/screens/dashboard/CompanyInfoUiModel.kt

@@ -7,4 +7,4 @@ data class CompanyInfoUiModel(
     val employees: String,
     val launchSites: Int,
     val valuation: Long
-)
+)

app/src/main/java/prieto/fernando/spacex/presentation/screens/dashboard/DashboardContract.kt

@@ -14,4 +14,4 @@ class DashboardContract {
     ) : ViewState
 
     object Effect : ViewSideEffect
-}
+}

app/src/main/java/prieto/fernando/spacex/presentation/screens/dashboard/DashboardScreen.kt

@@ -53,9 +53,9 @@ fun DashboardScreen(
         when {
             state.isLoading -> {
                 LottieAnimation(
-                   composition =  loadingComposition,
+                    composition = loadingComposition,
                     progress = loadingProgress,
-                    modifier = Modifier.semantics { contentDescription= "Loading Animation" }
+                    modifier = Modifier.semantics { contentDescription = "Loading Animation" }
                 )
             }
             state.isError -> {
@@ -92,4 +92,4 @@ private fun fillCompanyInfo(companyInfoUiModel: CompanyInfoUiModel): String =
         companyInfoUiModel.employees,
         companyInfoUiModel.launchSites,
         companyInfoUiModel.valuation
-    )
+    )