Skip to content

Commit 489e9d1

Browse files
committed
Fixed dependencies to be able to run UI tests
1 parent ee3d2c7 commit 489e9d1

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ dependencies {
6161
exclude module: 'recyclerview-v7'
6262
}
6363

64-
androidTestImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$MOCKITO_KOTLIN_VERSION"
65-
androidTestImplementation "com.linkedin.dexmaker:dexmaker-mockito:$DEXMAKER_VERSION"
64+
androidTestImplementation "org.mockito:mockito-android:$MOCKITO_VERSION"
65+
kaptAndroidTest "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
6666
}

app/src/androidTest/java/com/example/tamaskozmer/kotlinrxexample/view/fragments/UserListFragmentTest.kt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,16 @@ import com.example.tamaskozmer.kotlinrxexample.model.entities.UserListModel
2222
import com.example.tamaskozmer.kotlinrxexample.model.repositories.UserRepository
2323
import com.example.tamaskozmer.kotlinrxexample.testutil.RecyclerViewMatcher
2424
import com.example.tamaskozmer.kotlinrxexample.view.activities.MainActivity
25-
import com.nhaarman.mockito_kotlin.mock
26-
import com.nhaarman.mockito_kotlin.whenever
2725
import io.reactivex.Single
2826
import io.reactivex.SingleEmitter
2927
import org.hamcrest.Matchers
3028
import org.junit.Before
3129
import org.junit.Rule
3230
import org.junit.Test
3331
import org.junit.runner.RunWith
32+
import org.mockito.Mock
33+
import org.mockito.MockitoAnnotations
34+
import org.mockito.Mockito.`when` as whenever
3435

3536

3637
/**
@@ -39,18 +40,20 @@ import org.junit.runner.RunWith
3940
@RunWith(AndroidJUnit4::class)
4041
class UserListFragmentTest {
4142

42-
@Rule @JvmField
43+
@Rule
44+
@JvmField
4345
var activityRule = ActivityTestRule(MainActivity::class.java, true, false)
4446

45-
lateinit var mockUserRepository: UserRepository
47+
@Mock
48+
private lateinit var mockUserRepository: UserRepository
4649

4750
private fun withRecyclerView(recyclerViewId: Int): RecyclerViewMatcher {
4851
return RecyclerViewMatcher(recyclerViewId)
4952
}
5053

5154
@Before
5255
fun setUp() {
53-
mockUserRepository = mock()
56+
MockitoAnnotations.initMocks(this)
5457

5558
val instrumentation = InstrumentationRegistry.getInstrumentation()
5659
val app = instrumentation.targetContext.applicationContext as CustomApplication

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ ext {
2828
ESPRESSO_VERSION = '2.2.2'
2929
JUNIT_VERSION = '4.12'
3030
DEXMAKER_VERSION = '2.2.0'
31+
MOCKITO_VERSION = '2.8.47'
3132
}
3233

3334
allprojects {

0 commit comments

Comments
 (0)