Upgrade Mockito-Kotlin to 3.1.0
This commit is contained in:
parent
41697dcc5e
commit
632d8f3cb7
33 changed files with 71 additions and 71 deletions
|
@ -17,7 +17,7 @@ dependencies {
|
|||
testImplementation "junit:junit:${versions.junit}"
|
||||
testImplementation "com.google.truth:truth:${versions.truth}"
|
||||
testImplementation "org.mockito:mockito-core:${versions.mockito}"
|
||||
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.koin:koin-test:${versions.koin}"
|
||||
}
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ dependencies {
|
|||
testImplementation "junit:junit:${versions.junit}"
|
||||
testImplementation "com.google.truth:truth:${versions.truth}"
|
||||
testImplementation "org.mockito:mockito-core:${versions.mockito}"
|
||||
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.koin:koin-test:${versions.koin}"
|
||||
}
|
||||
|
||||
|
|
|
@ -5,12 +5,12 @@ import com.fsck.k9.autodiscovery.api.DiscoveredServerSettings
|
|||
import com.fsck.k9.autodiscovery.api.DiscoveryResults
|
||||
import com.fsck.k9.autodiscovery.api.DiscoveryTarget
|
||||
import com.fsck.k9.mail.ConnectionSecurity
|
||||
import com.nhaarman.mockitokotlin2.doReturn
|
||||
import com.nhaarman.mockitokotlin2.mock
|
||||
import com.nhaarman.mockitokotlin2.verify
|
||||
import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Test
|
||||
import org.mockito.kotlin.doReturn
|
||||
import org.mockito.kotlin.mock
|
||||
import org.mockito.kotlin.verify
|
||||
import org.mockito.kotlin.verifyNoMoreInteractions
|
||||
|
||||
class SrvServiceDiscoveryTest : RobolectricTest() {
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ dependencies {
|
|||
testImplementation "junit:junit:${versions.junit}"
|
||||
testImplementation "com.google.truth:truth:${versions.truth}"
|
||||
testImplementation "org.mockito:mockito-core:${versions.mockito}"
|
||||
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.koin:koin-test:${versions.koin}"
|
||||
}
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@ dependencies {
|
|||
testImplementation "junit:junit:${versions.junit}"
|
||||
testImplementation "com.google.truth:truth:${versions.truth}"
|
||||
testImplementation "org.mockito:mockito-core:${versions.mockito}"
|
||||
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.jdom:jdom2:2.0.6"
|
||||
testImplementation "org.koin:koin-test:${versions.koin}"
|
||||
}
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
package com.fsck.k9
|
||||
|
||||
import com.nhaarman.mockitokotlin2.whenever
|
||||
import java.util.Calendar
|
||||
import org.junit.Assert.assertFalse
|
||||
import org.junit.Assert.assertTrue
|
||||
import org.junit.Test
|
||||
import org.mockito.Mockito.mock
|
||||
import org.mockito.kotlin.whenever
|
||||
|
||||
class QuietTimeCheckerTest {
|
||||
private val clock = mock(Clock::class.java)
|
||||
|
|
|
@ -10,9 +10,9 @@ import com.fsck.k9.notification.NotificationStrategy
|
|||
import com.fsck.k9.preferences.InMemoryStoragePersister
|
||||
import com.fsck.k9.preferences.StoragePersister
|
||||
import com.fsck.k9.storage.storageModule
|
||||
import com.nhaarman.mockitokotlin2.mock
|
||||
import org.koin.core.qualifier.named
|
||||
import org.koin.dsl.module
|
||||
import org.mockito.kotlin.mock
|
||||
|
||||
class TestApp : Application() {
|
||||
override fun onCreate() {
|
||||
|
|
|
@ -7,14 +7,14 @@ import com.fsck.k9.Preferences
|
|||
import com.fsck.k9.backend.api.BackendStorage
|
||||
import com.fsck.k9.mail.FolderClass
|
||||
import com.fsck.k9.provider.EmailProvider
|
||||
import com.nhaarman.mockitokotlin2.any
|
||||
import com.nhaarman.mockitokotlin2.doReturn
|
||||
import com.nhaarman.mockitokotlin2.mock
|
||||
import org.junit.After
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.koin.core.component.inject
|
||||
import org.mockito.kotlin.any
|
||||
import org.mockito.kotlin.doReturn
|
||||
import org.mockito.kotlin.mock
|
||||
|
||||
class K9BackendStorageTest : K9RobolectricTest() {
|
||||
val preferences: Preferences by inject()
|
||||
|
|
|
@ -4,13 +4,13 @@ import com.fsck.k9.Account
|
|||
import com.fsck.k9.AccountRemovedListener
|
||||
import com.fsck.k9.preferences.AccountManager
|
||||
import com.google.common.truth.Truth.assertThat
|
||||
import com.nhaarman.mockitokotlin2.KStubbing
|
||||
import com.nhaarman.mockitokotlin2.argumentCaptor
|
||||
import com.nhaarman.mockitokotlin2.doNothing
|
||||
import com.nhaarman.mockitokotlin2.doReturn
|
||||
import com.nhaarman.mockitokotlin2.mock
|
||||
import com.nhaarman.mockitokotlin2.whenever
|
||||
import org.junit.Test
|
||||
import org.mockito.kotlin.KStubbing
|
||||
import org.mockito.kotlin.argumentCaptor
|
||||
import org.mockito.kotlin.doNothing
|
||||
import org.mockito.kotlin.doReturn
|
||||
import org.mockito.kotlin.mock
|
||||
import org.mockito.kotlin.whenever
|
||||
|
||||
class MessageStoreManagerTest {
|
||||
private val account = Account("00000000-0000-4000-0000-000000000000")
|
||||
|
|
|
@ -8,11 +8,11 @@ import com.fsck.k9.mail.Message
|
|||
import com.fsck.k9.mail.Message.RecipientType
|
||||
import com.fsck.k9.mail.crlf
|
||||
import com.google.common.truth.Truth.assertThat
|
||||
import com.nhaarman.mockitokotlin2.doReturn
|
||||
import com.nhaarman.mockitokotlin2.eq
|
||||
import com.nhaarman.mockitokotlin2.mock
|
||||
import java.util.Date
|
||||
import org.junit.Test
|
||||
import org.mockito.kotlin.doReturn
|
||||
import org.mockito.kotlin.eq
|
||||
import org.mockito.kotlin.mock
|
||||
|
||||
class TextQuoteCreatorTest : RobolectricTest() {
|
||||
val sentDate = Date(1540421219L)
|
||||
|
|
|
@ -37,7 +37,7 @@ dependencies {
|
|||
testImplementation "junit:junit:${versions.junit}"
|
||||
testImplementation "com.google.truth:truth:${versions.truth}"
|
||||
testImplementation "org.mockito:mockito-core:${versions.mockito}"
|
||||
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.koin:koin-test:${versions.koin}"
|
||||
}
|
||||
|
||||
|
|
|
@ -6,8 +6,6 @@ import com.fsck.k9.ui.endtoend.AutocryptKeyTransferActivity
|
|||
import com.fsck.k9.ui.endtoend.AutocryptKeyTransferPresenter
|
||||
import com.fsck.k9.ui.folders.FolderNameFormatter
|
||||
import com.fsck.k9.ui.helper.SizeFormatter
|
||||
import com.nhaarman.mockitokotlin2.doReturn
|
||||
import com.nhaarman.mockitokotlin2.mock
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.koin.core.annotation.KoinInternal
|
||||
|
@ -16,6 +14,8 @@ import org.koin.core.parameter.parametersOf
|
|||
import org.koin.java.KoinJavaComponent
|
||||
import org.koin.test.AutoCloseKoinTest
|
||||
import org.koin.test.check.checkModules
|
||||
import org.mockito.kotlin.doReturn
|
||||
import org.mockito.kotlin.mock
|
||||
import org.openintents.openpgp.OpenPgpApiManager
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.RuntimeEnvironment
|
||||
|
|
|
@ -36,7 +36,7 @@ dependencies {
|
|||
testImplementation "junit:junit:${versions.junit}"
|
||||
testImplementation "com.google.truth:truth:${versions.truth}"
|
||||
testImplementation "org.mockito:mockito-core:${versions.mockito}"
|
||||
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.koin:koin-test:${versions.koin}"
|
||||
}
|
||||
|
||||
|
|
|
@ -6,8 +6,6 @@ import com.fsck.k9.ui.endtoend.AutocryptKeyTransferActivity
|
|||
import com.fsck.k9.ui.endtoend.AutocryptKeyTransferPresenter
|
||||
import com.fsck.k9.ui.folders.FolderNameFormatter
|
||||
import com.fsck.k9.ui.helper.SizeFormatter
|
||||
import com.nhaarman.mockitokotlin2.doReturn
|
||||
import com.nhaarman.mockitokotlin2.mock
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.koin.core.annotation.KoinInternal
|
||||
|
@ -16,6 +14,8 @@ import org.koin.core.parameter.parametersOf
|
|||
import org.koin.java.KoinJavaComponent
|
||||
import org.koin.test.AutoCloseKoinTest
|
||||
import org.koin.test.check.checkModules
|
||||
import org.mockito.kotlin.doReturn
|
||||
import org.mockito.kotlin.mock
|
||||
import org.openintents.openpgp.OpenPgpApiManager
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.RuntimeEnvironment
|
||||
|
|
|
@ -14,11 +14,11 @@ import com.fsck.k9.ui.folders.FolderNameFormatter
|
|||
import com.fsck.k9.ui.folders.FolderNameFormatterFactory
|
||||
import com.fsck.k9.ui.messagelist.DefaultFolderProvider
|
||||
import com.google.common.truth.Truth.assertThat
|
||||
import com.nhaarman.mockitokotlin2.any
|
||||
import com.nhaarman.mockitokotlin2.doReturn
|
||||
import com.nhaarman.mockitokotlin2.mock
|
||||
import org.junit.Test
|
||||
import org.mockito.ArgumentMatchers.eq
|
||||
import org.mockito.kotlin.any
|
||||
import org.mockito.kotlin.doReturn
|
||||
import org.mockito.kotlin.mock
|
||||
import org.robolectric.RuntimeEnvironment
|
||||
|
||||
class UnreadWidgetDataProviderTest : AppRobolectricTest() {
|
||||
|
|
|
@ -19,7 +19,7 @@ dependencies {
|
|||
testImplementation "junit:junit:${versions.junit}"
|
||||
testImplementation "com.google.truth:truth:${versions.truth}"
|
||||
testImplementation "org.mockito:mockito-core:${versions.mockito}"
|
||||
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.koin:koin-test:${versions.koin}"
|
||||
testImplementation "commons-io:commons-io:${versions.commonsIo}"
|
||||
}
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
package com.fsck.k9.preferences
|
||||
|
||||
import com.fsck.k9.storage.K9RobolectricTest
|
||||
import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
|
||||
import com.nhaarman.mockitokotlin2.whenever
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertFalse
|
||||
import org.junit.Assert.assertTrue
|
||||
|
@ -14,6 +12,8 @@ import org.mockito.Mock
|
|||
import org.mockito.Mockito.times
|
||||
import org.mockito.Mockito.verify
|
||||
import org.mockito.MockitoAnnotations
|
||||
import org.mockito.kotlin.verifyNoMoreInteractions
|
||||
import org.mockito.kotlin.whenever
|
||||
|
||||
class StorageEditorTest : K9RobolectricTest() {
|
||||
@Mock private lateinit var storage: Storage
|
||||
|
|
|
@ -4,17 +4,17 @@ import android.content.Context
|
|||
import com.fsck.k9.preferences.K9StoragePersister.StoragePersistOperationCallback
|
||||
import com.fsck.k9.preferences.K9StoragePersister.StoragePersistOperations
|
||||
import com.fsck.k9.storage.K9RobolectricTest
|
||||
import com.nhaarman.mockitokotlin2.any
|
||||
import com.nhaarman.mockitokotlin2.inOrder
|
||||
import com.nhaarman.mockitokotlin2.never
|
||||
import com.nhaarman.mockitokotlin2.spy
|
||||
import com.nhaarman.mockitokotlin2.verify
|
||||
import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertSame
|
||||
import org.junit.Assert.assertTrue
|
||||
import org.junit.Assert.fail
|
||||
import org.junit.Test
|
||||
import org.mockito.kotlin.any
|
||||
import org.mockito.kotlin.inOrder
|
||||
import org.mockito.kotlin.never
|
||||
import org.mockito.kotlin.spy
|
||||
import org.mockito.kotlin.verify
|
||||
import org.mockito.kotlin.verifyNoMoreInteractions
|
||||
import org.robolectric.RuntimeEnvironment
|
||||
|
||||
class StoragePersisterTest : K9RobolectricTest() {
|
||||
|
|
|
@ -11,8 +11,8 @@ import com.fsck.k9.coreModules
|
|||
import com.fsck.k9.crypto.EncryptionExtractor
|
||||
import com.fsck.k9.preferences.K9StoragePersister
|
||||
import com.fsck.k9.preferences.StoragePersister
|
||||
import com.nhaarman.mockitokotlin2.mock
|
||||
import org.koin.dsl.module
|
||||
import org.mockito.kotlin.mock
|
||||
|
||||
class TestApp : Application() {
|
||||
override fun onCreate() {
|
||||
|
|
|
@ -3,12 +3,12 @@ package com.fsck.k9.storage.messages
|
|||
import com.fsck.k9.mailstore.StorageManager
|
||||
import com.fsck.k9.storage.RobolectricTest
|
||||
import com.google.common.truth.Truth.assertThat
|
||||
import com.nhaarman.mockitokotlin2.anyOrNull
|
||||
import com.nhaarman.mockitokotlin2.doReturn
|
||||
import com.nhaarman.mockitokotlin2.eq
|
||||
import com.nhaarman.mockitokotlin2.mock
|
||||
import org.junit.After
|
||||
import org.junit.Test
|
||||
import org.mockito.kotlin.anyOrNull
|
||||
import org.mockito.kotlin.doReturn
|
||||
import org.mockito.kotlin.eq
|
||||
import org.mockito.kotlin.mock
|
||||
|
||||
private const val ACCOUNT_UUID = "00000000-0000-4000-0000-000000000000"
|
||||
|
||||
|
|
|
@ -3,12 +3,12 @@ package com.fsck.k9.storage.messages
|
|||
import com.fsck.k9.mailstore.StorageManager
|
||||
import com.fsck.k9.storage.RobolectricTest
|
||||
import com.google.common.truth.Truth.assertThat
|
||||
import com.nhaarman.mockitokotlin2.anyOrNull
|
||||
import com.nhaarman.mockitokotlin2.doReturn
|
||||
import com.nhaarman.mockitokotlin2.eq
|
||||
import com.nhaarman.mockitokotlin2.mock
|
||||
import org.junit.After
|
||||
import org.junit.Test
|
||||
import org.mockito.kotlin.anyOrNull
|
||||
import org.mockito.kotlin.doReturn
|
||||
import org.mockito.kotlin.eq
|
||||
import org.mockito.kotlin.mock
|
||||
|
||||
private const val ACCOUNT_UUID = "00000000-0000-4000-0000-000000000000"
|
||||
|
||||
|
|
|
@ -10,11 +10,11 @@ import com.fsck.k9.mailstore.DatabasePreviewType
|
|||
import com.fsck.k9.mailstore.LockableDatabase
|
||||
import com.fsck.k9.mailstore.MigrationsHelper
|
||||
import com.fsck.k9.storage.K9SchemaDefinitionFactory
|
||||
import com.nhaarman.mockitokotlin2.any
|
||||
import com.nhaarman.mockitokotlin2.doAnswer
|
||||
import com.nhaarman.mockitokotlin2.mock
|
||||
import java.io.File
|
||||
import org.mockito.ArgumentMatchers
|
||||
import org.mockito.kotlin.any
|
||||
import org.mockito.kotlin.doAnswer
|
||||
import org.mockito.kotlin.mock
|
||||
|
||||
fun createLockableDatabaseMock(sqliteDatabase: SQLiteDatabase): LockableDatabase {
|
||||
return mock {
|
||||
|
|
|
@ -13,14 +13,14 @@ import com.fsck.k9.message.extractors.BasicPartInfoExtractor
|
|||
import com.fsck.k9.message.extractors.PreviewResult
|
||||
import com.fsck.k9.storage.RobolectricTest
|
||||
import com.google.common.truth.Truth.assertThat
|
||||
import com.nhaarman.mockitokotlin2.anyOrNull
|
||||
import com.nhaarman.mockitokotlin2.doReturn
|
||||
import com.nhaarman.mockitokotlin2.eq
|
||||
import com.nhaarman.mockitokotlin2.mock
|
||||
import java.io.ByteArrayOutputStream
|
||||
import java.util.Stack
|
||||
import org.junit.After
|
||||
import org.junit.Test
|
||||
import org.mockito.kotlin.anyOrNull
|
||||
import org.mockito.kotlin.doReturn
|
||||
import org.mockito.kotlin.eq
|
||||
import org.mockito.kotlin.mock
|
||||
|
||||
private const val ACCOUNT_UUID = "00000000-0000-4000-0000-000000000000"
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ dependencies {
|
|||
api "org.robolectric:robolectric:${versions.robolectric}"
|
||||
api "org.koin:koin-core:${versions.koin}"
|
||||
api "org.mockito:mockito-core:${versions.mockito}"
|
||||
api "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
api "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
}
|
||||
|
||||
android {
|
||||
|
|
|
@ -62,7 +62,7 @@ dependencies {
|
|||
testImplementation "junit:junit:${versions.junit}"
|
||||
testImplementation "com.google.truth:truth:${versions.truth}"
|
||||
testImplementation "org.mockito:mockito-core:${versions.mockito}"
|
||||
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.koin:koin-test:${versions.koin}"
|
||||
}
|
||||
|
||||
|
|
|
@ -25,13 +25,13 @@ import com.fsck.k9.ui.R
|
|||
import com.fsck.k9.ui.helper.RelativeDateTimeFormatter
|
||||
import com.fsck.k9.ui.messagelist.MessageListAppearance
|
||||
import com.fsck.k9.ui.messagelist.MessageListItem
|
||||
import com.nhaarman.mockitokotlin2.mock
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertFalse
|
||||
import org.junit.Assert.assertNull
|
||||
import org.junit.Assert.assertTrue
|
||||
import org.junit.Ignore
|
||||
import org.junit.Test
|
||||
import org.mockito.kotlin.mock
|
||||
import org.robolectric.Robolectric
|
||||
|
||||
private const val SOME_ACCOUNT_UUID = "6b84207b-25de-4dab-97c3-953bbf03fec6"
|
||||
|
|
|
@ -27,7 +27,6 @@ import com.fsck.k9.mail.internet.TextBody
|
|||
import com.fsck.k9.message.MessageBuilder.Callback
|
||||
import com.fsck.k9.message.quote.InsertableHtmlContent
|
||||
import com.fsck.k9.view.RecipientSelectView
|
||||
import com.nhaarman.mockitokotlin2.anyOrNull
|
||||
import java.io.ByteArrayOutputStream
|
||||
import java.io.IOException
|
||||
import java.io.OutputStream
|
||||
|
@ -52,6 +51,7 @@ import org.mockito.Mockito.mock
|
|||
import org.mockito.Mockito.spy
|
||||
import org.mockito.Mockito.verify
|
||||
import org.mockito.Mockito.verifyNoMoreInteractions
|
||||
import org.mockito.kotlin.anyOrNull
|
||||
import org.openintents.openpgp.OpenPgpApiManager.OpenPgpProviderState
|
||||
import org.openintents.openpgp.OpenPgpError
|
||||
import org.openintents.openpgp.util.OpenPgpApi
|
||||
|
|
|
@ -3,7 +3,6 @@ package com.fsck.k9.ui.helper
|
|||
import android.os.SystemClock
|
||||
import com.fsck.k9.Clock
|
||||
import com.fsck.k9.RobolectricTest
|
||||
import com.nhaarman.mockitokotlin2.whenever
|
||||
import java.time.LocalDate
|
||||
import java.time.LocalDateTime
|
||||
import java.time.ZoneId
|
||||
|
@ -12,6 +11,7 @@ import org.junit.Assert.assertEquals
|
|||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.mockito.Mockito
|
||||
import org.mockito.kotlin.whenever
|
||||
import org.robolectric.RuntimeEnvironment
|
||||
import org.robolectric.annotation.Config
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@ dependencies {
|
|||
testImplementation "junit:junit:${versions.junit}"
|
||||
testImplementation "com.google.truth:truth:${versions.truth}"
|
||||
testImplementation "org.mockito:mockito-core:${versions.mockito}"
|
||||
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.koin:koin-test:${versions.koin}"
|
||||
}
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@ buildscript {
|
|||
'junit': '4.13.2',
|
||||
'robolectric': '4.5.1',
|
||||
'mockito': '3.9.0',
|
||||
'mockitoKotlin': '2.2.0',
|
||||
'mockitoKotlin': '3.1.0',
|
||||
'truth': '1.1',
|
||||
|
||||
'ktlint': '0.39.0'
|
||||
|
|
|
@ -20,7 +20,7 @@ dependencies {
|
|||
testImplementation "junit:junit:${versions.junit}"
|
||||
testImplementation "com.google.truth:truth:${versions.truth}"
|
||||
testImplementation "org.mockito:mockito-core:${versions.mockito}"
|
||||
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
}
|
||||
|
||||
android {
|
||||
|
|
|
@ -21,7 +21,7 @@ dependencies {
|
|||
testImplementation "junit:junit:${versions.junit}"
|
||||
testImplementation "com.google.truth:truth:${versions.truth}"
|
||||
testImplementation "org.mockito:mockito-core:${versions.mockito}"
|
||||
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
|
||||
testImplementation "com.squareup.okio:okio:${versions.okio}"
|
||||
testImplementation "org.apache.james:apache-mime4j-core:${versions.mime4j}"
|
||||
}
|
||||
|
|
|
@ -11,12 +11,6 @@ import com.fsck.k9.mail.Part
|
|||
import com.fsck.k9.mail.internet.BinaryTempFileBody
|
||||
import com.fsck.k9.mail.internet.MimeHeader
|
||||
import com.fsck.k9.mail.store.imap.ImapResponseHelper.createImapResponse
|
||||
import com.nhaarman.mockitokotlin2.anyOrNull
|
||||
import com.nhaarman.mockitokotlin2.argumentCaptor
|
||||
import com.nhaarman.mockitokotlin2.doReturn
|
||||
import com.nhaarman.mockitokotlin2.doThrow
|
||||
import com.nhaarman.mockitokotlin2.mock
|
||||
import com.nhaarman.mockitokotlin2.whenever
|
||||
import java.io.IOException
|
||||
import java.util.Date
|
||||
import java.util.TimeZone
|
||||
|
@ -39,6 +33,12 @@ import org.mockito.Mockito.atLeastOnce
|
|||
import org.mockito.Mockito.times
|
||||
import org.mockito.Mockito.verify
|
||||
import org.mockito.Mockito.verifyNoMoreInteractions
|
||||
import org.mockito.kotlin.anyOrNull
|
||||
import org.mockito.kotlin.argumentCaptor
|
||||
import org.mockito.kotlin.doReturn
|
||||
import org.mockito.kotlin.doThrow
|
||||
import org.mockito.kotlin.mock
|
||||
import org.mockito.kotlin.whenever
|
||||
import org.robolectric.RuntimeEnvironment
|
||||
|
||||
@RunWith(K9LibRobolectricTestRunner::class)
|
||||
|
|
Loading…
Reference in a new issue