Merge "Fix Wi-Fi calling option does not appear" into main
This commit is contained in:
@@ -62,6 +62,7 @@ class WifiCallingPreferenceControllerTest {
|
||||
|
||||
private val mockWifiCallingRepository = mock<WifiCallingRepository> {
|
||||
on { getWiFiCallingMode() } doReturn ImsMmTelManager.WIFI_MODE_UNKNOWN
|
||||
on { wifiCallingReadyFlow() } doReturn flowOf(true)
|
||||
}
|
||||
|
||||
private val callingPreferenceCategoryController =
|
||||
@@ -71,7 +72,7 @@ class WifiCallingPreferenceControllerTest {
|
||||
context = context,
|
||||
key = TEST_KEY,
|
||||
callStateFlowFactory = { flowOf(callState) },
|
||||
wifiCallingRepository = { mockWifiCallingRepository },
|
||||
wifiCallingRepositoryFactory = { mockWifiCallingRepository },
|
||||
).init(subId = SUB_ID, callingPreferenceCategoryController)
|
||||
|
||||
@Before
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
/*
|
||||
* Copyright (C) 2024 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.network.telephony.ims
|
||||
|
||||
import android.telephony.ims.ProvisioningManager
|
||||
import android.telephony.ims.ProvisioningManager.FeatureProvisioningCallback
|
||||
import android.telephony.ims.feature.MmTelFeature
|
||||
import android.telephony.ims.stub.ImsRegistrationImplBase
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import com.android.settingslib.spa.testutils.toListWithTimeout
|
||||
import com.google.common.truth.Truth.assertThat
|
||||
import kotlinx.coroutines.async
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.flow.first
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.mockito.kotlin.any
|
||||
import org.mockito.kotlin.doAnswer
|
||||
import org.mockito.kotlin.mock
|
||||
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
class ImsFeatureProvisionedFlowTest {
|
||||
|
||||
private var callback: FeatureProvisioningCallback? = null
|
||||
|
||||
private val mockProvisioningManager = mock<ProvisioningManager> {
|
||||
on { registerFeatureProvisioningChangedCallback(any(), any()) } doAnswer {
|
||||
callback = it.arguments[1] as FeatureProvisioningCallback
|
||||
callback?.onFeatureProvisioningChanged(CAPABILITY, TECH, true)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun imsFeatureProvisionedFlow_sendInitialValue() = runBlocking {
|
||||
val flow = imsFeatureProvisionedFlow(SUB_ID, CAPABILITY, TECH, mockProvisioningManager)
|
||||
|
||||
val state = flow.first()
|
||||
|
||||
assertThat(state).isTrue()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun imsFeatureProvisionedFlow_changed(): Unit = runBlocking {
|
||||
val listDeferred = async {
|
||||
imsFeatureProvisionedFlow(SUB_ID, CAPABILITY, TECH, mockProvisioningManager)
|
||||
.toListWithTimeout()
|
||||
}
|
||||
delay(100)
|
||||
|
||||
callback?.onFeatureProvisioningChanged(CAPABILITY, TECH, false)
|
||||
|
||||
assertThat(listDeferred.await().last()).isFalse()
|
||||
}
|
||||
|
||||
private companion object {
|
||||
const val SUB_ID = 1
|
||||
const val CAPABILITY = MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE
|
||||
const val TECH = ImsRegistrationImplBase.REGISTRATION_TECH_IWLAN
|
||||
}
|
||||
}
|
||||
@@ -17,14 +17,26 @@
|
||||
package com.android.settings.network.telephony.ims
|
||||
|
||||
import android.content.Context
|
||||
import android.telephony.AccessNetworkConstants
|
||||
import android.telephony.ims.ImsMmTelManager
|
||||
import android.telephony.ims.ImsStateCallback
|
||||
import android.telephony.ims.feature.MmTelFeature
|
||||
import androidx.test.core.app.ApplicationProvider
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
import com.android.settingslib.spa.testutils.toListWithTimeout
|
||||
import com.google.common.truth.Truth.assertThat
|
||||
import java.util.function.Consumer
|
||||
import kotlinx.coroutines.async
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.flow.first
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.mockito.kotlin.any
|
||||
import org.mockito.kotlin.doAnswer
|
||||
import org.mockito.kotlin.doReturn
|
||||
import org.mockito.kotlin.doThrow
|
||||
import org.mockito.kotlin.eq
|
||||
import org.mockito.kotlin.mock
|
||||
import org.mockito.kotlin.stub
|
||||
|
||||
@@ -32,10 +44,21 @@ import org.mockito.kotlin.stub
|
||||
class ImsMmTelRepositoryTest {
|
||||
private val context: Context = ApplicationProvider.getApplicationContext()
|
||||
|
||||
private var stateCallback: ImsStateCallback? = null
|
||||
|
||||
private val mockImsMmTelManager = mock<ImsMmTelManager> {
|
||||
on { isVoWiFiSettingEnabled } doReturn true
|
||||
on { getVoWiFiRoamingModeSetting() } doReturn ImsMmTelManager.WIFI_MODE_WIFI_PREFERRED
|
||||
on { getVoWiFiModeSetting() } doReturn ImsMmTelManager.WIFI_MODE_CELLULAR_PREFERRED
|
||||
on { registerImsStateCallback(any(), any()) } doAnswer {
|
||||
stateCallback = it.arguments[1] as ImsStateCallback
|
||||
stateCallback?.onAvailable()
|
||||
}
|
||||
on { isSupported(eq(CAPABILITY), eq(TRANSPORT), any(), any()) } doAnswer {
|
||||
@Suppress("UNCHECKED_CAST")
|
||||
val consumer = it.arguments[3] as Consumer<Boolean>
|
||||
consumer.accept(true)
|
||||
}
|
||||
}
|
||||
|
||||
private val repository = ImsMmTelRepositoryImpl(context, SUB_ID, mockImsMmTelManager)
|
||||
@@ -76,7 +99,37 @@ class ImsMmTelRepositoryTest {
|
||||
assertThat(wiFiCallingMode).isEqualTo(ImsMmTelManager.WIFI_MODE_UNKNOWN)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun imsReadyFlow_sendInitialValue() = runBlocking {
|
||||
val flow = repository.imsReadyFlow()
|
||||
|
||||
val state = flow.first()
|
||||
|
||||
assertThat(state).isTrue()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun imsReadyFlow_changed(): Unit = runBlocking {
|
||||
val listDeferred = async {
|
||||
repository.imsReadyFlow().toListWithTimeout()
|
||||
}
|
||||
delay(100)
|
||||
|
||||
stateCallback?.onUnavailable(ImsStateCallback.REASON_IMS_SERVICE_NOT_READY)
|
||||
|
||||
assertThat(listDeferred.await().last()).isFalse()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun isSupported() = runBlocking {
|
||||
val isSupported = repository.isSupported(CAPABILITY, TRANSPORT)
|
||||
|
||||
assertThat(isSupported).isTrue()
|
||||
}
|
||||
|
||||
private companion object {
|
||||
const val SUB_ID = 1
|
||||
const val CAPABILITY = MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE
|
||||
const val TRANSPORT = AccessNetworkConstants.TRANSPORT_TYPE_WLAN
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user