Reapply "Create CallStateRepository.isInCallFlow"

This reverts commit 93e4c65d3d.

Fixed the test by cherry-pick change
I7a3d27cb53c930a56ab0f0896b545807bf4f9dc0.

Bug: 336209156
Test: manual - on MobileNetworkSwitchController
Test: atest SubscriptionInfoListViewModelTest
Change-Id: Id606d6ee90acd8a98de706d8533fed0aac96bff4
This commit is contained in:
Chaohui Wang
2024-04-30 12:31:59 +08:00
parent f97e76bc3f
commit 7bbd8fa4e3
8 changed files with 217 additions and 37 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 The Android Open Source Project
* 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.
@@ -17,6 +17,7 @@
package com.android.settings.network.telephony
import android.content.Context
import android.telephony.SubscriptionManager
import android.telephony.TelephonyCallback
import android.telephony.TelephonyManager
import androidx.test.core.app.ApplicationProvider
@@ -36,7 +37,7 @@ import org.mockito.kotlin.mock
import org.mockito.kotlin.spy
@RunWith(AndroidJUnit4::class)
class CallStateFlowTest {
class CallStateRepositoryTest {
private var callStateListener: TelephonyCallback.CallStateListener? = null
private val mockTelephonyManager = mock<TelephonyManager> {
@@ -47,13 +48,24 @@ class CallStateFlowTest {
}
}
private val mockSubscriptionManager = mock<SubscriptionManager> {
on { activeSubscriptionIdList } doReturn intArrayOf(SUB_ID)
on { addOnSubscriptionsChangedListener(any(), any()) } doAnswer {
val listener = it.arguments[1] as SubscriptionManager.OnSubscriptionsChangedListener
listener.onSubscriptionsChanged()
}
}
private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
on { getSystemService(TelephonyManager::class.java) } doReturn mockTelephonyManager
on { subscriptionManager } doReturn mockSubscriptionManager
}
private val repository = CallStateRepository(context)
@Test
fun callStateFlow_initial_sendInitialState() = runBlocking {
val flow = context.callStateFlow(SUB_ID)
val flow = repository.callStateFlow(SUB_ID)
val state = flow.firstWithTimeoutOrNull()
@@ -63,7 +75,7 @@ class CallStateFlowTest {
@Test
fun callStateFlow_changed_sendChangedState() = runBlocking {
val listDeferred = async {
context.callStateFlow(SUB_ID).toListWithTimeout()
repository.callStateFlow(SUB_ID).toListWithTimeout()
}
delay(100)
@@ -74,6 +86,27 @@ class CallStateFlowTest {
.inOrder()
}
@Test
fun isInCallFlow_initial() = runBlocking {
val isInCall = repository.isInCallFlow().firstWithTimeoutOrNull()
assertThat(isInCall).isFalse()
}
@Test
fun isInCallFlow_changed_sendChangedState() = runBlocking {
val listDeferred = async {
repository.isInCallFlow().toListWithTimeout()
}
delay(100)
callStateListener?.onCallStateChanged(TelephonyManager.CALL_STATE_RINGING)
assertThat(listDeferred.await())
.containsExactly(false, true)
.inOrder()
}
private companion object {
const val SUB_ID = 1
}

View File

@@ -0,0 +1,84 @@
/*
* 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
import android.content.Context
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settings.network.SatelliteRepository
import com.android.settingslib.spa.testutils.firstWithTimeoutOrNull
import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.runBlocking
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.kotlin.doReturn
import org.mockito.kotlin.mock
import org.mockito.kotlin.stub
@RunWith(AndroidJUnit4::class)
class SubscriptionActivationRepositoryTest {
private val context: Context = ApplicationProvider.getApplicationContext()
private val mockCallStateRepository = mock<CallStateRepository>()
private val mockSatelliteRepository = mock<SatelliteRepository>()
private val repository =
SubscriptionActivationRepository(context, mockCallStateRepository, mockSatelliteRepository)
@Test
fun isActivationChangeableFlow_changeable() = runBlocking {
mockCallStateRepository.stub {
on { isInCallFlow() } doReturn flowOf(false)
}
mockSatelliteRepository.stub {
on { getIsSessionStartedFlow() } doReturn flowOf(false)
}
val changeable = repository.isActivationChangeableFlow().firstWithTimeoutOrNull()
assertThat(changeable).isTrue()
}
@Test
fun isActivationChangeableFlow_inCall_notChangeable() = runBlocking {
mockCallStateRepository.stub {
on { isInCallFlow() } doReturn flowOf(true)
}
mockSatelliteRepository.stub {
on { getIsSessionStartedFlow() } doReturn flowOf(false)
}
val changeable = repository.isActivationChangeableFlow().firstWithTimeoutOrNull()
assertThat(changeable).isFalse()
}
@Test
fun isActivationChangeableFlow_satelliteSessionStarted_notChangeable() = runBlocking {
mockCallStateRepository.stub {
on { isInCallFlow() } doReturn flowOf(false)
}
mockSatelliteRepository.stub {
on { getIsSessionStartedFlow() } doReturn flowOf(true)
}
val changeable = repository.isActivationChangeableFlow().firstWithTimeoutOrNull()
assertThat(changeable).isFalse()
}
}

View File

@@ -58,7 +58,9 @@ class WifiCallingPreferenceControllerTest {
}
private val preferenceScreen = PreferenceManager(context).createPreferenceScreen(context)
private var callState = TelephonyManager.CALL_STATE_IDLE
private val mockCallStateRepository = mock<CallStateRepository> {
on { callStateFlow(SUB_ID) } doReturn flowOf(TelephonyManager.CALL_STATE_IDLE)
}
private val mockWifiCallingRepository = mock<WifiCallingRepository> {
on { getWiFiCallingMode() } doReturn ImsMmTelManager.WIFI_MODE_UNKNOWN
@@ -71,7 +73,7 @@ class WifiCallingPreferenceControllerTest {
private val controller = WifiCallingPreferenceController(
context = context,
key = TEST_KEY,
callStateFlowFactory = { flowOf(callState) },
callStateRepository = mockCallStateRepository,
wifiCallingRepositoryFactory = { mockWifiCallingRepository },
).init(subId = SUB_ID, callingPreferenceCategoryController)
@@ -112,7 +114,9 @@ class WifiCallingPreferenceControllerTest {
@Test
fun isEnabled_callIdle_enabled() = runBlocking {
callState = TelephonyManager.CALL_STATE_IDLE
mockCallStateRepository.stub {
on { callStateFlow(SUB_ID) } doReturn flowOf(TelephonyManager.CALL_STATE_IDLE)
}
controller.onViewCreated(TestLifecycleOwner())
delay(100)
@@ -122,7 +126,9 @@ class WifiCallingPreferenceControllerTest {
@Test
fun isEnabled_notCallIdle_disabled() = runBlocking {
callState = TelephonyManager.CALL_STATE_RINGING
mockCallStateRepository.stub {
on { callStateFlow(SUB_ID) } doReturn flowOf(TelephonyManager.CALL_STATE_RINGING)
}
controller.onViewCreated(TestLifecycleOwner())
delay(100)