diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1da5bed5cc..d3b4527977 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -616,8 +616,6 @@ dependencies { androidTestImplementation(testLibs.androidx.test.core) androidTestImplementation(testLibs.androidx.test.core.ktx) androidTestImplementation(testLibs.androidx.test.ext.junit.ktx) - androidTestImplementation(testLibs.mockito.android) - androidTestImplementation(testLibs.mockito.kotlin) androidTestImplementation(testLibs.mockk.android) androidTestImplementation(testLibs.square.okhttp.mockserver) androidTestImplementation(testLibs.diff.utils) diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt index ca43ef2401..fe861e9e6a 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt @@ -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() } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt b/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt index cf927e8f3b..1bcd47c9a5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt @@ -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 } diff --git a/build-logic/plugins/src/main/java/signal-library.gradle.kts b/build-logic/plugins/src/main/java/signal-library.gradle.kts index d3e37ce9bf..bc8a3d2dcb 100644 --- a/build-logic/plugins/src/main/java/signal-library.gradle.kts +++ b/build-logic/plugins/src/main/java/signal-library.gradle.kts @@ -62,7 +62,6 @@ dependencies { testImplementation(testLibs.junit.junit) testImplementation(testLibs.mockito.core) - testImplementation(testLibs.mockito.android) testImplementation(testLibs.mockito.kotlin) testImplementation(testLibs.robolectric.robolectric) testImplementation(testLibs.androidx.test.core) diff --git a/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts b/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts index 3dcc4d17f1..357d7dd191 100644 --- a/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts +++ b/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts @@ -80,7 +80,6 @@ dependencies { testImplementation(testLibs.junit.junit) testImplementation(testLibs.mockito.core) - testImplementation(testLibs.mockito.android) testImplementation(testLibs.mockito.kotlin) testImplementation(testLibs.robolectric.robolectric) testImplementation(testLibs.androidx.test.core) diff --git a/gradle/test-libs.versions.toml b/gradle/test-libs.versions.toml index 72ed8d102b..cd962e5527 100644 --- a/gradle/test-libs.versions.toml +++ b/gradle/test-libs.versions.toml @@ -19,7 +19,6 @@ espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = kotlinx-coroutines-test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0" mockito-core = "org.mockito:mockito-inline:4.6.1" mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:4.0.0" -mockito-android = "org.mockito:mockito-android:4.6.1" robolectric-robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" } bouncycastle-bcprov-jdk15on = "org.bouncycastle:bcprov-jdk15on:1.70" bouncycastle-bcpkix-jdk15on = "org.bouncycastle:bcpkix-jdk15on:1.70" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 8e3cc178b1..a52c6f490b 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -6005,11 +6005,6 @@ https://docs.gradle.org/current/userguide/dependency_verification.html - - - - -