Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions buildsystem/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ext {

// Test
junit_version = '4.13'
mockito_version = '3.3.1'
mockito_kotlin_version = '2.1.0'
mockitoinline_version = '3.3.0'

// Android Core Testing
Expand Down Expand Up @@ -74,9 +74,9 @@ ext {
]

classpathDependencies = [
androidToolsBuild : "com.android.tools.build:gradle:${gradle_version}",
kotlinGradlePlugin : "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}",
androidAnalyzer : "com.justpinch:androidanalyzer:${android_analyzer_version}",
androidToolsBuild : "com.android.tools.build:gradle:${gradle_version}",
kotlinGradlePlugin: "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}",
androidAnalyzer : "com.justpinch:androidanalyzer:${android_analyzer_version}",
androidToolsBuild : "com.android.tools.build:gradle:${gradle_version}",
kotlinGradlePlugin: "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}",
safeArgs : "androidx.navigation:navigation-safe-args-gradle-plugin:${safeargs_version}"
Expand All @@ -90,24 +90,24 @@ ext {
]

testDependencies = [
jUnit : "junit:junit:${junit_version}",
mockitoCore : "org.mockito:mockito-core:${mockito_version}",
mokitoInlline : "org.mockito:mockito-inline:${mockitoinline_version}",
jUnit : "junit:junit:${junit_version}",
mockitoKotlin: "com.nhaarman.mockitokotlin2:mockito-kotlin:${mockito_kotlin_version}",
mokitoInlline: "org.mockito:mockito-inline:${mockitoinline_version}",
]

androidXTestLibs = [
androidCoreTesting : "androidx.arch.core:core-testing:${archcoretesting_version}"
androidCoreTesting: "androidx.arch.core:core-testing:${archcoretesting_version}"
]

androidTestDependencies = [
androidXJUnit: "androidx.test.ext:junit:${androidx_junit_version}",
testRunner: "androidx.test:runner:${testrunner_version}",
testRules: "androidx.test:rules:${testrules_version}",
testRunner : "androidx.test:runner:${testrunner_version}",
testRules : "androidx.test:rules:${testrules_version}",
espressoCore : "androidx.test.espresso:espresso-core:${espresso_core_version}",
]

androidDependenciesFramework = [
dagger: "com.google.dagger:dagger:${daggerVersion}",
dagger : "com.google.dagger:dagger:${daggerVersion}",
servicesLocation: "com.google.android.gms:play-services-location:${servicesLocationVersion}"

]
Expand Down Expand Up @@ -157,6 +157,6 @@ ext {
]

dexterDependencies = [
dexter : "com.karumi:dexter:${dexterVersion}"
dexter: "com.karumi:dexter:${dexterVersion}"
]
}
1 change: 1 addition & 0 deletions presentation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ dependencies {
implementation project(':domain')
implementation project(':usecases')
implementation project(':generic')
implementation project(":testShared")
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation jetBrainsDependencies.values()
implementation androidXDependencies.values()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.architectcoders.presentation.event

open class Event<out T>(private val content: T) {

var hasBeenHandled = false
private set

fun getContentIfNotHandled(): T? {
return if (hasBeenHandled) {
null
} else {
hasBeenHandled = true
content
}
}

fun peekContent(): T = content
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.architectcoders.presentation.event

import androidx.lifecycle.Observer

class EventObserver<T>(private val onEventUnhandledContent: (T) -> Unit) : Observer<Event<T>> {
override fun onChanged(event: Event<T>?) {
event?.getContentIfNotHandled()?.let { value ->
onEventUnhandledContent(value)
}
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
package com.architectcoders.presentation.viewmodels

import androidx.arch.core.executor.testing.InstantTaskExecutorRule
import androidx.lifecycle.Observer
import com.gabriel.usecases.GetFavoriteMoviesUseCase
import com.gabriel.usecases.GetPopularMoviesUseCase
import com.gabriel.usecases.GetSearchMoviesUseCase
import com.gabriel.usecases.GetTopRatedMoviesUseCase
import kotlinx.coroutines.Dispatchers
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.Mock
import org.mockito.Mockito.verify
import org.mockito.junit.MockitoJUnitRunner

@RunWith(MockitoJUnitRunner::class)
class MovieViewModelTest {

@get:Rule
val rule = InstantTaskExecutorRule()

@Mock
lateinit var getPopularMoviesUseCase: GetPopularMoviesUseCase

@Mock
lateinit var getTopRatedMoviesUseCase: GetTopRatedMoviesUseCase

@Mock
lateinit var getSearchMoviesUseCase: GetSearchMoviesUseCase

@Mock
lateinit var getFavoriteMoviesUseCase: GetFavoriteMoviesUseCase

@Mock
lateinit var observer: Observer<MovieViewModel.UiModel>

private lateinit var vm: MovieViewModel

@Before
fun setUp() {
vm = MovieViewModel(
getPopularMoviesUseCase,
getTopRatedMoviesUseCase,
getSearchMoviesUseCase,
getFavoriteMoviesUseCase,
Dispatchers.Unconfined
)
}

@Test
fun `Observing LiveData launches request movies`() {
vm.model.observeForever(observer)

verify(observer).onChanged(MovieViewModel.UiModel.RequestMovies)
}

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Imagino que estos comentarios están ahí para acabarlo en otro momento. Te comento una cosa molona que tiene github, por si no lo conocías: a la hora de crear una PR puedes marcarla como WIP, de forma que hasta que no confirmes que el trabajo ya está acabado no se pueda mergear ni se solicita review a los reviewers.

Weeeeeeeeeeeee!!! Primer test funcionandoooooooo!! =D=D
Grande Gabi! =)

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mola lo de WIP! No lo conocía. Lo de mergear está guay, pero sí que me hace falta review... jajaja

// @Test
// fun `After requesting the permission, loading is shown`() {
// runBlocking {
// val movies = listOf(mockedMovie.copy(id = 1))
// whenever(getPopularMoviesUseCase.useCaseExecution(null)).thenReturn(
// DataState.Success(
// movies
// )
// )
//
// vm.onRequestPopularMovies()
//
// verify(observer).onChanged(MovieViewModel.UiModel.Content(movies))
// }
// }
}
1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
include ':app', ':presentation', ':domain', ':data', ':generic', ':usecases'
rootProject.name='equipocinco'
include ':testShared'
1 change: 1 addition & 0 deletions testShared/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
9 changes: 9 additions & 0 deletions testShared/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apply plugin: 'java-library'
apply plugin: 'kotlin'

dependencies {
implementation project(":domain")

implementation jetBrainsDependencies.values()
implementation coroutinesDependencies.values()
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.architectcoders.testshared

import com.architectcoders.domain.model.Movie

val mockedMovie = Movie(
0,
"Title",
"Overview",
"01/01/2025",
"",
"",
"EN",
"Title",
5.0,
5.1,
false
)
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import com.architectcoders.domain.state.DataState
class GetPopularMoviesUseCase(private val moviesRepository: MoviesRepository) :
MoviesBaseUseCase<List<Movie>, Any>() {

override suspend fun useCaseExecution(params: Any?): DataState<List<Movie>> {
public override suspend fun useCaseExecution(params: Any?): DataState<List<Movie>> {
return moviesRepository.getPopularMovies()
}
}