PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "packages/apps/Settings: remove usages of deprecated Mockito matchers" into main

Browse Source
This commit is contained in:
Adrian Roos
2025-03-13 13:31:54 -07:00
committed by Android (Google) Code Review
parent 19ad5b3eaf 693035ab86
commit 3ab16de602
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/spa_unit/src/com/android/settings/network/telephony/CarrierConfigRepositoryTest.kt
View File

@@ -25,7 +25,6 @@ import org.junit.Before
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mockito.kotlin.any import org.mockito.kotlin.any
import org.mockito.kotlin.anyVararg
import org.mockito.kotlin.doReturn import org.mockito.kotlin.doReturn
import org.mockito.kotlin.doThrow import org.mockito.kotlin.doThrow
import org.mockito.kotlin.eq import org.mockito.kotlin.eq
@@ -106,7 +105,7 @@ class CarrierConfigRepositoryTest {
@Test @Test
fun transformConfig_managerThrowIllegalStateException_returnDefaultValue() { fun transformConfig_managerThrowIllegalStateException_returnDefaultValue() {
mockCarrierConfigManager.stub { mockCarrierConfigManager.stub {
on { getConfigForSubId(any(), anyVararg()) } doThrow IllegalStateException() on { getConfigForSubId(any(), any()) } doThrow IllegalStateException()
} }
val carrierName = val carrierName =
@@ -132,7 +131,7 @@ class CarrierConfigRepositoryTest {
repository.transformConfig(SUB_ID) { getString(key) } repository.transformConfig(SUB_ID) { getString(key) }
repository.transformConfig(SUB_ID) { getString(key) } repository.transformConfig(SUB_ID) { getString(key) }
verify(mockCarrierConfigManager, times(1)).getConfigForSubId(any(), anyVararg()) verify(mockCarrierConfigManager, times(1)).getConfigForSubId(any(), any())
} }
@Test @Test

4
tests/unit/src/com/android/settings/wifi/tether/WifiHotspotSwitchPreferenceTest.kt
View File

@@ -30,7 +30,7 @@ import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mockito.ArgumentMatchers.eq import org.mockito.ArgumentMatchers.eq
import org.mockito.Mockito.verify import org.mockito.Mockito.verify
import org.mockito.kotlin.anyVararg import org.mockito.kotlin.any
import org.mockito.kotlin.doReturn import org.mockito.kotlin.doReturn
import org.mockito.kotlin.mock import org.mockito.kotlin.mock
import org.mockito.kotlin.stub import org.mockito.kotlin.stub
@@ -77,7 +77,7 @@ class WifiHotspotSwitchPreferenceTest {
fun setValue_valueOn_startTethering() { fun setValue_valueOn_startTethering() {
preference.storage(context).setBoolean(WifiHotspotSwitchPreference.KEY, true) preference.storage(context).setBoolean(WifiHotspotSwitchPreference.KEY, true)
verify(mockTetheringManager).startTethering(eq(TETHERING_WIFI), anyVararg(), anyVararg()) verify(mockTetheringManager).startTethering(eq(TETHERING_WIFI), any(), any())
} }
@Test @Test