New BillingCycleRepository

Migrate BillingCyclePreference to BillingCycleRepository first, will
also migrate DataUsageList in future cl.

Also fix an issue that the BillingCyclePreference initial enable state
not set.

Bug: 290856342
Test: manual - on mobile settings
Test: unit test
Change-Id: Idd171fefbc30763010afb7bfb68543612f7b9b1a
This commit is contained in:
Chaohui Wang
2023-09-21 12:23:53 +08:00
parent 2b21582fd3
commit ba1ec910ac
7 changed files with 314 additions and 203 deletions

View File

@@ -0,0 +1,60 @@
/*
* Copyright (C) 2023 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.datausage
import android.content.Context
import android.net.NetworkTemplate
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settings.datausage.lib.BillingCycleRepository
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.kotlin.doReturn
import org.mockito.kotlin.mock
@RunWith(AndroidJUnit4::class)
class BillingCyclePreferenceTest {
private val mockBillingCycleRepository = mock<BillingCycleRepository> {
on { isModifiable(SUB_ID) } doReturn false
}
private val context: Context = ApplicationProvider.getApplicationContext()
private val preference = BillingCyclePreference(context, null, mockBillingCycleRepository)
@Test
fun isEnabled_initialState() {
val enabled = preference.isEnabled
assertThat(enabled).isTrue()
}
@Test
fun isEnabled_afterSetTemplate_updated() {
preference.setTemplate(mock<NetworkTemplate>(), SUB_ID, null)
val enabled = preference.isEnabled
assertThat(enabled).isFalse()
}
private companion object {
const val SUB_ID = 1
}
}

View File

@@ -0,0 +1,120 @@
/*
* Copyright (C) 2023 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.datausage.lib
import android.content.Context
import android.os.INetworkManagementService
import android.os.UserManager
import android.telephony.TelephonyManager
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settingslib.spaprivileged.framework.common.userManager
import com.google.common.truth.Truth.assertThat
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.kotlin.doReturn
import org.mockito.kotlin.mock
import org.mockito.kotlin.spy
import org.mockito.kotlin.whenever
@RunWith(AndroidJUnit4::class)
class BillingCycleRepositoryTest {
private val mockNetworkManagementService = mock<INetworkManagementService> {
on { isBandwidthControlEnabled } doReturn true
}
private val mockUserManager = mock<UserManager> {
on { isAdminUser } doReturn true
}
private val mockTelephonyManager = mock<TelephonyManager> {
on { createForSubscriptionId(SUB_ID) } doReturn mock
on { isDataEnabledForReason(TelephonyManager.DATA_ENABLED_REASON_USER) } doReturn false
}
private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
on { userManager } doReturn mockUserManager
on { getSystemService(TelephonyManager::class.java) } doReturn mockTelephonyManager
}
private val repository = BillingCycleRepository(context, mockNetworkManagementService)
@Test
fun isModifiable_bandwidthControlDisabled_returnFalse() {
whenever(mockNetworkManagementService.isBandwidthControlEnabled).thenReturn(false)
val modifiable = repository.isModifiable(SUB_ID)
assertThat(modifiable).isFalse()
}
@Test
fun isModifiable_notAdminUser_returnFalse() {
whenever(mockUserManager.isAdminUser).thenReturn(false)
val modifiable = repository.isModifiable(SUB_ID)
assertThat(modifiable).isFalse()
}
@Test
fun isModifiable_dataDisabled_returnFalse() {
whenever(
mockTelephonyManager.isDataEnabledForReason(TelephonyManager.DATA_ENABLED_REASON_USER)
).thenReturn(false)
val modifiable = repository.isModifiable(SUB_ID)
assertThat(modifiable).isFalse()
}
@Test
fun isModifiable_meetAllRequirements_returnTrue() {
whenever(mockNetworkManagementService.isBandwidthControlEnabled).thenReturn(true)
whenever(mockUserManager.isAdminUser).thenReturn(true)
whenever(
mockTelephonyManager.isDataEnabledForReason(TelephonyManager.DATA_ENABLED_REASON_USER)
).thenReturn(true)
val modifiable = repository.isModifiable(SUB_ID)
assertThat(modifiable).isTrue()
}
@Test
fun isBandwidthControlEnabled_bandwidthControlDisabled_returnFalse() {
whenever(mockNetworkManagementService.isBandwidthControlEnabled).thenReturn(false)
val enabled = repository.isBandwidthControlEnabled()
assertThat(enabled).isFalse()
}
@Test
fun isBandwidthControlEnabled_bandwidthControlEnabled_returnTrue() {
whenever(mockNetworkManagementService.isBandwidthControlEnabled).thenReturn(true)
val enabled = repository.isBandwidthControlEnabled()
assertThat(enabled).isTrue()
}
private companion object {
const val SUB_ID = 1
}
}

View File

@@ -1,78 +0,0 @@
/*
* Copyright (C) 2022 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.datausage;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import android.content.Context;
import android.os.INetworkManagementService;
import android.os.RemoteException;
import android.os.UserManager;
import android.telephony.TelephonyManager;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@RunWith(AndroidJUnit4.class)
public class BillingCyclePreferenceTest {
private Context mContext;
private BillingCyclePreference mPreference;
private TemplatePreference.NetworkServices mServices;
@Mock
private INetworkManagementService mNetManageSerice;
@Mock
private TelephonyManager mTelephonyManager;
@Mock
private UserManager mUserManager;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(ApplicationProvider.getApplicationContext());
mServices = new TemplatePreference.NetworkServices();
mServices.mNetworkService = mNetManageSerice;
mServices.mTelephonyManager = mTelephonyManager;
mServices.mUserManager = mUserManager;
doReturn(mTelephonyManager).when(mTelephonyManager)
.createForSubscriptionId(anyInt());
mPreference = spy(new BillingCyclePreference(mContext, null /* attrs */));
mPreference.setTemplate(null, 0, mServices);
}
@Test
public void testPreferenceUpdate_onMobileDataEnabledChange_accessDataEnabledApi() {
try {
doReturn(true).when(mNetManageSerice).isBandwidthControlEnabled();
} catch (RemoteException exception) {}
doReturn(true).when(mUserManager).isAdminUser();
mPreference.onMobileDataEnabledChange();
verify(mTelephonyManager)
.isDataEnabledForReason(TelephonyManager.DATA_ENABLED_REASON_USER);
}
}