Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[SB Refactor] Lint all the wifi classes; move network model to shared." into tm-qpr-dev

Browse Source
This commit is contained in:
Caitlin Shkuratov
2023-02-14 19:40:11 +00:00
committed by Android (Google) Code Review
parent 51ab23d453 0beef1ec01
commit 7cf6cd8567
22 changed files with 1222 additions and 1350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/ktfmt_includes.txt
View File

@@ -452,12 +452,6 @@
-packages/SystemUI/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherFeatureController.kt -packages/SystemUI/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherFeatureController.kt
-packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt -packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt
-packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityPipelineLogger.kt -packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityPipelineLogger.kt
-packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/model/WifiActivityModel.kt
-packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/model/WifiNetworkModel.kt
-packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/domain/interactor/WifiInteractor.kt
-packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/shared/WifiConstants.kt
-packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiView.kt
-packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModel.kt
-packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryStateNotifier.kt -packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryStateNotifier.kt
-packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceControlsController.kt -packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceControlsController.kt
-packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImpl.kt -packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImpl.kt
@@ -743,10 +737,6 @@
-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/panelstate/ShadeExpansionStateManagerTest.kt -packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/panelstate/ShadeExpansionStateManagerTest.kt
-packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherControllerOldImplTest.kt -packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/userswitcher/StatusBarUserSwitcherControllerOldImplTest.kt
-packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityPipelineLoggerTest.kt -packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ConnectivityPipelineLoggerTest.kt
-packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImplTest.kt
-packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/domain/interactor/WifiInteractorImplTest.kt
-packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiViewTest.kt
-packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModelTest.kt
-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BatteryStateNotifierTest.kt -packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BatteryStateNotifierTest.kt
-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/ClockTest.kt -packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/ClockTest.kt
-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImplTest.kt -packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/DeviceControlsControllerImplTest.kt

2
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepository.kt
View File

@@ -28,8 +28,8 @@ import com.android.systemui.statusbar.pipeline.mobile.data.model.ResolvedNetwork
import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository
import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository.Companion.DEFAULT_NUM_LEVELS import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository.Companion.DEFAULT_NUM_LEVELS
import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository
import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
import javax.inject.Inject import javax.inject.Inject
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow

2
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryImpl.kt
View File

@@ -52,8 +52,8 @@ import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConn
import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxy import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxy
import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger
import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger.Companion.logInputChange import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger.Companion.logInputChange
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository
import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
import com.android.systemui.util.kotlin.pairwise import com.android.systemui.util.kotlin.pairwise
import javax.inject.Inject import javax.inject.Inject
import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineDispatcher

2
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepository.kt
View File

@@ -17,7 +17,7 @@
package com.android.systemui.statusbar.pipeline.wifi.data.repository package com.android.systemui.statusbar.pipeline.wifi.data.repository
import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
/** Provides data related to the wifi state. */ /** Provides data related to the wifi state. */

2
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepositorySwitcher.kt
View File

@@ -23,9 +23,9 @@ import com.android.systemui.dagger.qualifiers.Application
import com.android.systemui.demomode.DemoMode import com.android.systemui.demomode.DemoMode
import com.android.systemui.demomode.DemoModeController import com.android.systemui.demomode.DemoModeController
import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.data.repository.demo.DemoWifiRepository import com.android.systemui.statusbar.pipeline.wifi.data.repository.demo.DemoWifiRepository
import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.WifiRepositoryImpl import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.WifiRepositoryImpl
import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
import javax.inject.Inject import javax.inject.Inject
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.ExperimentalCoroutinesApi

2
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/DemoWifiRepository.kt
View File

@@ -19,9 +19,9 @@ package com.android.systemui.statusbar.pipeline.wifi.data.repository.demo
import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Application
import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
import com.android.systemui.statusbar.pipeline.shared.data.model.toWifiDataActivityModel import com.android.systemui.statusbar.pipeline.shared.data.model.toWifiDataActivityModel
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository
import com.android.systemui.statusbar.pipeline.wifi.data.repository.demo.model.FakeWifiEventModel import com.android.systemui.statusbar.pipeline.wifi.data.repository.demo.model.FakeWifiEventModel
import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
import javax.inject.Inject import javax.inject.Inject
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job import kotlinx.coroutines.Job

2
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/DisabledWifiRepository.kt
View File

@@ -18,8 +18,8 @@ package com.android.systemui.statusbar.pipeline.wifi.data.repository.prod
import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.data.repository.RealWifiRepository import com.android.systemui.statusbar.pipeline.wifi.data.repository.RealWifiRepository
import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
import javax.inject.Inject import javax.inject.Inject
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow

2
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt
View File

@@ -43,9 +43,9 @@ import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger
import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger.Companion.logInputChange import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger.Companion.logInputChange
import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
import com.android.systemui.statusbar.pipeline.shared.data.model.toWifiDataActivityModel import com.android.systemui.statusbar.pipeline.shared.data.model.toWifiDataActivityModel
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.data.repository.RealWifiRepository import com.android.systemui.statusbar.pipeline.wifi.data.repository.RealWifiRepository
import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository
import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
import java.util.concurrent.Executor import java.util.concurrent.Executor
import javax.inject.Inject import javax.inject.Inject
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope

37
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/domain/interactor/WifiInteractor.kt
View File

@@ -21,8 +21,8 @@ import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.statusbar.pipeline.shared.data.model.ConnectivitySlot import com.android.systemui.statusbar.pipeline.shared.data.model.ConnectivitySlot
import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepository import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepository
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository
import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
import javax.inject.Inject import javax.inject.Inject
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
@@ -58,25 +58,29 @@ interface WifiInteractor {
} }
@SysUISingleton @SysUISingleton
class WifiInteractorImpl @Inject constructor( class WifiInteractorImpl
@Inject
constructor(
connectivityRepository: ConnectivityRepository, connectivityRepository: ConnectivityRepository,
wifiRepository: WifiRepository, wifiRepository: WifiRepository,
) : WifiInteractor { ) : WifiInteractor {
override val ssid: Flow<String?> = wifiRepository.wifiNetwork.map { info -> override val ssid: Flow<String?> =
when (info) { wifiRepository.wifiNetwork.map { info ->
is WifiNetworkModel.Unavailable -> null when (info) {
is WifiNetworkModel.Invalid -> null is WifiNetworkModel.Unavailable -> null
is WifiNetworkModel.Inactive -> null is WifiNetworkModel.Invalid -> null
is WifiNetworkModel.CarrierMerged -> null is WifiNetworkModel.Inactive -> null
is WifiNetworkModel.Active -> when { is WifiNetworkModel.CarrierMerged -> null
info.isPasspointAccessPoint || info.isOnlineSignUpForPasspointAccessPoint -> is WifiNetworkModel.Active ->
info.passpointProviderFriendlyName when {
info.ssid != WifiManager.UNKNOWN_SSID -> info.ssid info.isPasspointAccessPoint || info.isOnlineSignUpForPasspointAccessPoint ->
else -> null info.passpointProviderFriendlyName
info.ssid != WifiManager.UNKNOWN_SSID -> info.ssid
else -> null
}
} }
} }
}
override val isEnabled: Flow<Boolean> = wifiRepository.isWifiEnabled override val isEnabled: Flow<Boolean> = wifiRepository.isWifiEnabled
@@ -86,7 +90,6 @@ class WifiInteractorImpl @Inject constructor(
override val activity: StateFlow<DataActivityModel> = wifiRepository.wifiActivity override val activity: StateFlow<DataActivityModel> = wifiRepository.wifiActivity
override val isForceHidden: Flow<Boolean> = connectivityRepository.forceHiddenSlots.map { override val isForceHidden: Flow<Boolean> =
it.contains(ConnectivitySlot.WIFI) connectivityRepository.forceHiddenSlots.map { it.contains(ConnectivitySlot.WIFI) }
}
} }

54
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/model/WifiNetworkModel.kt → packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/shared/model/WifiNetworkModel.kt
View File

@@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.systemui.statusbar.pipeline.wifi.data.model package com.android.systemui.statusbar.pipeline.wifi.shared.model
import android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID import android.telephony.SubscriptionManager
import androidx.annotation.VisibleForTesting import androidx.annotation.VisibleForTesting
import com.android.systemui.log.table.TableRowLogger
import com.android.systemui.log.table.Diffable import com.android.systemui.log.table.Diffable
import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository.Companion.DEFAULT_NUM_LEVELS import com.android.systemui.log.table.TableRowLogger
import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository
/** Provides information about the current wifi network. */ /** Provides information about the current wifi network. */
sealed class WifiNetworkModel : Diffable<WifiNetworkModel> { sealed class WifiNetworkModel : Diffable<WifiNetworkModel> {
@@ -57,9 +57,7 @@ sealed class WifiNetworkModel : Diffable<WifiNetworkModel> {
} }
} }
/** /** A model representing that the wifi information we received was invalid in some way. */
* A model representing that the wifi information we received was invalid in some way.
*/
data class Invalid( data class Invalid(
/** A description of why the wifi information was invalid. */ /** A description of why the wifi information was invalid. */
val invalidReason: String, val invalidReason: String,
@@ -142,21 +140,17 @@ sealed class WifiNetworkModel : Diffable<WifiNetworkModel> {
*/ */
val subscriptionId: Int, val subscriptionId: Int,
/** /** The signal level, guaranteed to be 0 <= level <= numberOfLevels. */
* The signal level, guaranteed to be 0 <= level <= numberOfLevels.
*/
val level: Int, val level: Int,
/** /** The maximum possible level. */
* The maximum possible level. val numberOfLevels: Int = MobileConnectionRepository.DEFAULT_NUM_LEVELS,
*/
val numberOfLevels: Int = DEFAULT_NUM_LEVELS,
) : WifiNetworkModel() { ) : WifiNetworkModel() {
init { init {
require(level in MIN_VALID_LEVEL..numberOfLevels) { require(level in MIN_VALID_LEVEL..numberOfLevels) {
"0 <= wifi level <= $numberOfLevels required; level was $level" "0 <= wifi level <= $numberOfLevels required; level was $level"
} }
require(subscriptionId != INVALID_SUBSCRIPTION_ID) { require(subscriptionId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
"subscription ID cannot be invalid" "subscription ID cannot be invalid"
} }
} }
@@ -208,9 +202,7 @@ sealed class WifiNetworkModel : Diffable<WifiNetworkModel> {
/** See [android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED]. */ /** See [android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED]. */
val isValidated: Boolean = false, val isValidated: Boolean = false,
/** /** The wifi signal level, guaranteed to be 0 <= level <= 4. */
* The wifi signal level, guaranteed to be 0 <= level <= 4.
*/
val level: Int, val level: Int,
/** See [android.net.wifi.WifiInfo.ssid]. */ /** See [android.net.wifi.WifiInfo.ssid]. */
@@ -255,8 +247,10 @@ sealed class WifiNetworkModel : Diffable<WifiNetworkModel> {
if (prevVal.isPasspointAccessPoint != isPasspointAccessPoint) { if (prevVal.isPasspointAccessPoint != isPasspointAccessPoint) {
row.logChange(COL_PASSPOINT_ACCESS_POINT, isPasspointAccessPoint) row.logChange(COL_PASSPOINT_ACCESS_POINT, isPasspointAccessPoint)
} }
if (prevVal.isOnlineSignUpForPasspointAccessPoint != if (
isOnlineSignUpForPasspointAccessPoint) { prevVal.isOnlineSignUpForPasspointAccessPoint !=
isOnlineSignUpForPasspointAccessPoint
) {
row.logChange(COL_ONLINE_SIGN_UP, isOnlineSignUpForPasspointAccessPoint) row.logChange(COL_ONLINE_SIGN_UP, isOnlineSignUpForPasspointAccessPoint)
} }
if (prevVal.passpointProviderFriendlyName != passpointProviderFriendlyName) { if (prevVal.passpointProviderFriendlyName != passpointProviderFriendlyName) {
@@ -281,29 +275,29 @@ sealed class WifiNetworkModel : Diffable<WifiNetworkModel> {
// Only include the passpoint-related values in the string if we have them. (Most // Only include the passpoint-related values in the string if we have them. (Most
// networks won't have them so they'll be mostly clutter.) // networks won't have them so they'll be mostly clutter.)
val passpointString = val passpointString =
if (isPasspointAccessPoint || if (
isOnlineSignUpForPasspointAccessPoint || isPasspointAccessPoint ||
passpointProviderFriendlyName != null) { isOnlineSignUpForPasspointAccessPoint ||
passpointProviderFriendlyName != null
) {
", isPasspointAp=$isPasspointAccessPoint, " + ", isPasspointAp=$isPasspointAccessPoint, " +
"isOnlineSignUpForPasspointAp=$isOnlineSignUpForPasspointAccessPoint, " + "isOnlineSignUpForPasspointAp=$isOnlineSignUpForPasspointAccessPoint, " +
"passpointName=$passpointProviderFriendlyName" "passpointName=$passpointProviderFriendlyName"
} else { } else {
"" ""
} }
return "WifiNetworkModel.Active(networkId=$networkId, isValidated=$isValidated, " + return "WifiNetworkModel.Active(networkId=$networkId, isValidated=$isValidated, " +
"level=$level, ssid=$ssid$passpointString)" "level=$level, ssid=$ssid$passpointString)"
} }
companion object { companion object {
@VisibleForTesting @VisibleForTesting internal const val MAX_VALID_LEVEL = 4
internal const val MAX_VALID_LEVEL = 4
} }
} }
companion object { companion object {
@VisibleForTesting @VisibleForTesting internal const val MIN_VALID_LEVEL = 0
internal const val MIN_VALID_LEVEL = 0
} }
} }

102
packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModel.kt
View File

@@ -25,8 +25,6 @@ import com.android.systemui.R
import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.ContentDescription
import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.SysUISingleton
import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Application
import com.android.systemui.statusbar.pipeline.dagger.WifiTableLog
import com.android.systemui.statusbar.pipeline.wifi.ui.model.WifiIcon
import com.android.systemui.log.table.TableLogBuffer import com.android.systemui.log.table.TableLogBuffer
import com.android.systemui.log.table.logDiffsForTable import com.android.systemui.log.table.logDiffsForTable
import com.android.systemui.statusbar.connectivity.WifiIcons.WIFI_FULL_ICONS import com.android.systemui.statusbar.connectivity.WifiIcons.WIFI_FULL_ICONS
@@ -34,13 +32,15 @@ import com.android.systemui.statusbar.connectivity.WifiIcons.WIFI_NO_INTERNET_IC
import com.android.systemui.statusbar.connectivity.WifiIcons.WIFI_NO_NETWORK import com.android.systemui.statusbar.connectivity.WifiIcons.WIFI_NO_NETWORK
import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags import com.android.systemui.statusbar.pipeline.StatusBarPipelineFlags
import com.android.systemui.statusbar.pipeline.airplane.ui.viewmodel.AirplaneModeViewModel import com.android.systemui.statusbar.pipeline.airplane.ui.viewmodel.AirplaneModeViewModel
import com.android.systemui.statusbar.pipeline.dagger.WifiTableLog
import com.android.systemui.statusbar.pipeline.shared.ConnectivityConstants import com.android.systemui.statusbar.pipeline.shared.ConnectivityConstants
import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger
import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger.Companion.logOutputChange import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger.Companion.logOutputChange
import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractor import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractor
import com.android.systemui.statusbar.pipeline.wifi.shared.WifiConstants import com.android.systemui.statusbar.pipeline.wifi.shared.WifiConstants
import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.ui.model.WifiIcon
import javax.inject.Inject import javax.inject.Inject
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
@@ -55,15 +55,12 @@ import kotlinx.coroutines.flow.stateIn
/** /**
* Models the UI state for the status bar wifi icon. * Models the UI state for the status bar wifi icon.
* *
* This class exposes three view models, one per status bar location: * This class exposes three view models, one per status bar location: [home], [keyguard], and [qs].
* - [home] * In order to get the UI state for the wifi icon, you must use one of those view models (whichever
* - [keyguard] * is correct for your location).
* - [qs]
* In order to get the UI state for the wifi icon, you must use one of those view models (whichever
* is correct for your location).
* *
* Internally, this class maintains the current state of the wifi icon and notifies those three * Internally, this class maintains the current state of the wifi icon and notifies those three view
* view models of any changes. * models of any changes.
*/ */
@SysUISingleton @SysUISingleton
class WifiViewModel class WifiViewModel
@@ -85,12 +82,13 @@ constructor(
is WifiNetworkModel.Unavailable -> WifiIcon.Hidden is WifiNetworkModel.Unavailable -> WifiIcon.Hidden
is WifiNetworkModel.Invalid -> WifiIcon.Hidden is WifiNetworkModel.Invalid -> WifiIcon.Hidden
is WifiNetworkModel.CarrierMerged -> WifiIcon.Hidden is WifiNetworkModel.CarrierMerged -> WifiIcon.Hidden
is WifiNetworkModel.Inactive -> WifiIcon.Visible( is WifiNetworkModel.Inactive ->
res = WIFI_NO_NETWORK, WifiIcon.Visible(
ContentDescription.Loaded( res = WIFI_NO_NETWORK,
"${context.getString(WIFI_NO_CONNECTION)},${context.getString(NO_INTERNET)}" ContentDescription.Loaded(
"${context.getString(WIFI_NO_CONNECTION)},${context.getString(NO_INTERNET)}"
)
) )
)
is WifiNetworkModel.Active -> { is WifiNetworkModel.Active -> {
val levelDesc = context.getString(WIFI_CONNECTION_STRENGTH[this.level]) val levelDesc = context.getString(WIFI_CONNECTION_STRENGTH[this.level])
when { when {
@@ -114,25 +112,25 @@ constructor(
/** The wifi icon that should be displayed. */ /** The wifi icon that should be displayed. */
private val wifiIcon: StateFlow<WifiIcon> = private val wifiIcon: StateFlow<WifiIcon> =
combine( combine(
interactor.isEnabled, interactor.isEnabled,
interactor.isDefault, interactor.isDefault,
interactor.isForceHidden, interactor.isForceHidden,
interactor.wifiNetwork, interactor.wifiNetwork,
) { isEnabled, isDefault, isForceHidden, wifiNetwork -> ) { isEnabled, isDefault, isForceHidden, wifiNetwork ->
if (!isEnabled || isForceHidden || wifiNetwork is WifiNetworkModel.CarrierMerged) { if (!isEnabled || isForceHidden || wifiNetwork is WifiNetworkModel.CarrierMerged) {
return@combine WifiIcon.Hidden return@combine WifiIcon.Hidden
} }
val icon = wifiNetwork.icon() val icon = wifiNetwork.icon()
return@combine when { return@combine when {
isDefault -> icon isDefault -> icon
wifiConstants.alwaysShowIconIfEnabled -> icon wifiConstants.alwaysShowIconIfEnabled -> icon
!connectivityConstants.hasDataCapabilities -> icon !connectivityConstants.hasDataCapabilities -> icon
wifiNetwork is WifiNetworkModel.Active && wifiNetwork.isValidated -> icon wifiNetwork is WifiNetworkModel.Active && wifiNetwork.isValidated -> icon
else -> WifiIcon.Hidden else -> WifiIcon.Hidden
}
} }
}
.logDiffsForTable( .logDiffsForTable(
wifiTableLogBuffer, wifiTableLogBuffer,
columnPrefix = "", columnPrefix = "",
@@ -147,34 +145,34 @@ constructor(
/** The wifi activity status. Null if we shouldn't display the activity status. */ /** The wifi activity status. Null if we shouldn't display the activity status. */
private val activity: Flow<DataActivityModel?> = private val activity: Flow<DataActivityModel?> =
if (!connectivityConstants.shouldShowActivityConfig) { if (!connectivityConstants.shouldShowActivityConfig) {
flowOf(null) flowOf(null)
} else { } else {
combine(interactor.activity, interactor.ssid) { activity, ssid -> combine(interactor.activity, interactor.ssid) { activity, ssid ->
when (ssid) { when (ssid) {
null -> null null -> null
else -> activity else -> activity
}
} }
} }
} .distinctUntilChanged()
.distinctUntilChanged() .logOutputChange(logger, "activity")
.logOutputChange(logger, "activity") .stateIn(scope, started = SharingStarted.WhileSubscribed(), initialValue = null)
.stateIn(scope, started = SharingStarted.WhileSubscribed(), initialValue = null)
private val isActivityInViewVisible: Flow<Boolean> = private val isActivityInViewVisible: Flow<Boolean> =
activity activity
.map { it?.hasActivityIn == true } .map { it?.hasActivityIn == true }
.stateIn(scope, started = SharingStarted.WhileSubscribed(), initialValue = false) .stateIn(scope, started = SharingStarted.WhileSubscribed(), initialValue = false)
private val isActivityOutViewVisible: Flow<Boolean> = private val isActivityOutViewVisible: Flow<Boolean> =
activity activity
.map { it?.hasActivityOut == true } .map { it?.hasActivityOut == true }
.stateIn(scope, started = SharingStarted.WhileSubscribed(), initialValue = false) .stateIn(scope, started = SharingStarted.WhileSubscribed(), initialValue = false)
private val isActivityContainerVisible: Flow<Boolean> = private val isActivityContainerVisible: Flow<Boolean> =
combine(isActivityInViewVisible, isActivityOutViewVisible) { activityIn, activityOut -> combine(isActivityInViewVisible, isActivityOutViewVisible) { activityIn, activityOut ->
activityIn || activityOut activityIn || activityOut
} }
.stateIn(scope, started = SharingStarted.WhileSubscribed(), initialValue = false) .stateIn(scope, started = SharingStarted.WhileSubscribed(), initialValue = false)
// TODO(b/238425913): It isn't ideal for the wifi icon to need to know about whether the // TODO(b/238425913): It isn't ideal for the wifi icon to need to know about whether the
// airplane icon is visible. Instead, we should have a parent StatusBarSystemIconsViewModel // airplane icon is visible. Instead, we should have a parent StatusBarSystemIconsViewModel

2
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/CarrierMergedConnectionRepositoryTest.kt
View File

@@ -26,8 +26,8 @@ import com.android.systemui.statusbar.pipeline.mobile.data.model.MobileConnectio
import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameModel
import com.android.systemui.statusbar.pipeline.mobile.data.model.ResolvedNetworkType import com.android.systemui.statusbar.pipeline.mobile.data.model.ResolvedNetworkType
import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository
import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
import com.android.systemui.util.mockito.whenever import com.android.systemui.util.mockito.whenever
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.ExperimentalCoroutinesApi

2
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/FullMobileConnectionRepositoryTest.kt
View File

@@ -32,8 +32,8 @@ import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameMode
import com.android.systemui.statusbar.pipeline.mobile.data.repository.FakeMobileConnectionRepository import com.android.systemui.statusbar.pipeline.mobile.data.repository.FakeMobileConnectionRepository
import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository
import com.android.systemui.statusbar.pipeline.mobile.data.repository.prod.MobileTelephonyHelpers.getTelephonyCallbackForType import com.android.systemui.statusbar.pipeline.mobile.data.repository.prod.MobileTelephonyHelpers.getTelephonyCallbackForType
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository
import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.any
import com.android.systemui.util.mockito.eq import com.android.systemui.util.mockito.eq
import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.mock

2
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryTest.kt
View File

@@ -44,8 +44,8 @@ import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConn
import com.android.systemui.statusbar.pipeline.mobile.data.repository.prod.FullMobileConnectionRepository.Factory.Companion.tableBufferLogName import com.android.systemui.statusbar.pipeline.mobile.data.repository.prod.FullMobileConnectionRepository.Factory.Companion.tableBufferLogName
import com.android.systemui.statusbar.pipeline.mobile.util.FakeMobileMappingsProxy import com.android.systemui.statusbar.pipeline.mobile.util.FakeMobileMappingsProxy
import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository
import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.any
import com.android.systemui.util.mockito.argumentCaptor import com.android.systemui.util.mockito.argumentCaptor
import com.android.systemui.util.mockito.eq import com.android.systemui.util.mockito.eq

2
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/FakeWifiRepository.kt
View File

@@ -17,8 +17,8 @@
package com.android.systemui.statusbar.pipeline.wifi.data.repository package com.android.systemui.statusbar.pipeline.wifi.data.repository
import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.WifiRepositoryImpl.Companion.ACTIVITY_DEFAULT import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.WifiRepositoryImpl.Companion.ACTIVITY_DEFAULT
import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow

2
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/DisabledWifiRepositoryTest.kt
View File

@@ -19,7 +19,7 @@ package com.android.systemui.statusbar.pipeline.wifi.data.repository.prod
import androidx.test.filters.SmallTest import androidx.test.filters.SmallTest
import com.android.systemui.SysuiTestCase import com.android.systemui.SysuiTestCase
import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import org.junit.Before import org.junit.Before
import org.junit.Test import org.junit.Test

1313
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImplTest.kt
View File

File diff suppressed because it is too large Load Diff

334
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/domain/interactor/WifiInteractorImplTest.kt
View File

@@ -22,8 +22,8 @@ import com.android.systemui.SysuiTestCase
import com.android.systemui.statusbar.pipeline.shared.data.model.ConnectivitySlot import com.android.systemui.statusbar.pipeline.shared.data.model.ConnectivitySlot
import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository
import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -57,10 +57,7 @@ class WifiInteractorImplTest : SysuiTestCase() {
wifiRepository.setWifiNetwork(WifiNetworkModel.Unavailable) wifiRepository.setWifiNetwork(WifiNetworkModel.Unavailable)
var latest: String? = "default" var latest: String? = "default"
val job = underTest val job = underTest.ssid.onEach { latest = it }.launchIn(this)
.ssid
.onEach { latest = it }
.launchIn(this)
assertThat(latest).isNull() assertThat(latest).isNull()
@@ -68,238 +65,223 @@ class WifiInteractorImplTest : SysuiTestCase() {
} }
@Test @Test
fun ssid_inactiveNetwork_outputsNull() = runBlocking(IMMEDIATE) { fun ssid_inactiveNetwork_outputsNull() =
wifiRepository.setWifiNetwork(WifiNetworkModel.Inactive) runBlocking(IMMEDIATE) {
wifiRepository.setWifiNetwork(WifiNetworkModel.Inactive)
var latest: String? = "default" var latest: String? = "default"
val job = underTest val job = underTest.ssid.onEach { latest = it }.launchIn(this)
.ssid
.onEach { latest = it }
.launchIn(this)
assertThat(latest).isNull() assertThat(latest).isNull()
job.cancel() job.cancel()
} }
@Test @Test
fun ssid_carrierMergedNetwork_outputsNull() = runBlocking(IMMEDIATE) { fun ssid_carrierMergedNetwork_outputsNull() =
wifiRepository.setWifiNetwork( runBlocking(IMMEDIATE) {
WifiNetworkModel.CarrierMerged(networkId = 1, subscriptionId = 2, level = 1) wifiRepository.setWifiNetwork(
) WifiNetworkModel.CarrierMerged(networkId = 1, subscriptionId = 2, level = 1)
)
var latest: String? = "default" var latest: String? = "default"
val job = underTest val job = underTest.ssid.onEach { latest = it }.launchIn(this)
.ssid
.onEach { latest = it }
.launchIn(this)
assertThat(latest).isNull() assertThat(latest).isNull()
job.cancel() job.cancel()
} }
@Test @Test
fun ssid_isPasspointAccessPoint_outputsPasspointName() = runBlocking(IMMEDIATE) { fun ssid_isPasspointAccessPoint_outputsPasspointName() =
wifiRepository.setWifiNetwork(WifiNetworkModel.Active( runBlocking(IMMEDIATE) {
networkId = 1, wifiRepository.setWifiNetwork(
level = 1, WifiNetworkModel.Active(
isPasspointAccessPoint = true, networkId = 1,
passpointProviderFriendlyName = "friendly", level = 1,
)) isPasspointAccessPoint = true,
passpointProviderFriendlyName = "friendly",
)
)
var latest: String? = null var latest: String? = null
val job = underTest val job = underTest.ssid.onEach { latest = it }.launchIn(this)
.ssid
.onEach { latest = it }
.launchIn(this)
assertThat(latest).isEqualTo("friendly") assertThat(latest).isEqualTo("friendly")
job.cancel() job.cancel()
} }
@Test @Test
fun ssid_isOnlineSignUpForPasspoint_outputsPasspointName() = runBlocking(IMMEDIATE) { fun ssid_isOnlineSignUpForPasspoint_outputsPasspointName() =
wifiRepository.setWifiNetwork(WifiNetworkModel.Active( runBlocking(IMMEDIATE) {
networkId = 1, wifiRepository.setWifiNetwork(
level = 1, WifiNetworkModel.Active(
isOnlineSignUpForPasspointAccessPoint = true, networkId = 1,
passpointProviderFriendlyName = "friendly", level = 1,
)) isOnlineSignUpForPasspointAccessPoint = true,
passpointProviderFriendlyName = "friendly",
)
)
var latest: String? = null var latest: String? = null
val job = underTest val job = underTest.ssid.onEach { latest = it }.launchIn(this)
.ssid
.onEach { latest = it }
.launchIn(this)
assertThat(latest).isEqualTo("friendly") assertThat(latest).isEqualTo("friendly")
job.cancel() job.cancel()
} }
@Test @Test
fun ssid_unknownSsid_outputsNull() = runBlocking(IMMEDIATE) { fun ssid_unknownSsid_outputsNull() =
wifiRepository.setWifiNetwork(WifiNetworkModel.Active( runBlocking(IMMEDIATE) {
networkId = 1, wifiRepository.setWifiNetwork(
level = 1, WifiNetworkModel.Active(
ssid = WifiManager.UNKNOWN_SSID, networkId = 1,
)) level = 1,
ssid = WifiManager.UNKNOWN_SSID,
)
)
var latest: String? = "default" var latest: String? = "default"
val job = underTest val job = underTest.ssid.onEach { latest = it }.launchIn(this)
.ssid
.onEach { latest = it }
.launchIn(this)
assertThat(latest).isNull() assertThat(latest).isNull()
job.cancel() job.cancel()
} }
@Test @Test
fun ssid_validSsid_outputsSsid() = runBlocking(IMMEDIATE) { fun ssid_validSsid_outputsSsid() =
wifiRepository.setWifiNetwork(WifiNetworkModel.Active( runBlocking(IMMEDIATE) {
networkId = 1, wifiRepository.setWifiNetwork(
level = 1, WifiNetworkModel.Active(
ssid = "MyAwesomeWifiNetwork", networkId = 1,
)) level = 1,
ssid = "MyAwesomeWifiNetwork",
)
)
var latest: String? = null var latest: String? = null
val job = underTest val job = underTest.ssid.onEach { latest = it }.launchIn(this)
.ssid
.onEach { latest = it }
.launchIn(this)
assertThat(latest).isEqualTo("MyAwesomeWifiNetwork") assertThat(latest).isEqualTo("MyAwesomeWifiNetwork")
job.cancel() job.cancel()
} }
@Test @Test
fun isEnabled_matchesRepoIsEnabled() = runBlocking(IMMEDIATE) { fun isEnabled_matchesRepoIsEnabled() =
var latest: Boolean? = null runBlocking(IMMEDIATE) {
val job = underTest var latest: Boolean? = null
.isEnabled val job = underTest.isEnabled.onEach { latest = it }.launchIn(this)
.onEach { latest = it }
.launchIn(this)
wifiRepository.setIsWifiEnabled(true) wifiRepository.setIsWifiEnabled(true)
yield() yield()
assertThat(latest).isTrue() assertThat(latest).isTrue()
wifiRepository.setIsWifiEnabled(false) wifiRepository.setIsWifiEnabled(false)
yield() yield()
assertThat(latest).isFalse() assertThat(latest).isFalse()
wifiRepository.setIsWifiEnabled(true) wifiRepository.setIsWifiEnabled(true)
yield() yield()
assertThat(latest).isTrue() assertThat(latest).isTrue()
job.cancel() job.cancel()
} }
@Test @Test
fun isDefault_matchesRepoIsDefault() = runBlocking(IMMEDIATE) { fun isDefault_matchesRepoIsDefault() =
var latest: Boolean? = null runBlocking(IMMEDIATE) {
val job = underTest var latest: Boolean? = null
.isDefault val job = underTest.isDefault.onEach { latest = it }.launchIn(this)
.onEach { latest = it }
.launchIn(this)
wifiRepository.setIsWifiDefault(true) wifiRepository.setIsWifiDefault(true)
yield() yield()
assertThat(latest).isTrue() assertThat(latest).isTrue()
wifiRepository.setIsWifiDefault(false) wifiRepository.setIsWifiDefault(false)
yield() yield()
assertThat(latest).isFalse() assertThat(latest).isFalse()
wifiRepository.setIsWifiDefault(true) wifiRepository.setIsWifiDefault(true)
yield() yield()
assertThat(latest).isTrue() assertThat(latest).isTrue()
job.cancel() job.cancel()
} }
@Test @Test
fun wifiNetwork_matchesRepoWifiNetwork() = runBlocking(IMMEDIATE) { fun wifiNetwork_matchesRepoWifiNetwork() =
val wifiNetwork = WifiNetworkModel.Active( runBlocking(IMMEDIATE) {
networkId = 45, val wifiNetwork =
isValidated = true, WifiNetworkModel.Active(
level = 3, networkId = 45,
ssid = "AB", isValidated = true,
passpointProviderFriendlyName = "friendly" level = 3,
) ssid = "AB",
wifiRepository.setWifiNetwork(wifiNetwork) passpointProviderFriendlyName = "friendly"
)
wifiRepository.setWifiNetwork(wifiNetwork)
var latest: WifiNetworkModel? = null var latest: WifiNetworkModel? = null
val job = underTest val job = underTest.wifiNetwork.onEach { latest = it }.launchIn(this)
.wifiNetwork
.onEach { latest = it }
.launchIn(this)
assertThat(latest).isEqualTo(wifiNetwork) assertThat(latest).isEqualTo(wifiNetwork)
job.cancel() job.cancel()
} }
@Test @Test
fun activity_matchesRepoWifiActivity() = runBlocking(IMMEDIATE) { fun activity_matchesRepoWifiActivity() =
var latest: DataActivityModel? = null runBlocking(IMMEDIATE) {
val job = underTest var latest: DataActivityModel? = null
.activity val job = underTest.activity.onEach { latest = it }.launchIn(this)
.onEach { latest = it }
.launchIn(this)
val activity1 = DataActivityModel(hasActivityIn = true, hasActivityOut = true) val activity1 = DataActivityModel(hasActivityIn = true, hasActivityOut = true)
wifiRepository.setWifiActivity(activity1) wifiRepository.setWifiActivity(activity1)
yield() yield()
assertThat(latest).isEqualTo(activity1) assertThat(latest).isEqualTo(activity1)
val activity2 = DataActivityModel(hasActivityIn = false, hasActivityOut = false) val activity2 = DataActivityModel(hasActivityIn = false, hasActivityOut = false)
wifiRepository.setWifiActivity(activity2) wifiRepository.setWifiActivity(activity2)
yield() yield()
assertThat(latest).isEqualTo(activity2) assertThat(latest).isEqualTo(activity2)
val activity3 = DataActivityModel(hasActivityIn = true, hasActivityOut = false) val activity3 = DataActivityModel(hasActivityIn = true, hasActivityOut = false)
wifiRepository.setWifiActivity(activity3) wifiRepository.setWifiActivity(activity3)
yield() yield()
assertThat(latest).isEqualTo(activity3) assertThat(latest).isEqualTo(activity3)
job.cancel() job.cancel()
} }
@Test @Test
fun isForceHidden_repoHasWifiHidden_outputsTrue() = runBlocking(IMMEDIATE) { fun isForceHidden_repoHasWifiHidden_outputsTrue() =
connectivityRepository.setForceHiddenIcons(setOf(ConnectivitySlot.WIFI)) runBlocking(IMMEDIATE) {
connectivityRepository.setForceHiddenIcons(setOf(ConnectivitySlot.WIFI))
var latest: Boolean? = null var latest: Boolean? = null
val job = underTest val job = underTest.isForceHidden.onEach { latest = it }.launchIn(this)
.isForceHidden
.onEach { latest = it }
.launchIn(this)
assertThat(latest).isTrue() assertThat(latest).isTrue()
job.cancel() job.cancel()
} }
@Test @Test
fun isForceHidden_repoDoesNotHaveWifiHidden_outputsFalse() = runBlocking(IMMEDIATE) { fun isForceHidden_repoDoesNotHaveWifiHidden_outputsFalse() =
connectivityRepository.setForceHiddenIcons(setOf()) runBlocking(IMMEDIATE) {
connectivityRepository.setForceHiddenIcons(setOf())
var latest: Boolean? = null var latest: Boolean? = null
val job = underTest val job = underTest.isForceHidden.onEach { latest = it }.launchIn(this)
.isForceHidden
.onEach { latest = it }
.launchIn(this)
assertThat(latest).isFalse() assertThat(latest).isFalse()
job.cancel() job.cancel()
} }
} }
private val IMMEDIATE = Dispatchers.Main.immediate private val IMMEDIATE = Dispatchers.Main.immediate

6
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/model/WifiNetworkModelTest.kt → packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/shared/model/WifiNetworkModelTest.kt
View File

@@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.systemui.statusbar.pipeline.wifi.data.model package com.android.systemui.statusbar.pipeline.wifi.shared.model
import android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID import android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID
import androidx.test.filters.SmallTest import androidx.test.filters.SmallTest
import com.android.systemui.SysuiTestCase import com.android.systemui.SysuiTestCase
import com.android.systemui.log.table.TableRowLogger import com.android.systemui.log.table.TableRowLogger
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel.Active.Companion.MAX_VALID_LEVEL import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel.Active.Companion.MAX_VALID_LEVEL
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel.Companion.MIN_VALID_LEVEL import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel.Companion.MIN_VALID_LEVEL
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import org.junit.Test import org.junit.Test

58
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/view/ModernStatusBarWifiViewTest.kt
View File

@@ -38,11 +38,11 @@ import com.android.systemui.statusbar.pipeline.airplane.ui.viewmodel.AirplaneMod
import com.android.systemui.statusbar.pipeline.shared.ConnectivityConstants import com.android.systemui.statusbar.pipeline.shared.ConnectivityConstants
import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger
import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository
import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractor import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractor
import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractorImpl import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractorImpl
import com.android.systemui.statusbar.pipeline.wifi.shared.WifiConstants import com.android.systemui.statusbar.pipeline.wifi.shared.WifiConstants
import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel.LocationBasedWifiViewModel import com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel.LocationBasedWifiViewModel
import com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel.WifiViewModel import com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel.WifiViewModel
import com.android.systemui.util.mockito.whenever import com.android.systemui.util.mockito.whenever
@@ -62,16 +62,11 @@ class ModernStatusBarWifiViewTest : SysuiTestCase() {
private lateinit var testableLooper: TestableLooper private lateinit var testableLooper: TestableLooper
@Mock @Mock private lateinit var statusBarPipelineFlags: StatusBarPipelineFlags
private lateinit var statusBarPipelineFlags: StatusBarPipelineFlags @Mock private lateinit var logger: ConnectivityPipelineLogger
@Mock @Mock private lateinit var tableLogBuffer: TableLogBuffer
private lateinit var logger: ConnectivityPipelineLogger @Mock private lateinit var connectivityConstants: ConnectivityConstants
@Mock @Mock private lateinit var wifiConstants: WifiConstants
private lateinit var tableLogBuffer: TableLogBuffer
@Mock
private lateinit var connectivityConstants: ConnectivityConstants
@Mock
private lateinit var wifiConstants: WifiConstants
private lateinit var airplaneModeRepository: FakeAirplaneModeRepository private lateinit var airplaneModeRepository: FakeAirplaneModeRepository
private lateinit var connectivityRepository: FakeConnectivityRepository private lateinit var connectivityRepository: FakeConnectivityRepository
private lateinit var wifiRepository: FakeWifiRepository private lateinit var wifiRepository: FakeWifiRepository
@@ -91,25 +86,28 @@ class ModernStatusBarWifiViewTest : SysuiTestCase() {
wifiRepository.setIsWifiEnabled(true) wifiRepository.setIsWifiEnabled(true)
interactor = WifiInteractorImpl(connectivityRepository, wifiRepository) interactor = WifiInteractorImpl(connectivityRepository, wifiRepository)
scope = CoroutineScope(Dispatchers.Unconfined) scope = CoroutineScope(Dispatchers.Unconfined)
airplaneModeViewModel = AirplaneModeViewModelImpl( airplaneModeViewModel =
AirplaneModeInteractor( AirplaneModeViewModelImpl(
airplaneModeRepository, AirplaneModeInteractor(
connectivityRepository, airplaneModeRepository,
), connectivityRepository,
logger, ),
scope, logger,
) scope,
viewModel = WifiViewModel( )
airplaneModeViewModel, viewModel =
connectivityConstants, WifiViewModel(
context, airplaneModeViewModel,
logger, connectivityConstants,
tableLogBuffer, context,
interactor, logger,
scope, tableLogBuffer,
statusBarPipelineFlags, interactor,
wifiConstants, scope,
).home statusBarPipelineFlags,
wifiConstants,
)
.home
} }
// Note: The following tests are more like integration tests, since they stand up a full // Note: The following tests are more like integration tests, since they stand up a full

2
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModelIconParameterizedTest.kt
View File

@@ -36,11 +36,11 @@ import com.android.systemui.statusbar.pipeline.shared.ConnectivityConstants
import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger
import com.android.systemui.statusbar.pipeline.shared.data.model.ConnectivitySlot import com.android.systemui.statusbar.pipeline.shared.data.model.ConnectivitySlot
import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository
import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractor import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractor
import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractorImpl import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractorImpl
import com.android.systemui.statusbar.pipeline.wifi.shared.WifiConstants import com.android.systemui.statusbar.pipeline.wifi.shared.WifiConstants
import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.ui.model.WifiIcon import com.android.systemui.statusbar.pipeline.wifi.ui.model.WifiIcon
import com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel.WifiViewModel.Companion.NO_INTERNET import com.android.systemui.statusbar.pipeline.wifi.ui.viewmodel.WifiViewModel.Companion.NO_INTERNET
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat

632
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModelTest.kt
View File

@@ -29,11 +29,11 @@ import com.android.systemui.statusbar.pipeline.shared.ConnectivityPipelineLogger
import com.android.systemui.statusbar.pipeline.shared.data.model.ConnectivitySlot import com.android.systemui.statusbar.pipeline.shared.data.model.ConnectivitySlot
import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel
import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository
import com.android.systemui.statusbar.pipeline.wifi.data.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository
import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractor import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractor
import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractorImpl import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractorImpl
import com.android.systemui.statusbar.pipeline.wifi.shared.WifiConstants import com.android.systemui.statusbar.pipeline.wifi.shared.WifiConstants
import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
import com.android.systemui.statusbar.pipeline.wifi.ui.model.WifiIcon import com.android.systemui.statusbar.pipeline.wifi.ui.model.WifiIcon
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
@@ -79,14 +79,15 @@ class WifiViewModelTest : SysuiTestCase() {
wifiRepository.setIsWifiEnabled(true) wifiRepository.setIsWifiEnabled(true)
interactor = WifiInteractorImpl(connectivityRepository, wifiRepository) interactor = WifiInteractorImpl(connectivityRepository, wifiRepository)
scope = CoroutineScope(IMMEDIATE) scope = CoroutineScope(IMMEDIATE)
airplaneModeViewModel = AirplaneModeViewModelImpl( airplaneModeViewModel =
AirplaneModeInteractor( AirplaneModeViewModelImpl(
airplaneModeRepository, AirplaneModeInteractor(
connectivityRepository, airplaneModeRepository,
), connectivityRepository,
logger, ),
scope, logger,
) scope,
)
createAndSetViewModel() createAndSetViewModel()
} }
@@ -104,451 +105,386 @@ class WifiViewModelTest : SysuiTestCase() {
// instances. There are also some tests that verify all 3 instances received the same data. // instances. There are also some tests that verify all 3 instances received the same data.
@Test @Test
fun wifiIcon_allLocationViewModelsReceiveSameData() = runBlocking(IMMEDIATE) { fun wifiIcon_allLocationViewModelsReceiveSameData() =
var latestHome: WifiIcon? = null runBlocking(IMMEDIATE) {
val jobHome = underTest var latestHome: WifiIcon? = null
.home val jobHome = underTest.home.wifiIcon.onEach { latestHome = it }.launchIn(this)
.wifiIcon
.onEach { latestHome = it }
.launchIn(this)
var latestKeyguard: WifiIcon? = null var latestKeyguard: WifiIcon? = null
val jobKeyguard = underTest val jobKeyguard =
.keyguard underTest.keyguard.wifiIcon.onEach { latestKeyguard = it }.launchIn(this)
.wifiIcon
.onEach { latestKeyguard = it }
.launchIn(this)
var latestQs: WifiIcon? = null var latestQs: WifiIcon? = null
val jobQs = underTest val jobQs = underTest.qs.wifiIcon.onEach { latestQs = it }.launchIn(this)
.qs
.wifiIcon
.onEach { latestQs = it }
.launchIn(this)
wifiRepository.setWifiNetwork( wifiRepository.setWifiNetwork(
WifiNetworkModel.Active( WifiNetworkModel.Active(NETWORK_ID, isValidated = true, level = 1)
NETWORK_ID,
isValidated = true,
level = 1
) )
) yield()
yield()
assertThat(latestHome).isInstanceOf(WifiIcon.Visible::class.java) assertThat(latestHome).isInstanceOf(WifiIcon.Visible::class.java)
assertThat(latestHome).isEqualTo(latestKeyguard) assertThat(latestHome).isEqualTo(latestKeyguard)
assertThat(latestKeyguard).isEqualTo(latestQs) assertThat(latestKeyguard).isEqualTo(latestQs)
jobHome.cancel() jobHome.cancel()
jobKeyguard.cancel() jobKeyguard.cancel()
jobQs.cancel() jobQs.cancel()
} }
@Test @Test
fun activity_showActivityConfigFalse_outputsFalse() = runBlocking(IMMEDIATE) { fun activity_showActivityConfigFalse_outputsFalse() =
whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(false) runBlocking(IMMEDIATE) {
createAndSetViewModel() whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(false)
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK) createAndSetViewModel()
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
var activityIn: Boolean? = null var activityIn: Boolean? = null
val activityInJob = underTest val activityInJob =
.home underTest.home.isActivityInViewVisible.onEach { activityIn = it }.launchIn(this)
.isActivityInViewVisible
.onEach { activityIn = it }
.launchIn(this)
var activityOut: Boolean? = null var activityOut: Boolean? = null
val activityOutJob = underTest val activityOutJob =
.home underTest.home.isActivityOutViewVisible.onEach { activityOut = it }.launchIn(this)
.isActivityOutViewVisible
.onEach { activityOut = it }
.launchIn(this)
var activityContainer: Boolean? = null var activityContainer: Boolean? = null
val activityContainerJob = underTest val activityContainerJob =
.home underTest.home.isActivityContainerVisible
.isActivityContainerVisible .onEach { activityContainer = it }
.onEach { activityContainer = it } .launchIn(this)
.launchIn(this)
// Verify that on launch, we receive false. // Verify that on launch, we receive false.
assertThat(activityIn).isFalse() assertThat(activityIn).isFalse()
assertThat(activityOut).isFalse() assertThat(activityOut).isFalse()
assertThat(activityContainer).isFalse() assertThat(activityContainer).isFalse()
activityInJob.cancel() activityInJob.cancel()
activityOutJob.cancel() activityOutJob.cancel()
activityContainerJob.cancel() activityContainerJob.cancel()
} }
@Test @Test
fun activity_showActivityConfigFalse_noUpdatesReceived() = runBlocking(IMMEDIATE) { fun activity_showActivityConfigFalse_noUpdatesReceived() =
whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(false) runBlocking(IMMEDIATE) {
createAndSetViewModel() whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(false)
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK) createAndSetViewModel()
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
var activityIn: Boolean? = null var activityIn: Boolean? = null
val activityInJob = underTest val activityInJob =
.home underTest.home.isActivityInViewVisible.onEach { activityIn = it }.launchIn(this)
.isActivityInViewVisible
.onEach { activityIn = it }
.launchIn(this)
var activityOut: Boolean? = null var activityOut: Boolean? = null
val activityOutJob = underTest val activityOutJob =
.home underTest.home.isActivityOutViewVisible.onEach { activityOut = it }.launchIn(this)
.isActivityOutViewVisible
.onEach { activityOut = it }
.launchIn(this)
var activityContainer: Boolean? = null var activityContainer: Boolean? = null
val activityContainerJob = underTest val activityContainerJob =
.home underTest.home.isActivityContainerVisible
.isActivityContainerVisible .onEach { activityContainer = it }
.onEach { activityContainer = it } .launchIn(this)
.launchIn(this)
// WHEN we update the repo to have activity // WHEN we update the repo to have activity
val activity = DataActivityModel(hasActivityIn = true, hasActivityOut = true) val activity = DataActivityModel(hasActivityIn = true, hasActivityOut = true)
wifiRepository.setWifiActivity(activity) wifiRepository.setWifiActivity(activity)
yield() yield()
// THEN we didn't update to the new activity (because our config is false) // THEN we didn't update to the new activity (because our config is false)
assertThat(activityIn).isFalse() assertThat(activityIn).isFalse()
assertThat(activityOut).isFalse() assertThat(activityOut).isFalse()
assertThat(activityContainer).isFalse() assertThat(activityContainer).isFalse()
activityInJob.cancel() activityInJob.cancel()
activityOutJob.cancel() activityOutJob.cancel()
activityContainerJob.cancel() activityContainerJob.cancel()
} }
@Test @Test
fun activity_nullSsid_outputsFalse() = runBlocking(IMMEDIATE) { fun activity_nullSsid_outputsFalse() =
whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true) runBlocking(IMMEDIATE) {
createAndSetViewModel() whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)
createAndSetViewModel()
wifiRepository.setWifiNetwork(WifiNetworkModel.Active(NETWORK_ID, ssid = null, level = 1)) wifiRepository.setWifiNetwork(
WifiNetworkModel.Active(NETWORK_ID, ssid = null, level = 1)
)
var activityIn: Boolean? = null var activityIn: Boolean? = null
val activityInJob = underTest val activityInJob =
.home underTest.home.isActivityInViewVisible.onEach { activityIn = it }.launchIn(this)
.isActivityInViewVisible
.onEach { activityIn = it }
.launchIn(this)
var activityOut: Boolean? = null var activityOut: Boolean? = null
val activityOutJob = underTest val activityOutJob =
.home underTest.home.isActivityOutViewVisible.onEach { activityOut = it }.launchIn(this)
.isActivityOutViewVisible
.onEach { activityOut = it }
.launchIn(this)
var activityContainer: Boolean? = null var activityContainer: Boolean? = null
val activityContainerJob = underTest val activityContainerJob =
.home underTest.home.isActivityContainerVisible
.isActivityContainerVisible .onEach { activityContainer = it }
.onEach { activityContainer = it } .launchIn(this)
.launchIn(this)
// WHEN we update the repo to have activity // WHEN we update the repo to have activity
val activity = DataActivityModel(hasActivityIn = true, hasActivityOut = true) val activity = DataActivityModel(hasActivityIn = true, hasActivityOut = true)
wifiRepository.setWifiActivity(activity) wifiRepository.setWifiActivity(activity)
yield() yield()
// THEN we still output false because our network's SSID is null // THEN we still output false because our network's SSID is null
assertThat(activityIn).isFalse() assertThat(activityIn).isFalse()
assertThat(activityOut).isFalse() assertThat(activityOut).isFalse()
assertThat(activityContainer).isFalse() assertThat(activityContainer).isFalse()
activityInJob.cancel() activityInJob.cancel()
activityOutJob.cancel() activityOutJob.cancel()
activityContainerJob.cancel() activityContainerJob.cancel()
} }
@Test @Test
fun activity_allLocationViewModelsReceiveSameData() = runBlocking(IMMEDIATE) { fun activity_allLocationViewModelsReceiveSameData() =
whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true) runBlocking(IMMEDIATE) {
createAndSetViewModel() whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK) createAndSetViewModel()
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
var latestHome: Boolean? = null var latestHome: Boolean? = null
val jobHome = underTest val jobHome =
.home underTest.home.isActivityInViewVisible.onEach { latestHome = it }.launchIn(this)
.isActivityInViewVisible
.onEach { latestHome = it }
.launchIn(this)
var latestKeyguard: Boolean? = null var latestKeyguard: Boolean? = null
val jobKeyguard = underTest val jobKeyguard =
.keyguard underTest.keyguard.isActivityInViewVisible
.isActivityInViewVisible .onEach { latestKeyguard = it }
.onEach { latestKeyguard = it } .launchIn(this)
.launchIn(this)
var latestQs: Boolean? = null var latestQs: Boolean? = null
val jobQs = underTest val jobQs = underTest.qs.isActivityInViewVisible.onEach { latestQs = it }.launchIn(this)
.qs
.isActivityInViewVisible
.onEach { latestQs = it }
.launchIn(this)
val activity = DataActivityModel(hasActivityIn = true, hasActivityOut = true) val activity = DataActivityModel(hasActivityIn = true, hasActivityOut = true)
wifiRepository.setWifiActivity(activity) wifiRepository.setWifiActivity(activity)
yield() yield()
assertThat(latestHome).isTrue() assertThat(latestHome).isTrue()
assertThat(latestKeyguard).isTrue() assertThat(latestKeyguard).isTrue()
assertThat(latestQs).isTrue() assertThat(latestQs).isTrue()
jobHome.cancel() jobHome.cancel()
jobKeyguard.cancel() jobKeyguard.cancel()
jobQs.cancel() jobQs.cancel()
} }
@Test @Test
fun activityIn_hasActivityInTrue_outputsTrue() = runBlocking(IMMEDIATE) { fun activityIn_hasActivityInTrue_outputsTrue() =
whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true) runBlocking(IMMEDIATE) {
createAndSetViewModel() whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK) createAndSetViewModel()
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
var latest: Boolean? = null var latest: Boolean? = null
val job = underTest val job = underTest.home.isActivityInViewVisible.onEach { latest = it }.launchIn(this)
.home
.isActivityInViewVisible
.onEach { latest = it }
.launchIn(this)
val activity = DataActivityModel(hasActivityIn = true, hasActivityOut = false) val activity = DataActivityModel(hasActivityIn = true, hasActivityOut = false)
wifiRepository.setWifiActivity(activity) wifiRepository.setWifiActivity(activity)
yield() yield()
assertThat(latest).isTrue() assertThat(latest).isTrue()
job.cancel() job.cancel()
} }
@Test @Test
fun activityIn_hasActivityInFalse_outputsFalse() = runBlocking(IMMEDIATE) { fun activityIn_hasActivityInFalse_outputsFalse() =
whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true) runBlocking(IMMEDIATE) {
createAndSetViewModel() whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK) createAndSetViewModel()
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
var latest: Boolean? = null var latest: Boolean? = null
val job = underTest val job = underTest.home.isActivityInViewVisible.onEach { latest = it }.launchIn(this)
.home
.isActivityInViewVisible
.onEach { latest = it }
.launchIn(this)
val activity = DataActivityModel(hasActivityIn = false, hasActivityOut = true) val activity = DataActivityModel(hasActivityIn = false, hasActivityOut = true)
wifiRepository.setWifiActivity(activity) wifiRepository.setWifiActivity(activity)
yield() yield()
assertThat(latest).isFalse() assertThat(latest).isFalse()
job.cancel() job.cancel()
} }
@Test @Test
fun activityOut_hasActivityOutTrue_outputsTrue() = runBlocking(IMMEDIATE) { fun activityOut_hasActivityOutTrue_outputsTrue() =
whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true) runBlocking(IMMEDIATE) {
createAndSetViewModel() whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK) createAndSetViewModel()
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
var latest: Boolean? = null var latest: Boolean? = null
val job = underTest val job = underTest.home.isActivityOutViewVisible.onEach { latest = it }.launchIn(this)
.home
.isActivityOutViewVisible
.onEach { latest = it }
.launchIn(this)
val activity = DataActivityModel(hasActivityIn = false, hasActivityOut = true) val activity = DataActivityModel(hasActivityIn = false, hasActivityOut = true)
wifiRepository.setWifiActivity(activity) wifiRepository.setWifiActivity(activity)
yield() yield()
assertThat(latest).isTrue() assertThat(latest).isTrue()
job.cancel() job.cancel()
} }
@Test @Test
fun activityOut_hasActivityOutFalse_outputsFalse() = runBlocking(IMMEDIATE) { fun activityOut_hasActivityOutFalse_outputsFalse() =
whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true) runBlocking(IMMEDIATE) {
createAndSetViewModel() whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK) createAndSetViewModel()
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
var latest: Boolean? = null var latest: Boolean? = null
val job = underTest val job = underTest.home.isActivityOutViewVisible.onEach { latest = it }.launchIn(this)
.home
.isActivityOutViewVisible
.onEach { latest = it }
.launchIn(this)
val activity = DataActivityModel(hasActivityIn = true, hasActivityOut = false) val activity = DataActivityModel(hasActivityIn = true, hasActivityOut = false)
wifiRepository.setWifiActivity(activity) wifiRepository.setWifiActivity(activity)
yield() yield()
assertThat(latest).isFalse() assertThat(latest).isFalse()
job.cancel() job.cancel()
} }
@Test @Test
fun activityContainer_hasActivityInTrue_outputsTrue() = runBlocking(IMMEDIATE) { fun activityContainer_hasActivityInTrue_outputsTrue() =
whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true) runBlocking(IMMEDIATE) {
createAndSetViewModel() whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK) createAndSetViewModel()
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
var latest: Boolean? = null var latest: Boolean? = null
val job = underTest val job =
.home underTest.home.isActivityContainerVisible.onEach { latest = it }.launchIn(this)
.isActivityContainerVisible
.onEach { latest = it }
.launchIn(this)
val activity = DataActivityModel(hasActivityIn = true, hasActivityOut = false) val activity = DataActivityModel(hasActivityIn = true, hasActivityOut = false)
wifiRepository.setWifiActivity(activity) wifiRepository.setWifiActivity(activity)
yield() yield()
assertThat(latest).isTrue() assertThat(latest).isTrue()
job.cancel() job.cancel()
} }
@Test @Test
fun activityContainer_hasActivityOutTrue_outputsTrue() = runBlocking(IMMEDIATE) { fun activityContainer_hasActivityOutTrue_outputsTrue() =
whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true) runBlocking(IMMEDIATE) {
createAndSetViewModel() whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK) createAndSetViewModel()
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
var latest: Boolean? = null var latest: Boolean? = null
val job = underTest val job =
.home underTest.home.isActivityContainerVisible.onEach { latest = it }.launchIn(this)
.isActivityContainerVisible
.onEach { latest = it }
.launchIn(this)
val activity = DataActivityModel(hasActivityIn = false, hasActivityOut = true) val activity = DataActivityModel(hasActivityIn = false, hasActivityOut = true)
wifiRepository.setWifiActivity(activity) wifiRepository.setWifiActivity(activity)
yield() yield()
assertThat(latest).isTrue() assertThat(latest).isTrue()
job.cancel() job.cancel()
} }
@Test @Test
fun activityContainer_inAndOutTrue_outputsTrue() = runBlocking(IMMEDIATE) { fun activityContainer_inAndOutTrue_outputsTrue() =
whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true) runBlocking(IMMEDIATE) {
createAndSetViewModel() whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK) createAndSetViewModel()
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
var latest: Boolean? = null var latest: Boolean? = null
val job = underTest val job =
.home underTest.home.isActivityContainerVisible.onEach { latest = it }.launchIn(this)
.isActivityContainerVisible
.onEach { latest = it }
.launchIn(this)
val activity = DataActivityModel(hasActivityIn = true, hasActivityOut = true) val activity = DataActivityModel(hasActivityIn = true, hasActivityOut = true)
wifiRepository.setWifiActivity(activity) wifiRepository.setWifiActivity(activity)
yield() yield()
assertThat(latest).isTrue() assertThat(latest).isTrue()
job.cancel() job.cancel()
} }
@Test @Test
fun activityContainer_inAndOutFalse_outputsFalse() = runBlocking(IMMEDIATE) { fun activityContainer_inAndOutFalse_outputsFalse() =
whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true) runBlocking(IMMEDIATE) {
createAndSetViewModel() whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK) createAndSetViewModel()
wifiRepository.setWifiNetwork(ACTIVE_VALID_WIFI_NETWORK)
var latest: Boolean? = null var latest: Boolean? = null
val job = underTest val job =
.home underTest.home.isActivityContainerVisible.onEach { latest = it }.launchIn(this)
.isActivityContainerVisible
.onEach { latest = it }
.launchIn(this)
val activity = DataActivityModel(hasActivityIn = false, hasActivityOut = false) val activity = DataActivityModel(hasActivityIn = false, hasActivityOut = false)
wifiRepository.setWifiActivity(activity) wifiRepository.setWifiActivity(activity)
yield() yield()
assertThat(latest).isFalse() assertThat(latest).isFalse()
job.cancel() job.cancel()
} }
@Test @Test
fun airplaneSpacer_notAirplaneMode_outputsFalse() = runBlocking(IMMEDIATE) { fun airplaneSpacer_notAirplaneMode_outputsFalse() =
var latest: Boolean? = null runBlocking(IMMEDIATE) {
val job = underTest var latest: Boolean? = null
.qs val job = underTest.qs.isAirplaneSpacerVisible.onEach { latest = it }.launchIn(this)
.isAirplaneSpacerVisible
.onEach { latest = it }
.launchIn(this)
airplaneModeRepository.setIsAirplaneMode(false) airplaneModeRepository.setIsAirplaneMode(false)
yield() yield()
assertThat(latest).isFalse() assertThat(latest).isFalse()
job.cancel() job.cancel()
} }
@Test @Test
fun airplaneSpacer_airplaneForceHidden_outputsFalse() = runBlocking(IMMEDIATE) { fun airplaneSpacer_airplaneForceHidden_outputsFalse() =
var latest: Boolean? = null runBlocking(IMMEDIATE) {
val job = underTest var latest: Boolean? = null
.qs val job = underTest.qs.isAirplaneSpacerVisible.onEach { latest = it }.launchIn(this)
.isAirplaneSpacerVisible
.onEach { latest = it }
.launchIn(this)
airplaneModeRepository.setIsAirplaneMode(true) airplaneModeRepository.setIsAirplaneMode(true)
connectivityRepository.setForceHiddenIcons(setOf(ConnectivitySlot.AIRPLANE)) connectivityRepository.setForceHiddenIcons(setOf(ConnectivitySlot.AIRPLANE))
yield() yield()
assertThat(latest).isFalse() assertThat(latest).isFalse()
job.cancel() job.cancel()
} }
@Test @Test
fun airplaneSpacer_airplaneIconVisible_outputsTrue() = runBlocking(IMMEDIATE) { fun airplaneSpacer_airplaneIconVisible_outputsTrue() =
var latest: Boolean? = null runBlocking(IMMEDIATE) {
val job = underTest var latest: Boolean? = null
.qs val job = underTest.qs.isAirplaneSpacerVisible.onEach { latest = it }.launchIn(this)
.isAirplaneSpacerVisible
.onEach { latest = it }
.launchIn(this)
airplaneModeRepository.setIsAirplaneMode(true) airplaneModeRepository.setIsAirplaneMode(true)
yield() yield()
assertThat(latest).isTrue() assertThat(latest).isTrue()
job.cancel() job.cancel()
} }
private fun createAndSetViewModel() { private fun createAndSetViewModel() {
// [WifiViewModel] creates its flows as soon as it's instantiated, and some of those flow // [WifiViewModel] creates its flows as soon as it's instantiated, and some of those flow
// creations rely on certain config values that we mock out in individual tests. This method // creations rely on certain config values that we mock out in individual tests. This method
// allows tests to create the view model only after those configs are correctly set up. // allows tests to create the view model only after those configs are correctly set up.
underTest = WifiViewModel( underTest =
airplaneModeViewModel, WifiViewModel(
connectivityConstants, airplaneModeViewModel,
context, connectivityConstants,
logger, context,
tableLogBuffer, logger,
interactor, tableLogBuffer,
scope, interactor,
statusBarPipelineFlags, scope,
wifiConstants, statusBarPipelineFlags,
) wifiConstants,
)
} }
companion object { companion object {