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

Remove "v2" from the data usage version 2 code.

Browse Source 
Change-Id: I8ede82029194d1a9a43d00a3de7ec1a8dd77d978
Fixes: 117420679
Test: make RunSettingsRoboTests
This commit is contained in:
Doris Ling
2018-11-30 16:20:32 -08:00
parent d3ad570818
commit 282a0d9222
18 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/robotests/src/com/android/settings/datausage/AppDataUsageV2Test.java → tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
View File

@@ -66,14 +66,14 @@ import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowEntityHeaderController.class, ShadowRestrictedLockUtilsInternal.class})
public class AppDataUsageV2Test {
public class AppDataUsageTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private EntityHeaderController mHeaderController;
@Mock
private PackageManager mPackageManager;
private AppDataUsageV2 mFragment;
private AppDataUsage mFragment;
@Before
public void setUp() {
@@ -92,7 +92,7 @@ public class AppDataUsageV2Test {
when(mHeaderController.setRecyclerView(any(), any())).thenReturn(mHeaderController);
when(mHeaderController.setUid(anyInt())).thenReturn(mHeaderController);
mFragment = spy(new AppDataUsageV2());
mFragment = spy(new AppDataUsage());
when(mFragment.getPreferenceManager())
.thenReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS));
@@ -109,7 +109,7 @@ public class AppDataUsageV2Test {
PackageManager.NameNotFoundException {
final int fakeUserId = 100;
mFragment = spy(new AppDataUsageV2());
mFragment = spy(new AppDataUsage());
final ArraySet<String> packages = new ArraySet<>();
packages.add("pkg");
final AppItem appItem = new AppItem(123456789);
@@ -138,7 +138,7 @@ public class AppDataUsageV2Test {
@Test
public void changePreference_backgroundData_shouldUpdateUI() {
mFragment = spy(new AppDataUsageV2());
mFragment = spy(new AppDataUsage());
final AppItem appItem = new AppItem(123456789);
final RestrictedSwitchPreference pref = mock(RestrictedSwitchPreference.class);
final DataSaverBackend dataSaverBackend = mock(DataSaverBackend.class);
@@ -155,7 +155,7 @@ public class AppDataUsageV2Test {
@Test
public void updatePrefs_restrictedByAdmin_shouldDisablePreference() {
mFragment = spy(new AppDataUsageV2());
mFragment = spy(new AppDataUsage());
final int testUid = 123123;
final AppItem appItem = new AppItem(testUid);
final RestrictedSwitchPreference restrictBackgroundPref
@@ -182,7 +182,7 @@ public class AppDataUsageV2Test {
@Test
public void bindData_noAppUsageData_shouldHideCycleSpinner() {
mFragment = spy(new AppDataUsageV2());
mFragment = spy(new AppDataUsage());
final SpinnerPreference cycle = mock(SpinnerPreference.class);
ReflectionHelpers.setField(mFragment, "mCycle", cycle);
final Preference preference = mock(Preference.class);
@@ -198,7 +198,7 @@ public class AppDataUsageV2Test {
@Test
public void bindData_hasAppUsageData_shouldShowCycleSpinnerAndUpdateUsageSummary() {
mFragment = spy(new AppDataUsageV2());
mFragment = spy(new AppDataUsage());
final Context context = RuntimeEnvironment.application;
doReturn(context).when(mFragment).getContext();
final long backgroundBytes = 1234L;

14
tests/robotests/src/com/android/settings/datausage/DataUsageListV2Test.java → tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
View File

@@ -47,7 +47,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.preference.PreferenceManager;
@RunWith(SettingsRobolectricTestRunner.class)
public class DataUsageListV2Test {
public class DataUsageListTest {
@Mock
private CellDataPreference.DataStateListener mListener;
@@ -55,14 +55,14 @@ public class DataUsageListV2Test {
private TemplatePreference.NetworkServices mNetworkServices;
@Mock
private Context mContext;
private DataUsageListV2 mDataUsageList;
private DataUsageList mDataUsageList;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest();
mNetworkServices.mPolicyEditor = mock(NetworkPolicyEditor.class);
mDataUsageList = spy(DataUsageListV2.class);
mDataUsageList = spy(DataUsageList.class);
doReturn(mContext).when(mDataUsageList).getContext();
ReflectionHelpers.setField(mDataUsageList, "mDataStateListener", mListener);
@@ -88,8 +88,8 @@ public class DataUsageListV2Test {
@Test
public void processArgument_shouldGetTemplateFromArgument() {
final Bundle args = new Bundle();
args.putParcelable(DataUsageListV2.EXTRA_NETWORK_TEMPLATE, mock(NetworkTemplate.class));
args.putInt(DataUsageListV2.EXTRA_SUB_ID, 3);
args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE, mock(NetworkTemplate.class));
args.putInt(DataUsageList.EXTRA_SUB_ID, 3);
mDataUsageList.setArguments(args);
mDataUsageList.processArgument();
@@ -101,8 +101,8 @@ public class DataUsageListV2Test {
@Test
public void processArgument_shouldGetNetworkTypeFromArgument() {
final Bundle args = new Bundle();
args.putInt(DataUsageListV2.EXTRA_NETWORK_TYPE, ConnectivityManager.TYPE_WIFI);
args.putInt(DataUsageListV2.EXTRA_SUB_ID, 3);
args.putInt(DataUsageList.EXTRA_NETWORK_TYPE, ConnectivityManager.TYPE_WIFI);
args.putInt(DataUsageList.EXTRA_SUB_ID, 3);
mDataUsageList.setArguments(args);
mDataUsageList.processArgument();

4
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
View File

@@ -513,11 +513,11 @@ public class DataUsageSummaryPreferenceTest {
SubSettings.class.getName()));
final Bundle expect = new Bundle(1);
expect.putParcelable(DataUsageListV2.EXTRA_NETWORK_TEMPLATE,
expect.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE,
NetworkTemplate.buildTemplateWifiWildcard());
final Bundle actual = startedIntent
.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS);
assertThat((NetworkTemplate) actual.getParcelable(DataUsageListV2.EXTRA_NETWORK_TEMPLATE))
assertThat((NetworkTemplate) actual.getParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE))
.isEqualTo(NetworkTemplate.buildTemplateWifiWildcard());
assertThat(startedIntent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))