wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Mockito to 3.2.4 and Mockito-Kotlin to 2.2.0

Browse source
This commit is contained in:
cketti 2020-01-19 02:31:15 +01:00
parent 28f411f3d4
commit 9b2b82eee6
22 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/autodiscovery/build.gradle
View file

@ -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:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "org.koin:koin-test:${versions.koin}"
}

4
app/autodiscovery/src/test/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscoveryTest.kt
View file

@ -7,8 +7,8 @@ import com.fsck.k9.mail.AuthType
import com.fsck.k9.mail.ConnectionSecurity
import com.fsck.k9.mail.transport.smtp.SmtpTransportUriDecoder
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockito_kotlin.doAnswer
import com.nhaarman.mockito_kotlin.mock
import com.nhaarman.mockitokotlin2.doAnswer
import com.nhaarman.mockitokotlin2.mock
import org.junit.Test
import org.mockito.ArgumentMatchers.anyString
import org.robolectric.RuntimeEnvironment

2
app/core/build.gradle
View file

@ -38,7 +38,7 @@ dependencies {
testImplementation "junit:junit:${versions.junit}"
testImplementation "com.google.truth:truth:${versions.truth}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation "com.nhaarman:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "org.jdom:jdom2:2.0.6"
testImplementation "org.koin:koin-test:${versions.koin}"
}

2
app/core/src/test/java/com/fsck/k9/QuietTimeCheckerTest.kt
View file

@ -1,6 +1,6 @@
package com.fsck.k9
import com.nhaarman.mockito_kotlin.whenever
import com.nhaarman.mockitokotlin2.whenever
import java.util.Calendar
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue

2
app/core/src/test/java/com/fsck/k9/TestApp.kt
View file

@ -5,7 +5,7 @@ import com.fsck.k9.crypto.EncryptionExtractor
import com.fsck.k9.preferences.InMemoryStoragePersister
import com.fsck.k9.preferences.StoragePersister
import com.fsck.k9.storage.storageModule
import com.nhaarman.mockito_kotlin.mock
import com.nhaarman.mockitokotlin2.mock
import org.koin.dsl.module
class TestApp : Application() {

4
app/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt
View file

@ -11,8 +11,8 @@ import com.fsck.k9.mail.Address
import com.fsck.k9.mail.Message
import com.fsck.k9.mail.Message.RecipientType
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockito_kotlin.doReturn
import com.nhaarman.mockito_kotlin.mock
import com.nhaarman.mockitokotlin2.doReturn
import com.nhaarman.mockitokotlin2.mock
import java.util.Date
import java.util.Locale
import org.junit.Before

2
app/k9mail-jmap/build.gradle
View file

@ -32,7 +32,7 @@ dependencies {
testImplementation "junit:junit:${versions.junit}"
testImplementation "com.google.truth:truth:${versions.truth}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation "com.nhaarman:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "org.jdom:jdom2:2.0.6"
testImplementation "org.koin:koin-test:${versions.koin}"

4
app/k9mail-jmap/src/test/java/com/fsck/k9/DependencyInjectionTest.kt
View file

@ -4,8 +4,8 @@ import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleOwner
import com.fsck.k9.ui.endtoend.AutocryptKeyTransferActivity
import com.fsck.k9.ui.endtoend.AutocryptKeyTransferPresenter
import com.nhaarman.mockito_kotlin.doReturn
import com.nhaarman.mockito_kotlin.mock
import com.nhaarman.mockitokotlin2.doReturn
import com.nhaarman.mockitokotlin2.mock
import org.junit.Test
import org.junit.runner.RunWith
import org.koin.core.KoinApplication

2
app/k9mail/build.gradle
View file

@ -25,7 +25,7 @@ dependencies {
testImplementation "junit:junit:${versions.junit}"
testImplementation "com.google.truth:truth:${versions.truth}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation "com.nhaarman:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "org.jdom:jdom2:2.0.6"
testImplementation "org.koin:koin-test:${versions.koin}"

4
app/k9mail/src/test/java/com/fsck/k9/DependencyInjectionTest.kt
View file

@ -4,8 +4,8 @@ import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleOwner
import com.fsck.k9.ui.endtoend.AutocryptKeyTransferActivity
import com.fsck.k9.ui.endtoend.AutocryptKeyTransferPresenter
import com.nhaarman.mockito_kotlin.doReturn
import com.nhaarman.mockito_kotlin.mock
import com.nhaarman.mockitokotlin2.doReturn
import com.nhaarman.mockitokotlin2.mock
import org.junit.Test
import org.junit.runner.RunWith
import org.koin.core.KoinApplication

6
app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt
View file

@ -8,9 +8,9 @@ import com.fsck.k9.controller.MessagingController
import com.fsck.k9.search.SearchAccount
import com.fsck.k9.ui.messagelist.DefaultFolderProvider
import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockito_kotlin.any
import com.nhaarman.mockito_kotlin.doReturn
import com.nhaarman.mockito_kotlin.mock
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.robolectric.RuntimeEnvironment

2
app/storage/build.gradle
View file

@ -16,7 +16,7 @@ dependencies {
testImplementation "org.robolectric:robolectric:${versions.robolectric}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation "com.nhaarman:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "org.koin:koin-test:${versions.koin}"
testImplementation "commons-io:commons-io:${versions.commonsIo}"
}

4
app/storage/src/test/java/com/fsck/k9/preferences/StorageEditorTest.kt
View file

@ -1,8 +1,8 @@
package com.fsck.k9.preferences
import com.fsck.k9.storage.K9RobolectricTest
import com.nhaarman.mockito_kotlin.verifyNoMoreInteractions
import com.nhaarman.mockito_kotlin.whenever
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

12
app/storage/src/test/java/com/fsck/k9/preferences/StoragePersisterTest.kt
View file

@ -4,12 +4,12 @@ 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.mockito_kotlin.any
import com.nhaarman.mockito_kotlin.inOrder
import com.nhaarman.mockito_kotlin.never
import com.nhaarman.mockito_kotlin.spy
import com.nhaarman.mockito_kotlin.verify
import com.nhaarman.mockito_kotlin.verifyNoMoreInteractions
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

2
app/storage/src/test/java/com/fsck/k9/storage/TestApp.kt
View file

@ -10,7 +10,7 @@ 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.mockito_kotlin.mock
import com.nhaarman.mockitokotlin2.mock
import org.koin.dsl.module
class TestApp : Application() {

4
app/storage/src/test/java/com/fsck/k9/storage/migrations/MigrationTo51Test.kt
View file

@ -5,8 +5,8 @@ import com.fsck.k9.Account
import com.fsck.k9.mailstore.MigrationsHelper
import com.fsck.k9.mailstore.StorageManager
import com.fsck.k9.storage.RobolectricTest
import com.nhaarman.mockito_kotlin.doReturn
import com.nhaarman.mockito_kotlin.mock
import com.nhaarman.mockitokotlin2.doReturn
import com.nhaarman.mockitokotlin2.mock
import java.io.ByteArrayInputStream
import org.apache.commons.io.IOUtils
import org.apache.james.mime4j.codec.QuotedPrintableInputStream

2
app/testing/build.gradle
View file

@ -11,7 +11,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:mockito-kotlin:${versions.mockitoKotlin}"
api "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
}
android {

2
app/ui/build.gradle
View file

@ -56,7 +56,7 @@ dependencies {
testImplementation "junit:junit:${versions.junit}"
testImplementation "com.google.truth:truth:${versions.truth}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation "com.nhaarman:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"
testImplementation "org.jdom:jdom2:2.0.6"
testImplementation "org.koin:koin-test:${versions.koin}"
}

2
app/ui/src/test/java/com/fsck/k9/TestApp.kt
View file

@ -4,7 +4,7 @@ import android.app.Application
import com.fsck.k9.preferences.InMemoryStoragePersister
import com.fsck.k9.preferences.StoragePersister
import com.fsck.k9.storage.storageModule
import com.nhaarman.mockito_kotlin.mock
import com.nhaarman.mockitokotlin2.mock
import org.koin.dsl.module
class TestApp : Application() {

2
app/ui/src/test/java/com/fsck/k9/fragment/MessageListAdapterTest.kt
View file

@ -23,7 +23,7 @@ import com.fsck.k9.ui.ContactBadge
import com.fsck.k9.ui.R
import com.fsck.k9.ui.messagelist.MessageListAppearance
import com.fsck.k9.ui.messagelist.MessageListItem
import com.nhaarman.mockito_kotlin.mock
import com.nhaarman.mockitokotlin2.mock
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNull

2
app/ui/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.kt
View file

@ -27,7 +27,7 @@ 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.mockito_kotlin.anyOrNull
import com.nhaarman.mockitokotlin2.anyOrNull
import java.io.ByteArrayOutputStream
import java.io.IOException
import java.io.OutputStream

4
build.gradle
View file

@ -32,8 +32,8 @@ buildscript {
'androidxTestRunner': '1.1.1',
'junit': '4.12',
'robolectric': '4.2.1',
'mockito': '2.18.0',
'mockitoKotlin': '1.5.0',
'mockito': '3.2.4',
'mockitoKotlin': '2.2.0',
'truth': '0.35'
]