PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Settings] Apply ImsQueryProvisioningStat to VoLTE

Browse Source 
1. Code refactor
2. Apply ImsQueryProvisioningStat class to VoLTE's use case

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gLteSliceHelperTest
Change-Id: Ie5a56e9b768b9abe88c635e4e5532d72c9ddd1a2
This commit is contained in:
Bonian Chen
2020-01-22 19:32:46 +08:00
parent 2d29e935f7
commit 19b232f73e
8 changed files with 126 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
tests/robotests/src/com/android/settings/network/ims/MockVolteQueryImsState.java Normal file
View File

@@ -0,0 +1,84 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.network.ims;
import android.content.Context;
import com.android.ims.ImsManager;
/**
* Controller class for mock VoLte status
*/
public class MockVolteQueryImsState extends VolteQueryImsState {
private ImsQuery mIsTtyOnVolteEnabled;
private ImsQuery mIsProvisionedOnDevice;
private ImsQuery mIsEnabledByUser;
/**
* Constructor
*
* @param context {@link Context}
* @param subId subscription's id
*/
public MockVolteQueryImsState(Context context, int subId) {
super(context, subId);
}
public ImsManager getImsManager(int subId) {
return super.getImsManager(subId);
}
public void setIsTtyOnVolteEnabled(boolean enabled) {
mIsTtyOnVolteEnabled = new MockImsQueryResult.BooleanResult(enabled);
}
@Override
ImsQuery isTtyOnVolteEnabled(int subId) {
if (mIsTtyOnVolteEnabled != null) {
return mIsTtyOnVolteEnabled;
}
return super.isTtyOnVolteEnabled(subId);
}
public void setIsProvisionedOnDevice(boolean isProvisioned) {
mIsProvisionedOnDevice = new MockImsQueryResult.BooleanResult(isProvisioned);
}
@Override
ImsQuery isProvisionedOnDevice(int subId) {
if (mIsProvisionedOnDevice != null) {
return mIsProvisionedOnDevice;
}
return super.isProvisionedOnDevice(subId);
}
public void setIsEnabledByUser(boolean enabled) {
mIsEnabledByUser = new MockImsQueryResult.BooleanResult(enabled);
}
@Override
ImsQuery isEnabledByUser(int subId) {
if (mIsEnabledByUser != null) {
return mIsEnabledByUser;
}
return super.isEnabledByUser(subId);
}
}

2
tests/robotests/src/com/android/settings/network/ims/MockVtQueryImsState.java
View File

@@ -33,7 +33,7 @@ public class MockVtQueryImsState extends VtQueryImsState {
/**
* Constructor
*
* @param context {@code Context}
* @param context {@link Context}
* @param subId subscription's id
*/
public MockVtQueryImsState(Context context, int subId) {

16
tests/robotests/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java
View File

@@ -35,7 +35,7 @@ import androidx.preference.SwitchPreference;
import com.android.ims.ImsManager;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.network.ims.VolteQueryImsState;
import com.android.settings.network.ims.MockVolteQueryImsState;
import com.android.settingslib.RestrictedSwitchPreference;
import org.junit.Before;
@@ -63,7 +63,7 @@ public class Enhanced4gBasePreferenceControllerTest {
@Mock
private ProvisioningManager mProvisioningManager;
private VolteQueryImsState mQueryImsState;
private MockVolteQueryImsState mQueryImsState;
private Enhanced4gLtePreferenceController mController;
private SwitchPreference mPreference;
@@ -85,17 +85,13 @@ public class Enhanced4gBasePreferenceControllerTest {
mCarrierConfig = new PersistableBundle();
doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
mQueryImsState = spy(new VolteQueryImsState(mContext, SUB_ID));
mQueryImsState = spy(new MockVolteQueryImsState(mContext, SUB_ID));
doReturn(mImsManager).when(mQueryImsState).getImsManager(anyInt());
mQueryImsState.setIsProvisionedOnDevice(true);
mPreference = new RestrictedSwitchPreference(mContext);
mController = spy(new Enhanced4gLtePreferenceController(mContext, "roaming") {
@Override
ProvisioningManager getProvisioningManager(int subId) {
return mProvisioningManager;
}
});
mController = spy(new Enhanced4gLtePreferenceController(mContext, "VoLTE"));
mController.init(SUB_ID);
mController.mImsManager = mImsManager;
doReturn(mQueryImsState).when(mController).queryImsState(anyInt());
mPreference.setKey(mController.getPreferenceKey());
}

34
tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java
View File

@@ -34,8 +34,6 @@ import android.content.Intent;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager;
import android.telephony.ims.ProvisioningManager;
import android.telephony.ims.feature.MmTelFeature;
import android.telephony.ims.stub.ImsRegistrationImplBase;
import androidx.slice.Slice;
import androidx.slice.SliceItem;
@@ -47,7 +45,7 @@ import androidx.slice.widget.SliceLiveData;
import com.android.ims.ImsManager;
import com.android.settings.R;
import com.android.settings.network.ims.VolteQueryImsState;
import com.android.settings.network.ims.MockVolteQueryImsState;
import com.android.settings.slices.CustomSliceRegistry;
import com.android.settings.slices.SettingsSliceProvider;
import com.android.settings.slices.SliceBroadcastReceiver;
@@ -81,7 +79,7 @@ public class Enhanced4gLteSliceHelperTest {
private ProvisioningManager mProvisioningManager;
private ShadowSubscriptionManager mShadowSubscriptionManager;
private VolteQueryImsState mQueryImsState;
private MockVolteQueryImsState mQueryImsState;
private Context mContext;
private FakeEnhanced4gLteSliceHelper mEnhanced4gLteSliceHelper;
@@ -110,7 +108,9 @@ public class Enhanced4gLteSliceHelperTest {
//setup for SliceBroadcastReceiver test
mReceiver = spy(new SliceBroadcastReceiver());
mQueryImsState = spy(new VolteQueryImsState(mContext, SUB_ID));
mQueryImsState = spy(new MockVolteQueryImsState(mContext, SUB_ID));
doReturn(mMockImsManager).when(mQueryImsState).getImsManager(anyInt());
mQueryImsState.setIsProvisionedOnDevice(true);
mEnhanced4gLteSliceHelper = spy(new FakeEnhanced4gLteSliceHelper(mContext));
doReturn(mQueryImsState).when(mEnhanced4gLteSliceHelper).queryImsState(anyInt());
@@ -143,9 +143,7 @@ public class Enhanced4gLteSliceHelperTest {
@Test
public void test_CreateEnhanced4gLteSlice_success() {
when(mMockImsManager.isVolteEnabledByPlatform()).thenReturn(true);
when(mProvisioningManager.getProvisioningStatusForCapability(
MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE,
ImsRegistrationImplBase.REGISTRATION_TECH_LTE)).thenReturn(true);
mQueryImsState.setIsProvisionedOnDevice(true);
doReturn(true).when(mQueryImsState).isEnabledByUser();
when(mMockImsManager.isNonTtyOrTtyOnVolteEnabled()).thenReturn(true);
when(mMockCarrierConfigManager.getConfigForSubId(1)).thenReturn(null);
@@ -160,9 +158,7 @@ public class Enhanced4gLteSliceHelperTest {
@Test
public void test_SettingSliceProvider_getsRightSliceEnhanced4gLte() {
when(mMockImsManager.isVolteEnabledByPlatform()).thenReturn(true);
when(mProvisioningManager.getProvisioningStatusForCapability(
MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE,
ImsRegistrationImplBase.REGISTRATION_TECH_LTE)).thenReturn(true);
mQueryImsState.setIsProvisionedOnDevice(true);
doReturn(true).when(mQueryImsState).isEnabledByUser();
when(mMockImsManager.isNonTtyOrTtyOnVolteEnabled()).thenReturn(true);
when(mMockCarrierConfigManager.getConfigForSubId(1)).thenReturn(null);
@@ -179,9 +175,7 @@ public class Enhanced4gLteSliceHelperTest {
@Ignore
public void test_SliceBroadcastReceiver_toggleOffEnhanced4gLte() {
when(mMockImsManager.isVolteEnabledByPlatform()).thenReturn(true);
when(mProvisioningManager.getProvisioningStatusForCapability(
MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE,
ImsRegistrationImplBase.REGISTRATION_TECH_LTE)).thenReturn(true);
mQueryImsState.setIsProvisionedOnDevice(true);
doReturn(false).when(mQueryImsState).isEnabledByUser();
when(mMockImsManager.isNonTtyOrTtyOnVolteEnabled()).thenReturn(true);
when(mSlicesFeatureProvider.getNewEnhanced4gLteSliceHelper(mContext))
@@ -278,7 +272,7 @@ public class Enhanced4gLteSliceHelperTest {
}
private class FakeEnhanced4gLteSliceHelper extends Enhanced4gLteSliceHelper {
int mSubId = 1;
int mSubId = SUB_ID;
FakeEnhanced4gLteSliceHelper(Context context) {
super(context);
@@ -289,16 +283,6 @@ public class Enhanced4gLteSliceHelperTest {
return mMockCarrierConfigManager;
}
@Override
protected ImsManager getImsManager(int subId) {
return mMockImsManager;
}
@Override
ProvisioningManager getProvisioningManager(int subId) {
return mProvisioningManager;
}
protected int getDefaultVoiceSubId() {
return mSubId;
}