InternetPreferenceController V2 (7/7)

Support alternateSummary for HotspotNetworkEntry.

Bug: 339884322
Flag: com.android.settings.flags.internet_preference_controller_v2
Test: manual - on Internet
Test: unit test
Change-Id: I6a454e86453ea8ed597a032d3f5769b6cf9102ba

tests/spa_unit/src/com/android/settings/wifi/WifiSummaryRepositoryTest.kt

@@ -20,13 +20,19 @@ import android.content.Context
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.android.settings.R
+import com.android.settings.wifi.repository.WifiPickerRepository
+import com.android.settings.wifi.repository.WifiStatusRepository
 import com.android.settingslib.spa.testutils.firstWithTimeoutOrNull
 import com.android.settingslib.wifi.WifiStatusTracker
+import com.android.wifitrackerlib.HotspotNetworkEntry
 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 WifiSummaryRepositoryTest {
@@ -35,11 +41,22 @@ class WifiSummaryRepositoryTest {
 
     private val context: Context = ApplicationProvider.getApplicationContext()
 
-    private val repository = WifiSummaryRepository(context) { mockWifiStatusTracker }
+    private val mockWifiStatusRepository =
+        mock<WifiStatusRepository> {
+            on { wifiStatusTrackerFlow() } doReturn flowOf(mockWifiStatusTracker)
+        }
+
+    private val mockWifiPickerRepository = mock<WifiPickerRepository>()
 
     @Test
     fun summaryFlow_wifiDisabled_returnOff() = runBlocking {
         mockWifiStatusTracker.enabled = false
+        val repository =
+            WifiSummaryRepository(
+                context = context,
+                wifiStatusRepository = mockWifiStatusRepository,
+                wifiPickerRepository = null,
+            )
 
         val summary = repository.summaryFlow().firstWithTimeoutOrNull()
 
@@ -52,6 +69,12 @@ class WifiSummaryRepositoryTest {
             enabled = true
             connected = false
         }
+        val repository =
+            WifiSummaryRepository(
+                context = context,
+                wifiStatusRepository = mockWifiStatusRepository,
+                wifiPickerRepository = null,
+            )
 
         val summary = repository.summaryFlow().firstWithTimeoutOrNull()
 
@@ -65,6 +88,12 @@ class WifiSummaryRepositoryTest {
             connected = true
             ssid = TEST_SSID
         }
+        val repository =
+            WifiSummaryRepository(
+                context = context,
+                wifiStatusRepository = mockWifiStatusRepository,
+                wifiPickerRepository = null,
+            )
 
         val summary = repository.summaryFlow().firstWithTimeoutOrNull()
 
@@ -79,14 +108,40 @@ class WifiSummaryRepositoryTest {
             ssid = TEST_SSID
             statusLabel = STATUS_LABEL
         }
+        val repository =
+            WifiSummaryRepository(
+                context = context,
+                wifiStatusRepository = mockWifiStatusRepository,
+                wifiPickerRepository = null,
+            )
 
         val summary = repository.summaryFlow().firstWithTimeoutOrNull()
 
         assertThat(summary).isEqualTo("$TEST_SSID / $STATUS_LABEL")
     }
 
+    @Test
+    fun summaryFlow_withWifiPickerRepository() = runBlocking {
+        val hotspotNetworkEntry =
+            mock<HotspotNetworkEntry> { on { alternateSummary } doReturn ALTERNATE_SUMMARY }
+        mockWifiPickerRepository.stub {
+            on { connectedWifiEntryFlow() } doReturn flowOf(hotspotNetworkEntry)
+        }
+        val repository =
+            WifiSummaryRepository(
+                context = context,
+                wifiStatusRepository = mockWifiStatusRepository,
+                wifiPickerRepository = mockWifiPickerRepository,
+            )
+
+        val summary = repository.summaryFlow().firstWithTimeoutOrNull()
+
+        assertThat(summary).isEqualTo(ALTERNATE_SUMMARY)
+    }
+
     private companion object {
         const val TEST_SSID = "Test Ssid"
         const val STATUS_LABEL = "Very Fast"
+        const val ALTERNATE_SUMMARY = "Alternate Summary"
     }
 }

tests/spa_unit/src/com/android/settings/wifi/repository/WifiPickerRepositoryTest.kt

@@ -0,0 +1,78 @@
+/*
+ * 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.wifi.repository
+
+import android.content.Context
+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.android.wifitrackerlib.WifiEntry
+import com.android.wifitrackerlib.WifiPickerTracker
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.async
+import kotlinx.coroutines.delay
+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
+import org.mockito.kotlin.verify
+
+@RunWith(AndroidJUnit4::class)
+class WifiPickerRepositoryTest {
+
+    private val context: Context = ApplicationProvider.getApplicationContext()
+
+    private val mockWifiPickerTracker = mock<WifiPickerTracker>()
+
+    private var callback: WifiPickerTracker.WifiPickerTrackerCallback? = null
+
+    private val repository =
+        WifiPickerRepository(context) { _, callback ->
+            this.callback = callback
+            mockWifiPickerTracker
+        }
+
+    @Test
+    fun connectedWifiEntryFlow_callOnStartOnStopAndOnDestroy() = runBlocking {
+        repository.connectedWifiEntryFlow().firstWithTimeoutOrNull()
+
+        verify(mockWifiPickerTracker).onStart()
+        verify(mockWifiPickerTracker).onStop()
+        verify(mockWifiPickerTracker).onDestroy()
+    }
+
+    @Test
+    fun connectedWifiEntryFlow_initial() = runBlocking {
+        val wifiEntry = repository.connectedWifiEntryFlow().firstWithTimeoutOrNull()
+
+        assertThat(wifiEntry).isNull()
+    }
+
+    @Test
+    fun connectedWifiEntryFlow_onWifiEntriesChanged() = runBlocking {
+        val listDeferred = async { repository.connectedWifiEntryFlow().toListWithTimeout() }
+        delay(100)
+
+        mockWifiPickerTracker.stub { on { connectedWifiEntry } doReturn mock<WifiEntry>() }
+        callback?.onWifiEntriesChanged()
+
+        assertThat(listDeferred.await().filterNotNull()).isNotEmpty()
+    }
+}

tests/spa_unit/src/com/android/settings/wifi/repository/WifiStatusRepositoryTest.kt

@@ -0,0 +1,47 @@
+/*
+ * 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.wifi.repository
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settingslib.spa.testutils.firstWithTimeoutOrNull
+import com.android.settingslib.wifi.WifiStatusTracker
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.runBlocking
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+
+@RunWith(AndroidJUnit4::class)
+class WifiStatusRepositoryTest {
+
+    private val mockWifiStatusTracker = mock<WifiStatusTracker>()
+
+    private val context: Context = ApplicationProvider.getApplicationContext()
+
+    private val repository = WifiStatusRepository(context) { mockWifiStatusTracker }
+
+    @Test
+    fun wifiStatusTrackerFlow() = runBlocking {
+        mockWifiStatusTracker.enabled = false
+
+        val wifiStatusTracker = repository.wifiStatusTrackerFlow().firstWithTimeoutOrNull()
+
+        assertThat(wifiStatusTracker).isSameInstanceAs(mockWifiStatusTracker)
+    }
+}