Merge "packages/apps/Settings: remove usages of deprecated Mockito matchers" into main (3ab16de6) · Commits · e / os / android_packages_apps_Settings

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.kotlin.any
		import org.mockito.kotlin.anyVararg
		import org.mockito.kotlin.doReturn
		import org.mockito.kotlin.doThrow
		import org.mockito.kotlin.eq
		@@ -106,7 +105,7 @@ class CarrierConfigRepositoryTest {
		@Test
		fun transformConfig_managerThrowIllegalStateException_returnDefaultValue() {
		mockCarrierConfigManager.stub {
		on { getConfigForSubId(any(), anyVararg()) } doThrow IllegalStateException()
		on { getConfigForSubId(any(), any()) } doThrow IllegalStateException()
		}

		val carrierName =
		@@ -132,7 +131,7 @@ class CarrierConfigRepositoryTest {
		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

+2 −2

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

		verify(mockTetheringManager).startTethering(eq(TETHERING_WIFI), anyVararg(), anyVararg())
		verify(mockTetheringManager).startTethering(eq(TETHERING_WIFI), any(), any())
		}

		@Test