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

Replace deprecated RuntimeEnvironment.application

Browse source
This commit is contained in:
Olivia Mackintosh 2020-05-16 17:19:37 +01:00
parent cd2a89ebdb
commit 76678057ad
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/autodiscovery/build.gradle
View file

@ -15,6 +15,7 @@ dependencies {
testImplementation project(':app:testing') testImplementation project(':app:testing')
testImplementation project(":backend:imap") testImplementation project(":backend:imap")
testImplementation "org.robolectric:robolectric:${versions.robolectric}" testImplementation "org.robolectric:robolectric:${versions.robolectric}"
testImplementation "androidx.test:core:${versions.androidxCore}"
testImplementation "junit:junit:${versions.junit}" testImplementation "junit:junit:${versions.junit}"
testImplementation "com.google.truth:truth:${versions.truth}" testImplementation "com.google.truth:truth:${versions.truth}"
testImplementation "org.mockito:mockito-core:${versions.mockito}" testImplementation "org.mockito:mockito-core:${versions.mockito}"

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

@ -1,5 +1,6 @@
package com.fsck.k9.autodiscovery.providersxml package com.fsck.k9.autodiscovery.providersxml
import androidx.test.core.app.ApplicationProvider
import com.fsck.k9.RobolectricTest import com.fsck.k9.RobolectricTest
import com.fsck.k9.autodiscovery.DiscoveryTarget import com.fsck.k9.autodiscovery.DiscoveryTarget
import com.fsck.k9.backend.BackendManager import com.fsck.k9.backend.BackendManager
@ -12,17 +13,16 @@ import com.nhaarman.mockitokotlin2.doAnswer
import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.mock
import org.junit.Test import org.junit.Test
import org.mockito.ArgumentMatchers.anyString import org.mockito.ArgumentMatchers.anyString
import org.robolectric.RuntimeEnvironment
class ProvidersXmlDiscoveryTest : RobolectricTest() { class ProvidersXmlDiscoveryTest : RobolectricTest() {
val backendManager = mock<BackendManager> { private val backendManager = mock<BackendManager> {
on { decodeStoreUri(anyString()) } doAnswer { mock -> ImapStoreUriDecoder.decode(mock.getArgument(0)) } on { decodeStoreUri(anyString()) } doAnswer { mock -> ImapStoreUriDecoder.decode(mock.getArgument(0)) }
on { decodeTransportUri(anyString()) } doAnswer { mock -> on { decodeTransportUri(anyString()) } doAnswer { mock ->
SmtpTransportUriDecoder.decodeSmtpUri(mock.getArgument(0)) SmtpTransportUriDecoder.decodeSmtpUri(mock.getArgument(0))
} }
} }
val xmlProvider = ProvidersXmlProvider(RuntimeEnvironment.application) private val xmlProvider = ProvidersXmlProvider(ApplicationProvider.getApplicationContext())
val providersXmlDiscovery = ProvidersXmlDiscovery(backendManager, xmlProvider) private val providersXmlDiscovery = ProvidersXmlDiscovery(backendManager, xmlProvider)
@Test @Test
fun discover_withGmailDomain_shouldReturnCorrectSettings() { fun discover_withGmailDomain_shouldReturnCorrectSettings() {