Merge "Migrate to new ImsRegistrationCallback" into main

tests/spa_unit/src/com/android/settings/deviceinfo/simstatus/ImsRegistrationStateControllerTest.kt

@@ -0,0 +1,72 @@
+/*
+ * 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.deviceinfo.simstatus
+
+import android.content.Context
+import androidx.lifecycle.testing.TestLifecycleOwner
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.network.telephony.SimSlotRepository
+import com.android.settings.network.telephony.ims.ImsMmTelRepository
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.delay
+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
+
+@RunWith(AndroidJUnit4::class)
+class ImsRegistrationStateControllerTest {
+
+    private val context: Context = ApplicationProvider.getApplicationContext()
+
+    private val mockSimSlotRepository = mock<SimSlotRepository> {
+        on { subIdInSimSlotFlow(SIM_SLOT_INDEX) } doReturn flowOf(SUB_ID)
+    }
+
+    private val mockImsMmTelRepository = mock<ImsMmTelRepository> {
+        on { imsRegisteredFlow() } doReturn flowOf(true)
+    }
+
+    private val controller = ImsRegistrationStateController(
+        context = context,
+        simSlotRepository = mockSimSlotRepository,
+        imsMmTelRepositoryFactory = { subId ->
+            assertThat(subId).isEqualTo(SUB_ID)
+            mockImsMmTelRepository
+        },
+    )
+
+    @Test
+    fun collectImsRegistered() = runBlocking {
+        var imsRegistered = false
+
+        controller.collectImsRegistered(TestLifecycleOwner(), SIM_SLOT_INDEX) {
+            imsRegistered = it
+        }
+        delay(100)
+
+        assertThat(imsRegistered).isTrue()
+    }
+
+    private companion object {
+        const val SIM_SLOT_INDEX = 0
+        const val SUB_ID = 1
+    }
+}

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

@@ -0,0 +1,79 @@
+/*
+ * 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 android.telephony.SubscriptionInfo
+import android.telephony.SubscriptionManager
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settingslib.spa.testutils.firstWithTimeoutOrNull
+import com.google.common.truth.Truth.assertThat
+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.mock
+import org.mockito.kotlin.spy
+import org.mockito.kotlin.stub
+
+@RunWith(AndroidJUnit4::class)
+class SimSlotRepositoryTest {
+
+    private val mockSubscriptionManager = mock<SubscriptionManager> {
+        on { addOnSubscriptionsChangedListener(any(), any()) } doAnswer {
+            val listener = it.arguments[1] as SubscriptionManager.OnSubscriptionsChangedListener
+            listener.onSubscriptionsChanged()
+        }
+    }
+
+    private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
+        on { getSystemService(SubscriptionManager::class.java) } doReturn mockSubscriptionManager
+    }
+
+    private val repository = SimSlotRepository(context)
+
+    @Test
+    fun subIdInSimSlotFlow_valid() = runBlocking {
+        mockSubscriptionManager.stub {
+            on { getActiveSubscriptionInfoForSimSlotIndex(SIM_SLOT_INDEX) } doReturn
+                SubscriptionInfo.Builder().setId(SUB_ID).build()
+        }
+
+        val subId = repository.subIdInSimSlotFlow(SIM_SLOT_INDEX).firstWithTimeoutOrNull()
+
+        assertThat(subId).isEqualTo(SUB_ID)
+    }
+
+    @Test
+    fun subIdInSimSlotFlow_invalid() = runBlocking {
+        mockSubscriptionManager.stub {
+            on { getActiveSubscriptionInfoForSimSlotIndex(SIM_SLOT_INDEX) } doReturn null
+        }
+
+        val subId = repository.subIdInSimSlotFlow(SIM_SLOT_INDEX).firstWithTimeoutOrNull()
+
+        assertThat(subId).isEqualTo(SubscriptionManager.INVALID_SIM_SLOT_INDEX)
+    }
+
+    private companion object {
+        const val SIM_SLOT_INDEX = 0
+        const val SUB_ID = 1
+    }
+}

tests/spa_unit/src/com/android/settings/network/telephony/ims/ImsMmTelRepositoryTest.kt

@@ -19,10 +19,14 @@ package com.android.settings.network.telephony.ims
 import android.content.Context
 import android.telephony.AccessNetworkConstants
 import android.telephony.ims.ImsMmTelManager
+import android.telephony.ims.ImsReasonInfo
+import android.telephony.ims.ImsRegistrationAttributes
 import android.telephony.ims.ImsStateCallback
+import android.telephony.ims.RegistrationManager.RegistrationCallback
 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.firstWithTimeoutOrNull
 import com.android.settingslib.spa.testutils.toListWithTimeout
 import com.google.common.truth.Truth.assertThat
 import java.util.function.Consumer
@@ -44,12 +48,17 @@ import org.mockito.kotlin.stub
 class ImsMmTelRepositoryTest {
     private val context: Context = ApplicationProvider.getApplicationContext()
 
+    private var registrationCallback: RegistrationCallback? = null
     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 { registerImsRegistrationCallback(any(), any<RegistrationCallback>()) } doAnswer {
+            registrationCallback = it.arguments[1] as RegistrationCallback
+            registrationCallback?.onRegistered(mock<ImsRegistrationAttributes>())
+        }
         on { registerImsStateCallback(any(), any()) } doAnswer {
             stateCallback = it.arguments[1] as ImsStateCallback
             stateCallback?.onAvailable()
@@ -99,6 +108,25 @@ class ImsMmTelRepositoryTest {
         assertThat(wiFiCallingMode).isEqualTo(ImsMmTelManager.WIFI_MODE_UNKNOWN)
     }
 
+    @Test
+    fun imsRegisteredFlow_sendInitialValue() = runBlocking {
+        val imsRegistered = repository.imsRegisteredFlow().firstWithTimeoutOrNull()
+
+        assertThat(imsRegistered).isTrue()
+    }
+
+    @Test
+    fun imsRegisteredFlow_changed(): Unit = runBlocking {
+        val listDeferred = async {
+            repository.imsRegisteredFlow().toListWithTimeout()
+        }
+        delay(100)
+
+        registrationCallback?.onUnregistered(ImsReasonInfo())
+
+        assertThat(listDeferred.await().last()).isFalse()
+    }
+
     @Test
     fun imsReadyFlow_sendInitialValue() = runBlocking {
         val flow = repository.imsReadyFlow()

tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java

@@ -418,7 +418,6 @@ public class SimStatusDialogControllerTest {
     }
 
     @Test
-    @Ignore
     public void initialize_showImsRegistration_shouldNotRemoveImsRegistrationStateSetting() {
         mPersistableBundle.putBoolean(
                 CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, true);
@@ -429,7 +428,6 @@ public class SimStatusDialogControllerTest {
     }
 
     @Test
-    @Ignore
     public void initialize_doNotShowImsRegistration_shouldRemoveImsRegistrationStateSetting() {
         mPersistableBundle.putBoolean(
                 CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, false);