Fix DataUsageListTest
Using androidx.fragment.app.testing.launchFragment to rewrite the test. Bug: 315449973 Test: manual - on DataUsageList Test: unit test Change-Id: Ief373becb4ac8ab1ba93b8ff3c594b5682c4821e
This commit is contained in:
@@ -30,6 +30,7 @@ import androidx.annotation.VisibleForTesting
|
||||
import androidx.fragment.app.viewModels
|
||||
import androidx.preference.Preference
|
||||
import com.android.settings.R
|
||||
import com.android.settings.dashboard.DashboardFragment
|
||||
import com.android.settings.datausage.lib.BillingCycleRepository
|
||||
import com.android.settings.datausage.lib.NetworkUsageData
|
||||
import com.android.settings.network.MobileNetworkRepository
|
||||
@@ -45,43 +46,42 @@ import kotlin.jvm.optionals.getOrNull
|
||||
* to inspect based on usage cycle and control through [NetworkPolicy].
|
||||
*/
|
||||
@OpenForTesting
|
||||
open class DataUsageList : DataUsageBaseFragment() {
|
||||
@JvmField
|
||||
open class DataUsageList : DashboardFragment() {
|
||||
@VisibleForTesting
|
||||
var template: NetworkTemplate? = null
|
||||
private set
|
||||
|
||||
@JvmField
|
||||
@VisibleForTesting
|
||||
var subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID
|
||||
private set
|
||||
|
||||
private lateinit var usageAmount: Preference
|
||||
private var subscriptionInfoEntity: SubscriptionInfoEntity? = null
|
||||
private lateinit var dataUsageListAppsController: DataUsageListAppsController
|
||||
private lateinit var chartDataUsagePreferenceController: ChartDataUsagePreferenceController
|
||||
private lateinit var billingCycleRepository: BillingCycleRepository
|
||||
|
||||
private val viewModel: DataUsageListViewModel by viewModels()
|
||||
private var usageAmount: Preference? = null
|
||||
private var subscriptionInfoEntity: SubscriptionInfoEntity? = null
|
||||
private var dataUsageListAppsController: DataUsageListAppsController? = null
|
||||
private var chartDataUsagePreferenceController: ChartDataUsagePreferenceController? = null
|
||||
private var dataUsageListHeaderController: DataUsageListHeaderController? = null
|
||||
|
||||
@VisibleForTesting
|
||||
var dataUsageListHeaderController: DataUsageListHeaderController? = null
|
||||
private val viewModel: DataUsageListViewModel by viewModels()
|
||||
|
||||
override fun getMetricsCategory() = SettingsEnums.DATA_USAGE_LIST
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
billingCycleRepository = BillingCycleRepository(requireContext())
|
||||
if (requireContext().userManager.isGuestUser) {
|
||||
Log.e(TAG, "This setting isn't available for guest user")
|
||||
EventLog.writeEvent(0x534e4554, "262741858", -1 /* UID */, "Guest user")
|
||||
finish()
|
||||
return
|
||||
}
|
||||
billingCycleRepository = createBillingCycleRepository()
|
||||
if (!billingCycleRepository.isBandwidthControlEnabled()) {
|
||||
Log.w(TAG, "No bandwidth control; leaving")
|
||||
finish()
|
||||
return
|
||||
}
|
||||
usageAmount = findPreference(KEY_USAGE_AMOUNT)!!
|
||||
usageAmount = findPreference(KEY_USAGE_AMOUNT)
|
||||
processArgument()
|
||||
val template = template
|
||||
if (template == null) {
|
||||
@@ -94,12 +94,9 @@ open class DataUsageList : DataUsageBaseFragment() {
|
||||
init(template)
|
||||
}
|
||||
chartDataUsagePreferenceController = use(ChartDataUsagePreferenceController::class.java)
|
||||
chartDataUsagePreferenceController.init(template)
|
||||
.apply { init(template) }
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
open fun createBillingCycleRepository() = BillingCycleRepository(requireContext())
|
||||
|
||||
override fun onViewCreated(v: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(v, savedInstanceState)
|
||||
|
||||
@@ -117,10 +114,10 @@ open class DataUsageList : DataUsageBaseFragment() {
|
||||
::updateSelectedCycle,
|
||||
)
|
||||
viewModel.cyclesFlow.collectLatestWithLifecycle(viewLifecycleOwner) { cycles ->
|
||||
dataUsageListAppsController.updateCycles(cycles)
|
||||
dataUsageListAppsController?.updateCycles(cycles)
|
||||
}
|
||||
viewModel.chartDataFlow.collectLatestWithLifecycle(viewLifecycleOwner) { chartData ->
|
||||
chartDataUsagePreferenceController.update(chartData)
|
||||
chartDataUsagePreferenceController?.update(chartData)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -128,7 +125,7 @@ open class DataUsageList : DataUsageBaseFragment() {
|
||||
|
||||
override fun getLogTag() = TAG
|
||||
|
||||
fun processArgument() {
|
||||
private fun processArgument() {
|
||||
arguments?.let {
|
||||
subId = it.getInt(EXTRA_SUB_ID, SubscriptionManager.INVALID_SUBSCRIPTION_ID)
|
||||
template = it.getParcelable(EXTRA_NETWORK_TEMPLATE, NetworkTemplate::class.java)
|
||||
@@ -145,8 +142,7 @@ open class DataUsageList : DataUsageBaseFragment() {
|
||||
}
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
open fun updateSubscriptionInfoEntity() {
|
||||
private fun updateSubscriptionInfoEntity() {
|
||||
ThreadUtils.postOnBackgroundThread {
|
||||
subscriptionInfoEntity =
|
||||
MobileNetworkRepository.getInstance(context).getSubInfoById(subId.toString())
|
||||
@@ -154,19 +150,16 @@ open class DataUsageList : DataUsageBaseFragment() {
|
||||
}
|
||||
|
||||
/** Update chart sweeps and cycle list to reflect [NetworkPolicy] for current [template]. */
|
||||
@VisibleForTesting
|
||||
fun updatePolicy() {
|
||||
private fun updatePolicy() {
|
||||
val isBillingCycleModifiable = isBillingCycleModifiable()
|
||||
dataUsageListHeaderController?.setConfigButtonVisible(isBillingCycleModifiable)
|
||||
chartDataUsagePreferenceController.setBillingCycleModifiable(isBillingCycleModifiable)
|
||||
chartDataUsagePreferenceController?.setBillingCycleModifiable(isBillingCycleModifiable)
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
open fun isBillingCycleModifiable(): Boolean {
|
||||
return (billingCycleRepository.isModifiable(subId) &&
|
||||
private fun isBillingCycleModifiable(): Boolean =
|
||||
billingCycleRepository.isModifiable(subId) &&
|
||||
requireContext().getSystemService(SubscriptionManager::class.java)!!
|
||||
.getActiveSubscriptionInfo(subId) != null)
|
||||
}
|
||||
.getActiveSubscriptionInfo(subId) != null
|
||||
|
||||
/**
|
||||
* Updates the chart and detail data when initial loaded or selected cycle changed.
|
||||
@@ -174,7 +167,7 @@ open class DataUsageList : DataUsageBaseFragment() {
|
||||
private fun updateSelectedCycle(usageData: NetworkUsageData) {
|
||||
Log.d(TAG, "showing cycle $usageData")
|
||||
|
||||
usageAmount.title = usageData.getDataUsedString(requireContext())
|
||||
usageAmount?.title = usageData.getDataUsedString(requireContext())
|
||||
viewModel.selectedCycleFlow.value = usageData
|
||||
|
||||
updateApps(usageData)
|
||||
@@ -182,7 +175,7 @@ open class DataUsageList : DataUsageBaseFragment() {
|
||||
|
||||
/** Updates applications data usage. */
|
||||
private fun updateApps(usageData: NetworkUsageData) {
|
||||
dataUsageListAppsController.update(
|
||||
dataUsageListAppsController?.update(
|
||||
carrierId = subscriptionInfoEntity?.carrierId,
|
||||
startTime = usageData.startTime,
|
||||
endTime = usageData.endTime,
|
||||
|
Reference in New Issue
Block a user