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

Merge "Clean up used EntityHeaderController" into main

Browse Source
This commit is contained in:
Chaohui Wang
2023-08-24 09:23:18 +00:00
committed by Android (Google) Code Review
parent 0e4aa4ea50 0aca2ffbdb
commit 56dfd4a57a
10 changed files with 10 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
View File

@@ -135,7 +135,7 @@ public class DataUsageSummaryPreferenceControllerTest {
mDataUsageController,
mDataInfoController,
mNetworkTemplate,
mActivity, null, null, mDefaultSubscriptionId));
mActivity, mDefaultSubscriptionId));
doReturn(null).when(mController).getSubscriptionInfo(
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
doReturn(null).when(mController).getSubscriptionPlans(

3
tests/robotests/src/com/android/settings/datausage/WifiDataUsageSummaryPreferenceControllerTest.java
View File

@@ -72,8 +72,7 @@ public class WifiDataUsageSummaryPreferenceControllerTest {
doNothing().when(mSummaryPreference).setWifiMode(anyBoolean(), anyString(), anyBoolean());
doReturn(mDataUsageInfo).when(mDataUsageController).getDataUsageInfo(any());
mController = spy(new WifiDataUsageSummaryPreferenceController(mActivity, null,
mAllNetworkKeys));
mController = spy(new WifiDataUsageSummaryPreferenceController(mActivity, mAllNetworkKeys));
doReturn(mDataUsageController).when(mController).createDataUsageController(any());
}

15
tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
View File

@@ -23,7 +23,6 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.hardware.usb.UsbManager;
@@ -34,8 +33,6 @@ import android.os.BatteryManager;
import android.os.PowerManager;
import android.text.TextUtils;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
@@ -47,7 +44,6 @@ import com.android.settings.testutils.BatteryTestUtils;
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.UsageProgressBarPreference;
import org.junit.After;
@@ -72,10 +68,6 @@ public class BatteryHeaderPreferenceControllerTest {
private static final String TIME_LEFT = "2h30min";
private static final String BATTERY_STATUS = "Charging";
@Mock
private Activity mActivity;
@Mock
private PreferenceFragmentCompat mPreferenceFragment;
@Mock
private PreferenceScreen mPreferenceScreen;
@Mock
@@ -97,15 +89,11 @@ public class BatteryHeaderPreferenceControllerTest {
private Context mContext;
private ShadowPowerManager mShadowPowerManager;
private Intent mBatteryIntent;
private LifecycleOwner mLifecycleOwner;
private Lifecycle mLifecycle;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(UsbManager.class)).thenReturn(mUsbManager);
ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
@@ -124,9 +112,6 @@ public class BatteryHeaderPreferenceControllerTest {
mShadowPowerManager = Shadows.shadowOf(mContext.getSystemService(PowerManager.class));
mController = spy(new BatteryHeaderPreferenceController(mContext, PREF_KEY));
mLifecycle.addObserver(mController);
mController.setActivity(mActivity);
mController.setFragment(mPreferenceFragment);
mController.mBatteryUsageProgressBarPref = mBatteryUsageProgressBarPref;
mController.mBatteryStatusFeatureProvider = mBatteryStatusFeatureProvider;
}