Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-25 19:29:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove mockito usage from android tests.

Browse Source
This commit is contained in:
Cody Henthorne
2024-11-20 09:39:33 -05:00
committed by Greyson Parrelli
parent 75f4fed9ce
commit 2f4577531d
7 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt
View File

@@ -1,6 +1,8 @@
package org.thoughtcrime.securesms.dependencies
import android.app.Application
import io.mockk.every
import io.mockk.mockk
import io.mockk.spyk
import okhttp3.ConnectionSpec
import okhttp3.Response
@@ -11,9 +13,6 @@ import okhttp3.mockwebserver.MockResponse
import okhttp3.mockwebserver.MockWebServer
import okhttp3.mockwebserver.RecordedRequest
import okio.ByteString
import org.mockito.kotlin.any
import org.mockito.kotlin.doReturn
import org.mockito.kotlin.mock
import org.signal.core.util.Base64
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.BuildConfig
@@ -94,11 +93,14 @@ class InstrumentationApplicationDependencyProvider(val application: Application,
censored = false
)
serviceNetworkAccessMock = mock {
on { getConfiguration() } doReturn uncensoredConfiguration
on { getConfiguration(any()) } doReturn uncensoredConfiguration
on { uncensoredConfiguration } doReturn uncensoredConfiguration
}
serviceNetworkAccessMock = mockk()
every { serviceNetworkAccessMock.isCensored() } returns false
every { serviceNetworkAccessMock.isCensored(any()) } returns false
every { serviceNetworkAccessMock.isCountryCodeCensoredByDefault(any()) } returns false
every { serviceNetworkAccessMock.getConfiguration() } returns uncensoredConfiguration
every { serviceNetworkAccessMock.getConfiguration(any()) } returns uncensoredConfiguration
every { serviceNetworkAccessMock.uncensoredConfiguration } returns uncensoredConfiguration
recipientCache = LiveRecipientCache(application) { r -> r.run() }
}

8
app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt
View File

@@ -33,7 +33,7 @@ import java.util.Optional
* Provides a [SignalServiceConfiguration] to be used with our service layer.
* If you're looking for a place to start, look at [getConfiguration].
*/
open class SignalServiceNetworkAccess(context: Context) {
class SignalServiceNetworkAccess(context: Context) {
companion object {
private val TAG = Log.tag(SignalServiceNetworkAccess::class.java)
@@ -233,7 +233,7 @@ open class SignalServiceNetworkAccess(context: Context) {
COUNTRY_CODE_PAKISTAN
)
open val uncensoredConfiguration: SignalServiceConfiguration = SignalServiceConfiguration(
val uncensoredConfiguration: SignalServiceConfiguration = SignalServiceConfiguration(
signalServiceUrls = arrayOf(SignalServiceUrl(BuildConfig.SIGNAL_URL, serviceTrustStore)),
signalCdnUrlMap = mapOf(
0 to arrayOf(SignalCdnUrl(BuildConfig.SIGNAL_CDN_URL, serviceTrustStore)),
@@ -252,11 +252,11 @@ open class SignalServiceNetworkAccess(context: Context) {
censored = false
)
open fun getConfiguration(): SignalServiceConfiguration {
fun getConfiguration(): SignalServiceConfiguration {
return getConfiguration(SignalStore.account.e164)
}
open fun getConfiguration(e164: String?): SignalServiceConfiguration {
fun getConfiguration(e164: String?): SignalServiceConfiguration {
if (e164 == null || SignalStore.proxy.isProxyEnabled) {
return uncensoredConfiguration
}