Update mockk to version 1.14.2 (#5139)

This commit is contained in:
Patrick Honkonen
2025-05-07 14:14:01 -04:00
committed by GitHub
parent 4e88833737
commit 625ac0ea5f
2 changed files with 7 additions and 30 deletions

View File

@@ -27,7 +27,6 @@ import org.junit.jupiter.api.Assertions.assertNull
import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import timber.log.Timber
import java.io.IOException
import java.security.KeyStore
import java.security.KeyStoreException
@@ -58,7 +57,7 @@ class CertificateManagerTest {
)
@BeforeEach
fun setUp() {
mockkStatic(KeyStore::class, KeyChain::class, Uri::class, Timber::class)
mockkStatic(KeyStore::class, KeyChain::class)
mockkConstructor(MissingPropertyException::class)
every {
anyConstructed<MissingPropertyException>() == any<MissingPropertyException>()
@@ -72,7 +71,6 @@ class CertificateManagerTest {
KeyChain::class,
Uri::class,
SSLContext::class,
Timber::class,
)
unmockkConstructor(MissingPropertyException::class)
}
@@ -158,25 +156,18 @@ class CertificateManagerTest {
@Suppress("MaxLineLength")
@Test
fun `mutualTlsCertificate should log KeyChainException and return null`() {
mockkStatic(Timber::class)
fun `mutualTlsCertificate should return null when KeyChain throws KeyChainException for private key`() {
setupMockUri(authority = MutualTlsKeyHost.KEY_CHAIN.name)
val keyChainException = KeyChainException("Alias not found")
every {
KeyChain.getPrivateKey(mockContext, "mockAlias")
} throws keyChainException
assertNull(certificateManager.mutualTlsCertificate)
verify {
Timber.e(
keyChainException,
"Requested alias not found in system KeyChain",
)
}
}
@Suppress("MaxLineLength")
@Test
fun `mutualTlsCertificate should log exception and return null when KeyChain throws KeyChainException for certificate chain`() {
fun `mutualTlsCertificate should return null when KeyChain throws KeyChainException for certificate chain`() {
setupMockUri(authority = MutualTlsKeyHost.KEY_CHAIN.name)
val keyChainException = KeyChainException("Unable to access certificate chain")
every {
@@ -186,12 +177,6 @@ class CertificateManagerTest {
KeyChain.getCertificateChain(mockContext, "mockAlias")
} throws keyChainException
assertNull(certificateManager.mutualTlsCertificate)
verify {
Timber.e(
keyChainException,
"Unable to access certificate chain for provided alias",
)
}
}
@Test
@@ -242,7 +227,7 @@ class CertificateManagerTest {
@Suppress("MaxLineLength")
@Test
fun `mutualTlsCertificate should log exception and return null when AndroidKeyStore throws KeyStoreException`() {
fun `mutualTlsCertificate should return null when AndroidKeyStore throws KeyStoreException`() {
setupMockUri()
setupMockAndroidKeyStore()
val keyStoreException = KeyStoreException()
@@ -254,7 +239,7 @@ class CertificateManagerTest {
@Suppress("MaxLineLength")
@Test
fun `mutualTlsCertificate should log exception and return null when AndroidKeyStore throws UnrecoverableKeyException`() {
fun `mutualTlsCertificate should return null when AndroidKeyStore throws UnrecoverableKeyException`() {
setupMockUri()
setupMockAndroidKeyStore()
every {
@@ -265,7 +250,7 @@ class CertificateManagerTest {
@Suppress("MaxLineLength")
@Test
fun `mutualTlsCertificate should log exception and return null when AndroidKeyStore throws NoSuchAlgorithmException`() {
fun `mutualTlsCertificate should return null when AndroidKeyStore throws NoSuchAlgorithmException`() {
setupMockUri()
setupMockAndroidKeyStore()
val noSuchAlgorithmException = NoSuchAlgorithmException()
@@ -273,12 +258,6 @@ class CertificateManagerTest {
mockAndroidKeyStore.getKey("mockAlias", null)
} throws noSuchAlgorithmException
assertNull(certificateManager.mutualTlsCertificate)
verify {
Timber.e(
noSuchAlgorithmException,
"Key cannot be recovered. Password may be incorrect.",
)
}
}
@Test
@@ -635,7 +614,6 @@ class CertificateManagerTest {
@Suppress("MaxLineLength")
@Test
fun `removeMutualTlsKey should catch KeyStoreException when deleting key from AndroidKeyStore fails`() {
mockkStatic(Timber::class)
setupMockAndroidKeyStore()
val mockAlias = "mockAlias"
val mockException = KeyStoreException()
@@ -649,7 +627,6 @@ class CertificateManagerTest {
verify {
mockAndroidKeyStore.deleteEntry(mockAlias)
Timber.e(mockException, "Failed to remove key from Android KeyStore")
}
}

View File

@@ -45,7 +45,7 @@ kotlinxCoroutines = "1.10.2"
kotlinxSerialization = "1.8.1"
kotlinxKover = "0.9.1"
ksp = "2.1.20-2.0.0"
mockk = "1.14.0"
mockk = "1.14.2"
okhttp = "4.12.0"
retrofitBom = "2.11.0"
robolectric = "4.14.1"